gentoo resync : 24.12.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-12-24 14:11:38 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2018-12-24 14:11:38 +0000
commit: de49812990871e1705b64051c35161d5e6400269 (patch)
tree: 5e1e8fcb0ff4579dbd22a1bfee28a6b97dc8aaeb /media-plugins
parent: 536c3711867ec947c1738f2c4b96f22e4863322d (diff)
128 files changed, 1580 insertions, 1365 deletions
diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index 96c0b89cbbf0..a16e52fd90f1 100644
--- a/media-plugins/Manifest.gz
+++ b/media-plugins/Manifest.gz
diff --git a/media-plugins/alsaequal/Manifest b/media-plugins/alsaequal/Manifest
deleted file mode 100644
index dc08e02b5ffd..000000000000
--- a/media-plugins/alsaequal/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX alsaequal-0.6-asneeded.patch 481 BLAKE2B 177eedf1fa3aa1e61c7547ded34f71e7e1d8b7f19030e22878e2c5443b5aa553d5267a4fdbcf162b6fa50dc0e421b952e9d74fc1de5eaff0c8fe20fbe3b14df0 SHA512 e1aa6a169b28d5828c3a07a5d1cef75b30659e2385c2898fa80b914a9644fdc36cca8939e247e0c81c0d40f8f8dd116928f3ea49d28750a3b708af4ac04d4082
-AUX alsaequal-0.6-eq-name.patch 2081 BLAKE2B 62e0580b0df6023066aaff5369ae8ef271e08a148d9f3373b642c262bc25f9184d9b1571c04d45f5aca61f5bfc30d75ca5eb963a6198f3329b8ec20b97c6387e SHA512 17d8280da936684b2e525aa0d55b6568de02d44490c974a2a31e274bdaa130589f74f41f9157df6885ccef87a9c927f3184bfd2b8ea2368b921db201de0f8413
-DIST alsaequal-0.6.tar.bz2 23562 BLAKE2B 29a5465800eba650586df5b603f04c6fa1765785256fb794eb417001fa39cae40ecd7493ed0f54fffa439198764804ce862dbfc1bf441e7da1c2f0788b754e51 SHA512 53a73469682eb7b641849151d4e91a3ac031daa5f11f7ad328bdd0bcf5251112814c75d27dceb8baf8582c749bf80f055414397259d24b749e7edbc03472bc6a
-EBUILD alsaequal-0.6-r2.ebuild 1020 BLAKE2B c369ae15ef470f4723ad3a6270eeb6b3b6cfe00c1e0c87f622e1d9415d5686e1f0b24f93355722498e2fe8ac495c0951b5453075d6fef98d5c94b2412445505b SHA512 a670f540c14ecdd6d35a574b4534dac11b3c619146fdd5fedfa81b6b50e324c8ee10bf22f7b6355bce7593761794d675951ebf6b0cc2cae9881995db0c12a5eb
-MISC metadata.xml 265 BLAKE2B e3dedcada43b8145986c6c9f3ed1d374d3e93d2a1f6bdf5d83af1a43e24d01ee0ea4b6efd67ffee46d585e6d37272cbacec69e66e21b22af6a5e01878003e44a SHA512 5b875b5d0a59914316df520eee72ee3c5f931b8513424120281657bbc266c777214a924e4c6c867cdd7a61cb66037c7b9b501225cc06d890abb8ca04c13f5fba
diff --git a/media-plugins/alsaequal/alsaequal-0.6-r2.ebuild b/media-plugins/alsaequal/alsaequal-0.6-r2.ebuild
deleted file mode 100644
index ceb3b6a27f15..000000000000
--- a/media-plugins/alsaequal/alsaequal-0.6-r2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils multilib toolchain-funcs multilib-minimal
-
-DESCRIPTION="a real-time adjustable equalizer plugin for ALSA"
-HOMEPAGE="http://www.thedigitalmachine.net/alsaequal.html"
-SRC_URI="http://www.thedigitalmachine.net/tools/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}]
-	>=media-plugins/caps-plugins-0.9.15[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${PN}
-DOCS=( README )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-asneeded.patch
-	epatch "${FILESDIR}"/${P}-eq-name.patch
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS} -Wall -fPIC -DPIC" \
-		LD="$(tc-getCC)" \
-		LDFLAGS="${LDFLAGS} -shared" \
-		Q= \
-		SND_PCM_LIBS="-lasound" \
-		SND_CTL_LIBS="-lasound" || die
-}
-
-multilib_src_install() {
-	exeinto /usr/$(get_libdir)/alsa-lib
-	doexe *.so || die
-}
diff --git a/media-plugins/alsaequal/files/alsaequal-0.6-asneeded.patch b/media-plugins/alsaequal/files/alsaequal-0.6-asneeded.patch
deleted file mode 100644
index 50a95e6a5c95..000000000000
--- a/media-plugins/alsaequal/files/alsaequal-0.6-asneeded.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- Makefile
-+++ Makefile
-@@ -29,11 +29,11 @@
- 
- $(SND_PCM_BIN): $(SND_PCM_OBJECTS)
- 	@echo LD $@
--	$(Q)$(LD) $(LDFLAGS) $(SND_PCM_LIBS) $(SND_PCM_OBJECTS) -o $(SND_PCM_BIN)
-+	$(Q)$(LD) $(LDFLAGS) $(SND_PCM_OBJECTS) -o $(SND_PCM_BIN) $(SND_PCM_LIBS)
- 
- $(SND_CTL_BIN): $(SND_CTL_OBJECTS)
- 	@echo LD $@
--	$(Q)$(LD) $(LDFLAGS) $(SND_CTL_LIBS) $(SND_CTL_OBJECTS) -o $(SND_CTL_BIN)
-+	$(Q)$(LD) $(LDFLAGS) $(SND_CTL_OBJECTS) -o $(SND_CTL_BIN) $(SND_CTL_LIBS)
- 
- %.o: %.c
- 	@echo GCC $<
diff --git a/media-plugins/alsaequal/files/alsaequal-0.6-eq-name.patch b/media-plugins/alsaequal/files/alsaequal-0.6-eq-name.patch
deleted file mode 100644
index 7317214bf914..000000000000
--- a/media-plugins/alsaequal/files/alsaequal-0.6-eq-name.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-Description: Fix CAPS Eq plugin name
-Origin: vendor
-Bug-Debian: http://bugs.debian.org/721355
-Forwarded: no
-Author: Alessandro Ghedini <ghedo@debian.org>
-Last-Update: 2013-08-30
-
---- a/ctl_equal.c
-+++ b/ctl_equal.c
-@@ -167,7 +167,7 @@
- 	snd_ctl_equal_t *equal;
- 	const char *controls = ".alsaequal.bin";
- 	const char *library = "/usr/lib/ladspa/caps.so";
--	const char *module = "Eq";
-+	const char *module = "Eq10";
- 	long channels = 2;
- 	const char *sufix = " Playback Volume";
- 	int err, i, index;
---- a/pcm_equal.c
-+++ b/pcm_equal.c
-@@ -151,7 +151,7 @@
- 	snd_config_t *sconf = NULL;
- 	const char *controls = ".alsaequal.bin";
- 	const char *library = "/usr/lib/ladspa/caps.so";
--	const char *module = "Eq";
-+	const char *module = "Eq10";
- 	long channels = 2;
- 	int err;
- 	
---- a/README
-+++ b/README
-@@ -1,11 +1,11 @@
- Alsaequal is a real-time adjustable equalizer plugin for ALSA. It can
- be adjusted using any ALSA compatible mixer, e.g. alsamixergui.
- 
--Alsaequal uses the Eq CAPS LADSPA Plugin for audio processing, actually
-+Alsaequal uses the Eq10 CAPS LADSPA Plugin for audio processing, actually
- alsaequal is a generic LADSPA plugin interface with real-time access to
- the LADSPA controls (the LADSPA plugin included with alsa doesn't allow
- for real-time controls) but it was developed for and only tested with
--Eq CAPS LADSPA plugin. You are welcome to try it with other plugins, it
-+Eq10 CAPS LADSPA plugin. You are welcome to try it with other plugins, it
- may work. Let me know how it goes, you can reach me at
- <charles@thedigitalmachine.net>.
- 
-@@ -66,7 +66,7 @@
- 	library -- location of the LADSPA library, the default is
- 					"/usr/lib/ladspa/caps.so"
- 	module -- module name within the LADSPA library, the deafault
--					is "Eq"
-+					is "Eq10"
- 	channels -- number of channels, the default is 2
- }
- 
-@@ -81,7 +81,7 @@
- 	library -- location of the LADSPA library, the default is
- 					"/usr/lib/ladspa/caps.so"
- 	module -- module name within the LADSPA library, the deafault
--					is "Eq"
-+					is "Eq10"
- 	channels -- number of channels, the default is 2
- }
- 
diff --git a/media-plugins/alsaequal/metadata.xml b/media-plugins/alsaequal/metadata.xml
deleted file mode 100644
index 009e0e9e4ae2..000000000000
--- a/media-plugins/alsaequal/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>proaudio@gentoo.org</email>
-    <name>Gentoo ProAudio Project</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/media-plugins/audacious-plugins/Manifest b/media-plugins/audacious-plugins/Manifest
index d771ae1dbed8..65f10e553ca2 100644
--- a/media-plugins/audacious-plugins/Manifest
+++ b/media-plugins/audacious-plugins/Manifest
@@ -1,9 +1,7 @@
 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 4428 BLAKE2B 62886db82bd137bcb38ef9d98fd34f4c59557ea3122870765b1d983a8d997beaa37f7d30e86ac04a9b3a737ad03f02aeac4d6bd08bfd9d2ef79b0a4176eaea51 SHA512 c9753c7ec6b04860e2c582375e7de64733e9c969410c8d4dbb7db60484687d52ae5bd2d208eb9b1adeee44b92af01e9f22b9265bf2082da734727a62b2cc8c02
-MISC metadata.xml 1428 BLAKE2B f6f35bd76daa789fe1700ef910aee207bf132d9dee3660796d2d6182e54f839370dcb6f7eedf73cd52d5e3713a8460fed1e9db625e5208c76f3a857cb09da24f SHA512 720a609a086b8477062fa836b1e7ac2dcca5e9a0aaac25848fd6a6c69d48fcc8161885ac9bc3c428d81c3e8e1b2256f0343c799cc07e8ceb7ec4fd2ce3d7680d
+EBUILD audacious-plugins-3.10-r1.ebuild 4331 BLAKE2B bf4ca1c68855e38fdbb281d7ee95b7857a5e7ac8a40727a2dbaaf5eb05deb68c23dc0cd615a8c71e348df65f06647c887c3115dada0ea02eee54d57cb8d1bc06 SHA512 93cd48c84ff38ddb994d74b9162f0c0bfb746d7b9d550a4765c42f2e4a03ecc84fbe8bd47184511fe54f9c566768ae69908e34aa8c35c04a6cce24fc261231b9
+EBUILD audacious-plugins-3.9-r2.ebuild 3684 BLAKE2B 089fb220f9212d6bff4c10ea3b86719e918928d177a754d5d274f3e0d04257ce4cbbf4db0c3485cee2a8f31648ea96eaffafdb6908b5a71f51e2f0d7b46d8043 SHA512 2dc3cae3e3b663aa3dcaa2efc085d86ae292229e3984bc18a9b5876aef9d2923f04434774c5f39f47d33d178110b448a34d0a939c9a713495a180f0dfd8c6ee4
+EBUILD audacious-plugins-9999.ebuild 4277 BLAKE2B 1916a029169b9da4162cbf18ae3d52e64315943e91ee733eb6ebdbba017bf5f7b108e6fc7262f4575b88065a902cbdef2db794777cf22d2f0e164c1245b831d0 SHA512 0b9b68b4dd8db53198a8bf9787b91a09b359d5ec4279943f7db39e67c23fc8451e0b6ed9a0b9a98a3fa7e7308820f757f39f243723e80beabd67e32cbdf5ddb0
+MISC metadata.xml 1333 BLAKE2B f27c5c2d94c45688e56a6a48382c6b5fb3e05bfbbdff613af56ce386af8f607b6d24f5eedfebe221274fe5f56d0d13cc1cba21c11007ff9b5ceb5080f36dde64 SHA512 2c31199cc1f095d0108223e15584dd901fedc88aa02820bf4749cbb1014eeec5af04e1df9688efdd2c2b78a4f27658dec3a73a7c3e6e3968fc8ab659611e9c81
diff --git a/media-plugins/audacious-plugins/audacious-plugins-3.10.ebuild b/media-plugins/audacious-plugins/audacious-plugins-3.10-r1.ebuild
index 968cfc473386..2866dd8fcd2a 100644
--- a/media-plugins/audacious-plugins/audacious-plugins-3.10.ebuild
+++ b/media-plugins/audacious-plugins/audacious-plugins-3.10-r1.ebuild
@@ -5,9 +5,6 @@ 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"
@@ -15,14 +12,16 @@ else
 	SRC_URI="https://distfiles.audacious-media-player.org/${MY_P}.tar.bz2"
 	KEYWORDS="~amd64 ~x86"
 fi
+DESCRIPTION="Lightweight and versatile audio player"
+HOMEPAGE="https://audacious-media-player.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="aac +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"
+IUSE="aac adplug +alsa ampache bs2b cdda cue ffmpeg flac fluidsynth http gme jack lame libav libnotify libsamplerate
+	lirc mms modplug mp3 nls opengl pulseaudio qt5 qtmedia scrobbler sdl sid sndfile soxr speedpitch vorbis wavpack"
 REQUIRED_USE="
-	|| ( alsa jack pulseaudio sdl )
-	ampache? ( http )"
+	|| ( alsa jack pulseaudio qtmedia sdl )
+	ampache? ( qt5 http ) qtmedia? ( qt5 )"
 
 # The following plugins REQUIRE a GUI build of audacious, because non-GUI
 # builds do NOT install the libaudgui library & headers.
@@ -46,30 +45,22 @@ RDEPEND="
 	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}
+	~media-sound/audacious-${PV}[qt5=]
 	aac? ( >=media-libs/faad2-2.7 )
+	adplug? ( media-libs/adplug )
 	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
+		>=media-libs/libcddb-1.2.1
 	)
 	cue? ( media-libs/libcue )
 	ffmpeg? ( >=virtual/ffmpeg-0.7.3 )
 	flac? (
-		>=media-libs/libvorbis-1.0
 		>=media-libs/flac-1.2.1-r1
+		>=media-libs/libvorbis-1.0
 	)
 	fluidsynth? ( media-sound/fluidsynth )
 	http? ( >=net-libs/neon-0.26.4 )
@@ -78,12 +69,25 @@ RDEPEND="
 		virtual/jack
 	)
 	lame? ( media-sound/lame )
+	libnotify? ( x11-libs/libnotify )
 	libsamplerate? ( media-libs/libsamplerate:= )
 	lirc? ( app-misc/lirc )
 	mms? ( >=media-libs/libmms-0.3 )
 	modplug? ( media-libs/libmodplug )
 	mp3? ( >=media-sound/mpg123-1.12.1 )
 	pulseaudio? ( >=media-sound/pulseaudio-0.9.3 )
+	!qt5? (
+		x11-libs/gtk+:2
+		x11-libs/libXcomposite
+		x11-libs/libXrender
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		opengl? ( dev-qt/qtopengl:5 )
+	)
+	qtmedia? ( dev-qt/qtmultimedia:5 )
 	scrobbler? ( net-misc/curl )
 	sdl? ( media-libs/libsdl2[sound] )
 	sid? ( >=media-libs/libsidplayfp-1.0.0 )
@@ -91,65 +95,76 @@ RDEPEND="
 	soxr? ( media-libs/soxr )
 	speedpitch? ( media-libs/libsamplerate:= )
 	vorbis? (
-		>=media-libs/libvorbis-1.2.0
 		>=media-libs/libogg-1.1.3
+		>=media-libs/libvorbis-1.2.0
 	)
-	wavpack? ( >=media-sound/wavpack-4.50.1-r1 )"
-
+	wavpack? ( >=media-sound/wavpack-4.50.1-r1 )
+"
 DEPEND="${RDEPEND}
 	dev-util/gdbus-codegen
 	virtual/pkgconfig
-	nls? ( dev-util/intltool )"
+	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"
+src_prepare() {
+	default
+	if ! use nls; then
+		sed -e "/SUBDIRS/s/ po//" -i Makefile || die # bug #512698
 	fi
+	[[ ${PV} == *9999 ]] && eautoreconf
+}
+
+src_configure() {
+	use mp3 || ewarn "MP3 support is optional, you may want to enable the mp3 USE-flag"
 
-	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) \
+	local myeconfargs=(
+		--enable-mpris2
+		--enable-songchange
+		--disable-oss4
+		--disable-coreaudio
+		--disable-sndio
+		$(use_enable aac)
+		$(use_enable adplug)
+		$(use_enable alsa)
+		$(use_enable ampache)
+		$(use_enable bs2b)
+		$(use_enable cdda cdaudio)
+		$(use_enable cue)
+		$(use_enable flac)
+		$(use_enable flac filewriter)
+		$(use_enable fluidsynth amidiplug)
+		$(use_enable gme console)
+		$(use_enable http neon)
+		$(use_enable jack)
+		$(use_enable lame filewriter_mp3)
+		$(use_enable libnotify notify)
+		$(use_enable libsamplerate resample)
+		$(use_enable lirc)
+		$(use_enable mms)
+		$(use_enable modplug)
+		$(use_enable mp3 mpg123)
+		$(use_enable nls)
+		$(use_enable pulseaudio pulse)
+		$(use_enable !qt5 aosd)
+		$(use_enable !qt5 gtk)
+		$(use_enable !qt5 hotkey)
+		$(use_enable qt5 qt)
+		$(use_enable qtmedia qtaudio)
+		$(use_enable scrobbler scrobbler2)
+		$(use_enable sdl sdlout)
+		$(use_enable sid)
+		$(use_enable sndfile)
+		$(use_enable soxr)
+		$(use_enable speedpitch)
+		$(use_enable vorbis)
+		$(use_enable wavpack)
 		$(use_with ffmpeg ffmpeg $(usex libav libav ffmpeg))
+	)
+	use qt5 && myeconfargs+=( $(usex opengl --enable-qtglspectrum --disable-qtglspectrum) )
+
+	econf "${myeconfargs[@]}"
 }
diff --git a/media-plugins/audacious-plugins/audacious-plugins-3.9-r1.ebuild b/media-plugins/audacious-plugins/audacious-plugins-3.9-r1.ebuild
deleted file mode 100644
index 21da7bb77a88..000000000000
--- a/media-plugins/audacious-plugins/audacious-plugins-3.9-r1.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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"
-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="
-		!gtk3? ( https://distfiles.audacious-media-player.org/${MY_P}.tar.bz2 )
-		gtk3? ( https://distfiles.audacious-media-player.org/${MY_P}-gtk3.tar.bz2 )"
-	KEYWORDS="~amd64 ~x86"
-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
-	libnotify libsamplerate lirc mms modplug mp3 nls pulseaudio qt5 scrobbler sdl sid sndfile soxr speedpitch vorbis wavpack"
-REQUIRED_USE="
-	^^ ( gtk gtk3 qt5 )
-	qt5? ( !libnotify )
-	|| ( alsa jack pulseaudio sdl )
-	ampache? ( qt5 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
-	~media-sound/audacious-${PV}[gtk?,gtk3?,qt5?]
-	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-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 )
-	gtk? ( x11-libs/gtk+:2 )
-	gtk3? ( x11-libs/gtk+:3 )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtmultimedia:5
-		dev-qt/qtwidgets:5
-		media-libs/adplug
-	)
-	jack? (
-		>=media-libs/bio2jack-0.4
-		virtual/jack
-	)
-	lame? ( media-sound/lame )
-	libnotify? ( x11-libs/libnotify )
-	libsamplerate? ( media-libs/libsamplerate:= )
-	lirc? ( app-misc/lirc )
-	mms? ( >=media-libs/libmms-0.3 )
-	modplug? ( media-libs/libmodplug )
-	mp3? ( >=media-sound/mpg123-1.12.1 )
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.3 )
-	scrobbler? ( net-misc/curl )
-	sdl? ( media-libs/libsdl2[sound] )
-	sid? ( >=media-libs/libsidplayfp-1.0.0 )
-	sndfile? ( >=media-libs/libsndfile-1.0.17-r1 )
-	soxr? ( media-libs/soxr )
-	speedpitch? ( media-libs/libsamplerate:= )
-	vorbis? (
-		>=media-libs/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 )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${FILESDIR}/${P}-qt-5.10.patch" )
-
-src_unpack() {
-	if [[ ${PV} == *9999 ]]; then
-		git-r3_src_unpack
-	else
-		default
-		if use gtk3; then
-			mv "${MY_P}"{-gtk3,} || die
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-	[[ ${PV} == *9999 ]] && eautoreconf
-}
-
-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-songchange \
-		--disable-oss4 \
-		--disable-qtaudio \
-		--disable-qtglspectrum \
-		--disable-coreaudio \
-		--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 $(usex gtk gtk gtk3) gtk) \
-		$(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) \
-		$(use_enable lirc) \
-		$(use_enable mms) \
-		$(use_enable modplug) \
-		$(use_enable mp3 mpg123) \
-		$(use_enable nls) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable qt5 qt) \
-		$(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-3.9-r2.ebuild b/media-plugins/audacious-plugins/audacious-plugins-3.9-r2.ebuild
new file mode 100644
index 000000000000..1c297c5c68ae
--- /dev/null
+++ b/media-plugins/audacious-plugins/audacious-plugins-3.9-r2.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Lightweight and versatile audio player"
+HOMEPAGE="https://audacious-media-player.org/"
+SRC_URI="https://distfiles.audacious-media-player.org/${P}-gtk3.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="aac +alsa bs2b cdda cue ffmpeg flac fluidsynth gnome 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 )"
+
+# 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
+	media-libs/adplug
+	~media-sound/audacious-${PV}
+	x11-libs/gtk+:3
+	x11-libs/libXcomposite
+	x11-libs/libXrender
+	aac? ( >=media-libs/faad2-2.7 )
+	alsa? ( >=media-libs/alsa-lib-1.0.16 )
+	bs2b? ( media-libs/libbs2b )
+	cdda? (
+		dev-libs/libcdio:=
+		dev-libs/libcdio-paranoia
+		>=media-libs/libcddb-1.2.1
+	)
+	cue? ( media-libs/libcue )
+	ffmpeg? ( >=virtual/ffmpeg-0.7.3 )
+	flac? (
+		>=media-libs/flac-1.2.1-r1
+		>=media-libs/libvorbis-1.0
+	)
+	fluidsynth? ( media-sound/fluidsynth )
+	http? ( >=net-libs/neon-0.26.4 )
+	jack? (
+		>=media-libs/bio2jack-0.4
+		virtual/jack
+	)
+	lame? ( media-sound/lame )
+	libnotify? ( x11-libs/libnotify )
+	libsamplerate? ( media-libs/libsamplerate:= )
+	lirc? ( app-misc/lirc )
+	mms? ( >=media-libs/libmms-0.3 )
+	modplug? ( media-libs/libmodplug )
+	mp3? ( >=media-sound/mpg123-1.12.1 )
+	pulseaudio? ( >=media-sound/pulseaudio-0.9.3 )
+	scrobbler? ( net-misc/curl )
+	sdl? ( media-libs/libsdl2[sound] )
+	sid? ( >=media-libs/libsidplayfp-1.0.0 )
+	sndfile? ( >=media-libs/libsndfile-1.0.17-r1 )
+	soxr? ( media-libs/soxr )
+	speedpitch? ( media-libs/libsamplerate:= )
+	vorbis? (
+		>=media-libs/libogg-1.1.3
+		>=media-libs/libvorbis-1.2.0
+	)
+	wavpack? ( >=media-sound/wavpack-4.50.1-r1 )
+"
+DEPEND="${RDEPEND}
+	dev-util/gdbus-codegen
+	virtual/pkgconfig
+	nls? ( dev-util/intltool )
+"
+
+S="${WORKDIR}/${P}-gtk3"
+
+src_prepare() {
+	default
+	if ! use nls; then
+		sed -e "/SUBDIRS/s/ po//" -i Makefile || die # bug #512698
+	fi
+}
+
+src_configure() {
+	use mp3 || ewarn "MP3 support is optional, you may want to enable the mp3 USE-flag"
+
+	local myeconfargs=(
+		--enable-aosd
+		--enable-gtk
+		--enable-hotkey
+		--enable-mpris2
+		--enable-songchange
+		--disable-ampache
+		--disable-oss4
+		--disable-qt
+		--disable-qtaudio
+		--disable-qtglspectrum
+		--disable-coreaudio
+		--disable-sndio
+		$(use_enable aac)
+		$(use_enable alsa)
+		$(use_enable bs2b)
+		$(use_enable cdda cdaudio)
+		$(use_enable cue)
+		$(use_enable flac)
+		$(use_enable flac filewriter)
+		$(use_enable fluidsynth amidiplug)
+		$(use_enable gme console)
+		$(use_enable http neon)
+		$(use_enable jack)
+		$(use_enable gnome gnomeshortcuts)
+		$(use_enable lame filewriter_mp3)
+		$(use_enable libnotify notify)
+		$(use_enable libsamplerate resample)
+		$(use_enable lirc)
+		$(use_enable mms)
+		$(use_enable modplug)
+		$(use_enable mp3 mpg123)
+		$(use_enable nls)
+		$(use_enable pulseaudio pulse)
+		$(use_enable scrobbler scrobbler2)
+		$(use_enable sdl sdlout)
+		$(use_enable sid)
+		$(use_enable sndfile)
+		$(use_enable soxr)
+		$(use_enable speedpitch)
+		$(use_enable vorbis)
+		$(use_enable wavpack)
+		$(use_with ffmpeg ffmpeg $(usex libav libav ffmpeg))
+	)
+	econf "${myeconfargs[@]}"
+}
diff --git a/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild b/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild
index 2481a86bccb4..d3d11e6d7792 100644
--- a/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild
+++ b/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild
@@ -5,28 +5,23 @@ 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="
-		!gtk3? ( https://distfiles.audacious-media-player.org/${MY_P}.tar.bz2 )
-		gtk3? ( https://distfiles.audacious-media-player.org/${MY_P}-gtk3.tar.bz2 )"
+	SRC_URI="https://distfiles.audacious-media-player.org/${MY_P}.tar.bz2"
 	KEYWORDS="~amd64 ~x86"
 fi
+DESCRIPTION="Lightweight and versatile audio player"
+HOMEPAGE="https://audacious-media-player.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="aac +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"
+IUSE="aac adplug +alsa ampache bs2b cdda cue ffmpeg flac fluidsynth http gme jack lame libav libnotify libsamplerate
+	lirc mms modplug mp3 nls opengl pulseaudio qt5 qtmedia scrobbler sdl sid sndfile soxr speedpitch vorbis wavpack"
 REQUIRED_USE="
-	^^ ( gtk gtk3 qt5 )
-	qt5? ( !hotkeys !libnotify )
-	|| ( alsa jack pulseaudio sdl )
-	ampache? ( qt5 http )"
+	|| ( alsa jack pulseaudio qtmedia sdl )
+	ampache? ( qt5 http ) qtmedia? ( qt5 )"
 
 # The following plugins REQUIRE a GUI build of audacious, because non-GUI
 # builds do NOT install the libaudgui library & headers.
@@ -50,37 +45,25 @@ RDEPEND="
 	dev-libs/dbus-glib
 	dev-libs/glib
 	dev-libs/libxml2:2
-	~media-sound/audacious-${PV}[gtk?,gtk3?,qt5?]
+	~media-sound/audacious-${PV}[qt5=]
 	aac? ( >=media-libs/faad2-2.7 )
+	adplug? ( media-libs/adplug )
 	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
+		>=media-libs/libcddb-1.2.1
 	)
 	cue? ( media-libs/libcue )
 	ffmpeg? ( >=virtual/ffmpeg-0.7.3 )
 	flac? (
-		>=media-libs/libvorbis-1.0
 		>=media-libs/flac-1.2.1-r1
+		>=media-libs/libvorbis-1.0
 	)
 	fluidsynth? ( media-sound/fluidsynth )
 	http? ( >=net-libs/neon-0.26.4 )
-	gtk? ( x11-libs/gtk+:2 )
-	gtk3? ( x11-libs/gtk+:3 )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtmultimedia:5
-		dev-qt/qtwidgets:5
-		media-libs/adplug
-	)
 	jack? (
 		>=media-libs/bio2jack-0.4
 		virtual/jack
@@ -93,6 +76,18 @@ RDEPEND="
 	modplug? ( media-libs/libmodplug )
 	mp3? ( >=media-sound/mpg123-1.12.1 )
 	pulseaudio? ( >=media-sound/pulseaudio-0.9.3 )
+	!qt5? (
+		x11-libs/gtk+:2
+		x11-libs/libXcomposite
+		x11-libs/libXrender
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		opengl? ( dev-qt/qtopengl:5 )
+	)
+	qtmedia? ( dev-qt/qtmultimedia:5 )
 	scrobbler? ( net-misc/curl )
 	sdl? ( media-libs/libsdl2[sound] )
 	sid? ( >=media-libs/libsidplayfp-1.0.0 )
@@ -100,79 +95,74 @@ RDEPEND="
 	soxr? ( media-libs/soxr )
 	speedpitch? ( media-libs/libsamplerate:= )
 	vorbis? (
-		>=media-libs/libvorbis-1.2.0
 		>=media-libs/libogg-1.1.3
+		>=media-libs/libvorbis-1.2.0
 	)
-	wavpack? ( >=media-sound/wavpack-4.50.1-r1 )"
-
+	wavpack? ( >=media-sound/wavpack-4.50.1-r1 )
+"
 DEPEND="${RDEPEND}
 	dev-util/gdbus-codegen
 	virtual/pkgconfig
-	nls? ( dev-util/intltool )"
+	nls? ( dev-util/intltool )
+"
 
 S="${WORKDIR}/${MY_P}"
 
-src_unpack() {
-	if [[ ${PV} == *9999 ]]; then
-		git-r3_src_unpack
-	else
-		default
-		if use gtk3; then
-			mv "${MY_P}"{-gtk3,} || die
-		fi
-	fi
-}
-
 src_prepare() {
 	default
+	if ! use nls; then
+		sed -e "/SUBDIRS/s/ po//" -i Makefile || die # bug #512698
+	fi
 	[[ ${PV} == *9999 ]] && eautoreconf
 }
 
 src_configure() {
-	if ! use mp3 ; then
-		ewarn "MP3 support is optional, you may want to enable the mp3 USE-flag"
-	fi
+	use mp3 || ewarn "MP3 support is optional, you may want to enable the mp3 USE-flag"
 
-	econf \
-		--enable-mpris2 \
-		--enable-songchange \
-		--disable-oss4 \
-		--disable-qtglspectrum \
-		--disable-coreaudio \
-		--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 $(usex gtk gtk gtk3) gtk) \
-		$(use_enable hotkeys hotkey) \
-		$(use_enable http neon) \
-		$(use_enable jack) \
-		$(use_enable lame filewriter_mp3) \
-		$(use_enable libnotify notify) \
-		$(use_enable libsamplerate resample) \
-		$(use_enable lirc) \
-		$(use_enable mms) \
-		$(use_enable modplug) \
-		$(use_enable mp3 mpg123) \
-		$(use_enable nls) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable qt5 qt) \
-		$(use_enable qt5 qtaudio) \
-		$(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) \
+	local myeconfargs=(
+		--enable-mpris2
+		--enable-songchange
+		--disable-oss4
+		--disable-coreaudio
+		--disable-sndio
+		$(use_enable aac)
+		$(use_enable adplug)
+		$(use_enable alsa)
+		$(use_enable ampache)
+		$(use_enable bs2b)
+		$(use_enable cdda cdaudio)
+		$(use_enable cue)
+		$(use_enable flac)
+		$(use_enable flac filewriter)
+		$(use_enable fluidsynth amidiplug)
+		$(use_enable gme console)
+		$(use_enable http neon)
+		$(use_enable jack)
+		$(use_enable lame filewriter_mp3)
+		$(use_enable libnotify notify)
+		$(use_enable libsamplerate resample)
+		$(use_enable lirc)
+		$(use_enable mms)
+		$(use_enable modplug)
+		$(use_enable mp3 mpg123)
+		$(use_enable nls)
+		$(use_enable pulseaudio pulse)
+		$(use_enable !qt5 aosd)
+		$(use_enable !qt5 gtk)
+		$(use_enable !qt5 hotkey)
+		$(use_enable qt5 qt)
+		$(use_enable qtmedia qtaudio)
+		$(use_enable scrobbler scrobbler2)
+		$(use_enable sdl sdlout)
+		$(use_enable sid)
+		$(use_enable sndfile)
+		$(use_enable soxr)
+		$(use_enable speedpitch)
+		$(use_enable vorbis)
+		$(use_enable wavpack)
 		$(use_with ffmpeg ffmpeg $(usex libav libav ffmpeg))
+	)
+	use qt5 && myeconfargs+=( $(usex opengl --enable-qtglspectrum --disable-qtglspectrum) )
+
+	econf "${myeconfargs[@]}"
 }
diff --git a/media-plugins/audacious-plugins/files/audacious-plugins-3.9-qt-5.10.patch b/media-plugins/audacious-plugins/files/audacious-plugins-3.9-qt-5.10.patch
deleted file mode 100644
index 64122bf91980..000000000000
--- a/media-plugins/audacious-plugins/files/audacious-plugins-3.9-qt-5.10.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 971f7ff7c3d8a0b9b420bf4fd19ab97755607637 Mon Sep 17 00:00:00 2001
-From: ilovezfs <ilovezfs@icloud.com>
-Date: Mon, 11 Dec 2017 00:17:26 -0800
-Subject: [PATCH] qtui: fix build with Qt 5.10
-
-Fixes "info_bar.cc:258:21: error: no viable overloaded '='"
----
- src/qtui/info_bar.cc | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/qtui/info_bar.cc b/src/qtui/info_bar.cc
-index 2789f93c5..eb29ef78e 100644
---- a/src/qtui/info_bar.cc
-+++ b/src/qtui/info_bar.cc
-@@ -257,8 +257,8 @@ void InfoBar::paintEvent (QPaintEvent *)
-         if (d.title.text ().isNull () && ! d.orig_title.isNull ())
-         {
-             QFontMetrics metrics = p.fontMetrics ();
--            d.title = metrics.elidedText (d.orig_title, Qt::ElideRight,
--             width () - ps.VisWidth - ps.Height - ps.Spacing);
-+            d.title = QStaticText(metrics.elidedText (d.orig_title, Qt::ElideRight,
-+             width () - ps.VisWidth - ps.Height - ps.Spacing));
-         }
- 
-         p.setPen (QColor (255, 255, 255));
-
diff --git a/media-plugins/audacious-plugins/metadata.xml b/media-plugins/audacious-plugins/metadata.xml
index 4fc91fc80a76..cdc6bec65c66 100644
--- a/media-plugins/audacious-plugins/metadata.xml
+++ b/media-plugins/audacious-plugins/metadata.xml
@@ -12,14 +12,13 @@
 	<use>
 		<flag name="adplug">Build with AdPlug (Adlib sound card emulation) support</flag>
 		<flag name="ampache">Support controlling audacious via <pkg>www-apps/ampache</pkg></flag>
-		<flag name="aosd">Enable support for Audacious OSD</flag>
 		<flag name="bs2b">Enable Bauer Bauer stereophonic-to-binaural headphone filter</flag>
 		<flag name="cue">Support CUE sheets using the libcue library</flag>
 		<flag name="fluidsynth">Support FluidSynth as MIDI synth backend</flag>
 		<flag name="gme">Support various gaming console music formats</flag>
-		<flag name="gtk3">Link against version 3 of the GIMP Toolkit instead of version 2 (x11-libs/gtk+)</flag>
-		<flag name="hotkeys">Enable support for controlling via hotkeys</flag>
 		<flag name="http">Support HTTP streams through neon</flag>
+		<flag name="qt5">Build with Qt5 interface instead Gtk+</flag>
+		<flag name="qtmedia">Enable playback via <pkg>dev-qt/qtmultimedia</pkg></flag>
 		<flag name="scrobbler">Build with scrobbler/LastFM submission support</flag>
 		<flag name="sid">Build with SID (Commodore 64 Audio) support</flag>
 		<flag name="soxr">Build with SoX Resampler support</flag>
diff --git a/media-plugins/grilo-plugins/Manifest b/media-plugins/grilo-plugins/Manifest
index 9094ed22a3a7..9204bd03c292 100644
--- a/media-plugins/grilo-plugins/Manifest
+++ b/media-plugins/grilo-plugins/Manifest
@@ -1,7 +1,5 @@
 DIST grilo-plugins-0.2.17.tar.xz 1036308 BLAKE2B c83de5b251c030c71164310f6240652ffc86efa46a057bc750ee242c7cc2ff91a9c28ec6a847783cf7fd2df068cba0dad6f10521db82c7080a466c63aacb4c03 SHA512 f556ae6e72c82ce74cc8902f7b4ae27f51060c3b06230989b36ce4498f93894c723809c1f08fc8edfabd892fc303eb0523f21ea72649f644c7eb421b62773140
-DIST grilo-plugins-0.3.5.tar.xz 1881080 BLAKE2B 06f06fe47cf6fb374d3d398e113a2d851c46e390011f2ef8c04a9b658bd04eea5f0c17ad4e89f7cd922ac0a24efe94f30db65697d4b71fab512eaf71c8ef936c SHA512 3420b18d5d938559b75ae41199a6a79dfa5a8a43d2b29631f7cb03c28df569627be610a4087514240c3413e476fa76def3ee7a1b065b5104679b788b633a5b0e
 DIST grilo-plugins-0.3.7.tar.xz 1892848 BLAKE2B 9894a01dc555f20c3119208e2ee875898c918f8d81e36571a777f7f1776c284d5fa5b4ac9126a352dc812b0f5ba9c15e0e81a2381ef9cb636afb66e272a77cec SHA512 9e69835b3b8f6e2974d799480e2c8c55a084d2089ead6b37112a8c3c79b6bd2142b8fd66952493b7118e09eb5070789408b59bd28784bd9f6bf5ea5a7bc5695d
 EBUILD grilo-plugins-0.2.17.ebuild 2435 BLAKE2B 3b10e88bc22e510adb5ef7b841304ff550ddc1ecd4b0977c8e09d618207a8ce3d41a4a527f3c7e6c36d3b0ba5dd962f33be9e982fd34b3ebc60e22a24b68d6e1 SHA512 28fff3c2ba9ccc801502d42f10ff125abb66250bc474d3748fe8ed6ec48484afcbf8e887428ec079eeec6be89fe1f45e58e1781ecf1ec00624a0e6d494c5ded8
-EBUILD grilo-plugins-0.3.5.ebuild 3580 BLAKE2B 27363429fde86523e15091f2ec933b1c5765b491e7879a33cdac6a836b2f927756dfe97eab91de3631ab37698f0f72e4d83bc7da821a89b731d098294e9a6833 SHA512 1b2014a8299a22faa0705c8432a0959f944829e8f058a178a0dad9d27985fd17eba538d2bb56ad3c98fbd8945ac0af8bb3555b7ddb2adf68e1df549f458e13fc
-EBUILD grilo-plugins-0.3.7.ebuild 3582 BLAKE2B e9c71e0c0a0a18df6d2cf48b2814498435e81aa991cd6bd398551080f6b2c0a6c341fe10fa5d99e16c9b7baef3ff3e9ef76df7ebbe71eb74d9848d581b2e70a4 SHA512 7a75b92ea6bb38a73122ddcc5146d0678d9834f63b19933f08a2dd484e803400025cb2a54d875156117813ebb2e9dec9c6d7ab9d0749b7c3bb276fa02017c2b5
+EBUILD grilo-plugins-0.3.7.ebuild 3577 BLAKE2B 23aa0ba03a43a60f310f12f7973a4093797083e0a02c37de67d64376f34310f5a28e5958e1fa12246f89591b1d144ba15c8ac53d3318135f98beb7675ca968af SHA512 8898c1fd574c7d030d98512db1560f09743c7ea7da6a7387a1dc8926a90798dab6c1e09d2108a6f26d94e3efb824d99210791b1580d28adb71786a7ce1c52e02
 MISC metadata.xml 1136 BLAKE2B 0efdd69b0def1abeb70d76229addd8cc17db0d8bf314696eb8abfe3e938a8f60ab68b47b0be7aad81d99ddcf0e597cec76e1717ff32e5c0529a8b4bbf8b92c08 SHA512 d308b981dd17f7c78462d0e90892169e2f15affbeb99d909aa35a46e0c1728f6fc3530e0fd936424150781411b469041a47fe62bbf438aa68c0140755830799d
diff --git a/media-plugins/grilo-plugins/grilo-plugins-0.3.5.ebuild b/media-plugins/grilo-plugins/grilo-plugins-0.3.5.ebuild
deleted file mode 100644
index 934007421c91..000000000000
--- a/media-plugins/grilo-plugins/grilo-plugins-0.3.5.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit gnome2 python-any-r1
-
-DESCRIPTION="A framework for easy media discovery and browsing"
-HOMEPAGE="https://wiki.gnome.org/Projects/Grilo"
-
-LICENSE="LGPL-2.1+"
-SLOT="0.3"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="daap dvd examples chromaprint flickr freebox gnome-online-accounts lua subtitles test thetvdb tracker upnp-av vimeo +youtube"
-
-# Bump gom requirement to avoid segfaults
-RDEPEND="
-	>=dev-libs/glib-2.44:2
-	>=media-libs/grilo-0.3.1:${SLOT}=[network,playlist]
-	media-libs/libmediaart:2.0
-	>=dev-libs/gom-0.3.2
-
-	dev-libs/gmime:3.0
-	dev-libs/json-glib
-	dev-libs/libxml2:2
-	dev-db/sqlite:3
-
-	chromaprint? ( media-plugins/gst-plugins-chromaprint:1.0 )
-	daap? ( >=net-libs/libdmapsharing-2.9.12:3.0 )
-	dvd? ( >=dev-libs/totem-pl-parser-3.4.1 )
-	flickr? ( net-libs/liboauth )
-	freebox? ( net-dns/avahi )
-	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.17.91:= )
-	lua? (
-		>=dev-lang/lua-5.3
-		app-arch/libarchive
-		dev-libs/libxml2:2
-		>=dev-libs/totem-pl-parser-3.4.1 )
-	subtitles? ( net-libs/libsoup:2.4 )
-	thetvdb? (
-		app-arch/libarchive
-		dev-libs/libxml2 )
-	tracker? ( >=app-misc/tracker-0.10.5:= )
-	youtube? (
-		>=dev-libs/libgdata-0.9.1:=
-		>=dev-libs/totem-pl-parser-3.4.1 )
-	upnp-av? (
-		net-libs/libsoup:2.4
-		net-libs/dleyna-connector-dbus
-		net-misc/dleyna-server )
-	vimeo? (
-		>=dev-libs/totem-pl-parser-3.4.1 )
-"
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.5
-	app-text/yelp-tools
-	>=dev-util/gdbus-codegen-2.44
-	>=dev-util/intltool-0.40.0
-	virtual/pkgconfig
-	lua? ( dev-util/gperf )
-	upnp-av? ( test? (
-		${PYTHON_DEPS}
-		$(python_gen_any_dep 'dev-python/dbusmock[${PYTHON_USEDEP}]') ) )
-"
-
-python_check_deps() {
-	use upnp-av && use test && has_version "dev-python/dbusmock[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use upnp-av && use test && python-any-r1_pkg_setup
-}
-
-src_prepare () {
-	gnome2_src_prepare
-	sed -e "s:GETTEXT_PACKAGE=grilo-plugins$:GETTEXT_PACKAGE=grilo-plugins-${SLOT}:" \
-		-i configure.ac configure || die "sed configure.ac configure failed"
-}
-
-# FIXME: some unittests required python-dbusmock
-src_configure() {
-	# --enable-debug only changes CFLAGS, useless for us
-	# Plugins
-	# shoutcast seems to be broken
-	gnome2_src_configure \
-		--disable-static \
-		--disable-debug \
-		--disable-uninstalled \
-		--enable-bookmarks \
-		--enable-filesystem \
-		--enable-gravatar \
-		--enable-jamendo \
-		--enable-local-metadata \
-		--enable-magnatune \
-		--enable-metadata-store \
-		--enable-podcasts \
-		--enable-raitv \
-		--disable-shoutcast \
-		--enable-tmdb \
-		$(use_enable chromaprint) \
-		$(use_enable daap dmap) \
-		$(use_enable dvd optical-media) \
-		$(use_enable flickr) \
-		$(use_enable freebox) \
-		$(use_enable gnome-online-accounts goa) \
-		$(use_enable lua lua-factory) \
-		$(use_enable subtitles opensubtitles) \
-		$(use_enable thetvdb) \
-		$(use_enable tracker) \
-		$(use_enable upnp-av dleyna) \
-		$(use_enable vimeo) \
-		$(use_enable youtube)
-}
-
-src_install() {
-	if use examples; then
-		docinto examples
-		doins help/examples/*.c
-	fi
-
-	gnome2_src_install \
-		DOC_MODULE_VERSION=${SLOT%/*} \
-		HELP_ID="grilo-plugins-${SLOT%/*}" \
-		HELP_MEDIA=""
-
-	# The above doesn't work and collides with 0.2 slot
-	mv "${ED}"/usr/share/help/C/examples/example-tmdb{,-0.3}.c || die
-	mv "${ED}"/usr/share/help/C/grilo-plugins/legal{,-0.3}.xml || die
-	mv "${ED}"/usr/share/help/C/grilo-plugins/grilo-plugins{,-0.3}.xml || die
-}
diff --git a/media-plugins/grilo-plugins/grilo-plugins-0.3.7.ebuild b/media-plugins/grilo-plugins/grilo-plugins-0.3.7.ebuild
index bdfe54ab8370..1a950a708cc4 100644
--- a/media-plugins/grilo-plugins/grilo-plugins-0.3.7.ebuild
+++ b/media-plugins/grilo-plugins/grilo-plugins-0.3.7.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
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Grilo"
 
 LICENSE="LGPL-2.1+"
 SLOT="0.3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="daap dvd examples chromaprint flickr freebox gnome-online-accounts lua subtitles test thetvdb tracker upnp-av vimeo +youtube"
 
 # Bump gom requirement to avoid segfaults
diff --git a/media-plugins/gst-plugins-chromaprint/Manifest b/media-plugins/gst-plugins-chromaprint/Manifest
index bfa415fb8067..1b6fa6407209 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 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
+EBUILD gst-plugins-chromaprint-1.14.1.ebuild 369 BLAKE2B 3d874ab5d65c333787cf2273c2a4766b4855c41a27992cd62ee2257d289310bdfbf69e645f1ca2bed18ba661cda8127681f6df48f52c915fbcc88ddc2ddb7382 SHA512 cabd03941e0b18937e951683bf61ea92357b0a24c3c680093fb02c99f5933d85fdedf06b59302fae3d6b46d5dccf801964dd257bdbdce032ed73805da99e438c
+EBUILD gst-plugins-chromaprint-1.14.2.ebuild 362 BLAKE2B 0122876b5592ec7e9a3395e8d2237db397741f72cf5c8e2211d79be930f4c75c75e1db4b6884e1c463b93fcc011a6bcc51006d6a5b7c0dcab66e9df433e2efcd SHA512 d8ca21107b35ff510d4e9686370a9fbe17dfb504e70a3b7c7e9a8f919d188e35b0801dfa61bb3f99a9573402650df2f51924dca61eeed048df512528bbe8d8d4
+EBUILD gst-plugins-chromaprint-1.14.3.ebuild 362 BLAKE2B 0122876b5592ec7e9a3395e8d2237db397741f72cf5c8e2211d79be930f4c75c75e1db4b6884e1c463b93fcc011a6bcc51006d6a5b7c0dcab66e9df433e2efcd SHA512 d8ca21107b35ff510d4e9686370a9fbe17dfb504e70a3b7c7e9a8f919d188e35b0801dfa61bb3f99a9573402650df2f51924dca61eeed048df512528bbe8d8d4
 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 924844fc346b..9f41a25684f8 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
@@ -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 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~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 88ac97348a15..1e2eba775d89 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
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="Calculate Chromaprint fingerprint from audio files for GStreamer"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~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 88ac97348a15..1e2eba775d89 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
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="Calculate Chromaprint fingerprint from audio files for GStreamer"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~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 46ac36ea6c06..c55186e9f8ed 100644
--- a/media-plugins/gst-plugins-libav/Manifest
+++ b/media-plugins/gst-plugins-libav/Manifest
@@ -1,5 +1,12 @@
+AUX external-ffmpeg4-dep.patch 672 BLAKE2B f6abd0913ce1dbd26d3c75fab15537f582605d21b6eb7e49cfffe6390a870bac13dc440f1ed319940c216e5a789a87309e20016649388d3b689dc0e602641c55 SHA512 11f9e7e4c96ffebaeb8b3e29934f1dd01ae8794bc6401a8fe3e999110a64949d282c41da1c2145f72a394b45f5c6d62cf1d9af7634e1dc9c4a67a507a9a575ee
+DIST ffmpeg-3.4.5.tar.bz2 10183082 BLAKE2B f72157baefcd6a0ca8f389309bbe947ad21996e0f2eb3c46c6bfc90f1ebbb14bfd007d001e46ea51efef5db5f9fcee24b1a90b6862136aeebecdc95bb61b23a5 SHA512 e12707d47404a9ce02790b77d2852fc1a1573c8108e980c7355fa48ba891d1649464d4fe4d08394ecd6d871f651ac4388486b7654cb54a7aaeedaf05c55513ec
+DIST ffmpeg-4.1.tar.bz2 10687291 BLAKE2B 07293af1b13c6c6cad72e368207db21bdbc4b991931166c24ff40b00c3b3c8e1242be1876af8e3f154cc840fcd90d87b762fe77faccf06936dd096478d5d074b SHA512 ccf6d07268dc47e08ca619eb182a003face2a8ee73ec1a28157330dd7de1df88939def1fc1c7e6b6ac7b59752cdad84657d589b2fafb73e14e5ef03fb6e33417
 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
+DIST gst-libav-1.14.4-ffmpeg4-patchset.tar.xz 49428 BLAKE2B 74c3e0b25643bcfdf01d1d16514401fef4bb988ba3d1f306b647ba0cd6e89f0205cc33e6d144889d6b2f7fab9e4fae946e03821a85009fa95c68f3cedf25068a SHA512 1347424ed342f00c25ac4780670611a24eeaf708426b6efc6d9f6c6fa7bf91ef292302a5363afe9523c497265b8c0d7ad81374364cbecb2924b749e716819745
+DIST gst-libav-1.14.4.tar.xz 9036732 BLAKE2B 1c2e257912f61dac71e1d890f4cb650e0cdbbf4472cbd8dc6b73e471d1914409b71699bd198c154069e15e68364530e91f76619afb52b91e373e58c9237ab7cb SHA512 4a0e9a91c23cba82e6a6b8eb65ff42b9d80389dd232b08c22b3431d3942fb93a6a7e64be97083d11cbceb2abe5d45dc5b37d230f7552e1a7fb193610d0530717
 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
+EBUILD gst-plugins-libav-1.14.4.3.4.5.ebuild 2447 BLAKE2B 8d25fbb13d05960c3163dea4803756bc1940f14425dafe82f8afdac9e69a8ba8a547b234d4e25aa78bc49aa51a336ca142c309341ab2cc40c44f0be614afc139 SHA512 8e21feac86d4feb30e8d53c8c3d4a16b57a1b10605bb082ac5dcb655638f5591924f5e24817d696d0f07462607f178d99d1edee7a25dc106fdb965fdf5cf6d66
+EBUILD gst-plugins-libav-1.14.4.4.1_p20181115.ebuild 2951 BLAKE2B c103597c9ead48bf9335486f109da27cc0401ed8471dfebf06d47815568948393404a5ef4948d00183120c26b03e285fc04d02b37350237f618349a3d78c8ad7 SHA512 a1c3e103488a67e5293aa3a06198f28bea6fd0b2ee84b3f55914210fe7b94eb9544fd930b9f8c67e42c03f86f9e916ed36e01cf2dc5ac4a272d9e3635ebea008
+MISC metadata.xml 435 BLAKE2B 8ee96f01d191e918656c2a80e8cacee47237740f7639d34f0205417815a06ae8dd5b0a27bd7bffac668f3a74ce8fc377112e3cbc369ad4fb34089b2975f3c733 SHA512 5c65497b650587ba929108974a18116b9fdea3ae175fc637c470725a39375defbaf962323f7062ce4287655fc47e8fd28ce4a1d8608fe7ea243bc6999a1bf753
diff --git a/media-plugins/gst-plugins-libav/files/external-ffmpeg4-dep.patch b/media-plugins/gst-plugins-libav/files/external-ffmpeg4-dep.patch
new file mode 100644
index 000000000000..c264507102f0
--- /dev/null
+++ b/media-plugins/gst-plugins-libav/files/external-ffmpeg4-dep.patch
@@ -0,0 +1,20 @@
+diff --git a/ext/libav/gstav.c b/ext/libav/gstav.c
+index 2a88230..f6a6303 100644
+--- a/ext/libav/gstav.c
++++ b/ext/libav/gstav.c
+@@ -155,6 +155,15 @@ plugin_init (GstPlugin * plugin)
+   /* build global ffmpeg param/property info */
+   gst_ffmpeg_cfg_init ();
+ 
++#ifndef HAVE_LIBAV_UNINSTALLED
++  /* Not using bundled ffmpeg - add a feature rescan dependency for system-ffmpeg */
++  gst_plugin_add_dependency_simple (plugin, NULL,
++      GIO_LIBDIR,
++      "libavcodec.so.58,"
++      "libavformat.so.58",
++      GST_PLUGIN_DEPENDENCY_FLAG_NONE);
++#endif
++
+   gst_ffmpegaudenc_register (plugin);
+   gst_ffmpegvidenc_register (plugin);
+   gst_ffmpegauddec_register (plugin);
diff --git a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.14.4.3.4.5.ebuild b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.14.4.3.4.5.ebuild
new file mode 100644
index 000000000000..dacb390c0618
--- /dev/null
+++ b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.14.4.3.4.5.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eapi7-ver multilib-minimal
+
+MY_PN="gst-libav"
+MY_PV="$(ver_cut 1-3)"
+MY_P="${MY_PN}-${MY_PV}"
+FFMPEG_PV="$(ver_cut 4-)"
+
+DESCRIPTION="FFmpeg based gstreamer plugin"
+HOMEPAGE="https://gstreamer.freedesktop.org/modules/gst-libav.html"
+SRC_URI="https://gstreamer.freedesktop.org/src/${MY_PN}/${MY_P}.tar.xz
+	libav? ( https://ffmpeg.org/releases/ffmpeg-${FFMPEG_PV}.tar.bz2 )"
+
+LICENSE="LGPL-2+"
+SLOT="1.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="libav +orc"
+
+RDEPEND="
+	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
+	>=media-libs/gstreamer-${MY_PV}:1.0[${MULTILIB_USEDEP}]
+	>=media-libs/gst-plugins-base-${MY_PV}:1.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}]
+	)
+	orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.12
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+"
+
+S="${WORKDIR}/${MY_P}"
+
+RESTRICT="test" # FIXME: tests seem to get stuck at one point; investigate properly
+
+src_unpack() {
+	default
+
+	if use libav; then
+		# Use newer version of bundled FFmpeg.
+		rm -r "${S}/gst-libs/ext/libav" || die
+		ln -s ../../../ffmpeg-${FFMPEG_PV} "${S}/gst-libs/ext/libav" || die
+	fi
+}
+
+multilib_src_configure() {
+	GST_PLUGINS_BUILD=""
+	# Upstream dropped support for system libav and won't work
+	# for preserving its compat anymore, forcing us to rely on internal
+	# ffmpeg copy if we don't want to cause unresolvable blockers for
+	# libav setups.
+	# https://bugzilla.gnome.org/show_bug.cgi?id=758183
+	# Prefer system ffmpeg for -libav
+	local myconf
+
+	if use libav; then
+		ewarn "Using bundled ffmpeg copy as upstream dropped"
+		ewarn "the support for compiling against system libav"
+		ewarn "https://bugzilla.gnome.org/show_bug.cgi?id=758183"
+	else
+		myconf="--with-system-libav"
+	fi
+
+	ECONF_SOURCE=${S} \
+	econf \
+		--disable-maintainer-mode \
+		--with-package-name="Gentoo GStreamer ebuild" \
+		--with-package-origin="https://www.gentoo.org" \
+		--disable-fatal-warnings \
+		$(use_enable orc) \
+		${myconf}
+}
+
+multilib_src_compile() {
+	# Don't build with -Werror
+	emake ERROR_CFLAGS=
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.14.4.4.1_p20181115.ebuild b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.14.4.4.1_p20181115.ebuild
new file mode 100644
index 000000000000..2df068ec20c0
--- /dev/null
+++ b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.14.4.4.1_p20181115.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eapi7-ver multilib-minimal
+
+MY_PN="gst-libav"
+MY_PV="$(ver_cut 1-3)"
+MY_P="${MY_PN}-${MY_PV}"
+FFMPEG_PV="$(ver_cut 4- ${PV%_*})"
+
+DESCRIPTION="FFmpeg based gstreamer plugin"
+HOMEPAGE="https://gstreamer.freedesktop.org/modules/gst-libav.html"
+SRC_URI="https://gstreamer.freedesktop.org/src/${MY_PN}/${MY_P}.tar.xz
+	https://dev.gentoo.org/~leio/distfiles/${MY_P}-ffmpeg4-patchset.tar.xz
+	libav? ( https://ffmpeg.org/releases/ffmpeg-${FFMPEG_PV}.tar.bz2 )"
+
+LICENSE="LGPL-2+"
+SLOT="1.0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="libav +orc"
+
+RDEPEND="
+	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
+	>=media-libs/gstreamer-${MY_PV}:1.0[${MULTILIB_USEDEP}]
+	>=media-libs/gst-plugins-base-${MY_PV}:1.0[${MULTILIB_USEDEP}]
+	!libav? ( >=media-video/ffmpeg-4:0=[${MULTILIB_USEDEP}] )
+	libav? (
+		app-arch/bzip2[${MULTILIB_USEDEP}]
+		app-arch/xz-utils[${MULTILIB_USEDEP}]
+	)
+	orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.12
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${WORKDIR}"/patches # ffmpeg-4 compat and more from git up to 20181115; requires eautoreconf
+	"${FILESDIR}"/external-ffmpeg4-dep.patch # Automatically rescan available elements for registry when system ffmpeg changes
+)
+
+RESTRICT="test" # FIXME: tests seem to get stuck at one point; investigate properly
+
+src_unpack() {
+	default
+
+	if use libav; then
+		# Use newer version of bundled FFmpeg.
+		rm -r "${S}/gst-libs/ext/libav" || die
+		ln -s ../../../ffmpeg-${FFMPEG_PV} "${S}/gst-libs/ext/libav" || die
+	fi
+}
+
+src_prepare() {
+	default
+	eautoreconf # remove with a proper release without build system touching patchset
+}
+
+multilib_src_configure() {
+	GST_PLUGINS_BUILD=""
+	# Upstream dropped support for system libav and won't work
+	# for preserving its compat anymore, forcing us to rely on internal
+	# ffmpeg copy if we don't want to cause unresolvable blockers for
+	# libav setups.
+	# https://bugzilla.gnome.org/show_bug.cgi?id=758183
+	# Prefer system ffmpeg for -libav
+	local myconf=()
+
+	if use libav; then
+		ewarn "Using bundled ffmpeg copy as upstream dropped"
+		ewarn "the support for compiling against system libav"
+		ewarn "https://bugzilla.gnome.org/show_bug.cgi?id=758183"
+
+		myconf+=(--with-libav-extra-configure="--disable-debug --optflags=\\\"${CFLAGS}\\\"")
+	else
+		myconf+=("--with-system-libav")
+	fi
+
+	ECONF_SOURCE=${S} \
+	econf \
+		--disable-maintainer-mode \
+		--with-package-name="Gentoo GStreamer ebuild" \
+		--with-package-origin="https://www.gentoo.org" \
+		--disable-fatal-warnings \
+		$(use_enable orc) \
+		"${myconf[@]}"
+}
+
+multilib_src_compile() {
+	# Don't build with -Werror; verbose build
+	emake ERROR_CFLAGS= V=1
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-plugins/gst-plugins-libav/metadata.xml b/media-plugins/gst-plugins-libav/metadata.xml
index 42b76fdc5c1b..bcee05e79041 100644
--- a/media-plugins/gst-plugins-libav/metadata.xml
+++ b/media-plugins/gst-plugins-libav/metadata.xml
@@ -5,4 +5,8 @@
 		<email>gstreamer@gentoo.org</email>
 		<name>GStreamer package maintainers</name>
 	</maintainer>
+	<use>
+		<flag name="libav">Use bundled ffmpeg to support systems using
+			<pkg>media-video/libav</pkg> globally instead of <pkg>media-video/ffmpeg</pkg></flag>
+	</use>
 </pkgmetadata>
diff --git a/media-plugins/gst-plugins-meta/Manifest b/media-plugins/gst-plugins-meta/Manifest
index ddcfdcbe90a3..e5a71f1a6dde 100644
--- a/media-plugins/gst-plugins-meta/Manifest
+++ b/media-plugins/gst-plugins-meta/Manifest
@@ -1,4 +1,4 @@
-EBUILD gst-plugins-meta-0.10-r11.ebuild 4380 BLAKE2B 90b2d3511987d3a9bc6f8cf6f0a44fc616015280a378ca50ea1fbb1e1531305fc8c0331f3b77da8e3d6a03628cbff879d75664cd569f7755c850a271d01ba83a SHA512 e047adac8d873c0568a59afaba4eeac62ff3e1822309096ac0b9a337e730d2ad8b204a3cce0385ac63c36f922a6181ef22be1ed0a0a4f9b7637ee7f34a14e6e3
-EBUILD gst-plugins-meta-1.14.1.ebuild 3758 BLAKE2B e8ef288159540fc4d4996bc3aac63a5b855c48426001d373f946c08973c354ec24e39ce015de128c29341f9c7305d54f523c55821de47af363aa6f66fb01006a SHA512 c9afdb06895118abfcb7e407b561110bfe8085be682dbc891c3fb0c419c465192241a0be62242fea86c51a673086212c81acd5838895effa546f1ccd8cf6b624
-EBUILD gst-plugins-meta-1.14.3.ebuild 3766 BLAKE2B 8e73e337b7ea18e59ca531b2a385c1c57ede97fae3c223f2ab85bad890f02efd345d126c93fe6707232380a1b61ab22450d71db7d7ec040acf753e0d42fd059d SHA512 d080ef167d49771bb107426ff7afe4bfe004508338b5c9689cf1a550a3066f49d97b2e298bc37a997738f0d0a531f2e0b046edbb7a82bceaf5766896f7dd1df2
+EBUILD gst-plugins-meta-0.10-r11.ebuild 4389 BLAKE2B de5b074ead1f2945933922055274e1865bb67458df6d3b6a9071889f5688fa39c34590112d2ae4400d05698538a1468dcb061cd3301378e2a90a10f7f2690a42 SHA512 e9332638416456961a4baa40356074b1246f0138097ec41d986df2219cc0c14fa8e1247986ef47512f1377c801ac3c18bc930cd8da6d19d19b135a59ca8dc384
+EBUILD gst-plugins-meta-1.14.1.ebuild 3767 BLAKE2B 09bf914203440b8b6c183ba42681271ffc728621a05c1dfb26983b744dc8d7413d9c33136d655f7b22e3554e0fdf1c27475b8ab1558286b2647dd13c60a0313d SHA512 d19a376267a338a19b08bdf0a6e248febe5c31d7b0908cab0795efaf4daadba07fffd5f0d41d39721f096c1e87df7118c2d4e5af1a366a0458f68b8c160d8384
+EBUILD gst-plugins-meta-1.14.3.ebuild 3775 BLAKE2B f36ae71b9d5f2d47c5e1c8378c3898575af26ac58f558adb4da63214bcdfa68cc609f00eeb4516b5c5f61ad7432ac6ce191ce4b3c0b503a087b03a3443d39f70 SHA512 5174424537cc557f4f68ec747c6c53db2f3a3e9c0326727a94cd9e6c6c3d0eca8474eca75c3f48c766b3112b972bbfd5e7cb568cf9b377b09c7d12b0bb5c68c8
 MISC metadata.xml 996 BLAKE2B 1bc83f42a32de2aafdf03808fffb16d603986c19160d2802426ecea7f279e529ff7ad0e2c321671681f80c3575dceaea0064db559dba1212b0a30b826ae8e2a2 SHA512 4d905ac8fb0f07b2ba3c6791d7a84daef638ed552d2fac834a71febb274d1c667abe66735e7cfe77f5ed83c269c01ca7c2761b13d176164cd956e8fadf31fbd0
diff --git a/media-plugins/gst-plugins-meta/gst-plugins-meta-0.10-r11.ebuild b/media-plugins/gst-plugins-meta/gst-plugins-meta-0.10-r11.ebuild
index 143356f03fe5..3bbc8062e805 100644
--- a/media-plugins/gst-plugins-meta/gst-plugins-meta-0.10-r11.ebuild
+++ b/media-plugins/gst-plugins-meta/gst-plugins-meta-0.10-r11.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="5"
@@ -6,7 +6,7 @@ EAPI="5"
 inherit multilib-build
 
 DESCRIPTION="Meta ebuild to pull in gst plugins for apps"
-HOMEPAGE="https://www.gentoo.org"
+HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="metapackage"
 SLOT="0.10"
diff --git a/media-plugins/gst-plugins-meta/gst-plugins-meta-1.14.1.ebuild b/media-plugins/gst-plugins-meta/gst-plugins-meta-1.14.1.ebuild
index dcd283104d85..22a8f074d605 100644
--- a/media-plugins/gst-plugins-meta/gst-plugins-meta-1.14.1.ebuild
+++ b/media-plugins/gst-plugins-meta/gst-plugins-meta-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
@@ -6,7 +6,7 @@ EAPI=6
 inherit multilib-build
 
 DESCRIPTION="Meta ebuild to pull in gst plugins for apps"
-HOMEPAGE="https://www.gentoo.org"
+HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="metapackage"
 SLOT="1.0"
diff --git a/media-plugins/gst-plugins-meta/gst-plugins-meta-1.14.3.ebuild b/media-plugins/gst-plugins-meta/gst-plugins-meta-1.14.3.ebuild
index 7381d424ebb0..ec582fe252bf 100644
--- a/media-plugins/gst-plugins-meta/gst-plugins-meta-1.14.3.ebuild
+++ b/media-plugins/gst-plugins-meta/gst-plugins-meta-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
@@ -6,7 +6,7 @@ EAPI=6
 inherit multilib-build
 
 DESCRIPTION="Meta ebuild to pull in gst plugins for apps"
-HOMEPAGE="https://www.gentoo.org"
+HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="metapackage"
 SLOT="1.0"
diff --git a/media-plugins/gst-plugins-srtp/Manifest b/media-plugins/gst-plugins-srtp/Manifest
index 640ed6b5c7a4..83f7d7d651bd 100644
--- a/media-plugins/gst-plugins-srtp/Manifest
+++ b/media-plugins/gst-plugins-srtp/Manifest
@@ -3,5 +3,5 @@ DIST gst-plugins-bad-1.14.2.tar.xz 4664260 BLAKE2B 477c9a864088676ead3170dc11017
 DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
 EBUILD gst-plugins-srtp-1.14.1.ebuild 333 BLAKE2B f6536d5482b6d27fb2a48d2a4c3a0707725bc196e418ba0af3df472b29673d47de54ac2bf61962acfbc3d8009a061ec8a5c5b8218739e9a7cdd32199146bd497 SHA512 c3aa3de4adc659a56fb58f7850f20d393ea1950f0d135bc632911d92f6fa7f07deed5a21878d760c2c5374706d9dc471f163bccaccfdf213c4676de414cf2048
 EBUILD gst-plugins-srtp-1.14.2.ebuild 364 BLAKE2B d95c25f4e50e86d2d9dbbe293c3a065020957b36b8cbd3654469d4b21fd9af9faf55ea56242613d605b9e7488c344a008bd6bd5269d735907c9800b760aad638 SHA512 929ae60008a85310973781e95bcf7ed15803f9ee162cd179a44f86efd663809f67b7134f864833093f67a54e2591c9f430ccdbccd57eedce393fdace88e4647f
-EBUILD gst-plugins-srtp-1.14.3.ebuild 371 BLAKE2B f3af9a6e3cbbcef971a5a0829f72989dfca230fc2bb65c670ff287019123cfb25e137e263d747cb63b4f9074c65e78d86b031c76b9394946386a194457a5fc28 SHA512 629262cbc0bef072f3896757b970db605bb2cbdff34372b3cfd09f6b0134615bc0e375440d03f933d9260fc348dc6fb0ee1ebbb38da67238251ff2fd49ee22e4
+EBUILD gst-plugins-srtp-1.14.3.ebuild 383 BLAKE2B 432017b9afdf4be43f16d0d1c92a76b7344ddfe8e7fa736b373aecab7241cd31b5c8e636a8c3f2e24360d3eeda9c2b7a683bb7b35dc822e6e5ed0a4a552751f1 SHA512 d9b9dd365e1a4bb344cb20c3d507b979b68c8c7600d117ba5a93f88ead4cbeb338dcfe8a967cfc668349141f0fd43d30fbe5031f7bf003491fbfb0e2346b1099
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-srtp/gst-plugins-srtp-1.14.3.ebuild b/media-plugins/gst-plugins-srtp/gst-plugins-srtp-1.14.3.ebuild
index b5801b2ac6f5..4f298f3a6b00 100644
--- a/media-plugins/gst-plugins-srtp/gst-plugins-srtp-1.14.3.ebuild
+++ b/media-plugins/gst-plugins-srtp/gst-plugins-srtp-1.14.3.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="SRTP encoder/decoder plugin for GStreamer"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-plugins/kodi-audiodecoder-sidplay/Manifest b/media-plugins/kodi-audiodecoder-sidplay/Manifest
index 75edf8fdcce0..f5cc9e7858b9 100644
--- a/media-plugins/kodi-audiodecoder-sidplay/Manifest
+++ b/media-plugins/kodi-audiodecoder-sidplay/Manifest
@@ -1,4 +1,6 @@
 DIST kodi-audiodecoder-sidplay-1.1.0.tar.gz 9120 BLAKE2B aad141a6b3b6145906fd482149ab72345c86c692cea0b7cf92c52cf015d158aa54de0644f83080f5a25b5690c0e4d12c008924fe78793ac5fc1cbc8c555f114f SHA512 a6874cd7de1c3b0e33593b5c349f64303690f0d56a881bd399c300f8d22ea361ebc995b38f97be39af6bc006a6f0e11b905e70cc671857bcb989dcff90a2d0ee
-EBUILD kodi-audiodecoder-sidplay-1.1.0.ebuild 701 BLAKE2B d0a591ca77624e989b70ba876d485d9145b881fd0f304666b82ca3f51970486a4cfd5b6cc21a55efde4e566a80fa6a312272e4f6ad37d5a592b8c08e9bdb42c9 SHA512 8672e1ee951346b6f1d775b146768029dc222caa983c7aff25fad1bf910e32c3cdb81b7ff78b5004a92f9c8eed064264580c9d9f4c3679480ec0b258b5f51af6
-EBUILD kodi-audiodecoder-sidplay-9999.ebuild 701 BLAKE2B d0a591ca77624e989b70ba876d485d9145b881fd0f304666b82ca3f51970486a4cfd5b6cc21a55efde4e566a80fa6a312272e4f6ad37d5a592b8c08e9bdb42c9 SHA512 8672e1ee951346b6f1d775b146768029dc222caa983c7aff25fad1bf910e32c3cdb81b7ff78b5004a92f9c8eed064264580c9d9f4c3679480ec0b258b5f51af6
+DIST kodi-audiodecoder-sidplay-1.1.3.tar.gz 10362 BLAKE2B e34853b875b8e328d06d67986609b40f31308c4e914f332420c8ce855c1d594b0bdd112689e874a663f189c722db6811ec12bfa64eb1e9b8907045776821d515 SHA512 8d3f43746328999ea817cd52e4e8f0f1454ffb1e243de4941752cfd7ea6f48848fe7d0855e7a9207934cb61e633389fed79379d3302d58c7c9e8c53784fc2adc
+EBUILD kodi-audiodecoder-sidplay-1.1.0-r1.ebuild 708 BLAKE2B 5ca178a36de3d50611842b932c4f584e80b9f1129b5143ffe1e08ed79d36b44140ea4311734ad6a228b55e4ecd15ad998276404aab1103ef921bb9250097cd30 SHA512 0aae80a150d5bd9157cae53d6ef948be79c3909a072f36f0bc05e8254d72c7d8bae5d984e7a11ff98d7ecda14a67e7d997bdb0c25efb4f30197d26a30ca9dfb1
+EBUILD kodi-audiodecoder-sidplay-1.1.3.ebuild 748 BLAKE2B 81a7a05ea5322372334887f5487246d69d98b473fe974114575b2bbdd982f1610e60a5f5fb33a2bf3e47f3f8af9dcf3f84525c949cb3ade5278e058b633d55db SHA512 a303cc4bd142ea7214d8dd60510e2c55ee77b999eb85404b71b00589c7fa5dda1322df48ed593a0e2fab5aeac7c221dfdc047ef7ec901d3e55061241d1912957
+EBUILD kodi-audiodecoder-sidplay-9999.ebuild 750 BLAKE2B f42174ba15150d832d063e0520bc43a7aeb8ab95a90237137f1eb84b4420130ed58498c28bf359f6a9d6e7da265d29eca23db3eb5dc41180de67ccab5ce3f8f3 SHA512 a08d681efce548bd835ea8835e5eeb1eceba49c8d05c4b4e8b83fb84dad24cd984734015743fe91a866e10f9b085d591cd98fb114457ca313bd01a1859d246e4
 MISC metadata.xml 442 BLAKE2B afc3ae3f9157185ec41cbd144cce22ddd50be0f1409ccb2c764a88a0e448d6504904522d0a18bcf089ca85bbc4a8b05f51e795ec30fb9f7614479835b1ec1185 SHA512 4046b1455fe5c4cb63127751d2fbcc21b3b124609fbe0798c9675e50a837cabf1ef8d7d48103162633a6b47b36394feb1f15d45fc92f6266760de36ea614d6ea
diff --git a/media-plugins/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay-1.1.0.ebuild b/media-plugins/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay-1.1.0-r1.ebuild
index e96f8120dfe6..882888415e09 100644
--- a/media-plugins/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay-1.1.0.ebuild
+++ b/media-plugins/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay-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/libsidplay:2
 	"
 
diff --git a/media-plugins/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay-1.1.3.ebuild b/media-plugins/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay-1.1.3.ebuild
new file mode 100644
index 000000000000..6d68262da236
--- /dev/null
+++ b/media-plugins/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay-1.1.3.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="SidPlay decoder addon for Kodi"
+HOMEPAGE="https://github.com/notspiff/audiodecoder.sidplay"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/notspiff/audiodecoder.sidplay.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Leia"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/notspiff/audiodecoder.sidplay/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/audiodecoder.sidplay-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-18*
+	=media-libs/kodi-platform-18*
+	media-libs/libsidplay:2
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
diff --git a/media-plugins/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay-9999.ebuild b/media-plugins/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay-9999.ebuild
index e96f8120dfe6..092cc74d4d6d 100644
--- a/media-plugins/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay-9999.ebuild
+++ b/media-plugins/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay-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.sidplay/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/audiodecoder.sidplay-${PV}"
+	SRC_URI="https://github.com/notspiff/audiodecoder.sidplay/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/audiodecoder.sidplay-${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
 	media-libs/libsidplay:2
 	"
 
diff --git a/media-plugins/kodi-audiodecoder-snesapu/Manifest b/media-plugins/kodi-audiodecoder-snesapu/Manifest
index ebb47b4c4c3f..c587f1f7d266 100644
--- a/media-plugins/kodi-audiodecoder-snesapu/Manifest
+++ b/media-plugins/kodi-audiodecoder-snesapu/Manifest
@@ -1,4 +1,6 @@
 DIST kodi-audiodecoder-snesapu-1.1.0.tar.gz 38567 BLAKE2B 461164cfc9f81c5c4e644e7905b40a475cb19aeb2b9c91912d8a8e7fd2505141fe7d513e4986922c374226025226257b00415953379ec071f95c37ea2db0fb1e SHA512 f58d87ddc2da1734399872543f18a1a77f5bfd2b3adce42c8e4211a7e4e199a51a59aaccfbd7dff24e4599c9457276014233ab6213c231e2be7e6c7d09e08ffe
-EBUILD kodi-audiodecoder-snesapu-1.1.0.ebuild 671 BLAKE2B e69e71c3375343e687906b00f79b771ecc598029c7f6f3f48232013a448f534a6267b88558951e1facc5e10bd181c3c5db17d86cdb2f5423150ae57ffd3290e0 SHA512 f8ce2e5b6a283e4093ddcd950570a693569b16a164adfe85b7fd74aa6d87d39b4894f7a5ed829c7eb4b8e5cdca85457951bf5090dc5a49ad56fe8ffd56d79c49
-EBUILD kodi-audiodecoder-snesapu-9999.ebuild 671 BLAKE2B e69e71c3375343e687906b00f79b771ecc598029c7f6f3f48232013a448f534a6267b88558951e1facc5e10bd181c3c5db17d86cdb2f5423150ae57ffd3290e0 SHA512 f8ce2e5b6a283e4093ddcd950570a693569b16a164adfe85b7fd74aa6d87d39b4894f7a5ed829c7eb4b8e5cdca85457951bf5090dc5a49ad56fe8ffd56d79c49
+DIST kodi-audiodecoder-snesapu-2.0.0.tar.gz 39499 BLAKE2B 5185eaa4e658a443aad400403be827289807b804ba574907a14b0bf5ee3cb5877cd360a0f100f75b309c9214047236723a079b0172d916ca9c4ebea740a5628e SHA512 d1b164a063ae983c49e24a48ed7fdba10f39343e1ed5aad60e0e141f20c8f3bd8115359ccc97bf4583fac7bc1fd9b1dedc800e34cb3d9ee8749c345396696724
+EBUILD kodi-audiodecoder-snesapu-1.1.0-r1.ebuild 678 BLAKE2B 9753713d54d097e33c0565165ba903ebee16f5f5c9749100ed077eede7b200ef924eb30b4a3b6ca624c6d584237f9b9426d9f1ca811651ab4321b5d29a8c3722 SHA512 80e277866745284ea673a159086cdabf897b455daab367b25eb9995fb51b5b38e401438b70714730104fce1849dbf1041b93e61e6676e21942a4450c71b5a236
+EBUILD kodi-audiodecoder-snesapu-2.0.0.ebuild 718 BLAKE2B 7b5b99a2d25eabd68267d06716a5aa6713b8901c5ab018fc269c563c0978ef2956754f90e677f820a3b50665e359467584d83a4e8dfb29b543fd6828c74674f0 SHA512 6a31ee44c729433ac50a202d97f3865c7e0f92e0df66e6452bb6f6ba783900c453df7fae77c9cffbbda8fe08f04eab984c767d1a1e35139afde15fe873ea2fdf
+EBUILD kodi-audiodecoder-snesapu-9999.ebuild 720 BLAKE2B 150b15ec1aa7defedf97a2d2b9d2410dcf9ee9c6a2d6d8526ce0d2406cd1f1aec4a66540a4ca9b514442d38fbccb0c51ea25858a56142436d27329ece55c6828 SHA512 b13e1651cf93e0df0306e57fc64c639b744b65639988ca0047c5863fe5379eb30e0d6e62570844385b716c62c838bfb64e2f611aad38c8acc439b22747b2dce9
 MISC metadata.xml 438 BLAKE2B 0b8c0545fe3ec7e6ead7eea42baa9255946bf7d27762d392899356ed45e1e7182d7087c25a56b34d114e6de8b95c8a5311fe90b0d52a9e7d007851ec22ab970e SHA512 9561349a81107c52fe83cada11fb8ab55c176fa4e410556741f5259503b7d43732bcf7debfa30a7c98fc7d1e5336abef914a7c31b9663556cd10fc7daf3dab14
diff --git a/media-plugins/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu-1.1.0.ebuild b/media-plugins/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu-1.1.0-r1.ebuild
index ee49d0f34147..f549197c1b8c 100644
--- a/media-plugins/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu-1.1.0.ebuild
+++ b/media-plugins/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu-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-snesapu/kodi-audiodecoder-snesapu-2.0.0.ebuild b/media-plugins/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu-2.0.0.ebuild
new file mode 100644
index 000000000000..36a879f7b682
--- /dev/null
+++ b/media-plugins/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu-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="SPC decoder addon for Kodi"
+HOMEPAGE="https://github.com/notspiff/audiodecoder.snesapu"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/notspiff/audiodecoder.snesapu.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Leia"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/notspiff/audiodecoder.snesapu/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/audiodecoder.snesapu-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-18*
+	=media-libs/kodi-platform-18*
+	"
+RDEPEND="
+	${DEPEND}
+	"
diff --git a/media-plugins/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu-9999.ebuild b/media-plugins/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu-9999.ebuild
index ee49d0f34147..4f9e8c3888ec 100644
--- a/media-plugins/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu-9999.ebuild
+++ b/media-plugins/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu-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.snesapu/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/audiodecoder.snesapu-${PV}"
+	SRC_URI="https://github.com/notspiff/audiodecoder.snesapu/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/audiodecoder.snesapu-${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-stsound/Manifest b/media-plugins/kodi-audiodecoder-stsound/Manifest
index 590247e2b33a..7dc6e0a21812 100644
--- a/media-plugins/kodi-audiodecoder-stsound/Manifest
+++ b/media-plugins/kodi-audiodecoder-stsound/Manifest
@@ -1,4 +1,6 @@
 DIST kodi-audiodecoder-stsound-1.1.0.tar.gz 62033 BLAKE2B 1aaf55b732ae2ac0a647963979afc3db79fc58ef0baee42ba15245c6a8d353cffd24bc9101113cbf302e7cf73bc504c621b480bcf3a09bd543601e0fbd691602 SHA512 462403bc3221cef4b64b12f25765fe89567e873a0aa9df7dfb4e649132500b5fec43f0551f7d359c2b4ee38ab8fcf03bc010e84d20bdd4b8665ad254568f9f60
-EBUILD kodi-audiodecoder-stsound-1.1.0.ebuild 671 BLAKE2B 10c3fe20948cd9ec4873add42e25a56f174abe4fcde897e101ff23d9acafed955ba6fed7a500627a7a69ce991b8cc4fba2bcd9443b17ed8a8702371404d2529b SHA512 d6aea641823475070e41908966dfb93064891402c35f67214ba4b93fd842be0b3eb9d53964a934dc15a71f226f3c503609e0b09e3a315dd8a998833e67ece021
-EBUILD kodi-audiodecoder-stsound-9999.ebuild 671 BLAKE2B 10c3fe20948cd9ec4873add42e25a56f174abe4fcde897e101ff23d9acafed955ba6fed7a500627a7a69ce991b8cc4fba2bcd9443b17ed8a8702371404d2529b SHA512 d6aea641823475070e41908966dfb93064891402c35f67214ba4b93fd842be0b3eb9d53964a934dc15a71f226f3c503609e0b09e3a315dd8a998833e67ece021
+DIST kodi-audiodecoder-stsound-2.0.0.tar.gz 63097 BLAKE2B c797c7fad5811aaa12217cd6c4caf4167581940e25fc2684c04578e06a04e44d683e0871d6847c6cc3367ee5f5925de4e5640b9eb2b4381a713a3ba6c5860dce SHA512 2770da6d379499fc53d013163e28aeb2c1ffdbbe1cb54f2f2a4d5bac33b68d867a8de0865fe72d283f28ded1f3bd79efee7c98fb79f04ff99459d5bcf3f0f1e9
+EBUILD kodi-audiodecoder-stsound-1.1.0-r1.ebuild 678 BLAKE2B a6ad83ddf2f38638241072a2764837e68603854c021711546e0e80b33a2026e6abe83ffe8b1f01f267f4dcc3adcafd8e19a9cf7a9b3af635194567e1efb781a1 SHA512 8a20bdde4f264e6d592e89bb95f5338395536e4e8064ce7c9f93c5a05c5f1b614c29ec0b43af9a9d535057ca240853fdd4a6fdd345e53a84c981dc3244b53aed
+EBUILD kodi-audiodecoder-stsound-2.0.0.ebuild 718 BLAKE2B 71873f38dc0906481f5f18d83fa6af3ec610f746bace3ba211957efddd902ecbb4a8d4a20f870e81bba94fce0e85e667836828d5a5f06f8136000221df056cf6 SHA512 15e356df7a512f9ed1036bb67b3e86defff69c0f077c751444ea66c847352ea9ca25aac3c61a39cd8c96b4023ae308ef7e418fb234e76fc8bd17dcf15eda393a
+EBUILD kodi-audiodecoder-stsound-9999.ebuild 720 BLAKE2B 8f60348ca48816e77c2c14f1017f2737b83994966c62b13f5e6d3535cf3f4735f7c7bfbd8535ff8212c00a47f04ab8ded0f16985d9ecef4d0c3152f84df76995 SHA512 6e86d0f3be3a8c29e59693b514ccef87b79eefbbd15bc1f01912fb5d2ca2a3f9a1887acbe1761ad18dd19e56df23cdfaac2a9d9020000e717c48e6271c49a6a8
 MISC metadata.xml 437 BLAKE2B 36e61faf2f1098a85827d6f81536b35d874e325a7094d535b742c71b30afaf671ed77cf9d84993ebe5e2407ee316d72453a3e18b3cfe55c0d5ccd9691f3cf12f SHA512 a985c629c36655238f0125134c4f64ffae47add726888adf934b8b66aeb9622a12ac256703206b98ed39f29ecd0a0f9ad9043af80160a8d545a982c9fe659504
diff --git a/media-plugins/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound-1.1.0.ebuild b/media-plugins/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound-1.1.0-r1.ebuild
index 4ce3334dd26a..bcb6ded7e4ca 100644
--- a/media-plugins/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound-1.1.0.ebuild
+++ b/media-plugins/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound-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-stsound/kodi-audiodecoder-stsound-2.0.0.ebuild b/media-plugins/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound-2.0.0.ebuild
new file mode 100644
index 000000000000..e88939d30e43
--- /dev/null
+++ b/media-plugins/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound-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="SPC decoder addon for Kodi"
+HOMEPAGE="https://github.com/notspiff/audiodecoder.stsound"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/notspiff/audiodecoder.stsound.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Leia"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/notspiff/audiodecoder.stsound/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/audiodecoder.stsound-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-18*
+	=media-libs/kodi-platform-18*
+	"
+RDEPEND="
+	${DEPEND}
+	"
diff --git a/media-plugins/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound-9999.ebuild b/media-plugins/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound-9999.ebuild
index 4ce3334dd26a..09c82e122719 100644
--- a/media-plugins/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound-9999.ebuild
+++ b/media-plugins/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound-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.stsound/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/audiodecoder.stsound-${PV}"
+	SRC_URI="https://github.com/notspiff/audiodecoder.stsound/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/audiodecoder.stsound-${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-vgmstream/Manifest b/media-plugins/kodi-audiodecoder-vgmstream/Manifest
index 965ab266e447..a1da64c29c2e 100644
--- a/media-plugins/kodi-audiodecoder-vgmstream/Manifest
+++ b/media-plugins/kodi-audiodecoder-vgmstream/Manifest
@@ -1,4 +1,6 @@
 DIST kodi-audiodecoder-vgmstream-1.1.0.tar.gz 235215 BLAKE2B de8253b3a619e0a9a3ab954967fe73081d72aaef37318862745e1378d21001cb9950a2849c0ae6320e9c968d2d0f2c16ca394315e30d08c5fda94e8faf599f45 SHA512 a0549ad7ef94a68bf3e1d77d222790acc15be06f124e148e980aa2f96956da659d5967e0ac034db9ccbb34416cd3a607e7607ec91d00ec12e4bf287766b76d0d
-EBUILD kodi-audiodecoder-vgmstream-1.1.0.ebuild 681 BLAKE2B 9daa09f17ac5d823be7240489768c880c19741f2f36ea348257f2eb20b7244b033d3d22896ef6845ac686c32bd46a387c3bff553faca5d7519de13c126977c54 SHA512 d0cb9cd729bd72f164f8f934d7ac8bf2caabeb8743145e0051e79181799fd63dfb70c51a03554c63ab5425112f082570826b6500ff79d55f7127346ea7f638c8
-EBUILD kodi-audiodecoder-vgmstream-9999.ebuild 681 BLAKE2B 9daa09f17ac5d823be7240489768c880c19741f2f36ea348257f2eb20b7244b033d3d22896ef6845ac686c32bd46a387c3bff553faca5d7519de13c126977c54 SHA512 d0cb9cd729bd72f164f8f934d7ac8bf2caabeb8743145e0051e79181799fd63dfb70c51a03554c63ab5425112f082570826b6500ff79d55f7127346ea7f638c8
+DIST kodi-audiodecoder-vgmstream-1.1.3.tar.gz 236276 BLAKE2B 4323a96ab7d899f40b0cc3243ed9047ca32b2669a845213e7a5703e79e3a4c10d1a37039b0d627d9b636dc1128b49da28e6ba798b44584411b9bb8bd84cc043a SHA512 7f855019e04156b5601a7be0f71a833b241c52bc2dd63f44f2c0c5f3a28b70e14ee9677e5e381ee283d332f167d1dc6e27f1f6cfc5212acb9854cfd93f2b4005
+EBUILD kodi-audiodecoder-vgmstream-1.1.0-r1.ebuild 688 BLAKE2B bfbfee18b46f19dcd42418f35238e5faedf15cf3916c0cc4324de1658302c79ee133b9f2b385d031004150dc67aa4eea8ce9ba9902c3f72149b29372c4e31d9f SHA512 cf7d35d15e305991ffed6589b78617a2e49476a2d01765f4ad0f74a66ea1ea1f425590984387280b64e853f98c54fd75b5adf5f6adcb5f7e5ffac5c233907a34
+EBUILD kodi-audiodecoder-vgmstream-1.1.3.ebuild 728 BLAKE2B 6af6cca76ee3aeb860bfcaa606edd22385991eb920396ea860a44d34a701a4915d2f3326f14a3e82d9f2fefa885f40649644fef6cd45d3678f23ab6cdb7ed7b7 SHA512 3518755dba1f5db9f6d571c7e3d52e83bb1c790c9b1df844c5152ea0d1a0a370bc4d5bc1efec35b3be642fa64764e962f3ccaa8a5c4c6ef591d449739a1f4fac
+EBUILD kodi-audiodecoder-vgmstream-9999.ebuild 730 BLAKE2B c53958e3168747f6abb5d723a72a0561f61d876b6613b6eedb6e5b0cff387d632f6d92150809180d4cdfe3199ebc3bad19cae5e2adcbb8f110a9fb78668cffb7 SHA512 75977913e6f35994654da714f6c349fd0a9eec4c0d267154b1440f5746b10741079dc18d7c092bee8523b8ab34f6fcf489ccfc928573265f0f3fe2667c7b4f96
 MISC metadata.xml 440 BLAKE2B 534e3b04fc69fd47da8b492744fc924ab8e3ffca3b8bb4ab06853dfd5e707f3131630ff06272548c3b05227a9d1cb110441a6b39315203918aca4dfc9fd1c52e SHA512 280074c2c911f1df1c0fbfaead6f51f49992accac7cff643e3d03a0b52f6b64cce156937430d950bc1c875c48c15632d703e5eb69a6c270bdbb25ea7faf7f03d
diff --git a/media-plugins/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream-1.1.0.ebuild b/media-plugins/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream-1.1.0-r1.ebuild
index 21015b25f58e..d655d51c8f1d 100644
--- a/media-plugins/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream-1.1.0.ebuild
+++ b/media-plugins/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream-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-vgmstream/kodi-audiodecoder-vgmstream-1.1.3.ebuild b/media-plugins/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream-1.1.3.ebuild
new file mode 100644
index 000000000000..fc4e9c3f0adf
--- /dev/null
+++ b/media-plugins/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream-1.1.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="vgmstream decoder addon for Kodi"
+HOMEPAGE="https://github.com/notspiff/audiodecoder.vgmstream"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/notspiff/audiodecoder.vgmstream"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Leia"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/notspiff/audiodecoder.vgmstream/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/audiodecoder.vgmstream-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-18*
+	=media-libs/kodi-platform-18*
+	"
+RDEPEND="
+	${DEPEND}
+	"
diff --git a/media-plugins/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream-9999.ebuild b/media-plugins/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream-9999.ebuild
index 21015b25f58e..dbd2e565982c 100644
--- a/media-plugins/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream-9999.ebuild
+++ b/media-plugins/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream-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.vgmstream/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/audiodecoder.vgmstream-${PV}"
+	SRC_URI="https://github.com/notspiff/audiodecoder.vgmstream/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/audiodecoder.vgmstream-${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-audioencoder-lame/Manifest b/media-plugins/kodi-audioencoder-lame/Manifest
index ec87874d49e8..763fb7043054 100644
--- a/media-plugins/kodi-audioencoder-lame/Manifest
+++ b/media-plugins/kodi-audioencoder-lame/Manifest
@@ -1,4 +1,6 @@
 DIST kodi-audioencoder-lame-1.2.0.tar.gz 23109 BLAKE2B 9734a09e6ad3627080161114bd748e40fa15c0146cb8c16d805b902503aa28c85c9b337ad5bd66ed756204362ddb7ea9003313523920bc0975ca83fbd3296b8d SHA512 4f4ce910f9831e6f86615b0dc97c77ce60a834d5fd4e000976c6cd84d411eaa65e1a9b8a38edae7ff7c52d1a24c99f794b65c76432cfe4eeb286050e495190c1
-EBUILD kodi-audioencoder-lame-1.2.0.ebuild 645 BLAKE2B 03207b572475ebadc4fc773eed0887371b414b8e25ba7a40cfddebf770c70970f582784b4aabc714d318a0dac335aeea39055238a78d1521665cbd178bbadb88 SHA512 b819b56825fc2d3f0bd3e5eed46994ac6b257ea985b4be37c0e294206f6fb3811bb24d55ff37923c3d92b1e6c5a4d7bd8f3adcb335e8540a6241afa2d7338b0b
-EBUILD kodi-audioencoder-lame-9999.ebuild 645 BLAKE2B 03207b572475ebadc4fc773eed0887371b414b8e25ba7a40cfddebf770c70970f582784b4aabc714d318a0dac335aeea39055238a78d1521665cbd178bbadb88 SHA512 b819b56825fc2d3f0bd3e5eed46994ac6b257ea985b4be37c0e294206f6fb3811bb24d55ff37923c3d92b1e6c5a4d7bd8f3adcb335e8540a6241afa2d7338b0b
+DIST kodi-audioencoder-lame-2.0.1.tar.gz 23505 BLAKE2B 706cefee19bfdc19caa7c65101d61a3032f70033b4c8adf40c90009aed81c8b69c30e0a8982cf633267c26ea568b19adbefaf6c035617573fa09ae486a6d8e80 SHA512 eb780f31e96a0c745cb2598212aab39a065cc85b186b579ba2ace4732640588dabf9a6ef2e6ee57ddd793a2790cab0b8c2a1068714b80ecbfa4ae4a6eaf2f4b1
+EBUILD kodi-audioencoder-lame-1.2.0-r1.ebuild 647 BLAKE2B b78bca9b11558b0c0964227640cf7ee46212a10546933b8a2086e57bd13ff308d6f2846edb9b60f41d48bdb54ce0eb02d38d2bb350bd3d80c59fc562850817c6 SHA512 38d1b98a75d1781e66eec1c74a0b5a5279d5a5980ffd2c9bcb7b3b6b8c79c6b7099e25c9c17bf09236a44e50edece274affac1c7b4e5be6150fea33d2b42e99e
+EBUILD kodi-audioencoder-lame-2.0.1.ebuild 647 BLAKE2B de177cc8b6520999c840a786a31e56d715cce0f815ddccfadba9f6f15e21c5c4931720c4bff995d2dff1a45179018f3d363c585b9ad054a658114d1ae2c4085f SHA512 3f17ff30706653b26f130e6323f0ec22d1bb0933667efde7280d7e97c22a908c651d193f5242115bb4b4af294da7285171104d6b62356d690c0906de1564a422
+EBUILD kodi-audioencoder-lame-9999.ebuild 648 BLAKE2B befe206451df8640829ddd4d18555291426fbe5c80c87b7e4875948d0866c4656c964d4b4fc984759e1379befacec44cd3ba1495cd1c6734be072d2ba3829068 SHA512 9222b29f7125751c9db86ba24558e8cc654db5d5ab885380b6a329c2b021276d87e98023513f64840ec84da6c5dc230ec9341d7ab388639643b0f24b664c54a2
 MISC metadata.xml 436 BLAKE2B 89eb2bd7916bd6c206439984ddc7f84b5c04cdfe923b28f911f919720aec90449d40ffaa7d85306e486357d9e2b8b9681b3f3b79624dde542f2cdac218ffa75a SHA512 15bf6ae63d3265efca6ede0b1fd0849d266e58b555b2f1e593eb85752ddd62e56a1684ba33c0194368b564228c88fa55349e7ed088ac376f5b020045f3c4239f
diff --git a/media-plugins/kodi-audioencoder-lame/kodi-audioencoder-lame-1.2.0.ebuild b/media-plugins/kodi-audioencoder-lame/kodi-audioencoder-lame-1.2.0-r1.ebuild
index 3ab1ec641db5..12208477a618 100644
--- a/media-plugins/kodi-audioencoder-lame/kodi-audioencoder-lame-1.2.0.ebuild
+++ b/media-plugins/kodi-audioencoder-lame/kodi-audioencoder-lame-1.2.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-sound/lame
 	"
 
diff --git a/media-plugins/kodi-audioencoder-lame/kodi-audioencoder-lame-2.0.1.ebuild b/media-plugins/kodi-audioencoder-lame/kodi-audioencoder-lame-2.0.1.ebuild
new file mode 100644
index 000000000000..8423fd613ff9
--- /dev/null
+++ b/media-plugins/kodi-audioencoder-lame/kodi-audioencoder-lame-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="Lame MP3 encoder addon for Kodi"
+HOMEPAGE="https://github.com/xbmc/audioencoder.lame"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/audioencoder.lame.git"
+	inherit git-r3
+	;;
+*)
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/xbmc/audioencoder.lame/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/audioencoder.lame-${PV}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-18*
+	media-sound/lame
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
diff --git a/media-plugins/kodi-audioencoder-lame/kodi-audioencoder-lame-9999.ebuild b/media-plugins/kodi-audioencoder-lame/kodi-audioencoder-lame-9999.ebuild
index 3ab1ec641db5..a30148d62097 100644
--- a/media-plugins/kodi-audioencoder-lame/kodi-audioencoder-lame-9999.ebuild
+++ b/media-plugins/kodi-audioencoder-lame/kodi-audioencoder-lame-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-sound/lame
 	"
 
diff --git a/media-plugins/kodi-audioencoder-wav/Manifest b/media-plugins/kodi-audioencoder-wav/Manifest
index 90398252f073..a1259b3a4671 100644
--- a/media-plugins/kodi-audioencoder-wav/Manifest
+++ b/media-plugins/kodi-audioencoder-wav/Manifest
@@ -1,4 +1,6 @@
 DIST kodi-audioencoder-wav-1.1.0.tar.gz 9743 BLAKE2B 912e5662338b9229c077e12fde9e9b7d7ffd0faea6dabc04cde315fe03aedb3c0d3305906fa5996254633e29418048e15d8ac0ec27735a19ac018cfea16d1f32 SHA512 002894dfebf427a86419f211f67abb34f68286573434272c39033ee281ad63d53acbe1d9288acd49abc991c770c577347512e018bebd627e0f722f300e961d85
-EBUILD kodi-audioencoder-wav-1.1.0.ebuild 593 BLAKE2B 29fed1bc1630e4004e1dc732cd68b58470283addb8389cfb837c9909e4ee5dea644cb1bbdfb0765b6aa74df2eae49c756cd1081b0b5ec92d315e00d9dfedd901 SHA512 98e12a8db993a7ced47daf89a0ec54a8450f89a0777cf426de89268db869a1315a959b81938104fb88ab2d397851bd7fe471108b02bfab4fdd8ab69433ed9eeb
-EBUILD kodi-audioencoder-wav-9999.ebuild 617 BLAKE2B bb1121e39609fad4be7b8dfa5299232afa9d7ba2af7d0a969e38909f22e3ab537230d603992decfd48b5ae83b0db7cdfc6cc03861f1f7495548bec3b2bf017b7 SHA512 168bc121f69613c679527bf6f2a04bca29512f3a4f7b2494dbafe586183aa6ee363fdb69760dd1d3aeaa9fa6e06f99502f1c41cb32ba4156eecbf18b9e955fe5
+DIST kodi-audioencoder-wav-2.0.1.tar.gz 9850 BLAKE2B 08275b37e033eea178054c2f8e6eab1b1af3073d7c88f8406de54bcc8a57791f55126b8d595d543520e214fc41dec7e2c8d45e64263071a98b01e7ea72ef8d01 SHA512 27746034397fe87bcfb81a429350e234be5fe793ef37f1c4f58ab87c91ef11fec8c808874183e59b325228289d519f948dddd5c9587911f3ffca36ca53641f8d
+EBUILD kodi-audioencoder-wav-1.1.0-r1.ebuild 595 BLAKE2B 4890e2b2b8e9e929fc1cab5210bbf4149b876a33565e70a01da40f90c57cd813ec620c134f0c4de65f626aba49d563c75d181ee7ab5a870087db58091ec60924 SHA512 0e998ce14fb65fca0e37da1b3d86da6bd1e0349ee0bc669b1eef648d8b4eaeae0ad8eb7dedc83762e3ac055ea2b9d352c8e63f3d6289ddd61565e500a479e2bb
+EBUILD kodi-audioencoder-wav-2.0.1.ebuild 619 BLAKE2B 85236318958ef404e09e37f37880a9ae4f1fc875e197dd10b4ac9651eca03975b6015d774d006f4eba8bb7b057c924ea9381c8788bd45d507ca8f705a563c440 SHA512 457ee9c98394779b65e4697d84773313778ef65881ab508352312027af420821a3cdef2d2172bf1143b8a5ecf618736fb6b7e6c85bded6be884d11c6eef0a3e2
+EBUILD kodi-audioencoder-wav-9999.ebuild 620 BLAKE2B 26681c856f6f0099a85a2fb482dc3aae661c9e6e7ea89a33c8be14869af4c3302f6457ad52093e609c1c2f169a65a00d2ba1394bca9b99ed1f871d3ddbf35a1f SHA512 a77f909150aad47c42e98638f5fa1e8d27b44c9fb1916869bac6db8139f3a63788cf85367608edd88e9e596bc95baccb958517c70e00c5c75e784eaf3d6ea0d2
 MISC metadata.xml 436 BLAKE2B 3c9c2bb8e781568176bb6635269e8c7fb2761f0f64a192e04fc53f325a79e99b474220c5787d5c2f28dc3e3cbcb3e4aea177d561aa63c6d866f261382126a01d SHA512 e92cafa5a635c7e1ee82d7da9eb48138f7f5267d7b91983f9da417ed25435d87cf5dcc47192df499a8acaaefc0c38713a869a4ec6351dda4dddcdfd5a7d15cce
diff --git a/media-plugins/kodi-audioencoder-wav/kodi-audioencoder-wav-1.1.0.ebuild b/media-plugins/kodi-audioencoder-wav/kodi-audioencoder-wav-1.1.0-r1.ebuild
index d8817b909c7c..cac731125098 100644
--- a/media-plugins/kodi-audioencoder-wav/kodi-audioencoder-wav-1.1.0.ebuild
+++ b/media-plugins/kodi-audioencoder-wav/kodi-audioencoder-wav-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,5 +27,5 @@ SLOT="0"
 IUSE=""
 
 DEPEND="
-	media-tv/kodi
+	=media-tv/kodi-17*
 	"
diff --git a/media-plugins/kodi-audioencoder-wav/kodi-audioencoder-wav-2.0.1.ebuild b/media-plugins/kodi-audioencoder-wav/kodi-audioencoder-wav-2.0.1.ebuild
new file mode 100644
index 000000000000..884ee4090004
--- /dev/null
+++ b/media-plugins/kodi-audioencoder-wav/kodi-audioencoder-wav-2.0.1.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="WAV encoder addon for Kodi"
+HOMEPAGE="https://github.com/xbmc/audioencoder.wav"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/audioencoder.wav.git"
+	inherit git-r3
+	;;
+*)
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/xbmc/audioencoder.wav/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/audioencoder.wav-${PV}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-18*
+	"
+RDEPEND="
+	${DEPEND}
+	"
diff --git a/media-plugins/kodi-audioencoder-wav/kodi-audioencoder-wav-9999.ebuild b/media-plugins/kodi-audioencoder-wav/kodi-audioencoder-wav-9999.ebuild
index 92c34671f99a..f53f0fe8eb8a 100644
--- a/media-plugins/kodi-audioencoder-wav/kodi-audioencoder-wav-9999.ebuild
+++ b/media-plugins/kodi-audioencoder-wav/kodi-audioencoder-wav-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
 	"
 RDEPEND="
 	${DEPEND}
diff --git a/media-plugins/kodi-inputstream-adaptive/Manifest b/media-plugins/kodi-inputstream-adaptive/Manifest
index 036e79c43f9a..9695e7a0a153 100644
--- a/media-plugins/kodi-inputstream-adaptive/Manifest
+++ b/media-plugins/kodi-inputstream-adaptive/Manifest
@@ -3,6 +3,8 @@ DIST kodi-inputstream-adaptive-2.0.19.tar.gz 881342 BLAKE2B afa1341e9f45d5b97338
 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.11.tar.gz 484770 BLAKE2B 23a19540ec911e254b5ea65180e548d59a4e2852be76e9493284138b0036651dac31dc35159dc8e56dc14e1a09f68eab1e637518c9f900e4d6bd346c3285df86 SHA512 a5371b92c688095947f5b3dd34e9c0c80b981b67151dd8b88c16ca2f47383c1274c39f3b2854e4518dcf6d075c740bc2ee94e49486c89733a913641949463129
+DIST kodi-inputstream-adaptive-2.3.12.tar.gz 484806 BLAKE2B 6a29e97ec0ab09bca83202d82d8181ba569e2df70622e66bb8927ab08c0e4c37c51db91ad0b8c160d12c65e03746dd005b0cf2a2b15dbc0b7561934503c21aaa SHA512 9a129df1afc8dae22e92e8ce7c90c67d0e07f2a69004e7cf22b07be25c54651514d4f48497017a0c785bff0222b3b80341557f80d07586000571d5ddda68ccb5
 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
@@ -11,6 +13,8 @@ EBUILD kodi-inputstream-adaptive-2.0.19.ebuild 799 BLAKE2B 3698cc34e454d7ad3c0b8
 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-2.3.10.ebuild 724 BLAKE2B 5ea90abb612d6a36a1ff0ce4a436e15061f7a327fdaa57ea3be7e8c62e318d26a4a2781f9e1a117d8deca548fb2c57c5f32e1a8ae515f495b18d312eba4832c4 SHA512 a7a099c05e52555bdd09401b01ff1c0bb6ab716260827a394c22466a081b9c5ba9167a67cb851a8042b226eb8f94582e53f359f287c5088223230f4fa3f4b41f
+EBUILD kodi-inputstream-adaptive-2.3.11.ebuild 724 BLAKE2B 5ea90abb612d6a36a1ff0ce4a436e15061f7a327fdaa57ea3be7e8c62e318d26a4a2781f9e1a117d8deca548fb2c57c5f32e1a8ae515f495b18d312eba4832c4 SHA512 a7a099c05e52555bdd09401b01ff1c0bb6ab716260827a394c22466a081b9c5ba9167a67cb851a8042b226eb8f94582e53f359f287c5088223230f4fa3f4b41f
+EBUILD kodi-inputstream-adaptive-2.3.12.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
diff --git a/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.3.11.ebuild b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.3.11.ebuild
new file mode 100644
index 000000000000..4c3d3f943e54
--- /dev/null
+++ b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.3.11.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.12.ebuild b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.3.12.ebuild
new file mode 100644
index 000000000000..4c3d3f943e54
--- /dev/null
+++ b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.3.12.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-pvr-argustv/Manifest b/media-plugins/kodi-pvr-argustv/Manifest
index 628805b6946a..524a47f33a36 100644
--- a/media-plugins/kodi-pvr-argustv/Manifest
+++ b/media-plugins/kodi-pvr-argustv/Manifest
@@ -1,6 +1,8 @@
 DIST kodi-pvr-argustv-2.5.4.tar.gz 150573 BLAKE2B 66c248c2410f30f253f345bcf1611b5e88afee70e38b2c89100653817cf91ccc8f6e0d3a1a74668b23d7fb41ae341ad74dd11edc6ab0ae8644491a78f0293964 SHA512 30b7eaec52fbbfaf47e031b42f7c51c463f43e863b458cead67c21cd1677897726d90f1d687937919d174bc615ddc6d4082afdaf3bca0cf075be66968efd2667
 DIST kodi-pvr-argustv-2.5.6.tar.gz 150669 BLAKE2B 4fc29e21d9cf9fe00a04aedd93daa5af014900f5e76c5d2dc58b66cd324dd7df6e1f0c51cfbe887cfe767c504e64735ee2c24e20a4e9709bb0fcb13b72d0df22 SHA512 009cd43cf8b040b3144f77f8e442d73ee96de217dcc123abd77b77affd7732edf4e1fa6f548889be62f3eea7aba58ab7b132d076c30195fd2f4a0bf19605ef81
+DIST kodi-pvr-argustv-3.5.4.tar.gz 149660 BLAKE2B 0afd36f8e7c153bb5d00235664ab40e7fa165d658b0491a271f9cc04c7ccf2f3bf9666c949b43c03b86ab8d6479863c7df9e05d75b8e18676526bb1d30f8b62e SHA512 37ae3fa9d3e0f49ce87429de56f16e875bcbb289f94e019822c9e8661f54cd62d11d6cebe195f29871d7c24241d859e88fde988fc6ed6dd2a3f64cd7e8efe1d3
 EBUILD kodi-pvr-argustv-2.5.4-r1.ebuild 709 BLAKE2B d6d9022b7d6b682d2790bb10ad2de99a4b7bc8bf43f6e5c436e7bfb5ee109b4b1cf47e20483f0ac3a2da7a9d1713d35fe7ad683a5db72e8a5e880661a77b0fa4 SHA512 a68ba3e8fdf339b00669afa6ba1984dff0d436b0f770ddf54becf87b5e874d18f173470de814ee9fb82d08ac44eadbcaa3ddf39d1350199201348f7d0c0d788d
 EBUILD kodi-pvr-argustv-2.5.6.ebuild 709 BLAKE2B d6d9022b7d6b682d2790bb10ad2de99a4b7bc8bf43f6e5c436e7bfb5ee109b4b1cf47e20483f0ac3a2da7a9d1713d35fe7ad683a5db72e8a5e880661a77b0fa4 SHA512 a68ba3e8fdf339b00669afa6ba1984dff0d436b0f770ddf54becf87b5e874d18f173470de814ee9fb82d08ac44eadbcaa3ddf39d1350199201348f7d0c0d788d
-EBUILD kodi-pvr-argustv-9999.ebuild 711 BLAKE2B fd30711b10d81df0675b31b2b1c371fc6790c39bcde9f6c266340d362b5064e557a869d83e9d201c02f6952de44a6eaa9f94be799776b375eeb224d1ebcdb9ee SHA512 3ea204c9c1c11026c4123dcfa0222955beabcff1db79e39e4abfc865a3a271c57555c3c709ad3e390b1b079e25e7e987d62797179f5275a4b3ffbad6f5eb5e03
+EBUILD kodi-pvr-argustv-3.5.4.ebuild 703 BLAKE2B 88426f2bd633dba02be419e2067a5860fba8ac022d16961ed2216eb34a1e7a8feae2520da95a1fa0bcd118c951a0ddbf36dcfccb016404eebba946849a4eb418 SHA512 b12ce181413e81ed518c09d8820985b1dd54a5aa64e64413f993a426c6bda743f52c6203e8769b198d446ed5f8a2248acdecbf95d8f9891cc2afdb9b17e8e4f0
+EBUILD kodi-pvr-argustv-9999.ebuild 705 BLAKE2B 3d5d932ddfca45f6066f6cd968350b378477b0accdda2aae9765dd09f132ecb153e1f4963873dac2a5845cf3c51e3ad58c4cfd5d916a2d20c02bf31143e6da74 SHA512 b52e751947d6fb1d8c723ce2b51e1f4355223088f33938881bdb6ef937d8dd8ea3af98cc3a3beacd2de805ae316f5c8640e31f2a444ed836085a56b781fd872a
 MISC metadata.xml 431 BLAKE2B 7cf6fe3e6a6c6cec6b72acbe12ed6b95b8204c33f9f8473f6ed48831e189063b9b5584b579365bd5551cf9ba109bcf85b6ee1dc77eeb18871f049fa5490215f3 SHA512 ee08e760ff80ed37cbc40ea35ef0daebd9b8b7dd7a532123787a022fea25c9441912103dfb154491b81aab1f79675408c4fe4022c4937b03433df826bdfa90bb
diff --git a/media-plugins/kodi-pvr-argustv/kodi-pvr-argustv-3.5.4.ebuild b/media-plugins/kodi-pvr-argustv/kodi-pvr-argustv-3.5.4.ebuild
new file mode 100644
index 000000000000..1f3503e27d2d
--- /dev/null
+++ b/media-plugins/kodi-pvr-argustv/kodi-pvr-argustv-3.5.4.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 ARGUS TV client addon"
+HOMEPAGE="https://github.com/kodi-pvr/pvr.argustv"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.argustv.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Leia"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/kodi-pvr/pvr.argustv/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/pvr.argustv-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-18*
+	=media-libs/kodi-platform-18*
+	dev-libs/jsoncpp
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
diff --git a/media-plugins/kodi-pvr-argustv/kodi-pvr-argustv-9999.ebuild b/media-plugins/kodi-pvr-argustv/kodi-pvr-argustv-9999.ebuild
index e7adfd04ff41..d1169d9e78b2 100644
--- a/media-plugins/kodi-pvr-argustv/kodi-pvr-argustv-9999.ebuild
+++ b/media-plugins/kodi-pvr-argustv/kodi-pvr-argustv-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.argustv/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/pvr.argustv-${PV}-${CODENAME}"
diff --git a/media-plugins/kodi-pvr-dvbviewer/Manifest b/media-plugins/kodi-pvr-dvbviewer/Manifest
index 08996b56fd3e..42f13ba65aa3 100644
--- a/media-plugins/kodi-pvr-dvbviewer/Manifest
+++ b/media-plugins/kodi-pvr-dvbviewer/Manifest
@@ -1,8 +1,10 @@
 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
+DIST kodi-pvr-dvbviewer-3.7.8-Leia.tar.gz 127666 BLAKE2B a1f73598ec8b3c6db067b6c991ea829ebfeae526e4575f9392c0fe36280b467ccee46eadc65f14309bf422e06f9ce9754ae3b2d3444f58fe0c938541be9130d3 SHA512 8d0c16c21b6b80f16801d0d253987f292aaa324f0eabd508c0023e87fce9502ebecbcc89f8fb00007dbd792ced83a8925e280f6cb1dbf0a5f319699a8b7d95d8
 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-3.7.5.ebuild 724 BLAKE2B 06c88eeb74096b98f317afcc10aab898af34159be154be5dd99713f0d6e33be9d49c0a3e4a06c3f6e40b8a43cb3a2427c527fec6f53cf71e7e24b0c0439174bc SHA512 1a7b983a71f4f8702e65534c9fac156aef3f343914064ffa2326841798b5aff8d16a5c4dd6d2af8aba766aa87d134e526f94b2dc057db2eafb75b5d5d2d54dd3
+EBUILD kodi-pvr-dvbviewer-3.7.8.ebuild 724 BLAKE2B 06c88eeb74096b98f317afcc10aab898af34159be154be5dd99713f0d6e33be9d49c0a3e4a06c3f6e40b8a43cb3a2427c527fec6f53cf71e7e24b0c0439174bc SHA512 1a7b983a71f4f8702e65534c9fac156aef3f343914064ffa2326841798b5aff8d16a5c4dd6d2af8aba766aa87d134e526f94b2dc057db2eafb75b5d5d2d54dd3
 EBUILD kodi-pvr-dvbviewer-9999.ebuild 726 BLAKE2B faa78ff1a46d710284b2043c26f458fc279161d53f6632ec320e5583b9c6576156ea5f52b1409ada64c32a6a52f79c5245c7d2dbdd6b81cae8a5101a3a2d4405 SHA512 59c05d893f445fef677587cfe13fc5340ad571f9a3856e6eb23ec119da39bfd5b863ce0051977bc4a5d3a4684a639af2e82670d0cdd99d16b225f8ee22326698
 MISC metadata.xml 434 BLAKE2B 8c6842bc4a5a0dc248402680bb06f034883ec52717aff60b0d8a55a27619f288719caf002056bb6c36f09506e8ecf0b45a173f7cfe85699db9477b30fdd380cd SHA512 9e817d4a01a0c99faf30fcbee42cf386310ee8e2a74799d5384bca834ee88c534740bd304b5febae834536c6283e6570199d6692b7091e5c2b9ebe35c1d717c4
diff --git a/media-plugins/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer-3.7.8.ebuild b/media-plugins/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer-3.7.8.ebuild
new file mode 100644
index 000000000000..cdd6fb80252c
--- /dev/null
+++ b/media-plugins/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer-3.7.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="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-filmon/Manifest b/media-plugins/kodi-pvr-filmon/Manifest
index 46a549976657..88a6e4a1b264 100644
--- a/media-plugins/kodi-pvr-filmon/Manifest
+++ b/media-plugins/kodi-pvr-filmon/Manifest
@@ -1,6 +1,8 @@
 DIST kodi-pvr-filmon-1.4.7.tar.gz 103691 BLAKE2B 660ef1777451bbcf0abcd38c66ff3df2829cd0010eb8a0b8f4b69b4e4cf6d83506743aef9ca52276723b76c97fcab1e019ff01d4f15e929b796141a70df3d6a7 SHA512 86bbfbe56607888983e7b80800680c2b955a743def3aedd9ba1a4cee8543af327b737b1c9a04dc03b09a950774a31c0ce9af8a0431103fca937b6f0fa7b76280
 DIST kodi-pvr-filmon-1.4.8.tar.gz 103709 BLAKE2B a31125631ef8e26702a132814d72468b4f731ea1b01c6ce0edd1459c96895ee5aa06631783af45ad4235308ea914c9f0295e34e1b758b471e8a5a17c30413eea SHA512 dd2069c221c12a0415140f108889de937b6d65c950a9dc57a73d8615c221c4f56c4bc7b3190ddbe54739b6f85204fcd0a5214c45b57db3fa71d83e0c4bf4de5d
+DIST kodi-pvr-filmon-2.4.4.tar.gz 104862 BLAKE2B 8333be55812ec5cb18535aa696c07e16cc02712522b540bef346bd030fdbd572daae47d81bed78be243014fb920911309d5f924079d323104c60090d0ca2c72b SHA512 f6d7c90842ca59ebb3b254860b47d7c1b7e6e5bd70f06744341eaf30a4bc2847027818a2bb097e56398354315753cfea7878cf2b82c3fc69b0aeed106b8d8e80
 EBUILD kodi-pvr-filmon-1.4.7.ebuild 703 BLAKE2B 3d33b39f584941ab92305bece0925e1c8d52cbf54c747116a0771118ee70b91f34351f9e08c36a9b235a2a82e7fd94ee2263106bade703155b14c62b32b8250c SHA512 153a5a0dcce9db0425490839c919f273332a5cb8882c6954f4b12fe0e172d0e6f2fe21447709ad195cb83a31bd5b44c6d568ed83e7ff57aa6e90b58791d8d32c
 EBUILD kodi-pvr-filmon-1.4.8.ebuild 703 BLAKE2B 3d33b39f584941ab92305bece0925e1c8d52cbf54c747116a0771118ee70b91f34351f9e08c36a9b235a2a82e7fd94ee2263106bade703155b14c62b32b8250c SHA512 153a5a0dcce9db0425490839c919f273332a5cb8882c6954f4b12fe0e172d0e6f2fe21447709ad195cb83a31bd5b44c6d568ed83e7ff57aa6e90b58791d8d32c
-EBUILD kodi-pvr-filmon-9999.ebuild 705 BLAKE2B 39ffbf5f764ae923d93ec4baa86d58fbcc53f9897ecc5415f24eda49295869c27288952ec7b39fa8b618ac3c6d7af206d6456b2bc419e0c47eda1c1ae9d7a40d SHA512 ce9296592edc1998034d7732be61c03fe2b8d9705a70e964926634a25793084f0c02c82bed38d245123cb3ddefd7bf3a44f963c169948493f10a09fed655f527
+EBUILD kodi-pvr-filmon-2.4.4.ebuild 697 BLAKE2B 40d100012cb3c7583684aebf7741c4629291a227af15627c4d9dac9a2b47ae2bbbf322ab34b70f03dab4c026ebb70e7bbcf6688468d81df840e151dcb9700760 SHA512 162b3053e55f4ca20f5586592b96538a4640dc32c5ed682262899880699b2097b013533eda33c3cf74d35b7a8aa6ce595188c16dea1054811e0cd8cfd2c0614e
+EBUILD kodi-pvr-filmon-9999.ebuild 699 BLAKE2B 883ffc7d43f5f599a4385c81c5326a0aae077bf819849d406ef8482d34589e4f23006365daf6da2460fbf45ef6bd6cb0eb8048f29fd9f8b0ddf319d0772166ab SHA512 87e2fd1de9e07f613d8418f6d2b825a6ca200bc7f020952f5f3e57ae5381cf0e85a9f16f978f34247c93526612a568571390a1efee6a24b60ab7ac558e75e275
 MISC metadata.xml 429 BLAKE2B 5432fd7942694c454c239f39e4835bb6430f8e5dbc14b4bb11d32f6aa618822be12b1fa6a6b39422f4fb5c0d7a1b8203ce7fc3f2090a7d2a7253ee65fca11439 SHA512 dea6258c8509740209e941e13d258d165e72fee1902dba1d5364ce3c453e53de4698df34cff64f591f192336a46e69278ae7409c187788df6ef1a0bb4cf10ee4
diff --git a/media-plugins/kodi-pvr-filmon/kodi-pvr-filmon-2.4.4.ebuild b/media-plugins/kodi-pvr-filmon/kodi-pvr-filmon-2.4.4.ebuild
new file mode 100644
index 000000000000..a785a13ade13
--- /dev/null
+++ b/media-plugins/kodi-pvr-filmon/kodi-pvr-filmon-2.4.4.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 Filmon client addon"
+HOMEPAGE="https://github.com/kodi-pvr/pvr.filmon"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.filmon.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Leia"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/kodi-pvr/pvr.filmon/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/pvr.filmon-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-18*
+	=media-libs/kodi-platform-18*
+	dev-libs/jsoncpp
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
diff --git a/media-plugins/kodi-pvr-filmon/kodi-pvr-filmon-9999.ebuild b/media-plugins/kodi-pvr-filmon/kodi-pvr-filmon-9999.ebuild
index 2333459273a8..d4bba9c02f3a 100644
--- a/media-plugins/kodi-pvr-filmon/kodi-pvr-filmon-9999.ebuild
+++ b/media-plugins/kodi-pvr-filmon/kodi-pvr-filmon-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.filmon/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/pvr.filmon-${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/jsoncpp
 	"
 
diff --git a/media-plugins/kodi-pvr-hts/Manifest b/media-plugins/kodi-pvr-hts/Manifest
index 3dc2c8cb9382..8305b35ca413 100644
--- a/media-plugins/kodi-pvr-hts/Manifest
+++ b/media-plugins/kodi-pvr-hts/Manifest
@@ -1,4 +1,8 @@
 DIST kodi-pvr-hts-3.4.24.tar.gz 201592 BLAKE2B ad4db20f002c006f9c5dbeec65b136287fe6f7b6d973794e90c1e7c2edb3d13717db077edc91172a94c709afc623ce5fc29ccfa88ff34e8c6694b164a9223497 SHA512 66d0c0f090a1c22f748a2cf70a9790dc1fa74c05bbb3ad478cce92b2a116c8f2c25dbc72a9d6f2269a19da94c0ea9f7123bfffeebb9d2d6f29dd17411410fe16
+DIST kodi-pvr-hts-4.4.2.tar.gz 159871 BLAKE2B 56d054e934367225809409960ecc629ebeb92ac95845c10f82cc3942cbcc7e4cf7c32ebfec18a90f2bc3c09f62fcb5cc020fa2a66584ce6891e4012c1342e812 SHA512 ab0e1cee6eb5e8b0810b78bc4af70481f061ae5b8144c5a06370b6fc4c9a1a7713531de144ccdabc9d21cef659e7909bd49f89dfcf377f3520f20be5cd738e9e
+DIST kodi-pvr-hts-4.4.6.tar.gz 159925 BLAKE2B f4dc1e27a91164521aeb9c2f9969c5248ebc62e81211f552b151c5ddec082bb1c7ed8d44ff0ea5fe88ad7f8b592fbe0110d52cdebcbf579bc8198cb56a1935e2 SHA512 c9cba9a967d2ef3fc89277ae3f01c9045cc309dfce92747619a513b0b289f8b7ee68d589bb44655c1dc48a9020943e66e1b8e6e5ee3271cb7efb0d050a551459
 EBUILD kodi-pvr-hts-3.4.24.ebuild 727 BLAKE2B 3b4ffb79aa912e1ec28482085cfda46969140da62410bb2c6698aaa6176b76b980aada914920dc2dafd170d155ab6ab586ef43c7f16c2629763b90561809b787 SHA512 469accb72b3fbf8085cd1d0d823c20a837442ac44d748bf352cadf5706952a9c3af4948753a236ac78bfc0f430d340710ff657f39fe65bbcd8b3c7ab3a58ac13
-EBUILD kodi-pvr-hts-9999.ebuild 729 BLAKE2B bcd47dfdfecaf80f89f6077ff94f90f818ab27328d6e8ae6628f7393c5c4fd3cbaa1b8f6d4e250dd3e534bba9014df2b14b969f7d815bb78918007f1dc109a1b SHA512 39ea88b694487d95790018cf1070a10b3b4f8f28477485de8f5e49704e8bd726f9424162c0a2f9e58f4a82b639c0bc8ba601c180d2649539236ae27d76712cb7
-MISC metadata.xml 420 BLAKE2B d131c9d640d008b41f5e858fecebc24917f5b96ea089341b5e40763e5f1aefdcee1264a45ddba39e05d5ae7adf17440ac28e54060fbef014e61bd214b287e66f SHA512 cfa1227f4217554c24eaa9aaeb9fac01e3ec663be0abc5f97682ef7e1b834460d3807c4789fac44a35bd874e6522080a36bf5a4b82ae80b6fc08936618940aab
+EBUILD kodi-pvr-hts-4.4.2.ebuild 721 BLAKE2B 6ad7ded19a2c0ab3051822e8e067d05a6ea3d100ad8754acd92f95b2f74f43f9dec304ec032278351ee85456f1b6144cc815ac11963648773bde999b9a3b7e12 SHA512 f92d1b10fd874708862855d1c3baa28d509c1ca9e096643d9545b8a25b4153e2323657976e4dc2d4da3c1d39993303c72f9d4fe9026d800baeb1e01fcdc624a5
+EBUILD kodi-pvr-hts-4.4.6.ebuild 721 BLAKE2B 6ad7ded19a2c0ab3051822e8e067d05a6ea3d100ad8754acd92f95b2f74f43f9dec304ec032278351ee85456f1b6144cc815ac11963648773bde999b9a3b7e12 SHA512 f92d1b10fd874708862855d1c3baa28d509c1ca9e096643d9545b8a25b4153e2323657976e4dc2d4da3c1d39993303c72f9d4fe9026d800baeb1e01fcdc624a5
+EBUILD kodi-pvr-hts-9999.ebuild 723 BLAKE2B c40ccaf825c6162a565463bfe008d827e96ee2663422904ad086eed69f239a240133e4d10ac889e2acaa640c800e4d37edf3e44763b89381e7ff80729a7642a5 SHA512 ca35fceee8d9d6a8f8d622dd6bc6b5e1fc06043522954f6e36656d420b3983b345865ebe3e417f6f0cba50850332356b03e5c16c84fab521ac2531ac4bc4f03b
+MISC metadata.xml 529 BLAKE2B 75957634fa1689db9429bec1f25738c6700813d2714a4c80a4381fa9dec88a126144ef661cbdf1ba7ceb94cddde73bcdc376714abd08f9c205fdc8156e3fed55 SHA512 e6eab8498b684a786e899769dca6949b3252e7534fed233cf7b59f9eef8de4180b676445f455d1736713738c4ebbbbc3e761e8b2af86e386b93e20cfd04f0439
diff --git a/media-plugins/kodi-pvr-hts/kodi-pvr-hts-4.4.2.ebuild b/media-plugins/kodi-pvr-hts/kodi-pvr-hts-4.4.2.ebuild
new file mode 100644
index 000000000000..9807816d0189
--- /dev/null
+++ b/media-plugins/kodi-pvr-hts/kodi-pvr-hts-4.4.2.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="Tvheadend Live TV and Radio PVR client addon for Kodi"
+HOMEPAGE="https://github.com/kodi-pvr/pvr.hts"
+SRC_URI=""
+
+if [[ ${PV} == 9999 ]]; then
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.hts.git"
+	inherit git-r3
+else
+	CODENAME="Leia"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/kodi-pvr/pvr.hts/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/pvr.hts-${PV}-${CODENAME}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=dev-libs/libplatform-2*
+	=media-libs/kodi-platform-18*
+	=media-tv/kodi-18*
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
diff --git a/media-plugins/kodi-pvr-hts/kodi-pvr-hts-4.4.6.ebuild b/media-plugins/kodi-pvr-hts/kodi-pvr-hts-4.4.6.ebuild
new file mode 100644
index 000000000000..9807816d0189
--- /dev/null
+++ b/media-plugins/kodi-pvr-hts/kodi-pvr-hts-4.4.6.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="Tvheadend Live TV and Radio PVR client addon for Kodi"
+HOMEPAGE="https://github.com/kodi-pvr/pvr.hts"
+SRC_URI=""
+
+if [[ ${PV} == 9999 ]]; then
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.hts.git"
+	inherit git-r3
+else
+	CODENAME="Leia"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/kodi-pvr/pvr.hts/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/pvr.hts-${PV}-${CODENAME}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=dev-libs/libplatform-2*
+	=media-libs/kodi-platform-18*
+	=media-tv/kodi-18*
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
diff --git a/media-plugins/kodi-pvr-hts/kodi-pvr-hts-9999.ebuild b/media-plugins/kodi-pvr-hts/kodi-pvr-hts-9999.ebuild
index e22f7487e303..0e79994348d2 100644
--- a/media-plugins/kodi-pvr-hts/kodi-pvr-hts-9999.ebuild
+++ b/media-plugins/kodi-pvr-hts/kodi-pvr-hts-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
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.hts.git"
 	inherit git-r3
 else
-	CODENAME="Krypton"
+	CODENAME="Leia"
 	KEYWORDS="~amd64 ~x86"
 	SRC_URI="https://github.com/kodi-pvr/pvr.hts/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/pvr.hts-${PV}-${CODENAME}"
@@ -26,8 +26,8 @@ IUSE=""
 
 DEPEND="
 	=dev-libs/libplatform-2*
-	=media-libs/kodi-platform-9999
-	=media-tv/kodi-9999
+	~media-libs/kodi-platform-9999
+	~media-tv/kodi-9999
 	"
 
 RDEPEND="
diff --git a/media-plugins/kodi-pvr-hts/metadata.xml b/media-plugins/kodi-pvr-hts/metadata.xml
index d8614f8ccaa1..3560c16ef41a 100644
--- a/media-plugins/kodi-pvr-hts/metadata.xml
+++ b/media-plugins/kodi-pvr-hts/metadata.xml
@@ -2,6 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
+		<email>candrews@gentoo.org</email>
+		<name>Craig Andrews</name>
+	</maintainer>
+	<maintainer type="person">
 		<email>fordfrog@gentoo.org</email>
 		<name>Miroslav Šulc</name>
 	</maintainer>
diff --git a/media-plugins/kodi-pvr-mythtv/Manifest b/media-plugins/kodi-pvr-mythtv/Manifest
index df5ab3913577..bf89a6cc976c 100644
--- a/media-plugins/kodi-pvr-mythtv/Manifest
+++ b/media-plugins/kodi-pvr-mythtv/Manifest
@@ -1,14 +1,18 @@
 DIST kodi-pvr-mythtv-4.15.3.tar.gz 650217 BLAKE2B ddc6b11039bd8e5e6b46331030909063e127f681f4059e604734644a3159c10f10c3dbed770ba8a58bb5ea3b7e543dfba042b28f347c842d963d7966e35cad32 SHA512 1171f4e6a05878660795b585185d35707ef713e310f3508e7fb3327caf79feb6a941e4b4f4d9f2331ef13492c141a4d36157547e350642eee900f3fad1d46b55
+DIST kodi-pvr-mythtv-5.10.1.tar.gz 697844 BLAKE2B fb7678cfed9c6c9d25f0bb0ff5fe6c8544581c2cfda9b564b12430596d907744489bc116c898f23eabf24567eab0fe497be2d408dca09b9c18264c166fd7877c SHA512 1125dada0b3791ba0ad668108e7681b53a5f2389ab8498360c241be1869157bf5e5277e7b90c0291aa484eb74cbf0435c8b29cc713f49d7b87a61d8ae2523e69
 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
+DIST kodi-pvr-mythtv-5.9.1.tar.gz 702309 BLAKE2B 351aadec6d76f96ee4056b11c12d2dbf3b92f4e301c56279cefdc42e0a4c4245f836f8d1ebf8f2d7dd212409cb0b390bb0eba1a45365131fa654f682337d4e8e SHA512 9a93ae34a8ce05425da5330d82650bbd27d7116281099f3514634def8d245623a33dd615d302e4a768e84047f4435ca370a8ddbdbec6217d2554ff8141f659b5
 EBUILD kodi-pvr-mythtv-4.15.3.ebuild 642 BLAKE2B 6b294e422af541a0867bf05d2bbb49e97f343d441b528836deca12cd1f919ecd7504978e5378713ec7019675a50f973dec956d6d93ad2de1d5a3308f3c37f789 SHA512 a5538514f1395a1f736ab751d46cadf5472c3db443ed8ee61b6ed021c358b93b5262cf1cc123c032e4ce3883a73ee677f4e7872190ff971506f2130f4c859283
+EBUILD kodi-pvr-mythtv-5.10.1.ebuild 680 BLAKE2B dadebd6ff7bf56b9f11dbd44f04fbc9f3c9cff0fdf9f322340b070d534a37e72e0df943c27cf37f68fa40cc29b8b2cd6c5ac2d73e7097b7a57d1a6c7d11f0305 SHA512 99cc81f96752512a0361d0147ca3503f5692df6ff3a4262164bd08431afe4a5dd6ce4173d1839e43df5b6db048c1c8370a8abc8301e6eba8656e7f5a2bb7f033
 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-5.9.1.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.10.1.ebuild b/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.10.1.ebuild
new file mode 100644
index 000000000000..05d2594341ea
--- /dev/null
+++ b/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.10.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="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.1.ebuild b/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.9.1.ebuild
new file mode 100644
index 000000000000..05d2594341ea
--- /dev/null
+++ b/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.9.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="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-nextpvr/Manifest b/media-plugins/kodi-pvr-nextpvr/Manifest
index 76d7a3322f57..ede1570ee3a2 100644
--- a/media-plugins/kodi-pvr-nextpvr/Manifest
+++ b/media-plugins/kodi-pvr-nextpvr/Manifest
@@ -1,6 +1,8 @@
 DIST kodi-pvr-nextpvr-2.4.11.tar.gz 111677 BLAKE2B ce1279641f4ed1bd5e1a0731198775c2ca6358ac8de846bc57588988eb415bfbaf9fe069b84717368eafb9fa01b232b833888c8580bdd886d1331618c369faab SHA512 2c9e98cb6b99aca8c582d4751096c7ef445f97b09fb6d51c798767c7a7b54632bd4e5c7fb2d723b023eeb335daa73e53ba455156bd8e8ea863c3a98659e5e906
 DIST kodi-pvr-nextpvr-2.4.13.tar.gz 111692 BLAKE2B 5199c9fb8b767eeaf116ed87abafe0d5f0e1e252fae945589413c002b313a222090c9cc12db02e927f168f6217c2fcff55f20adef984e54bceed92755e9922a5 SHA512 314217bca4ce7bf43900e8572fca158874c90bba50ca78b7541e804a3b00216bb39ef7624a270ceb4407f33d85b2711c7b58ea9b4ec1a0386d3d7697cac29c2a
+DIST kodi-pvr-nextpvr-3.3.8.tar.gz 118717 BLAKE2B ea72f205121b050355fcd194fc8c28a2bce62504187372128b7397841f03a411d9ae1419aa1cee36acf391e098fed04b58f3312a74cf3dadf48726cd72da59bb SHA512 3cf8de69091946c9678c73f0254be9d49b51ecffe8153f675e62198aa97fa952bc5c1b5a4ccabbf7de5c05e8ca9e0c01d1ee5fd5988504430acec37a5b2edf3e
 EBUILD kodi-pvr-nextpvr-2.4.11.ebuild 708 BLAKE2B cd6f8a585a17a0d94015dfc76680e1e204b4624fb829c892cd1adbd0bf977386badc5d709e28f129b833e8fe5578b58e711b837ac7830c0b6f241c64f6e1fcb4 SHA512 4066099029ac535ecb90d98617e396d5138286298d48cb7b13b5d0641add49e220ab1cc28ca9438cb92c39ca08f64938d87b1925adcaac948c1f965fc8b2ee9a
 EBUILD kodi-pvr-nextpvr-2.4.13.ebuild 708 BLAKE2B cd6f8a585a17a0d94015dfc76680e1e204b4624fb829c892cd1adbd0bf977386badc5d709e28f129b833e8fe5578b58e711b837ac7830c0b6f241c64f6e1fcb4 SHA512 4066099029ac535ecb90d98617e396d5138286298d48cb7b13b5d0641add49e220ab1cc28ca9438cb92c39ca08f64938d87b1925adcaac948c1f965fc8b2ee9a
-EBUILD kodi-pvr-nextpvr-9999.ebuild 710 BLAKE2B 1d8783249d4c878252e52889453aca1db2d6b673d77db2ea52ea44c874b92793efc7539ae9c6eb295a414bd675910f5095df4c519c72a619a3bef2a94f1fb911 SHA512 928144f8b6c28b5e9a7f6a0acf5267a7284056bce7259c7934b24f0dfa9d10b41632eba6fd02244040aa74461af8db1dc6043ce4f530c0c956f696bf83478f9b
+EBUILD kodi-pvr-nextpvr-3.3.8.ebuild 702 BLAKE2B 6d087756fb0b2e5bef01e78f2e986fddfb4f02c2dfbd8803410d3fb0d1b0e260a2370bc8034737d31ae1e2df2ffcd119fd5d02127b383e1518f674a8b9b87943 SHA512 d5d8320f1fa4f1e3baf3a7cda383d6453a44ca4e1816926212818469d01161f3348ca634ad5a7c95c148fc491fec9ce3e4f2b507b2cf4d07b4cf99960cda4e18
+EBUILD kodi-pvr-nextpvr-9999.ebuild 704 BLAKE2B 9bfe109a644ca55ceadedcbbb6cd8a48679afd67ffd9128eccbe9081bcf611aa5da06f1ec3b3d0d2bc59b279f2c8bbc90aa7e0b190868dcadb622625a60e4596 SHA512 dfe5613b50d14ab632d80dda8041ec11f7a7bf5996a8cd824b56f51490f9fc1678ef914f68f9e2f4f58def0af50f23d143069d622cc3b861e97d1c6cfba97294
 MISC metadata.xml 430 BLAKE2B 60ef7af47e0cd7d264fd19275a356b83cd9fd4e5ed4e237658c47152315d4abcf807377bd8c94d88ec3088530a5fd9ab2d9482336328eeb9ff380963364644a9 SHA512 b0bd41b39d6e1379e1b3c36124432716cb222205ed587246523a8a48c42e2d9922b1b24c87ef601bf5f7452cfb874710c1ec7b558b9224c95c921b80967e02e3
diff --git a/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-3.3.8.ebuild b/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-3.3.8.ebuild
new file mode 100644
index 000000000000..ddb345ee8d03
--- /dev/null
+++ b/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-3.3.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="Kodi's NextPVR client addon"
+HOMEPAGE="https://github.com/kodi-pvr/pvr.nextpvr"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.nextpvr.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Leia"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/kodi-pvr/pvr.nextpvr/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/pvr.nextpvr-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-18*
+	=media-libs/kodi-platform-18*
+	dev-libs/tinyxml
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
diff --git a/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-9999.ebuild b/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-9999.ebuild
index b254e4182857..8d192c0897ff 100644
--- a/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-9999.ebuild
+++ b/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-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.nextpvr/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/pvr.nextpvr-${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-pctv/Manifest b/media-plugins/kodi-pvr-pctv/Manifest
index c3c944d613f2..86511a1873ad 100644
--- a/media-plugins/kodi-pvr-pctv/Manifest
+++ b/media-plugins/kodi-pvr-pctv/Manifest
@@ -1,6 +1,8 @@
 DIST kodi-pvr-pctv-1.4.5.tar.gz 64968 BLAKE2B e73230dc79b7891c13d7e0a4a46cf3f56c072610d87f1c10738acff24add4d763ff318054d2a96c06513eeb951c5ffea63273d07d3c5e6ccaf2d3b90f0fa432b SHA512 75d61d0520536a4d6dc9d50953b7f98b08aec18f0d1bba30207332efb50acd920af1ca4380c47696edf88c1544950ec2b3b0ac559b672e84e4108fbcd8ba1780
 DIST kodi-pvr-pctv-1.4.7.tar.gz 65031 BLAKE2B fb240b1845755273a553efa040ec7f487435129a1924dac0b2b923243d75ae8eb80592cf1186dd3f5082b0bf610c392d305c87a02b515f713ba42919767c5c12 SHA512 f9989b5d90c115de9ac32254cd2ff2f1b5a7a78416ee66db8606afa63b21793f2164fed0ffabbf56e8ee041da011e18f48be70eb3ebe8a952f1c71be205085f1
+DIST kodi-pvr-pctv-2.4.5.tar.gz 67169 BLAKE2B 99861fadf9fba102fb45b9d095cf8ccaa58ca53b5182f714f8666dddecc43f98ce57583b3e7b3d156aaece9f63acc7fb653d2b3763104c280d9ef30dfff6d664 SHA512 288446a04b9dca623ab12759500123d3bc548b131a3cf6757431e99571611834408da2918085d52c29380e5d5f856a6c4dede7a9793ac427123291346a28ed62
 EBUILD kodi-pvr-pctv-1.4.5.ebuild 693 BLAKE2B 2c6e64ab264e373510e388cd8ea9d556a8b965ffa2ff5a25c195839c17ce36ae7ef4797965effc789aa1965ddab59a0430108125c43563a984418d1f642ea70d SHA512 7024bf36f5224b8c32cce63e7cce213643ae3b2d970fccb0d56f4dd8d6a8a5d09d3cb59a88a33033249ba394067575b0cea404fb78e7608b89c1759c8b23ec8f
 EBUILD kodi-pvr-pctv-1.4.7.ebuild 693 BLAKE2B 2c6e64ab264e373510e388cd8ea9d556a8b965ffa2ff5a25c195839c17ce36ae7ef4797965effc789aa1965ddab59a0430108125c43563a984418d1f642ea70d SHA512 7024bf36f5224b8c32cce63e7cce213643ae3b2d970fccb0d56f4dd8d6a8a5d09d3cb59a88a33033249ba394067575b0cea404fb78e7608b89c1759c8b23ec8f
-EBUILD kodi-pvr-pctv-9999.ebuild 695 BLAKE2B aff4f43ee345921416dce227be7e2d3f521ba59f837f59005581a986522cdc2e1bfe47d13aa04003aab95594334d18a8f0259d5f797fc5db0b59ea3b0e3c7b84 SHA512 0a298edd5c8c8588c1f786d8097d9d94c68bd362394f51914de22e94b43afd3423a79c9b26f86ab124e134b5f179c193c0f8d8b1092196e2fdf86105be8c29fb
+EBUILD kodi-pvr-pctv-2.4.5.ebuild 687 BLAKE2B f794a38cd128e6693c201becfc7c50743c47b28bac56724800490c8a707f72c39975ab26a16198d26a71a41c7a3e1860a9d3d95ebab1c28b255aa1e807d59e91 SHA512 2d853652a23ba3be606befad46257b9173c63b5ab1852f5df5fd4545eb41653ebb38fd48726c4e55bc4cdf01b98d8dbddc76b796bd3d775cddeb5b59a0c88ca6
+EBUILD kodi-pvr-pctv-9999.ebuild 689 BLAKE2B 98afe970dd3d70abe6ac80be709d4f6cbbce01dd4c4603ae23fa9cb49c00b917b23bbce806048e416ff9c6e7916b57cd480e8d14a350206fa250e9cde40d19f2 SHA512 2e9f0ca882abec3f2698c8fc023c3decfef8016713ca80589486b0a5a3a7972edaab68385f4440a29b1dc53965764a61d55f48afe04bd058c4bee323c6cdc876
 MISC metadata.xml 424 BLAKE2B 0637f01f1175e2d607d0e590535ef8d262173f71d42c265b5225d396bfe9783d03b6a231de1f75a9f548487769db28f9b9988ed27aadb5838ad5b37734405959 SHA512 91f472cc7c5eb36bfd24c3565a0679af173643011140133c98f6782fc6a14aef3ac30f30e86429bbe0b361c696998fca96ea968f97963eb08a64d14655f1b344
diff --git a/media-plugins/kodi-pvr-pctv/kodi-pvr-pctv-2.4.5.ebuild b/media-plugins/kodi-pvr-pctv/kodi-pvr-pctv-2.4.5.ebuild
new file mode 100644
index 000000000000..78f5a4d95399
--- /dev/null
+++ b/media-plugins/kodi-pvr-pctv/kodi-pvr-pctv-2.4.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 PCTV client addon"
+HOMEPAGE="https://github.com/kodi-pvr/pvr.pctv"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.pctv.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Leia"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/kodi-pvr/pvr.pctv/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/pvr.pctv-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-18*
+	=media-libs/kodi-platform-18*
+	dev-libs/jsoncpp
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
diff --git a/media-plugins/kodi-pvr-pctv/kodi-pvr-pctv-9999.ebuild b/media-plugins/kodi-pvr-pctv/kodi-pvr-pctv-9999.ebuild
index 8c0fb62f7c7c..cdec4c9ca49f 100644
--- a/media-plugins/kodi-pvr-pctv/kodi-pvr-pctv-9999.ebuild
+++ b/media-plugins/kodi-pvr-pctv/kodi-pvr-pctv-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.pctv/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/pvr.pctv-${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/jsoncpp
 	"
 
diff --git a/media-plugins/kodi-pvr-stalker/Manifest b/media-plugins/kodi-pvr-stalker/Manifest
index cb12b960d1c7..695b106b815f 100644
--- a/media-plugins/kodi-pvr-stalker/Manifest
+++ b/media-plugins/kodi-pvr-stalker/Manifest
@@ -1,6 +1,8 @@
 DIST kodi-pvr-stalker-2.8.3.tar.gz 111738 BLAKE2B 49fa5ca9fc3b3dedff9c82b7886bcc4539e07c53907960a60f0d55f37a5d7a2d7bcf22aa1280d36c9d38c63f65f0f701a2c9df7af6f31939fe0ed5dc35f3fe29 SHA512 26fdc7560e0e39c774115fe021a4ef9bc34bafeeead425935a8ea26b5a95cd3a4b4d1a60be466f89d6bbd0f16350cc8d3245409942164b4b55c969e4ecc9149e
 DIST kodi-pvr-stalker-2.8.6.tar.gz 112121 BLAKE2B 9093ccff3060333a88f26a33e2f27795bcf9692d1f5026c2204d87a52da2937d55a18eb2d35ada66a029f782e97d104bc12ca522dc0eab0e71660eb3851dd1ea SHA512 cb7c04a78de7ff1300765a77a5343092ee27231373f91c7f638dcb3bc76f6ed074403a362000964d360c936174cb4e7586ad91bad8c6ef30f4b412dadc8ceafa
+DIST kodi-pvr-stalker-3.4.8.tar.gz 115254 BLAKE2B 865ac0123b54369bbe73e67855d915efbd3af82d9cac5669099895efec8410eee7acf8d20f6904a0b939bdbba0feab8ec7aa3e953d816914407673c2bebd3c05 SHA512 f4fd2965199a0a5a31b37c2afa60e3cd6746c25dcfa80d8ddbedb2236b92f3c243dddfdff92fd9e6ffafd434c53124b89b8bd2c636856c62cb78b84e446a3292
 EBUILD kodi-pvr-stalker-2.8.3.ebuild 726 BLAKE2B f252d370b42ff45310e303f9ab651331df74c3165573e75ba89025741cba5f0cdc26496c1a693c603f3927fbe9dc7bbcbdd000f9db35ae7b84357e7faa1a2a6d SHA512 ee86d0522b61116f43a6467a5a233bbfb7fc676d1ccb3cb2b4f39fe1322d3f8a848b7f857d5d71e48376a445be2dba0a69208ecf6f528a02234633c53b6937f1
 EBUILD kodi-pvr-stalker-2.8.6.ebuild 726 BLAKE2B f252d370b42ff45310e303f9ab651331df74c3165573e75ba89025741cba5f0cdc26496c1a693c603f3927fbe9dc7bbcbdd000f9db35ae7b84357e7faa1a2a6d SHA512 ee86d0522b61116f43a6467a5a233bbfb7fc676d1ccb3cb2b4f39fe1322d3f8a848b7f857d5d71e48376a445be2dba0a69208ecf6f528a02234633c53b6937f1
-EBUILD kodi-pvr-stalker-9999.ebuild 728 BLAKE2B e7b407cf0e601fdbdc121d4c39b207aa23630be33e6cb121e7422406b21be18a8b9e3a455ae76a3506f6ffdbcd25a106d1e5646ddc07c073dbd9238ddb76569c SHA512 9898115715d11e5f67e05ce374ea098b8bc3f7ac90e9ede9079e762e56d8fdc968a0deb9b04afecb913742bdbe8e88f0f238e4480819696e81ea8d5466b339ff
+EBUILD kodi-pvr-stalker-3.4.8.ebuild 720 BLAKE2B b343088cf996082adfdf0fe0eabdaf2306a1574f47174896aad8da4a0ec8005315d3d764681ef8db07d12b31510c010123f915e9a55b1c4bff57fc6f28066f1a SHA512 d343af5481e62426bd4dac77c778296be9c09561c7ca0789145607b55f47333ad20a79c6dcc5ade746b925eafb9a55afca3c4f0e55dd92a586c35f67ddf8af0f
+EBUILD kodi-pvr-stalker-9999.ebuild 722 BLAKE2B 86605983551c7768c2e0df7bce7f8322bc345818bdc7a74df292633b61435035d93c69c70f0530f00354f9df4be8603527a9ef493e39ca52aa345f1a77fa2c4d SHA512 637d968a23bdfa1c84799c2a3e1eefcdc352d55908920af89cdcad1dfa41bb0b54d0957ab0474c3d046082a35c5287b24169648015a5ed0169c3c8844513afcf
 MISC metadata.xml 430 BLAKE2B 65eb48c9c9d6e307c0ce5950a5e79b705cf5cdb3e1032f97805dd5dec7ed9c302acedac823b4cc9d263156936576257a3097f7535d017f3c4cfb9bfc08b200df SHA512 b461665fc6954e9377b3afd38861852becea318284dd6ff089153679b4fd93dd92523d633299942314e439624d7516c466f57029025a7d4618f1e51919b09263
diff --git a/media-plugins/kodi-pvr-stalker/kodi-pvr-stalker-3.4.8.ebuild b/media-plugins/kodi-pvr-stalker/kodi-pvr-stalker-3.4.8.ebuild
new file mode 100644
index 000000000000..cc22dd09812a
--- /dev/null
+++ b/media-plugins/kodi-pvr-stalker/kodi-pvr-stalker-3.4.8.ebuild
@@ -0,0 +1,39 @@
+# 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 Stalker client addon"
+HOMEPAGE="https://github.com/kodi-pvr/pvr.stalker"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.stalker.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Leia"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/kodi-pvr/pvr.stalker/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/pvr.stalker-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-18*
+	=media-libs/kodi-platform-18*
+	dev-libs/jsoncpp
+	dev-libs/tinyxml
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
diff --git a/media-plugins/kodi-pvr-stalker/kodi-pvr-stalker-9999.ebuild b/media-plugins/kodi-pvr-stalker/kodi-pvr-stalker-9999.ebuild
index 1b608b65812b..3b5070346d7e 100644
--- a/media-plugins/kodi-pvr-stalker/kodi-pvr-stalker-9999.ebuild
+++ b/media-plugins/kodi-pvr-stalker/kodi-pvr-stalker-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.stalker/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/pvr.stalker-${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/jsoncpp
 	dev-libs/tinyxml
 	"
diff --git a/media-plugins/kodi-pvr-vbox/Manifest b/media-plugins/kodi-pvr-vbox/Manifest
index 1c753419dab6..78b5319f6dec 100644
--- a/media-plugins/kodi-pvr-vbox/Manifest
+++ b/media-plugins/kodi-pvr-vbox/Manifest
@@ -1,6 +1,8 @@
 DIST kodi-pvr-vbox-4.0.2.tar.gz 150156 BLAKE2B 82751404d60b8064ad4c56c5de2bb2745cf1d3bbf6a10c6c96391e3021353a1c64c1d7c54ecbd53722b3e39edaecd97716877ad6738bdbb9c0a3ff1f10c35d42 SHA512 2b46cd6090764660c25a8c229bc11c23b0b200e4eecc6682a89f2754f6869217b93600ac5eb7a48b7d9183ca6eb237e1a396902b84493668c7045a6b4eb23a6e
 DIST kodi-pvr-vbox-4.4.6.tar.gz 155719 BLAKE2B 178ec1adfd17f8afc80daf526fec863b93c17ec13b5a54c7a2aa166c6a73cbe5d57a3e349f2c6522c2081af6b4f892a731b49a0aee2a6e5686a2adf5f95d5fc9 SHA512 b34b2ddc9bdae9a51e44a7dbe483f9a21d6d4de951e0c996a2f82e63b87718b7f56a3bfbeb45c0cc7a6d828d279bb1f6ab25292b328b1853a09e1267c22026fe
+DIST kodi-pvr-vbox-4.4.7.tar.gz 155710 BLAKE2B b8de69b536ef265afb5e30123555918a071517f2b61999889397b93ae1e06d0a695de0f604f66c011017bfe14ab251f95e75a5aec83fa0b13b69761b24914872 SHA512 07aae037b72c643ff0ca7c7fd911d77e04246caaa475a55e2ce71ee2075da68f8824d7babdfcfa31e64c27893e122c337a1fe48c769daad6acbd482e4b78297d
 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-4.4.7.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.4.7.ebuild b/media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-4.4.7.ebuild
new file mode 100644
index 000000000000..42079e6ec24d
--- /dev/null
+++ b/media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-4.4.7.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-vuplus/Manifest b/media-plugins/kodi-pvr-vuplus/Manifest
index adaef9b8e55c..14ffe12844ec 100644
--- a/media-plugins/kodi-pvr-vuplus/Manifest
+++ b/media-plugins/kodi-pvr-vuplus/Manifest
@@ -1,6 +1,12 @@
 DIST kodi-pvr-vuplus-2.4.10.tar.gz 80514 BLAKE2B d84f0da7f8473456ce6258b2602fb2ddc7631080d951ac33f603d9b649369c6cfd1fc36421ac200de7aaacd09cd23797c70e9f187bb011353889144aa8014f70 SHA512 b9569a85a6cb2c02b72f9494148f55874acc7c4a826704abfd4bd1d29c96b6221dbc62510c3823947b6496bd3465d6d9cd2089009d984fa706efc5b8ea882fa1
 DIST kodi-pvr-vuplus-2.4.6.tar.gz 80550 BLAKE2B db6d62c7d8d6c8861aba350fc0182e397b7b41b98314358cb721208af7fc0070a13acaf0df2a1e31b21d48b170d08128554a34ea095d594f2e56a570d6cc57fc SHA512 c5c626cf99ea7f62861c9f82836cb10dd6cab0411c827345710a00f8ce626b17d97cde7177ba53478faefaf335a8f8ae3bbc20e49f64af54094151fcf94ef64b
+DIST kodi-pvr-vuplus-3.15.0.tar.gz 129176 BLAKE2B 340acb8c3f4ebc9142247e9080a491ea02f54996f91c19d4e809e6cee73ac128f32fccdd6527168cf78e96653cdb5617151295f94995cc5732ef3294fc41fba7 SHA512 ba14751c89c8a2e3c890e128c20ce21ef061f5260e7630f5084fca6f3fd2b0a0684b0320761789906b9375aebc6263a4516f8a34a1a65f46009d941f0d284a73
+DIST kodi-pvr-vuplus-3.15.1.tar.gz 137283 BLAKE2B 416915ce0e65d0e956a6cee88cb975b0c7f83174bc9ad9a7609b237ded017465563dbd9394197be0277a3339b1d1637ca1466bfaff7ba3b44610b0ce90488498 SHA512 aff83c27ba457e2a79c7422dcd833530ddf2c480da285265ded6551cd269f5aa9389101f85d1c77925bbf437069e2a011d6a49162812704371a9572add5f1597
+DIST kodi-pvr-vuplus-3.15.4.tar.gz 141775 BLAKE2B f5d8cc70101b7e1dd0cd486e19dbff5aa87f92fdbd34403cd8f495ac38ccda8679b522472f45843ed00151bae6cf0293bd88b9bfe3abc2d9685c1560cb0681a7 SHA512 8b2ad16344c9ef6de440527a885235f90686be665d44bfd851475b9688a8b8a8fecebab498436268f15bd247f46a7a3596ac14fb19fb29f2672533a1913e751c
 EBUILD kodi-pvr-vuplus-2.4.10.ebuild 703 BLAKE2B e0553ee884be358337c235140046d8268c38d2f1a3d324469e45999fc8e3376d48fdd22222ffc1655fe45a30738f828254a291fcbb1e0a3e9e36ab4e6362a21b SHA512 79b1c4362a9a0dd8e5d41f3e006bec07bf7799b5746804a0a9a47d9f343d76bd7fbd6a82ef4734d7ba596e402fcb5acf349c1de9787aa90286778a9524061667
 EBUILD kodi-pvr-vuplus-2.4.6.ebuild 703 BLAKE2B e0553ee884be358337c235140046d8268c38d2f1a3d324469e45999fc8e3376d48fdd22222ffc1655fe45a30738f828254a291fcbb1e0a3e9e36ab4e6362a21b SHA512 79b1c4362a9a0dd8e5d41f3e006bec07bf7799b5746804a0a9a47d9f343d76bd7fbd6a82ef4734d7ba596e402fcb5acf349c1de9787aa90286778a9524061667
-EBUILD kodi-pvr-vuplus-9999.ebuild 705 BLAKE2B da1434aa88d9789739cd14e3031e78014e1409546cd4c7025fca39e44bc933ebe2bfae60c34cc795f7a518a0a7cd63e71f76cd7418d1c124dc9d7ea2254a9ee4 SHA512 31ca3348cb48a9b214847977b0059059150de22713411e5459d1cab681d17888ddd19add4816cde5bc9d55bd3e05a457c5e3cc1db88dbca81cb3ae3512cfa892
+EBUILD kodi-pvr-vuplus-3.15.0.ebuild 697 BLAKE2B c4a907151214f6af4caf92c697f6c001138d68426bc83d1eb2add2ee636474bf5e6e5672d2359f8b47778f45a1a7d49f6db230b3abf38b0bae72e10c43de660f SHA512 5bbdc959c78fa5171d42e9bcbec819cf91c309cbbfd71b9ea3388caf9fb69b2d1238f9b28861bd966bfc2071abbda703d1450595413bb4f71fce11b2844816f6
+EBUILD kodi-pvr-vuplus-3.15.1.ebuild 697 BLAKE2B c4a907151214f6af4caf92c697f6c001138d68426bc83d1eb2add2ee636474bf5e6e5672d2359f8b47778f45a1a7d49f6db230b3abf38b0bae72e10c43de660f SHA512 5bbdc959c78fa5171d42e9bcbec819cf91c309cbbfd71b9ea3388caf9fb69b2d1238f9b28861bd966bfc2071abbda703d1450595413bb4f71fce11b2844816f6
+EBUILD kodi-pvr-vuplus-3.15.4.ebuild 697 BLAKE2B c4a907151214f6af4caf92c697f6c001138d68426bc83d1eb2add2ee636474bf5e6e5672d2359f8b47778f45a1a7d49f6db230b3abf38b0bae72e10c43de660f SHA512 5bbdc959c78fa5171d42e9bcbec819cf91c309cbbfd71b9ea3388caf9fb69b2d1238f9b28861bd966bfc2071abbda703d1450595413bb4f71fce11b2844816f6
+EBUILD kodi-pvr-vuplus-9999.ebuild 699 BLAKE2B 15200439c005cb5b4daccc3f0b3270d8740c5e0522438825799a15709a0fba6e31e8eebbfd386ba7d4a9da34eee7f04f48daa9e58e84077e1bfb4e2373587f64 SHA512 c66747994237b6b9a828f601b5f7cc043e792da3d62a3860ce0ae0e671bdbd225f4ddb30311832ec7f014bf4fe0f9fb54323472eb6445d65d71258899b70b016
 MISC metadata.xml 428 BLAKE2B ac264c6bbfc925ff772eda61b1b4069b52ed5bf12836af8d8e86a72fe42bd852be1d00f74056c1d6b925fa2a026ea7df57ee57e7434a797884741b70762ff173 SHA512 573f803447cb7a7d0095eb21caa9f55c41fa4fb68c0f40aabad63df2ee262ce168fc75f28f3a3ae6aa7bf41f258be771c6a6dd06d1f2e2486b3d557d89f28f4f
diff --git a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.15.0.ebuild b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.15.0.ebuild
new file mode 100644
index 000000000000..9fd162847e33
--- /dev/null
+++ b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.15.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="Kodi's VuPlus client addon"
+HOMEPAGE="https://github.com/kodi-pvr/pvr.vuplus"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.vuplus.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Leia"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/kodi-pvr/pvr.vuplus/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/pvr.vuplus-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-18*
+	=media-libs/kodi-platform-18*
+	dev-libs/tinyxml
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
diff --git a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.15.1.ebuild b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.15.1.ebuild
new file mode 100644
index 000000000000..9fd162847e33
--- /dev/null
+++ b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.15.1.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 VuPlus client addon"
+HOMEPAGE="https://github.com/kodi-pvr/pvr.vuplus"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.vuplus.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Leia"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/kodi-pvr/pvr.vuplus/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/pvr.vuplus-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-18*
+	=media-libs/kodi-platform-18*
+	dev-libs/tinyxml
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
diff --git a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.15.4.ebuild b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.15.4.ebuild
new file mode 100644
index 000000000000..9fd162847e33
--- /dev/null
+++ b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.15.4.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 VuPlus client addon"
+HOMEPAGE="https://github.com/kodi-pvr/pvr.vuplus"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.vuplus.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Leia"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/kodi-pvr/pvr.vuplus/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/pvr.vuplus-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-18*
+	=media-libs/kodi-platform-18*
+	dev-libs/tinyxml
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
diff --git a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-9999.ebuild b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-9999.ebuild
index 8c7c83b762f8..044c0d03bebb 100644
--- a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-9999.ebuild
+++ b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-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.vuplus/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/pvr.vuplus-${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-wmc/Manifest b/media-plugins/kodi-pvr-wmc/Manifest
index 90209c7999f4..cfcd67e93634 100644
--- a/media-plugins/kodi-pvr-wmc/Manifest
+++ b/media-plugins/kodi-pvr-wmc/Manifest
@@ -1,8 +1,10 @@
 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
+DIST kodi-pvr-wmc-2.4.3.tar.gz 178017 BLAKE2B fd08d6f2846e6570f41cf0dd37b0985ea58a65493209f8fc1e3e0e03665494b0e4f5fc484548af1d8fba4f1cee249c5d2ebe062b1224a5d235186c114202497f SHA512 11b1c15f01be9859e6463898b8402165688e820a65ca0145ff2b706acb9b7157429cc128380c77be2a691d956566d54ca79fc14609140a6de6ada3c747641741
 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-2.4.1.ebuild 680 BLAKE2B 2814d5ea052df3f80edb2dceb530d1bbf66afc5f709e9a6141c37d8c15c9a6b7eb6ecd10f69d1406d9df12471be8374e09ac17995e6f3f123cf1779e830fca9a SHA512 89ad91d22a608f040d8b56f5dee195009a1be6fd8068ad360becf2599b8d9500f512db3af3d9951c302e9c424699894d367cfffdbea5c0bec34fed205ff7997c
+EBUILD kodi-pvr-wmc-2.4.3.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.3.ebuild b/media-plugins/kodi-pvr-wmc/kodi-pvr-wmc-2.4.3.ebuild
new file mode 100644
index 000000000000..4b761be86741
--- /dev/null
+++ b/media-plugins/kodi-pvr-wmc/kodi-pvr-wmc-2.4.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="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-screensaver-asteroids/Manifest b/media-plugins/kodi-screensaver-asteroids/Manifest
index 160417dabb80..656cf1fb8add 100644
--- a/media-plugins/kodi-screensaver-asteroids/Manifest
+++ b/media-plugins/kodi-screensaver-asteroids/Manifest
@@ -1,6 +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-1.1.0-r1.ebuild 631 BLAKE2B 539b660c4b02a9feef43ba53d9789784719b79c47fc5943dd15ac6d1e8256a92a43af1de724460e25ed8814707cc6c779fb797756e65d8df3172c65f0574204a SHA512 372b1efa7c17b65f106db41358794c18a67dac7693cabaf80443c5adc5189b5206ac1018a96bfbc0284681f39d4b1feb0ffc2ac32c732df0aa01a456de2c7a85
 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-1.1.0.ebuild b/media-plugins/kodi-screensaver-asteroids/kodi-screensaver-asteroids-1.1.0-r1.ebuild
index d9849bf6cb5a..89339cd2eef0 100644
--- a/media-plugins/kodi-screensaver-asteroids/kodi-screensaver-asteroids-1.1.0.ebuild
+++ b/media-plugins/kodi-screensaver-asteroids/kodi-screensaver-asteroids-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,5 +27,5 @@ SLOT="0"
 IUSE=""
 
 DEPEND="
-	media-tv/kodi
+	=media-tv/kodi-17*
 	"
diff --git a/media-plugins/kodi-screensaver-crystalmorph/Manifest b/media-plugins/kodi-screensaver-crystalmorph/Manifest
index f71ecc01b5a1..d9783935b457 100644
--- a/media-plugins/kodi-screensaver-crystalmorph/Manifest
+++ b/media-plugins/kodi-screensaver-crystalmorph/Manifest
@@ -1,2 +1,2 @@
-EBUILD kodi-screensaver-crystalmorph-9999.ebuild 644 BLAKE2B 79b4308b5fda26c8aed5afd412cc2dc23494c3c0d0390f783e335f38de5f3d99c998ff3fa88c9550e7b4331d6beb172eb48612304aeebe95a2506f579fd852e1 SHA512 aef435e51adb78e9ce9a7881c7b35b070c150cb3e0c2217217cd88e2c28f5930f5df439cf45e37aaa150f9ed78fcc45a6205b416212b0fa8f7b929f6dd45ad2e
+EBUILD kodi-screensaver-crystalmorph-9999.ebuild 647 BLAKE2B d78c7ecee8c07f04c03699999059f4fb2a7ddd3ea46f0b5992e120ded078d1673667999d6fa0e50687a13cc5192c4d798b5b76fb1b439fb3b89dfe254ead3a71 SHA512 a4be58663dc15f31629877af82ac0679e9587c1372220b42c0101a17b01b4932c896d8c8017c1340b32b9b5238e0946181c021d3fa5aa4d0f1e27a026c253715
 MISC metadata.xml 449 BLAKE2B 15af0e3dc5f50626dfd4f43e02160639c2bae863302674f6455c707e44d39dacddd0d7fa06e0cde6a42f00d8ff658e0a043fe7384d105fa69bbdc5232f14823c SHA512 e91fe6087a08df65eb9bb92906561fee28b7273dd55d87b0efabb16e9df665c49e0d37cf6e8a4f6734007b788a47290bc772bca4daca8ccef38b7a5012ba9a3c
diff --git a/media-plugins/kodi-screensaver-crystalmorph/kodi-screensaver-crystalmorph-9999.ebuild b/media-plugins/kodi-screensaver-crystalmorph/kodi-screensaver-crystalmorph-9999.ebuild
index 11c80daab759..607de5eaf26c 100644
--- a/media-plugins/kodi-screensaver-crystalmorph/kodi-screensaver-crystalmorph-9999.ebuild
+++ b/media-plugins/kodi-screensaver-crystalmorph/kodi-screensaver-crystalmorph-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,5 +27,5 @@ SLOT="0"
 IUSE=""
 
 DEPEND="
-	media-tv/kodi
+	~media-tv/kodi-9999
 	"
diff --git a/media-plugins/kodi-screensaver-pyro/Manifest b/media-plugins/kodi-screensaver-pyro/Manifest
index ac4e9c495484..8d40ba699436 100644
--- a/media-plugins/kodi-screensaver-pyro/Manifest
+++ b/media-plugins/kodi-screensaver-pyro/Manifest
@@ -1,6 +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-1.1.0-r1.ebuild 606 BLAKE2B 73c62c65f456e4ea047e898a9e39f6a971e0afee6e73f4e4057fdfc9b86a867e16a2b989dfe82a7b709143c5f677bad08b52a84621e2530b91b9132bea03ff61 SHA512 0d27ffb34e88e354f1e37f1b354ea0d2e23f1a4678a0d77aa20caa4ad9c21bbeae470a2de6844fb902c66bc628db69466288b7efbe614d80ed01904edd779b43
 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-1.1.0.ebuild b/media-plugins/kodi-screensaver-pyro/kodi-screensaver-pyro-1.1.0-r1.ebuild
index 4cf7f36bed99..c1ca09124946 100644
--- a/media-plugins/kodi-screensaver-pyro/kodi-screensaver-pyro-1.1.0.ebuild
+++ b/media-plugins/kodi-screensaver-pyro/kodi-screensaver-pyro-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,5 +27,5 @@ SLOT="0"
 IUSE=""
 
 DEPEND="
-	media-tv/kodi
+	=media-tv/kodi-17*
 	"
diff --git a/media-plugins/kodi-visualization-fishbmc/Manifest b/media-plugins/kodi-visualization-fishbmc/Manifest
index 7df30dcc7147..994df2980ad0 100644
--- a/media-plugins/kodi-visualization-fishbmc/Manifest
+++ b/media-plugins/kodi-visualization-fishbmc/Manifest
@@ -1,4 +1,4 @@
 DIST kodi-visualization-fishbmc-4.1.0.tar.gz 58536 BLAKE2B e0e573d6fdf3b461606e9335e64e531a92497201918bf22a26b5f2e0220bc8fdef199383e63f31f5acadd5d5091ead7edfae62ad3c20fa5174638e9d07f5fda5 SHA512 6107228b8a3f92a047003ef3a34dc57d187d9c6b1f28e2f8d326fd71e7e7b586750c02a3bb9b11cdda322cbdc5d3fe0146c08364029da028fd65d0f3a13a3358
-EBUILD kodi-visualization-fishbmc-4.1.0.ebuild 666 BLAKE2B 22a1f4a361881db0ab3190f3abe8316fb10ae801d7a3705feaf021d3cc7c9611692e5b0a99b8bb5362e0f0fdbe0a3138901c3e482396a5d1095d5b47c0ed0fb9 SHA512 e1b28f95222e78ab7e65c6b98f69e2e68efc8b80e9d4ea82e3c83313166a512d5397ff6d2227b26a72fee4624cc9c8e5ce6bc108458c4efa1bf472f40a425fc8
-EBUILD kodi-visualization-fishbmc-9999.ebuild 666 BLAKE2B 22a1f4a361881db0ab3190f3abe8316fb10ae801d7a3705feaf021d3cc7c9611692e5b0a99b8bb5362e0f0fdbe0a3138901c3e482396a5d1095d5b47c0ed0fb9 SHA512 e1b28f95222e78ab7e65c6b98f69e2e68efc8b80e9d4ea82e3c83313166a512d5397ff6d2227b26a72fee4624cc9c8e5ce6bc108458c4efa1bf472f40a425fc8
+EBUILD kodi-visualization-fishbmc-4.1.0-r1.ebuild 668 BLAKE2B 89f071ea9bee7ecd6d2771a85fcafc1b89df6b323887b90f5fa9f9055ec96112135aed78dd89af2671876c77ce52a00fdc3c96495cc0ff76022c190f0c9c91b7 SHA512 b0c7ddd970f2997ec9f055a2c2d71c185f9f3f5b4eaa40ddc56b100ff1cc3809fc6063029e7e641fdb39b241924f7a2f57c1abe0d6d23604e666401754376915
+EBUILD kodi-visualization-fishbmc-9999.ebuild 669 BLAKE2B d73cad224cd4436741c0cf19f72e6adc7301912eb61cee169f618e84622a29e4a231b2c90257453cc4d2500cc88b30c40ecd4fedbae1bbaa7af1c2a4a02a7520 SHA512 5f2f171281e4c716248d0e5dc3082e4d2647c09177d8827a522b89f0b181918857e636f6d9c5e7aff10964c0f034a60a9776f8ac3fc55e0e0db0886b17e2d445
 MISC metadata.xml 439 BLAKE2B 538bd3c4a9323c884584cefda4f84d01e1ac2d677ac8c0f4b57a8b81dae2ac3cf6632769ffb50d46a5e162cb3571034fee417ece1878102dcaa8838e839495ac SHA512 0bdb34edf345e638dc3bd557a77adf3745d9332bd0858c40bc003511df26d87597932d2d2987e2245345c44b95d0d03696b61443c1eafaf95b0e151ddcc921d5
diff --git a/media-plugins/kodi-visualization-fishbmc/kodi-visualization-fishbmc-4.1.0.ebuild b/media-plugins/kodi-visualization-fishbmc/kodi-visualization-fishbmc-4.1.0-r1.ebuild
index 79e49b72338f..1646b899e334 100644
--- a/media-plugins/kodi-visualization-fishbmc/kodi-visualization-fishbmc-4.1.0.ebuild
+++ b/media-plugins/kodi-visualization-fishbmc/kodi-visualization-fishbmc-4.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-fishbmc/kodi-visualization-fishbmc-9999.ebuild b/media-plugins/kodi-visualization-fishbmc/kodi-visualization-fishbmc-9999.ebuild
index 79e49b72338f..e0bb237b4e91 100644
--- a/media-plugins/kodi-visualization-fishbmc/kodi-visualization-fishbmc-9999.ebuild
+++ b/media-plugins/kodi-visualization-fishbmc/kodi-visualization-fishbmc-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-nastyfft/Manifest b/media-plugins/kodi-visualization-nastyfft/Manifest
index bd893c46643a..2906e617ce0a 100644
--- a/media-plugins/kodi-visualization-nastyfft/Manifest
+++ b/media-plugins/kodi-visualization-nastyfft/Manifest
@@ -1,4 +1,4 @@
 DIST kodi-visualization-nastyfft-1.1.0.tar.gz 22375 BLAKE2B 3cd1c7362479e218259631dcf8af38f4f3bd32ef02e56fb5df8f9b3c9648096ac0e341eb9b9bd1567fc0e7ab2f690775289d2a39a7d59fd7f7923c56840a690b SHA512 fd32db6e39558102d6d9959b51029ceda250c5e3174689718ec78b095294cabda3d1459db753507245f96d7798273df23a197e82a9dea5a050147c6133a4b2e3
-EBUILD kodi-visualization-nastyfft-1.1.0.ebuild 672 BLAKE2B cfc08700aa095b9abf79bf8d898dca105d28238d66948dd9f422476b37ca163102d4083fe5ca0ea4156b7da3035bd328e97da4a9329a40bf69db15c6f75fbe8a SHA512 5a81ac8811637ba5cb61adc597950a6b6e56eba88b005b9ae1cd12e2c25b97ff58b15b0335e9b276b4973ff5d6ecc08db985bed1d810e389a504eaf21e1514db
-EBUILD kodi-visualization-nastyfft-9999.ebuild 672 BLAKE2B cfc08700aa095b9abf79bf8d898dca105d28238d66948dd9f422476b37ca163102d4083fe5ca0ea4156b7da3035bd328e97da4a9329a40bf69db15c6f75fbe8a SHA512 5a81ac8811637ba5cb61adc597950a6b6e56eba88b005b9ae1cd12e2c25b97ff58b15b0335e9b276b4973ff5d6ecc08db985bed1d810e389a504eaf21e1514db
+EBUILD kodi-visualization-nastyfft-1.1.0-r1.ebuild 674 BLAKE2B 7e9e3a84ae77be0be24dcefff0bc6fd9ef85ddda8ab92aaf926a6aa951181da66db284970ff3bc0e7ca48439244f67e1610a5879afbcf6b1fe9ec1822ac6673a SHA512 66639f30c77f11a50661582334e371f6615faf754edf20b6831dbdf62a6ac2dd310efc86ba1f7f0a1a37f1a0d838a6d8ddbcf4ab776036509e90046ade32780b
+EBUILD kodi-visualization-nastyfft-9999.ebuild 675 BLAKE2B 4878d31daf10995e01b8a3cb552e52f937d617c61b74121fe9c84ad01d9e59b72d26eefea6f428972257da77e849e942624f4348455acfc6ac9fa6748313ba71 SHA512 28eaf82009fe0921f6d6b2eef8f1bb21a365e862e70ef224e305a933b5a2afc4a4777be92b2c320ec8d1181d49275d8b85b2743e00728dd18176d09115cefcee
 MISC metadata.xml 442 BLAKE2B 9574b720a624b850e3aad20a4b3c03108b5b208d8a823d023408b415091ce2120eb135ce3a5369d7d554a17e89b2bb57fe7d20c3354b1612aeef4dcb1750ab20 SHA512 16f85f34283637601a3d32d268ff21a97ebe697e3830f082d39f4c1a401f123ce449c4943e1f8942aa9922404a7a4b86f36561e65db43a4788b9bdb8d700851b
diff --git a/media-plugins/kodi-visualization-nastyfft/kodi-visualization-nastyfft-1.1.0.ebuild b/media-plugins/kodi-visualization-nastyfft/kodi-visualization-nastyfft-1.1.0-r1.ebuild
index e2335a5790f0..09baa294d4dd 100644
--- a/media-plugins/kodi-visualization-nastyfft/kodi-visualization-nastyfft-1.1.0.ebuild
+++ b/media-plugins/kodi-visualization-nastyfft/kodi-visualization-nastyfft-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-nastyfft/kodi-visualization-nastyfft-9999.ebuild b/media-plugins/kodi-visualization-nastyfft/kodi-visualization-nastyfft-9999.ebuild
index e2335a5790f0..0aaa3f8336c6 100644
--- a/media-plugins/kodi-visualization-nastyfft/kodi-visualization-nastyfft-9999.ebuild
+++ b/media-plugins/kodi-visualization-nastyfft/kodi-visualization-nastyfft-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-waveform/Manifest b/media-plugins/kodi-visualization-waveform/Manifest
index 487a9b0e334c..4d6ae6be9a86 100644
--- a/media-plugins/kodi-visualization-waveform/Manifest
+++ b/media-plugins/kodi-visualization-waveform/Manifest
@@ -1,6 +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-1.1.0-r1.ebuild 674 BLAKE2B 8eb70ca28ff280213f446fbb306f5fca23f19c5d4a877a1019eac699f1a4db98ac95ab4a2726237ccc26e24cf4834a81f4717129acf6656449851ed2843b28e5 SHA512 7c69e490b081e6a09397dcb12f2597dbcfeae9d476a73d35e3243ac3a5e61323950dc56e5b89754992a249fd42aa9006c44adc511998937fc87bdac95527e4a2
 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-1.1.0.ebuild b/media-plugins/kodi-visualization-waveform/kodi-visualization-waveform-1.1.0-r1.ebuild
index 494532324f6a..c3e77106f082 100644
--- a/media-plugins/kodi-visualization-waveform/kodi-visualization-waveform-1.1.0.ebuild
+++ b/media-plugins/kodi-visualization-waveform/kodi-visualization-waveform-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/mediastreamer-silk/Manifest b/media-plugins/mediastreamer-silk/Manifest
deleted file mode 100644
index 61b2b0fa38d5..000000000000
--- a/media-plugins/mediastreamer-silk/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX mediastreamer-silk-0.0.1-sdk.patch 1570 BLAKE2B a87dbe2e941f3dfb9bd5b10304a6311d08f1a96a70b605c96d25d009f9143e7967ad1642c918569972993b1546450cbc43ac23c81f5a168f63ff04e1144158f7 SHA512 c3bc9086c1a08e1a5757d4a06bb4f63ff115896deb704358b09f356a639c2f82addc05ec7da700f192d85aba13a7ab76741d5e22786f00d84ff50542ca9bd719
-DIST SILK_SDK_SRC_v1.0.8.zip 65910872 BLAKE2B e51dd92c1a13fe36475ac997ddd27dfca94dcc8f417e343e5d55657da67b5b32b7d7248fa9a202b051edd4be133fce5e07bae8720a2fb66dbe0f5bd4631978aa SHA512 2d56552052ec8180de9bbbce2f89d76df63c1bf6a8ac936dacab104d39526c16b9ccac33e5602f3a757bb12057c2e6da6f955ae370b05b93ff1427632c3a9489
-DIST mssilk-0.0.1.tar.gz 57674 BLAKE2B 87d43e3d66fe53c5965ee7edec3a69a80dff9839fdf37dbb7ff9b161c3b470cbe0aad9db1d59b28f9b2daf835b501562e6ee65cc0894ef33ba546813e4d7167c SHA512 78325c0cf28bf035212583c76aa92f1291442e3f4fbe4c354056ad2b20ff72ba8d7149250431906942352c4deec7912567f512775d5a1dfe07b6b2bd44b5552e
-EBUILD mediastreamer-silk-0.0.1.ebuild 774 BLAKE2B 787cb5c044d5080646f20f7eac9d8e6b77a6480e2e051aab1b821dc241b8f7845e3ac0e0c7fb504dcef67a2e59bb64a8d2954187ecf51bb518e8ec971b0d67c1 SHA512 123535dcfc6c4b4197f25009321a7b4e29abd1f1b5f97baa87a90fb0a96565ee5bc3e7d6b61f79afb2ecef97ad8f3bd6fbc67d454242652b9d1754484f02157f
-MISC metadata.xml 250 BLAKE2B 2ea879960a826fa9be35ec3a0988634da4268c54a8f4a484936356f1fac9e100b779dd43d7a3a684f121e5de5bae7195991e4d378d36b18f97155208fae728d0 SHA512 a5334e41fb3acb7a8cce473ca9616ecea8fe484e870173f0a26042cd8aca0bc7fa4fe52e9cf10b7495c44608e15f1c71564b3f92a44611ba830b08785666b2ac
diff --git a/media-plugins/mediastreamer-silk/files/mediastreamer-silk-0.0.1-sdk.patch b/media-plugins/mediastreamer-silk/files/mediastreamer-silk-0.0.1-sdk.patch
deleted file mode 100644
index 851e824b54fa..000000000000
--- a/media-plugins/mediastreamer-silk/files/mediastreamer-silk-0.0.1-sdk.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- mssilk.orig/sdk/Makefile.am	2012-02-16 13:22:51.000000000 +0400
-+++ mssilk/sdk/Makefile.am	2012-05-15 20:35:37.374526548 +0400
-@@ -2,28 +2,14 @@
- silk_extracted_directory = SILK_SDK_SRC_v$(silk_version)
- silk_src_dir = $(silk_extracted_directory)/SILK_SDK_SRC_$(SILK_FLAVOUR)_v$(silk_version)
- 
--silk_zip = $(silk_extracted_directory).zip
--silk_url = http://developer.skype.com/silk/$(silk_zip)
--
--downloaded_files = $(silk_zip)
--checkmarks = $(downloaded_files:%=%.check)
--BUILT_SOURCES = $(downloaded_files) $(checkmarks) $(silk_extracted_directory) $(silk_src_dir) $(silk_extracted_directory)
-+BUILT_SOURCES = $(silk_extracted_directory) $(silk_src_dir) $(silk_extracted_directory)
- 
- checksum_dir = $(srcdir)/known_checksums
- checksum_files = $(addprefix $(checksum_dir)/, $(downloaded_files:%=%.md5))
- EXTRA_DIST = $(checksum_files)
- 
--$(srcdir)/$(silk_zip):
--	$(WGET) $(silk_url) -O $(srcdir)/${silk_zip}
--
--
--# for check, go to $(srcdir) or ./, depending on where file is
--$(checkmarks): %.check: %
--	cd $(<D); $(MD5SUM) -c $(checksum_dir)/$(<F).md5
--	touch $@
--
--$(silk_extracted_directory): $(checkmarks)
--	$(UNZIP) $(srcdir)/$(silk_zip) $(silk_src_dir)/*
-+$(silk_extracted_directory):
-+	ln -s ../../$(silk_extracted_directory)
- 
- $(silk_src_dir): $(silk_extracted_directory)
- 	cp $(srcdir)/patch_pic.diff $(silk_src_dir)
-@@ -41,6 +27,6 @@
- 	cd $(silk_src_dir) && $(MAKE) $(AM_MAKEFLAGS) clean
- 
- install-data-local: $(silk_src_dir)
--	cp $(silk_src_dir)/libSKP_SILK_SDK.a $(prefix)/lib
-+	echo "stub: nothing to install"
- 
- DISTCLEANFILES = $(BUILT_SOURCES)
diff --git a/media-plugins/mediastreamer-silk/mediastreamer-silk-0.0.1.ebuild b/media-plugins/mediastreamer-silk/mediastreamer-silk-0.0.1.ebuild
deleted file mode 100644
index 1b300c9c5221..000000000000
--- a/media-plugins/mediastreamer-silk/mediastreamer-silk-0.0.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_PN="mssilk"
-SDK_FILE="SILK_SDK_SRC_v1.0.8.zip" # please update silk version on bumps!
-
-inherit autotools eutils
-
-DESCRIPTION="SILK (skype codec) implementation for Linphone"
-HOMEPAGE="http://www.linphone.org"
-SRC_URI="mirror://nongnu/linphone/plugins/sources/${MY_PN}-${PV}.tar.gz
-	http://www.yxplayer.net/files/${SDK_FILE}"
-
-LICENSE="GPL-2+ Clear-BSD SILK-patent-license"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-
-RDEPEND=">=media-libs/mediastreamer-2.8.2:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_PN}"
-
-RESTRICT="bindist mirror" # silk license forbids distribution
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-sdk.patch"
-	eautoreconf
-}
diff --git a/media-plugins/mediastreamer-silk/metadata.xml b/media-plugins/mediastreamer-silk/metadata.xml
deleted file mode 100644
index 4343afde9aa5..000000000000
--- a/media-plugins/mediastreamer-silk/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>bircoph@gentoo.org</email>
-		<name>Andrew Savchenko</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/media-plugins/mythplugins/Manifest b/media-plugins/mythplugins/Manifest
deleted file mode 100644
index 02d6eb7f20e2..000000000000
--- a/media-plugins/mythplugins/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST mythtv-0.28.1.tar.gz 104477892 BLAKE2B bdecfc5723ec3495ab6e49c72caaa5c2dc62c75a11ce7524d3fd5cb8daec82b53b415591b6198eab00322bbbcaff2de7d4f1b7a165d449007f4c3742a69d304b SHA512 67a81858cd19b90f519113b234119ecc248366d8545c862d887755f256cddf04d9ca16a7bf67f63e06f7628730e7dbde2a2099ca8aaeb9061b2e55a5a0b7d5e7
-EBUILD mythplugins-0.28.1.ebuild 3719 BLAKE2B 44e75590db0968362a95fd28df1b1e3ecc4684c4f5db468d879ed761dfcc2cc6f78cb335cb892a6e8c119f9e14ab976a3708ea3de07c9d8b4f9c8f030e52190f SHA512 5f9deaaa49039c340022419a6b518c0143110762f4840bd6e9b7a5315e42ad2aaf551667a09caf2f290e1ba2af839b50c3700fcca60a7904eed34cfc4f3228b4
-MISC metadata.xml 1390 BLAKE2B efc05a3e26844ef34e614877857d2b4573f93a602e82863f5020dbcbd14966034e277002065404ccbd2878dcfbbc3ab2a926acd9056b0d32dfb11e0307b9f4cf SHA512 39e7f486f82acf9e052eb0e26e3f1a2ad2796babb4a7c93885caa4be24ee9b820f6dc7490b670407054dbb5ce06d8d63e093e98a064383d050bd99912d73caef
diff --git a/media-plugins/mythplugins/metadata.xml b/media-plugins/mythplugins/metadata.xml
deleted file mode 100644
index 05e99f352b02..000000000000
--- a/media-plugins/mythplugins/metadata.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<use>
-		<flag name="cdr">Allows MythMusic to burn CD-Rs</flag>
-		<flag name="exif">Allows MythGallery to read EXIF data from photos</flag>
-		<flag name="fftw">Adds visual effects to MythMusic when playing back music</flag>
-		<flag name="hls">HTTP Live Streaming support</flag>
-		<flag name="raw">Allows MythGallery to view photos saved in RAW format</flag>
-		<flag name="mytharchive">Allows you to archive recorded content to CD or DVD</flag>
-		<flag name="mythbrowser">Adds a web browser within MythTV</flag>
-		<flag name="mythgallery">Adds a picture viewing gallery within MythTV</flag>
-		<flag name="mythgame">Adds a frontend to various ROM emulators within MythTV</flag>
-		<flag name="mythmusic">Adds the ability for MythTV to act as a music player</flag>
-		<flag name="mythnetvision">Adds the ability to view netvision devices within MythTV</flag>
-		<flag name="mythnews">Adds a news viewer within MythTV</flag>
-		<flag name="mythweather">Adds weather information within MythTV</flag>
-		<flag name="mythzoneminder">Adds support for zoneminder (requires a server with the appropriate mythtv daemon somewhere on the network).</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">MythTV/mythtv</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-plugins/mythplugins/mythplugins-0.28.1.ebuild b/media-plugins/mythplugins/mythplugins-0.28.1.ebuild
deleted file mode 100644
index 3f901e40b892..000000000000
--- a/media-plugins/mythplugins/mythplugins-0.28.1.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-BACKPORTS="03f44039848bd09444ff4baa8dc158bd61454079"
-MY_P=${P%_p*}
-
-inherit eutils python-single-r1 vcs-snapshot
-
-DESCRIPTION="Official MythTV plugins"
-HOMEPAGE="https://www.mythtv.org"
-SRC_URI="https://github.com/MythTV/mythtv/archive/${BACKPORTS}.tar.gz -> mythtv-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-
-MYTHPLUGINS="+mytharchive +mythbrowser +mythgallery +mythgame \
-+mythmusic +mythnetvision +mythnews +mythweather +mythzoneminder"
-IUSE="${MYTHPLUGINS} alsa cdda cdr exif fftw +hls ieee1394 libass raw +theora +vorbis +xml xvid"
-
-DEPEND="
-	dev-libs/glib:2
-	dev-libs/openssl:=
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtopengl:5
-	dev-qt/qtsql:5
-	media-libs/freetype:2
-	media-libs/libpng:0=
-	~media-tv/mythtv-${PV}:=[alsa=,hls=,ieee1394=,libass=,python,theora=,vorbis=,xml=,xvid=]
-	sys-apps/util-linux
-	sys-libs/zlib
-	virtual/libudev:=
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXv
-	x11-libs/libXxf86vm
-	alsa? ( >=media-libs/alsa-lib-1.0.24 )
-	fftw? ( sci-libs/fftw:3.0= )
-	hls? (
-		media-libs/faac
-		media-libs/libvpx:=
-		>=media-libs/x264-0.0.20111220:=
-		>=media-sound/lame-3.93.1
-	)
-	ieee1394? (
-		>=media-libs/libiec61883-1.0.0
-		>=sys-libs/libavc1394-0.5.3
-		>=sys-libs/libraw1394-1.2.0
-	)
-	libass? ( >=media-libs/libass-0.9.11:= )
-	mytharchive? (
-		app-cdr/dvd+rw-tools
-		dev-python/pillow
-		media-video/dvdauthor
-		media-video/mjpegtools[png]
-		media-video/transcode
-		virtual/cdrtools
-	)
-	mythbrowser? ( dev-qt/qtwebkit:5 )
-	mythgallery? (
-		media-libs/tiff:0
-		virtual/opengl
-		exif? ( >media-libs/libexif-0.6.9:= )
-		raw? ( media-gfx/dcraw )
-	)
-	mythmusic? (
-		>=media-libs/flac-1.1.2
-		media-libs/libogg
-		>=media-libs/libvorbis-1.0
-		>=media-libs/taglib-1.6
-		>=media-sound/lame-3.93.1
-		virtual/opengl
-		cdda? (
-			dev-libs/libcdio:=
-			cdr? ( virtual/cdrtools )
-		)
-	)
-	mythnetvision? (
-		${PYTHON_DEPS}
-		dev-python/lxml
-		dev-python/mysql-python
-		dev-python/oauth
-		dev-python/pycurl
-	)
-	mythweather? (
-		dev-perl/Date-Manip
-		dev-perl/DateTime
-		dev-perl/DateTime-Format-ISO8601
-		dev-perl/Image-Size
-		dev-perl/JSON
-		dev-perl/SOAP-Lite
-		dev-perl/XML-Parser
-		dev-perl/XML-SAX
-		dev-perl/XML-Simple
-		dev-perl/XML-XPath
-	)
-	mythzoneminder? ( virtual/mysql )
-	theora? (
-		media-libs/libogg
-		media-libs/libtheora
-	)
-	xml? ( >=dev-libs/libxml2-2.6.0:= )
-	xvid? ( >=media-libs/xvid-1.1.0 )
-"
-RDEPEND="${DEPEND}
-	!media-plugins/mytharchive
-	!media-plugins/mythbrowser
-	!media-plugins/mythgallery
-	!media-plugins/mythgame
-	!media-plugins/mythmovies
-	!media-plugins/mythmusic
-	!media-plugins/mythnetvision
-	!media-plugins/mythnews
-	!media-plugins/mythweather
-"
-REQUIRED_USE="
-	cdda? ( mythmusic )
-	cdr? ( mythmusic cdda )
-	exif? ( mythgallery )
-	fftw? ( mythmusic )
-	mythmusic? ( vorbis )
-	mythnetvision? ( ${PYTHON_REQUIRED_USE} )
-	mythnews? ( mythbrowser )
-	raw? ( mythgallery )
-"
-
-S="${WORKDIR}/mythtv-${PV}/mythplugins"
-
-src_prepare() {
-	default
-	sed -i '1i#define OF(x) x' mythgame/mythgame/external/ioapi.h
-}
-
-src_configure() {
-	econf \
-		--prefix=/usr \
-		--python=${EPYTHON} \
-		--enable-opengl \
-		$(use_enable cdda cdio) \
-		$(use_enable exif) \
-		$(use_enable exif new-exif) \
-		$(use_enable raw dcraw) \
-		$(use_enable mytharchive) \
-		$(use_enable mythbrowser) \
-		$(use_enable mythgallery) \
-		$(use_enable mythgame) \
-		$(use_enable mythmusic) \
-		$(use_enable mythnetvision) \
-		$(use_enable mythnews) \
-		$(use_enable mythweather) \
-		$(use_enable mythzoneminder)
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install || die "make install failed"
-}
diff --git a/media-plugins/vdr-dvbhddevice/Manifest b/media-plugins/vdr-dvbhddevice/Manifest
index 499167f477e4..dd1546cc5afe 100644
--- a/media-plugins/vdr-dvbhddevice/Manifest
+++ b/media-plugins/vdr-dvbhddevice/Manifest
@@ -1,6 +1,6 @@
 DIST dvbhddevice-2.1.3_p20140115.tar.gz 40424 BLAKE2B 99d5fece7557c7c9f2b0174c9b1f01ac7628f0f0b6aa954f3e829de4653e10cbed6d0516b966f69737aff9ffafd224b3558bd868e972b64ab60c965ba569555a SHA512 29729325affec5e1330cf361a0c82ee5ef9f48f9a6a5032881b331a6451c05c8d99831c43e3eb08129053a7549dd4cd73a5e0afc6fe04d35956c8fecad48d2f4
 DIST vdr-dvbhddevice-2.1.6_p20141116.tar.gz 40902 BLAKE2B 60829c76226c1f0254ac6cdd940fcbcbf08d4cf0a50bfd9ab992db80f63f07389ab29cd4a04aec6319744a39e86cce7dbfee240ab77e819726facd9dbc6d7964 SHA512 0189cf5bfd1d9648915ec65427b4eeeb85ac80281a07a910e65381d86913c37d5840abd8984f17028afe63eae457c7ce398a446e3ad4b70ae4deada316c14b5b
-EBUILD vdr-dvbhddevice-2.1.3_p20140115-r1.ebuild 1059 BLAKE2B 25e2ba08ced19396f0b644f92bee0eaf96bd4e428efa30d391a77187f9313c6c07462d89aa2f7eff02321184259b0016cec05aae7faff233b46c869e965afacc SHA512 803a825cd6d12b3d0f52d7808440f012b55b32cc6ecce951f269d4dafe5c4d621e3cd3423b4bee8fb11b31aac7442ec95f132db1018606b90a25cbf3984206c4
-EBUILD vdr-dvbhddevice-2.1.3_p20140115.ebuild 857 BLAKE2B 13866847812f281db94f445006196ae4ad022b0b7dc30b69bf86a4df2bfd35f4993d806a1fb0ac67dc92a3a2aaa2a924901014327f9690a64afee9b5a460882d SHA512 78bd859c7c801bb8f00ed6d8644d589a783fc826f1cbddec7d8f89aa1b07c6c219677d8a0e7205f9e9909a2892b51ae84e86fb2d0dc1bc4d0d246257f3d50099
+EBUILD vdr-dvbhddevice-2.1.3_p20140115-r1.ebuild 1044 BLAKE2B 2bd45c2b8c14ee05aa378c7252f04470f66ce4724adaa5a55ce7eaf9ee15d893c80ccc77eabd29514243269192458ee41ecbfc2a6698967f78584b1b05e219d0 SHA512 8740268eb2f76b2625deaca9eccfa70df15b0322951e3ddda633f577dd9ee0ad3b4db4dc92479b6e704aea5269856c60cf0d045df8d09f0805b295c735d3c52e
+EBUILD vdr-dvbhddevice-2.1.3_p20140115.ebuild 842 BLAKE2B c487d9dc3d33893c57612bb0b0e29e0a2c3863675f4f0b2c45a1b62df449e07ecf7ad66a4f90febd8437ce6a822a396ad4aa6b8835aaa5bb38cea07edac5412b SHA512 ecda86c62b7f9049222f8714ce3e4d159e7d94cdb6ddf98669172c5ee2458d3c9245efd4127044d7feeb0b9de6da5251c7d98584c603f457c3cba12df4e0b8e6
 EBUILD vdr-dvbhddevice-2.1.6_p20141116-r1.ebuild 1004 BLAKE2B eef06e5956e37469ce7cc895cdf6d0bb1267dd181127c83ddb8b30ef7b85d3829a713bde5799299134135967e9fd46b378bf7c1ca24d1485702b559316b4816d SHA512 2e9b744bae3e1f0754bfb321af762422258effca238e2e6092fd7895923225eb6ed9415dc4cd835b89eb866013df59624a5acff9725bd862385d756115b79b58
 MISC metadata.xml 347 BLAKE2B 753b1fe019258fc38b15a39c9cca1c99c2048330e4126ec70473ea9801a3af52484efc92afec8c5d0120c79081e9dd966a399f9daad5af4a3c4826f43cc96837 SHA512 97f8bbb17d1fb015e5eaf9903da1f49a98018ba361abbde44ac759076a9947ace147d7a7f6f35ccf7e26b428e1c3279605fac36239117974b2c4e98f3f6d5c2a
diff --git a/media-plugins/vdr-dvbhddevice/vdr-dvbhddevice-2.1.3_p20140115-r1.ebuild b/media-plugins/vdr-dvbhddevice/vdr-dvbhddevice-2.1.3_p20140115-r1.ebuild
index a3e5445d0ef8..02e0463d33c9 100644
--- a/media-plugins/vdr-dvbhddevice/vdr-dvbhddevice-2.1.3_p20140115-r1.ebuild
+++ b/media-plugins/vdr-dvbhddevice/vdr-dvbhddevice-2.1.3_p20140115-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,8 +10,8 @@ HG_REVISION_DATE="20140115"
 
 DESCRIPTION="VDR Plugin: output device for the 'Full Featured' TechnoTrend
 S2-6400 DVB Card"
-HOMEPAGE="http://powarman.dyndns.org/hg/dvbhddevice"
-SRC_URI="http://powarman.dyndns.org/hgwebdir.cgi/dvbhddevice/archive/${HG_REVISION}.tar.gz
+HOMEPAGE="https://bitbucket.org/powARman/dvbhddevice"
+SRC_URI="https://bitbucket.org/powARman/dvbhddevice/get/${HG_REVISION}.tar.gz
 -> dvbhddevice-2.1.3_p${HG_REVISION_DATE}.tar.gz"
 
 KEYWORDS="~amd64 ~x86"
diff --git a/media-plugins/vdr-dvbhddevice/vdr-dvbhddevice-2.1.3_p20140115.ebuild b/media-plugins/vdr-dvbhddevice/vdr-dvbhddevice-2.1.3_p20140115.ebuild
index 62d21f73ffe7..56698cbc2573 100644
--- a/media-plugins/vdr-dvbhddevice/vdr-dvbhddevice-2.1.3_p20140115.ebuild
+++ b/media-plugins/vdr-dvbhddevice/vdr-dvbhddevice-2.1.3_p20140115.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,8 +10,8 @@ HG_REVISION_DATE="20140115"
 
 DESCRIPTION="VDR Plugin: output device for the 'Full Featured' TechnoTrend
 S2-6400 DVB Card"
-HOMEPAGE="http://powarman.dyndns.org/hg/dvbhddevice"
-SRC_URI="http://powarman.dyndns.org/hgwebdir.cgi/dvbhddevice/archive/${HG_REVISION}.tar.gz
+HOMEPAGE="https://bitbucket.org/powARman/dvbhddevice"
+SRC_URI="https://bitbucket.org/powARman/dvbhddevice/get/${HG_REVISION}.tar.gz
 -> dvbhddevice-2.1.3_p${HG_REVISION_DATE}.tar.gz"
 
 KEYWORDS="amd64 x86"
diff --git a/media-plugins/vdr-image/Manifest b/media-plugins/vdr-image/Manifest
deleted file mode 100644
index 9951ba5d30d3..000000000000
--- a/media-plugins/vdr-image/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX rc-addon-0.3.0.sh 587 BLAKE2B 8529a8f5050aa82234bcf3475cf46e13f833d9df130e6c0cead893fb1c2a299d9eb60fc19cffb97e6bd2e5bfcf9af7ab62ff0bbe0aa0a1cd313862645c63a9f8 SHA512 b11ddcb1640d3edbd8b381e20189f259280c9439d02739b91b27ed5dbc98b178400fb9d0ec74a6b66b62d7f2315aa76916c8694e16ef50728f059d53d0c1c275
-AUX vdr-image-0.4.0-ffmpeg3.patch 1798 BLAKE2B 4ae377fc2bff971b15b51c8324d6376c1f7067c9bbd0364ff832045f78b49086dcf1909cf9f73a8227840bc1b825d1ba5fb88ad12befa84fabc460439b21dc62 SHA512 470b853bd8c33b04f743e51bdeafa80f4cfc6defbc6485c356462fc8cf8f7de39fd39379ed9063a87d269103c3130c998d9d1856757aa52783b3e85dbb910a9d
-AUX vdr-image-0.4.0-gentoo.diff 2348 BLAKE2B 69667df82f111b27aecd93b67629b9a0d3ad8037af4c1c5a72f1c4ddc97009aa26725aac833cdf570750de40c2d5b07a10a75170a1d0d53f378eaa501745dca6 SHA512 ca6932ae0da10bf1037297dfe4eb1b667ecf78d660479fe332e474746cc1b2afcb6d1a048c511735d5e354dbd8867ee68be75a010eb31fd132382869dd98025c
-DIST vdr-image-0.4.0.tgz 129200 BLAKE2B efcbb1bd724a2dcd0b787a4d768fb1148b91f05112aaf773704fb2d7eab9f64d67dcf4538bfa169176f3f7d18d15fc7decffd96626290e841a827a0f592e9094 SHA512 d66bb7ff48ed622ec21a7d828985229b6aaf908123c12b870e531f09dfe85e792afafa096cd5c4580296139275e2f7171d30f21fe1f8d88978e19c1eb36ab169
-EBUILD vdr-image-0.4.0.ebuild 1518 BLAKE2B 2838a191d859c59e88494929d5b603a6f875375b86094d729a44400abb316afa95de938bb58f1e16aa5d735ae903e3c2870c8453bcf98f110873c6f351c12fcc SHA512 b37130a9919b4a71eadba2e9ade8633f568e6562eed26940badf6f111e8262965e0b6b99fd0d44204cdb8b580999c42d27b49ec9d9d1aaf8d4e170b3179672ed
-MISC metadata.xml 415 BLAKE2B 63c8ab3cd7b4d06bf7cfe5b1d43874e63f8e60cdd7776f515297827f11b97cc2bfbef25ecf746a27c3b902d217510b835c47cbba43cc9d026312868dbb7996bc SHA512 08fd11797252a87665f1459523990d0e30f92103309a7f6243a56c1d1091f1176392efef5ebd51f754ca99286d8daf6506571d65bf6623f0c561a3fd3b4c87e5
diff --git a/media-plugins/vdr-image/files/rc-addon-0.3.0.sh b/media-plugins/vdr-image/files/rc-addon-0.3.0.sh
deleted file mode 100644
index 800351fbe871..000000000000
--- a/media-plugins/vdr-image/files/rc-addon-0.3.0.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# rc-addon plugin-startup-skript for vdr-image
-#
-
-: ${IMAGE_MOUNT:=/usr/share/vdr/image/bin/mount-image.sh}
-: ${IMAGE_CONVERT:=/usr/share/vdr/image/bin/imageplugin.sh}
-
-plugin_pre_vdr_start() {
-	add_plugin_param "-m ${IMAGE_MOUNT}"
-	add_plugin_param "-C ${IMAGE_CONVERT}"
-	add_plugin_param "-c image"
-	
-	if [ -f /usr/lib/vdr/inc/commands-functions.sh ]; then
-		. /usr/lib/vdr/inc/commands-functions.sh
-	else
-		#source /usr/share/vdr/inc/functions.sh
-		include commands-functions
-	fi
-
-	merge_commands_conf /etc/vdr/imagecmds /etc/vdr/plugins/image/imagecmds.conf "${ORDER_IMAGECMDS}"
-}
diff --git a/media-plugins/vdr-image/files/vdr-image-0.4.0-ffmpeg3.patch b/media-plugins/vdr-image/files/vdr-image-0.4.0-ffmpeg3.patch
deleted file mode 100644
index de0ca025e165..000000000000
--- a/media-plugins/vdr-image/files/vdr-image-0.4.0-ffmpeg3.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Index: image-0.4.0/liboutput/encode.c
-===================================================================
---- image-0.4.0.orig/liboutput/encode.c
-+++ image-0.4.0/liboutput/encode.c
-@@ -150,7 +150,7 @@ void cEncode::SetupEncodingParameters(AV
-     }
-     context->max_b_frames=1;
-     context->flags |= CODEC_FLAG_QSCALE;
--    context->pix_fmt = PIX_FMT_YUV420P;
-+    context->pix_fmt = AV_PIX_FMT_YUV420P;
- }
- 
- bool cEncode::ConvertImageToFrame(AVFrame *frame)
-@@ -173,7 +173,7 @@ bool cEncode::ConvertImageToFrame(AVFram
-     // Convert RGB to YUV 
-     if(!avpicture_fill((AVPicture*)m_pImageFilled, 
-                                     m_pImageRGB, 
--                                    PIX_FMT_RGB24, m_nWidth, m_nHeight)) 
-+                                    AV_PIX_FMT_RGB24, m_nWidth, m_nHeight)) 
-     {
-         esyslog("imageplugin: failed avpicture_fill");
-         return false;
-@@ -182,13 +182,13 @@ bool cEncode::ConvertImageToFrame(AVFram
-     {
-         int result;
- #ifndef HAVE_SWSCALER
--        result=img_convert((AVPicture*)frame->data, PIX_FMT_YUV420P, 
--                       (AVPicture*)m_pImageFilled, PIX_FMT_RGB24, 
-+        result=img_convert((AVPicture*)frame->data, AV_PIX_FMT_YUV420P, 
-+                       (AVPicture*)m_pImageFilled, AV_PIX_FMT_RGB24, 
-                        m_nWidth, m_nHeight);
- #else
-         SwsContext* convert_ctx = sws_getContext(m_nWidth, m_nHeight, 
--                        PIX_FMT_RGB24, m_nWidth, m_nHeight, 
--                        PIX_FMT_YUV420P, SWS_BICUBIC, NULL, NULL, NULL);
-+                        AV_PIX_FMT_RGB24, m_nWidth, m_nHeight, 
-+                        AV_PIX_FMT_YUV420P, SWS_BICUBIC, NULL, NULL, NULL);
- 
- 	    if(!convert_ctx) {
-             esyslog("imageplugin: failed to initialize swscaler context");
diff --git a/media-plugins/vdr-image/files/vdr-image-0.4.0-gentoo.diff b/media-plugins/vdr-image/files/vdr-image-0.4.0-gentoo.diff
deleted file mode 100644
index 11479f2fc8a2..000000000000
--- a/media-plugins/vdr-image/files/vdr-image-0.4.0-gentoo.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur image-0.2.7.26.orig/examples/imagecmds.conf image-0.2.7.26/examples/imagecmds.conf
---- image-0.2.7.26.orig/examples/imagecmds.conf	2008-10-25 23:48:18.000000000 +0200
-+++ image-0.2.7.26/examples/imagecmds.conf	2008-10-25 23:50:53.000000000 +0200
-@@ -20,3 +20,5 @@
- Rotate JPEG picture lossless by 90 degrees to the right  : jpegtran -rotate 90 %s > $CONVERT_TEMPDIR/tmp.jpg && mv $CONVERT_TEMPDIR/tmp.jpg %s
- Rotate JPEG picture lossless by 90 degrees to the left   : jpegtran -rotate 270 %s > $CONVERT_TEMPDIR/tmp.jpg && mv $CONVERT_TEMPDIR/tmp.jpg %s
- Delete picture                                          ?: rm -f %s
-+Change burn template									 : echo ln -fs '%s' '/usr/share/vdr/burn/menu-bg.png' | /bin/bash
-+Change burn template ( Button )							 : echo ln -fs '%s' '/usr/share/vdr/burn/menu-button.png' | /bin/bash
-\ Kein Zeilenumbruch am Dateiende.
-diff -Naur image-0.2.7.26.orig/examples/imagecmds.conf.DE image-0.2.7.26/examples/imagecmds.conf.DE
---- image-0.2.7.26.orig/examples/imagecmds.conf.DE	2008-10-25 23:48:18.000000000 +0200
-+++ image-0.2.7.26/examples/imagecmds.conf.DE	2008-10-25 23:55:49.000000000 +0200
-@@ -11,6 +11,8 @@
- Informationen �ber das Bild                              : identify -verbose
- Gr��e des Bildes                                         : du -chs %s
- Exif Informationen des JPEG-Bildes ausgeben              : jpegtopnm -dumpexif %s >/dev/null 2> $CONVERT_TEMPDIR/exif.tmp && cat $CONVERT_TEMPDIR/exif.tmp && rm -f $CONVERT_TEMPDIR/exif.tmp
--Rotatiere JPEG Bildes verlustlos um 90� nach Rechts      : jpegtran -rotate 90 %s > $CONVERT_TEMPDIR/tmp.jpg && mv $CONVERT_TEMPDIR/tmp.jpg %s
--Rotatiere JPEG Bildes verlustlos um 90� nach Links       : jpegtran -rotate 270 %s > $CONVERT_TEMPDIR/tmp.jpg && mv $CONVERT_TEMPDIR/tmp.jpg %s
-+Rotiere JPEG Bildes verlustlos um 90° nach Rechts      : jpegtran -rotate 90 %s > $CONVERT_TEMPDIR/tmp.jpg && mv $CONVERT_TEMPDIR/tmp.jpg %s
-+Rotiere JPEG Bildes verlustlos um 90° nach Links       : jpegtran -rotate 270 %s > $CONVERT_TEMPDIR/tmp.jpg && mv $CONVERT_TEMPDIR/tmp.jpg %s
- L�sche Bild                                             ?: rm -f %s
-+Hintergrund vdr-burn ändern								: echo ln -fs '%s' '/usr/share/vdr/burn/menu-bg.png' | /bin/bash
-+Button vdr-burn ändern								: echo ln -fs '%s' '/usr/share/vdr/burn/menu-button.png' | /bin/bash
diff --git a/media-plugins/vdr-image/metadata.xml b/media-plugins/vdr-image/metadata.xml
deleted file mode 100644
index 8860e595d265..000000000000
--- a/media-plugins/vdr-image/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>vdr@gentoo.org</email>
-		<name>Gentoo VDR Project</name>
-		<description>
-			Please contact maintainer before you change something.
-		</description>
-	</maintainer>
-	<longdescription>
-		VDR Plugin to show pictures on TV
-	</longdescription>
-</pkgmetadata>
diff --git a/media-plugins/vdr-image/vdr-image-0.4.0.ebuild b/media-plugins/vdr-image/vdr-image-0.4.0.ebuild
deleted file mode 100644
index 15aba0b5a4c8..000000000000
--- a/media-plugins/vdr-image/vdr-image-0.4.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit vdr-plugin-2
-
-VERSION="1325" #every bump, new version
-
-DESCRIPTION="VDR plugin: display of digital images, like jpeg, tiff, png, bmp"
-HOMEPAGE="https://projects.vdr-developer.org/projects/plg-image"
-SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz"
-
-KEYWORDS="amd64 x86"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE="exif"
-
-COMMON_DEPEND=">=media-video/vdr-2
-	>=virtual/ffmpeg-9
-	>=media-libs/netpbm-10.0
-	exif? ( media-libs/libexif )"
-
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-
-RDEPEND="${COMMON_DEPEND}
-	media-tv/gentoo-vdr-scripts"
-
-VDR_RCADDON_FILE="${FILESDIR}/rc-addon-0.3.0.sh"
-
-src_prepare() {
-	vdr-plugin-2_src_prepare
-
-	#wrong include
-	sed -e 's:<liboutput/stillimage-player.h>:"liboutput/stillimage-player.h":'\
-		-i player-image.h
-
-	# dangerous warning
-	sed -e "s:mktemp:mkstemp:" -i data-image.c
-
-	eapply "${FILESDIR}/${P}-gentoo.diff" \
-		"${FILESDIR}/${P}-ffmpeg3.patch"
-
-	# ffmpeg-2.2.12, libav10
-	sed -e "s:avcodec_alloc_frame:av_frame_alloc:" \
-		-e "s:CODEC_ID_MPEG2VIDEO:AV_CODEC_ID_MPEG2VIDEO:" \
-		-i liboutput/encode.c
-}
-
-src_install() {
-	vdr-plugin-2_src_install
-
-	insinto /etc/vdr/imagecmds
-	newins examples/imagecmds.conf imagecmds.example.conf
-	newins examples/imagecmds.conf.DE imagecmds.example.conf.de
-
-	insinto /etc/vdr/plugins/image
-	doins examples/imagesources.conf
-
-	into /usr/share/vdr/image
-	dobin scripts/imageplugin.sh
-	newbin scripts/mount.sh mount-image.sh
-}
diff --git a/media-plugins/vdr-picselshow/Manifest b/media-plugins/vdr-picselshow/Manifest
deleted file mode 100644
index e389d5517c83..000000000000
--- a/media-plugins/vdr-picselshow/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX vdr-picselshow-0.0.2-gcc-4.4.diff 857 BLAKE2B fa961e792d4f3ed89a0c7db8123bc19cd572c85b06579d2321873c37235bb925ec9b4293bc8a1dbabfb9d3c4b950c96ae00b4f043210a955278262755326c4d4 SHA512 ade3b8b2a2b157ed60882dcaff8a3128d682bf0402f4a68149e3547d831f639b203495ed4558d19d23b79abc38c863f5780f568af38f931eddf975ae8160f533
-AUX vdr-picselshow-0.0.2-gentoo.diff 360 BLAKE2B 39947d61f3648a2328d61edf3caaba1ca324665ea99e133214d91c634060da3beff42b9360da78d3e0d9772a773691c53fa5e9138c91e6f4aee05aeeeef7d119 SHA512 8c9bd295158170c2828ed5e516c67a498ef37c9e5f13986f85f8b9103e789bb2a996eca96f43d2eff1e2367d778f4bb6f3b3c2071923fa9307dee0e443dc4bb6
-AUX vdr-picselshow-0.0.2-vdr-1.5.x.diff 864 BLAKE2B 558ac26eac3ba94f55b6b1e0ff5128d14e58d58d8f438e33236b867532781bf379f24c7f570129376bb3988581c28100ab99c5ff6a0fa3b1845062776c020471 SHA512 0920b75b8efde30223b7315b37fa0feede9f4a268ac3388dd36d50a08fdb508613357ace921742a1ff1b79db319836fdb84b96140e95b0cf6837ca54a80d9683
-DIST vdr-picselshow-0.0.2.tar.gz 97365 BLAKE2B 3fc966a09289e702c11cb8b3ed2c6d0e20f7b24583a3167fed44aeda339e2e173dccd00501d05446b2ca609cea964a68f7056a5c1aaa57358c9110fce6d9297a SHA512 3904d9a423c70041e013a2a6a326b0a071c9d315a9853edfbbceca8bab7eed1d672657ae95c0956c18d15c2ace1e28dd1ebe0784ed18770d1e629888188ee543
-EBUILD vdr-picselshow-0.0.2.ebuild 1062 BLAKE2B 21d49c2f7503c2e5b356073fe4262abf2947c1ea9799759f05f325168655df037f6d93749fca1d466d2e0efc963bb3103d2b773e49af2038ddce48c9c2dbbae8 SHA512 67474d699d621713e5443bef3727ad5a72e2cf43b5654858dacc4419c453f45e577ce8385898341a49e268f71660f4ac2617e62d5fe66bea97576b6626240c93
-MISC metadata.xml 243 BLAKE2B 6287033e852823666551691771936aead83e7394d6c41f6f5a43a4c21309300e6fcfd90e8a87a82eb90433f86344426c07f2fb7833e7226d2e3c4df9fda1d2d6 SHA512 f7d6e467a5a96c0afdd42df3c0f3866240defc5bbea5ccddf4c0b1a3c004225af5d46dab67d45a5ac34535391584f3b3727fe79ef6cef1a11413636bbc35cf06
diff --git a/media-plugins/vdr-picselshow/files/vdr-picselshow-0.0.2-gcc-4.4.diff b/media-plugins/vdr-picselshow/files/vdr-picselshow-0.0.2-gcc-4.4.diff
deleted file mode 100644
index de72e9e5b31e..000000000000
--- a/media-plugins/vdr-picselshow/files/vdr-picselshow-0.0.2-gcc-4.4.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -ru picselshow-0.0.2-orig/data.c picselshow-0.0.2/data.c
---- picselshow-0.0.2-orig/data.c	2009-08-10 10:56:14.657708090 +0200
-+++ picselshow-0.0.2/data.c	2009-08-10 11:02:12.287665408 +0200
-@@ -453,7 +453,7 @@
- 
- bool cFileSource::Action(eAction act)
- {
--  static char *str[] = { "mount", "unmount", "eject", "status" };
-+  static const char *str[] = { "mount", "unmount", "eject", "status" };
- 
-   char *cmd = 0;
-   asprintf(&cmd, "%s %s %s", g_szMountScript, str[act], basedir);
-diff -ru picselshow-0.0.2-orig/imagecache.h picselshow-0.0.2/imagecache.h
---- picselshow-0.0.2-orig/imagecache.h	2009-08-10 10:56:14.654371019 +0200
-+++ picselshow-0.0.2/imagecache.h	2009-08-10 11:01:18.421003775 +0200
-@@ -5,6 +5,7 @@
- #ifndef VDR_IMAGECACHE_HPP
- #define VDR_IMAGECACHE_HPP
- 
-+#include <sys/types.h>
- #include <map>
- #include <vector>
- #include <string>
diff --git a/media-plugins/vdr-picselshow/files/vdr-picselshow-0.0.2-gentoo.diff b/media-plugins/vdr-picselshow/files/vdr-picselshow-0.0.2-gentoo.diff
deleted file mode 100644
index a7f50817e069..000000000000
--- a/media-plugins/vdr-picselshow/files/vdr-picselshow-0.0.2-gentoo.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- picselshow-0.0.2-orig/picselshow.c	2007-05-17 23:25:57.000000000 +0200
-+++ picselshow-0.0.2/picselshow.c	2007-08-01 08:52:36.000000000 +0200
-@@ -58,7 +58,7 @@
- 	return ImageSetup.SetupParse(szName,szValue);
- }
- 
--const char *g_szConfigDirectory = NULL;
-+const char *g_szConfigDirectory = "picselshow";
- 
- const char *cPluginImage::CommandLineHelp(void)
- {
diff --git a/media-plugins/vdr-picselshow/files/vdr-picselshow-0.0.2-vdr-1.5.x.diff b/media-plugins/vdr-picselshow/files/vdr-picselshow-0.0.2-vdr-1.5.x.diff
deleted file mode 100644
index f6c112f36b0b..000000000000
--- a/media-plugins/vdr-picselshow/files/vdr-picselshow-0.0.2-vdr-1.5.x.diff
+++ /dev/null
@@ -1,51 +0,0 @@
---- control-image.c~	2007-05-18 12:00:59.000000000 +0200
-+++ control-image.c	2007-06-11 15:38:54.000000000 +0200
-@@ -194,7 +194,11 @@
- 
- void cImageControl::FadeIn(void)
- {
--needsFastResponse = true;
-+#if VDRVERSNUM >= 10500
-+  SetNeedsFastResponse(true);
-+#else
-+  needsFastResponse = true;
-+#endif
-   int i;
-   int alpha = 0;
-   
-@@ -237,13 +241,21 @@
-   fd--;
-   }
- 
--needsFastResponse = false;
-+#if VDRVERSNUM >= 10500
-+  SetNeedsFastResponse(false);
-+#else
-+  needsFastResponse = false;
-+#endif
- }
- 
- 
- void cImageControl::FadeOut(void)
- {
--needsFastResponse = true;
-+#if VDRVERSNUM >= 10500
-+  SetNeedsFastResponse(true);
-+#else
-+  needsFastResponse = true;
-+#endif
-   int i;
-   int alpha = 255;
-   int fd = 16;
-@@ -283,7 +295,11 @@
-   fd--;
-   }
- 
-+#if VDRVERSNUM >= 10500
-+  SetNeedsFastResponse(false);
-+#else
-   needsFastResponse = false;
-+#endif
- }
- 
- 
diff --git a/media-plugins/vdr-picselshow/metadata.xml b/media-plugins/vdr-picselshow/metadata.xml
deleted file mode 100644
index 27f419c289c3..000000000000
--- a/media-plugins/vdr-picselshow/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-<email>vdr@gentoo.org</email>
-<name>Gentoo VDR Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/media-plugins/vdr-picselshow/vdr-picselshow-0.0.2.ebuild b/media-plugins/vdr-picselshow/vdr-picselshow-0.0.2.ebuild
deleted file mode 100644
index 8d28c26f95d3..000000000000
--- a/media-plugins/vdr-picselshow/vdr-picselshow-0.0.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit vdr-plugin-2
-
-DESCRIPTION="VDR plugin: picselshow for vdr-music"
-HOMEPAGE="http://www.vdr.glaserei-franz.de/"
-SRC_URI="http://www.kost.sh/vdr/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="imagemagick"
-
-PATCHES=("${FILESDIR}/${P}-vdr-1.5.x.diff"
-	"${FILESDIR}/${P}-gcc-4.4.diff"
-	"${FILESDIR}/${P}-gentoo.diff")
-
-DEPEND="imagemagick? ( media-gfx/imagemagick )
-		!imagemagick? ( media-libs/imlib2 )"
-
-RDEPEND="media-plugins/vdr-image
-		media-plugins/vdr-music"
-
-src_prepare() {
-	vdr-plugin-2_src_prepare
-
-	use imagemagick && sed -i Makefile -e "s:#HAVE_MAGICK=1:HAVE_MAGICK=1:"
-
-	sed -i example/imagesources.conf -e "s:/media/vdrdaten/bilder:/mnt/images:"
-
-	sed -i example/imagesources.conf -e \
-		"s:/VDR/etc/plugins/music/downloads/music_cover:/etc/vdr/plugins/music/downloads/music_cover:"
-}
-
-src_install() {
-	vdr-plugin-2_src_install
-
-	insinto /etc/vdr/plugins/picselshow
-	doins -r picselshow/*
-	doins example/*
-}
author	V3n3RiX <venerix@redcorelinux.org>	2018-12-24 14:11:38 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2018-12-24 14:11:38 +0000
commit	de49812990871e1705b64051c35161d5e6400269 (patch)
tree	5e1e8fcb0ff4579dbd22a1bfee28a6b97dc8aaeb /media-plugins
parent	536c3711867ec947c1738f2c4b96f22e4863322d (diff)