gentoo resync : 06.08.2019

322 files changed, 1976 insertions, 2575 deletions

diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index 943e9f1dea05..9940218985c7 100644
--- a/media-plugins/Manifest.gz
+++ b/media-plugins/Manifest.gz
diff --git a/media-plugins/alsa-plugins/Manifest b/media-plugins/alsa-plugins/Manifest
index bf210abcef01..2d873cdbe3a0 100644
--- a/media-plugins/alsa-plugins/Manifest
+++ b/media-plugins/alsa-plugins/Manifest
@@ -9,7 +9,7 @@ DIST alsa-plugins-1.1.8.tar.bz2 375346 BLAKE2B 65c161ee375e7aed85dbe918a39bc2aa4
 DIST alsa-plugins-1.1.9.tar.bz2 406127 BLAKE2B 10bf3e96289a88edabfa3018d33ab4666982fe409eb41c486e6b9eee0dde87e926f3241c31e240b3bab114c8ab2c6d6bab92dd6192bceb467a01fcb6adc44b8e SHA512 1969dfe8f2bb4283e81a18da73d2f7f86d8788d1a8764d7195b4830b2f4704c208eacb50a1e26e20c9fe57e7d5bb06a004112d84cc86b4682b4180d2fec4d5d9
 EBUILD alsa-plugins-1.1.1-r1.ebuild 2698 BLAKE2B 3fac1377af069760efcc93fe6daa55a3d821742e7ffd5c0976dc0f3a066151ff087d20a65803aa59f253f27f8077d20345da879f92fd3dc28398440e31b3d148 SHA512 9df4f03ae71fe97423bdb37cd28755873a915f210ce92f5f394e15bcecd6662f321acff20b9f212fdb06b63337a7f58d2fb25a6c18eac2be3c5820bc21394860
 EBUILD alsa-plugins-1.1.6.ebuild 2870 BLAKE2B 4dbfa2bf67ebcaf0102e3e000965acb1a7ddebd9a4cc2071c6e40046d5d2f40c0a9939b55559563880c384620ab4b49d8c5fa54bf795d7edc4ad373d94919034 SHA512 4ee600a04dc60852a8a05948434c53e72c500773bf0ef9b569125787e32f934723588bffea4dea1500aad4a2e974c77cd6e5d63110244154aa23b2d8b53556f8
-EBUILD alsa-plugins-1.1.8.ebuild 2815 BLAKE2B 546f3205d96e8092cbed55c4d714a95655c30d7b44240a04d1a10d904fb73819385209501fc18c5b41d62a0f15b5f03d9c5c0566ca8ebf1866964cd7abee8753 SHA512 94a5a351db83cfc28830f01ad0014b423e87980e2768f2c3fc37c6665b36e451dab946769cdf77bd30c56dddf73277075a77d9c931abc1f9ce19365c632cfcea
+EBUILD alsa-plugins-1.1.8.ebuild 2813 BLAKE2B f28fcb8e2c41d7ba7e9a6da1d80fd0213749df1953895cd7eb23a5a8bc01cd2f38015e9ef0c3d1116214fc92e3531a7024e5f5d2bb08fa8baac9d79313dba041 SHA512 e49546ff0c2ac87531d67121f700bb8188b91a5cd2bd2aa4413c40ce97f64fd2b06a7c63c4cf2db340bbc4f4306820a656b063dc842a6e434008bb04e22c489f
 EBUILD alsa-plugins-1.1.9-r1.ebuild 3047 BLAKE2B 4135cf5a6aa0fb97e3599e3df3aeffe1773ecfd5c7ca0508af6f98bc383cc0da22405610c4ea5af836e4380d298ae97a0403c619ae546ad8529e8d00b8fd6956 SHA512 5faa9b98b87a54c530c943faea4f2ef0f994141c5e6c784b8af0ef4806e88ad18bcf0ebb8ac4b02fe2a5e62f47b1ded3ab5f74539287fe36cb5aefdd3437620e
 EBUILD alsa-plugins-1.1.9.ebuild 2921 BLAKE2B 082e1bb7fdfdac8ea826cabd171eeaf25445dc9b9520527b479357440ea4b9b29690e835fb6b097e23f3fc415cfbd5dd2e53ffb98233e49b853be8f3d8e1dcf6 SHA512 8c6413bc5e31b14a9fc2b44974b8a3587db8626ce2ef5287b2add5fc1bcc1c4dff18a48ed6eaff67ee9668cddb5e22164c74d85217fa39e18c94c74754adadb6
 MISC metadata.xml 512 BLAKE2B 2fa80544d70890c99164643bc1706b8c2e5f3d50c991e781e68441072366b1b89d0082507bf1c27d11d95bcd1c7d508f09ce0b193bd7d4ca77f27a2bdf9e24c8 SHA512 fce90766306d36d97ae40cbebf7b788f6f11766afc6d9680f563271ea184373ae20480b99b6e60edc74d9bfb222acd1d11c50163a31520f073a00bba9050e361
diff --git a/media-plugins/alsa-plugins/alsa-plugins-1.1.8.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.1.8.ebuild
index c7ae1efcfda6..dbf6c097e522 100644
--- a/media-plugins/alsa-plugins/alsa-plugins-1.1.8.ebuild
+++ b/media-plugins/alsa-plugins/alsa-plugins-1.1.8.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://alsaproject/plugins/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~ppc ~ppc64 ~sh sparc x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux"
 IUSE="arcam_av debug ffmpeg jack libav libsamplerate +mix oss pulseaudio speex +usb_stream"
 
 RDEPEND="
diff --git a/media-plugins/grilo-plugins/Manifest b/media-plugins/grilo-plugins/Manifest
index b51b2aa2fc81..ed2019b69cc6 100644
--- a/media-plugins/grilo-plugins/Manifest
+++ b/media-plugins/grilo-plugins/Manifest
@@ -1,4 +1,6 @@
 AUX 0.3.8-meson-goa.patch 2086 BLAKE2B 82bcd7de7d96caeed6f5448e36666acbb3870e4e8361c8890a73e031cb241261b98d8c97a3caf45187d2a7deebdf712a5447ccb29f96509a256eff8b5c257b6a SHA512 b5a6942092b32c91518e6142e7b0fbb46994eaa0f03eb83b0fbb561bf1ee27d435c1f0982cb036700fcff04bab27cf1080cb068bfdce44eeb6238f4f642c486d
 DIST grilo-plugins-0.3.8.tar.xz 1408952 BLAKE2B 3375275189a25289406b5d9fd6dd42b6c0ad92779b081ce2f480b464929302af7b52fc758f2f6277c94fad38a2b0bbfc8fe9fd668ff98fc0ac7fbeda69a5ac42 SHA512 c5a0a80fd7c871ce69a06bdcab2b3d8986708e4e6b9c9020d7e938d4450655f962db7f84da0b40ed38ba197f65fc2a561e06a92cdca593620d66c2b153eb4879
+DIST grilo-plugins-0.3.9.tar.xz 1418148 BLAKE2B 438aac490f2e099c40f5df15d8b3958dc29c4344e4846a3ff452561f60bf041fe2975b6c67b634f5f54721fd69e53f86c5008eadb3a402cbc8b479e805ab8221 SHA512 4700b08cab53afe0899edf7859a2e18608f6ed2016a9139694e8f1eb628c5b7318b04fe1633406fd1685a8dd54d1632b886352eac3192d52a1c1a1ac55896479
 EBUILD grilo-plugins-0.3.8.ebuild 2983 BLAKE2B e6981ac32540f0b919e4d256e1695c3752e65c32a5b1c42efc4720cc9243b5f6b54d444a61950defa5b8cf4f5138b060b635b80988c60140184d4c07c7fdc0c6 SHA512 2b65bbdaa3c4fb2fedf3cb22144d5979b7b47a561574919341388ab1eecbf568eddf3eaa0f226df17fda8361f9fa83a553dce273930d8f4f7c2d148e09eade0d
+EBUILD grilo-plugins-0.3.9.ebuild 2996 BLAKE2B 9c6192b4c8d3e50ecbd8b6b75631fec937e7fa516fe010fc3845caa8d789eea6a0627f6392e977e2142813377b620b2fd35a72c680f1c2cb721d712e15fbf5a6 SHA512 acbda6891b9605fa29743f506514e400abb909a463af5868ff1f02c8469a3ae8b6bcfa6b870894334e04ed048272cb693c984d25881a2ce1baf312fc9ca64f5b
 MISC metadata.xml 920 BLAKE2B c6119dc73ede7e500e3113f03677f81d65d4a2a524e84847f010e6c9215b96feed5fcaf400166471c25075742268cbe7639e23cd11447e0e795146b29dec797e SHA512 322b01e064c5656e9d9c7e2343d7feb76f35bd9ea6e5174ce3702747e5c4dd5de9ab60e9c91d72db171ad62a90f84eedcc03b3547ef7bc8e231090c7eaef9ac7
diff --git a/media-plugins/grilo-plugins/grilo-plugins-0.3.9.ebuild b/media-plugins/grilo-plugins/grilo-plugins-0.3.9.ebuild
new file mode 100644
index 000000000000..b5e655269161
--- /dev/null
+++ b/media-plugins/grilo-plugins/grilo-plugins-0.3.9.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+
+inherit gnome.org meson xdg
+
+DESCRIPTION="A collection of plugins for the Grilo framework"
+HOMEPAGE="https://wiki.gnome.org/Projects/Grilo"
+
+LICENSE="LGPL-2.1+"
+SLOT="0.3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="daap chromaprint flickr freebox gnome-online-accounts lua test thetvdb tracker upnp-av +youtube"
+
+# GOA is only optionally used by flickr and lua-factory plugins (checked at v0.3.8)
+# json-glib used by tmdb and lua; tmdb currently non-optional
+# TODO: validate upnp-av dleyna deps
+RDEPEND="
+	>=dev-libs/glib-2.44:2
+	>=media-libs/grilo-0.3.8:${SLOT}=[network,playlist]
+	freebox? (
+		net-dns/avahi )
+	>=dev-libs/gom-0.3.2-r1
+	chromaprint? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		media-plugins/gst-plugins-chromaprint:1.0 )
+	dev-libs/json-glib
+	daap? (
+		>=net-libs/libdmapsharing-2.9.12:3.0 )
+	media-libs/libmediaart:2.0
+	net-libs/libsoup:2.4
+	dev-libs/libxml2:2
+	flickr? (
+		net-libs/liboauth )
+	dev-db/sqlite:3
+	>=dev-libs/totem-pl-parser-3.4.1
+	tracker? (
+		>=app-misc/tracker-0.10.5:= )
+	upnp-av? (
+		net-libs/dleyna-connector-dbus
+		net-misc/dleyna-server )
+	lua? (
+		>=dev-lang/lua-5.3
+		app-arch/libarchive
+		dev-libs/libxml2:2 )
+	thetvdb? (
+		app-arch/libarchive )
+	youtube? (
+		>=dev-libs/libgdata-0.9.1:= )
+
+	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.17.91:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-text/docbook-xml-dtd:4.5
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	upnp-av? ( >=dev-util/gdbus-codegen-2.44 )
+	virtual/pkgconfig
+	lua? ( dev-util/gperf )
+"
+
+PATCHES=(
+	"${FILESDIR}"/0.3.8-meson-goa.patch # Support controlling g-o-a dep via 'goa' meson_options
+)
+
+src_prepare() {
+	xdg_src_prepare
+	sed -i -e "s:'GETTEXT_PACKAGE', meson.project_name():'GETTEXT_PACKAGE', 'grilo-plugins-${SLOT%/*}':" meson.build || die
+	sed -i -e "s:meson.project_name():'grilo-plugins-${SLOT%/*}':" po/meson.build || die
+	sed -i -e "s:meson.project_name():'grilo-plugins-${SLOT%/*}':" help/meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		-Denable-bookmarks=yes
+		-Denable-chromaprint=$(usex chromaprint yes no)
+		-Denable-dleyna=$(usex upnp-av yes no)
+		-Denable-dmap=$(usex daap yes no)
+		-Denable-filesystem=yes
+		-Denable-flickr=$(usex flickr yes no)
+		-Denable-freebox=$(usex freebox yes no)
+		-Denable-gravatar=yes
+		-Denable-jamendo=yes
+		-Denable-local-metadata=yes
+		-Denable-lua-factory=$(usex lua yes no)
+		-Denable-magnatune=yes
+		-Denable-metadata-store=yes
+		-Denable-opensubtitles=yes
+		-Denable-optical-media=yes
+		-Denable-podcasts=yes
+		-Denable-raitv=yes
+		-Denable-shoutcast=yes
+		-Denable-thetvdb=$(usex thetvdb yes no)
+		-Denable-tmdb=yes
+		-Denable-tracker=$(usex tracker yes no)
+		-Denable-vimeo=yes
+		-Denable-youtube=$(usex youtube yes no)
+		-Dgoa=$(usex gnome-online-accounts enabled disabled)
+	)
+	meson_src_configure
+}
diff --git a/media-plugins/gst-plugins-assrender/Manifest b/media-plugins/gst-plugins-assrender/Manifest
index 372ddf7994c2..f23c7cb00f3a 100644
--- a/media-plugins/gst-plugins-assrender/Manifest
+++ b/media-plugins/gst-plugins-assrender/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
+DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 EBUILD gst-plugins-assrender-1.14.3.ebuild 408 BLAKE2B 3368af61edc30f07a3dae8c24a7a57931864a0c24b99c0cab175a86d26fbaf6203a4cdc1cc6917e772c3d986c776c496c3d682fcf154bb84aac709161ef43f29 SHA512 73df7c65b2ae72d8cc82341f66f259e2e5d8b7277f1a69a8a616e0edc75212fe6c067b44c95f8d892b99a0808b4ee535ceb0c81fec1cd8545bb67f6febdb5523
+EBUILD gst-plugins-assrender-1.14.5.ebuild 416 BLAKE2B 9207b91fe83881342c8a74c0651b45ab0d45f1cf19e17518419a5a796591074cd1fc7a6e4cbc0d0e563a19485bd9bbcc430ee6ea475f3d8bd9970749f7deb909 SHA512 3e91c392f7fe6d0563d78dc89d7b43486f7b2a13a18e485bb3a182ab95bd36d6b33e03c25b365a59b9276e5dcafb2bc832c3b56db69303296064d3bb8ce880f0
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.14.5.ebuild b/media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.14.5.ebuild
new file mode 100644
index 000000000000..fa8ebe87cd88
--- /dev/null
+++ b/media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.14.5.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="ASS/SSA rendering with effects support plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+IUSE=""
+
+RDEPEND=">=media-libs/libass-0.10.2:=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-bluez/Manifest b/media-plugins/gst-plugins-bluez/Manifest
index 7b1c33ea54e9..1b0979e80d66 100644
--- a/media-plugins/gst-plugins-bluez/Manifest
+++ b/media-plugins/gst-plugins-bluez/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
+DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 EBUILD gst-plugins-bluez-1.14.3.ebuild 361 BLAKE2B 01dc807429ce2f5818ede7ad6f842ed8a2e18dd2b2edac4608e1b8f2841bea0bdea546082e0531ce02ab0b3f23ca1036a6fcebf06978e70fe3176a51335f7051 SHA512 e651a5ce9fe6b175f0bef8d38a2406c68ab4b4991d5a4e5aa8c1619ccb67c933a347328ed4de360fb73a259535dbb60a3921c4c5192c114ba00abf5c55a1a678
+EBUILD gst-plugins-bluez-1.14.5.ebuild 363 BLAKE2B 87ba3d38138e4867f8a700426bdc64667f09bf6ad325e0bec1e65780c20822e67b52310a13a61d475cdc8c24f419d401a4a646346ac54f035a701e2201f22fc4 SHA512 43e6aa5e724f069a39834a6c10efc44a59b1c56c12d102d0a39805298360e2fc78b400114e89812d7ae60b6d1ca24dd402742e21ef92fd4369bea247f5883831
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-bluez/gst-plugins-bluez-1.14.5.ebuild b/media-plugins/gst-plugins-bluez/gst-plugins-bluez-1.14.5.ebuild
new file mode 100644
index 000000000000..4677ef941fec
--- /dev/null
+++ b/media-plugins/gst-plugins-bluez/gst-plugins-bluez-1.14.5.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="AVDTP source/sink and A2DP sink plugin for GStreamer"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=net-wireless/bluez-5[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-util/gdbus-codegen
+"
diff --git a/media-plugins/gst-plugins-bs2b/Manifest b/media-plugins/gst-plugins-bs2b/Manifest
index 1f51fdf1c717..dc3cba2be062 100644
--- a/media-plugins/gst-plugins-bs2b/Manifest
+++ b/media-plugins/gst-plugins-bs2b/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
+DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 EBUILD gst-plugins-bs2b-1.14.3.ebuild 307 BLAKE2B 9ce161dc51a6581ebd198ec5595aa3fe36e706511166f33321370d51f4dc703d341ca859082f0d6f90a8d64fd44473db4986cce060166f487f14bc1546484c99 SHA512 0e2e4116b8e9c3906de2de4645765a7931fa0a323504f1871a40d14b5f9542ab9f35a7b2d92683ec40401597ea8c479b4dd9a0a79582f5be045bd660b77c569a
+EBUILD gst-plugins-bs2b-1.14.5.ebuild 309 BLAKE2B a60632e83754bc285c5730dae62b45e629631e2dd5b6aa9f02c76f1169bb12e63c20edd494bc58c8c1a6acc90392594ea1df4c8240dc6a103b580e0182de26d6 SHA512 71a51777eef0230bd38165e789f881a8039420cbdc411388c8b5cc8f4bd29cb9d0a3caf7ce2158721158503a4a14f57eb3f7f94f7a6cf4df3462d141aa20153e
 MISC metadata.xml 373 BLAKE2B 6e4682246da86a7f498c11bb63a8c8acd13d6b62c527db46a4030ae641d8f86d8e6fdfb67af1e53043fd3ea0c54086d67944c99a08f693a15e59d887fd99c977 SHA512 e0a9334a77c4ab15b765c27ace9033ea1aac985a2050e5048dccc4af340ed4fab99b79c6b40a2b668b2559d5bcdcd2076091f7376af3b973df8eb3236ce43956
diff --git a/media-plugins/gst-plugins-bs2b/gst-plugins-bs2b-1.14.5.ebuild b/media-plugins/gst-plugins-bs2b/gst-plugins-bs2b-1.14.5.ebuild
new file mode 100644
index 000000000000..5436754b9d98
--- /dev/null
+++ b/media-plugins/gst-plugins-bs2b/gst-plugins-bs2b-1.14.5.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="bs2b elements for Gstreamer"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	media-libs/libbs2b[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-cairo/Manifest b/media-plugins/gst-plugins-cairo/Manifest
index 19e046ead758..cb484cbf82de 100644
--- a/media-plugins/gst-plugins-cairo/Manifest
+++ b/media-plugins/gst-plugins-cairo/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
+DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
 EBUILD gst-plugins-cairo-1.14.4.ebuild 332 BLAKE2B 00608d0cb0131592e49a8ec528265b74238723a5d042c33b33081c0a426385ec7783329e66c15e399d74e5b9fad131d1a552aa1384411a0a6da250a55226d9ac SHA512 c6a35459b758c89c0ef27f1d096022fb212d665eacd8b8539317e3818a4940cd66c6884b8472a9bf560ece227530c024b7be24ba1a520b177ef4526d3f1498ea
+EBUILD gst-plugins-cairo-1.14.5.ebuild 332 BLAKE2B 37511ecb76bb4467c35f46f113e28be5f81f3160b0e7bcd51623741ebf22b0da202b5eff81945b6da332ed8cf7b78f34604c4634aedbc29165ffaedefd56d819 SHA512 1de3e39624aeda7911200d37ec8167d1deb7f9367f7b68b8a3f6b0ca8a4aa9a0616b8325275ff8cad245738ad5aa8bbdfa59ea26fd9e7271bdfea276cc8ef2a1
 MISC metadata.xml 478 BLAKE2B e9563654e8e62fab3969a394c62a847c1e87617f8e1bbb0042850709ccb7f450f31283e2bb563aa51b14f0599f69147be29aaa2af2ac57f2b56f162b50f3bc62 SHA512 07528fb30c717b584e9fd9381ad9d71829de406a7f20994876703a7164b84529d21b35e8bdf0880216e6b308e96bb83294ab4ddf9f3ed05a4e20f8d5d2b35708
diff --git a/media-plugins/gst-plugins-cairo/gst-plugins-cairo-1.14.5.ebuild b/media-plugins/gst-plugins-cairo/gst-plugins-cairo-1.14.5.ebuild
new file mode 100644
index 000000000000..2d48c8e9bb0b
--- /dev/null
+++ b/media-plugins/gst-plugins-cairo/gst-plugins-cairo-1.14.5.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-good
+
+inherit gstreamer
+
+DESCRIPTION="Video overlay plugin based on cairo for GStreamer"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND=">=x11-libs/cairo-1.10[glib,${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-cdparanoia/Manifest b/media-plugins/gst-plugins-cdparanoia/Manifest
index a4b4d96b0b90..8dfe2d222404 100644
--- a/media-plugins/gst-plugins-cdparanoia/Manifest
+++ b/media-plugins/gst-plugins-cdparanoia/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-base-1.14.4.tar.xz 3703232 BLAKE2B b22c44b857bc4f1972f03752cc1afb35c8d76e2d0c4a06c574af0ac4f3a91080c584ae4e4fc2a263ee879a53d58505c24a756ebc051d81ec62661c4f9e532f0e SHA512 42c59df9f2d848108f12afa0466acbcfa5ccda64e4d0d44608d4268abed20f2e036713de04e7d71feaed1868ad742c5bcb55ae0eef5dec8e19e053dc8541b8af
+DIST gst-plugins-base-1.14.5.tar.xz 3717076 BLAKE2B 461e90df614c60d7efce6fabcf8ad7a5cb68b5fc01b05761fa441d838d3155b5a2e7f9b9420b7e48b2eec49e4bcfbd39009a662db03a923f42c6f45c782795cd SHA512 4e81c44a5ea3b910f96d3e9251ba38a79feacead4f96adb92eab5a650695ca8d5313e3ec1df78fec04376cf3152d2eefd4d39f6c11dadc98a11e55bbf8c8ccdc
 EBUILD gst-plugins-cdparanoia-1.14.4.ebuild 473 BLAKE2B ff93502a8f090ac1a47b62bf1ddf608b1b176d7ebdac5f14f69cf39324d7bd5bcc5f1a03a3786194ee954ae2f8ecc084fe9aa4096648796b5c79a0b95c38e8d5 SHA512 bdb67ce87f3b3e53008006f4345537490fab616700b35dc61c7e3451a5cb4842f9398b6aa8dcbde231452923aab1a28b444e8b99c4a8801b21a3474dccc39f02
+EBUILD gst-plugins-cdparanoia-1.14.5.ebuild 481 BLAKE2B ff7d4f34451e03848c71bd0ee7d956c9431130ad60ffbc94474b840ab07f7825f77eae1a41f1f3fcf33c2beebc494431ad02b0e510a5adf53e3d3d5919ac7697 SHA512 6cad17aa69724dc10aa16eb5c5f242b18875a1cd7e157986720580a4832f16baf9e80a18d25599c7efff98709dbcf549ac6b54b0d23fa1d6ebd9d78a43270d7a
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.14.5.ebuild b/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.14.5.ebuild
new file mode 100644
index 000000000000..f3d57351508e
--- /dev/null
+++ b/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.14.5.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-base
+
+inherit gstreamer
+
+DESCRIPTION="CD Audio Source (cdda) plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=media-sound/cdparanoia-3.10.2-r6[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	gstreamer_system_link gst-libs/gst/audio:gstreamer-audio
+}
diff --git a/media-plugins/gst-plugins-chromaprint/Manifest b/media-plugins/gst-plugins-chromaprint/Manifest
index 1cdc77e17fed..eda24cbeee0b 100644
--- a/media-plugins/gst-plugins-chromaprint/Manifest
+++ b/media-plugins/gst-plugins-chromaprint/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
+DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 EBUILD gst-plugins-chromaprint-1.14.3.ebuild 383 BLAKE2B 0466f0b61418310c66e7a034359d2c1462dcab8a1288cc28a904dacda47c0eee92ca9ab46aadb8cc1b2ae81c06f6a7e2a3811bc4776b0d1069322d485d3378e2 SHA512 ee14449f182a93fb3c4ecb00e3d028f4382a9d899d43fc61c1834fc37d752e3e5508429734a1ba9f62107219786045e840f7c2e94e4a5333c856acee3395a71b
+EBUILD gst-plugins-chromaprint-1.14.5.ebuild 383 BLAKE2B 0466f0b61418310c66e7a034359d2c1462dcab8a1288cc28a904dacda47c0eee92ca9ab46aadb8cc1b2ae81c06f6a7e2a3811bc4776b0d1069322d485d3378e2 SHA512 ee14449f182a93fb3c4ecb00e3d028f4382a9d899d43fc61c1834fc37d752e3e5508429734a1ba9f62107219786045e840f7c2e94e4a5333c856acee3395a71b
 MISC metadata.xml 493 BLAKE2B 2a86d0343178b353fec290f550a1442e2e1492e1e5bfb3bbbbc24a9f18cad04c12c582f5fb3deb5c845dd7633c2b6d0c30566ff86c68bd60635c49d0b46a8058 SHA512 2eba41dd2cd60d1101e79a68553188fd8d6a43711de3121e7ce230c1b09e598d3123aa2b1e65a415af80182848cc0ea17433a39b34d6d6cbeb8aa3f8644eee4c
diff --git a/media-plugins/gst-plugins-chromaprint/gst-plugins-chromaprint-1.14.5.ebuild b/media-plugins/gst-plugins-chromaprint/gst-plugins-chromaprint-1.14.5.ebuild
new file mode 100644
index 000000000000..7b3362629eec
--- /dev/null
+++ b/media-plugins/gst-plugins-chromaprint/gst-plugins-chromaprint-1.14.5.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="Calculate Chromaprint fingerprint from audio files for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="media-libs/chromaprint[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-colormanagement/Manifest b/media-plugins/gst-plugins-colormanagement/Manifest
index 0d15f0cc57ea..8cabdbd9812c 100644
--- a/media-plugins/gst-plugins-colormanagement/Manifest
+++ b/media-plugins/gst-plugins-colormanagement/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
+DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 EBUILD gst-plugins-colormanagement-1.14.3.ebuild 346 BLAKE2B e907a768964d48685a931a5085a19ee4cb853a30da0230051d6a1c081556f5a753327610888cab4396b69d8098054bb7a348288c8fa5c8bfcf44c3c9664c6c7a SHA512 1462da28d450aa93bdfc0ff19bc8b6b4dc91218a2adeb955278d21b0d9f3c1967cf28442f309cd06c42f22eb2a2d54fd8c8bc878cc41830c1fd197d6daf5e901
+EBUILD gst-plugins-colormanagement-1.14.5.ebuild 343 BLAKE2B 4bbb50acb250359fa7f6755f15a72d9ce38d9829f77a7a2afddeb16095d48835e87cc7895c11e9a5fb65712c6452f7377eeddbc50e3f8aa5ba0bb2cbf15529d2 SHA512 2d13b1a1715731ca32ade98f94ce3ccb06683b09b2644fb5243623f53a68cd01fb03efabdf75ca639a93cd8bb77730d699858406dd9afaca390981bae654322c
 MISC metadata.xml 456 BLAKE2B 85f88de4f97a4f6790b0f6ad7336dbddc1e494e00350454d647dd7acfdf97d1a4ac6265803ab162aff060dca2272ea581dd0cc45280d9f274dc6d45609119419 SHA512 0a37048c0f940a25d9de2e1dc46c2d825c362ef44f9a34be1c5d49c12ff55ab8ff60cccba7c6c7a95d307fe1407452e1b2638c474bac3d62324b23c263681c24
diff --git a/media-plugins/gst-plugins-colormanagement/gst-plugins-colormanagement-1.14.5.ebuild b/media-plugins/gst-plugins-colormanagement/gst-plugins-colormanagement-1.14.5.ebuild
new file mode 100644
index 000000000000..49873558bfc0
--- /dev/null
+++ b/media-plugins/gst-plugins-colormanagement/gst-plugins-colormanagement-1.14.5.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="Color management correction GStreamer plugins"
+KEYWORDS="~amd64"
+
+RDEPEND=">=media-libs/lcms-2.7:2[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+GST_PLUGINS_BUILD="lcms2"
diff --git a/media-plugins/gst-plugins-dash/Manifest b/media-plugins/gst-plugins-dash/Manifest
index 350823744ea2..f79c0a619744 100644
--- a/media-plugins/gst-plugins-dash/Manifest
+++ b/media-plugins/gst-plugins-dash/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
+DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 EBUILD gst-plugins-dash-1.14.3.ebuild 1265 BLAKE2B e85c74465d9040f73bf987bc953b8780cc57841e09eb6f5c03939dd6c216450922b24268291ca7e911a0b822ff0b7a39f1b9d08b494674579638ae7f5685d511 SHA512 75606fb32c828c269d6f71fa33ef0236ff514cf74b4c26a990665a4ab655d1ca6c766c8dadbef93b6ffb093210abfcf610bd69490fcc4df01bc6349765b6bf8d
+EBUILD gst-plugins-dash-1.14.5.ebuild 1267 BLAKE2B cfe4edbd377fc3619771dc26cc196c525ce5327f71010ad8eebfb068260b7085f7a6c0392d4f5825e40bd46e2efaefd73a0b944dc9e442bec42b72897916c778 SHA512 d74e57744f13ad8a8fac0b8af511db422b8faa8d6b515c54f19e1ec5386e3a58a16e0f63dbcc7c8bfe795128024662e46f1f72cf02fea54741bbd26709fabda8
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-dash/gst-plugins-dash-1.14.5.ebuild b/media-plugins/gst-plugins-dash/gst-plugins-dash-1.14.5.ebuild
new file mode 100644
index 000000000000..10b6999fa76d
--- /dev/null
+++ b/media-plugins/gst-plugins-dash/gst-plugins-dash-1.14.5.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="MPEG-DASH plugin for GStreamer"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+
+	# FIXME: gsturidownloader does not have a .pc
+	# gstreamer_system_link \
+	#	gst-libs/gst/uridownloader:gsturidownloader \
+	#	gst-libs/gst/adaptivedemux:gstadaptivedemux \
+	#	gst-libs/gst/isoff:gstisoff
+
+	local directory libs
+	directory="gst-libs/gst/uridownloader"
+	libs="-lgstbase-1.0 -lgstreamer-1.0 -lgobject-2.0 -lglib-2.0 -lgsturidownloader-1.0"
+	sed -e "s:\$(top_builddir)/${directory}/.*\.la:${libs}:" \
+		-i ext/dash/Makefile.{am,in} || die
+
+	directory="gst-libs/gst/adaptivedemux"
+	libs="-lgsturidownloader-1.0 -lgstapp-1.0 -lgstbase-1.0 -lgstreamer-1.0 -lgobject-2.0 -lglib-2.0 -lgstadaptivedemux-1.0"
+	sed -e "s:\$(top_builddir)/${directory}/.*\.la:${libs}:" \
+		-i ext/dash/Makefile.{am,in} || die
+
+	directory="gst-libs/gst/isoff"
+	libs="-lgstbase-1.0 -lgstreamer-1.0 -lgobject-2.0 -lglib-2.0 -lgstisoff-1.0"
+	sed -e "s:\$(top_builddir)/${directory}/.*\.la:${libs}:" \
+		-i ext/dash/Makefile.{am,in} || die
+}
diff --git a/media-plugins/gst-plugins-dtls/Manifest b/media-plugins/gst-plugins-dtls/Manifest
index 54169cb265e3..bd33f29a9410 100644
--- a/media-plugins/gst-plugins-dtls/Manifest
+++ b/media-plugins/gst-plugins-dtls/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
+DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 EBUILD gst-plugins-dtls-1.14.3.ebuild 426 BLAKE2B 3978a7c398acbba159f5e2e0145b5c2c878ad47cb392f5e871acd953dc0d766c05228f052b70bc4a41f7eb5c1321ac2d884fb040e6cab1e5cb004f5715b5b7b8 SHA512 688e6aae0385bf212dde3102131678fb0638728d810da2e1f7127207ede3d38320ae805036cfa15c9e0b075c8a7980f78ddad7ab027e5643ab485c69ac487067
+EBUILD gst-plugins-dtls-1.14.5.ebuild 428 BLAKE2B 023bd610d39b9468cdc71d09949a016533d5885c8ac86ef270265c35ba52f8b9f2dcf2d379974150a9fe62f4789c1d24c615ebfe4c752b26533d5f663d981200 SHA512 9004fac8e2344529e3a8dd72a515052b3108c9e8a4fa52d65ed1cf8c6f2ae122095e6f5b9c666d64b83e6d9908fbfac9e6cd6155b49d01283811c9ce0f7db20a
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-dtls/gst-plugins-dtls-1.14.5.ebuild b/media-plugins/gst-plugins-dtls/gst-plugins-dtls-1.14.5.ebuild
new file mode 100644
index 000000000000..46367907c81e
--- /dev/null
+++ b/media-plugins/gst-plugins-dtls/gst-plugins-dtls-1.14.5.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="DTLS encoder/decoder with SRTP support plugin for GStreamer"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl"
+
+RDEPEND="
+	libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
+	!libressl? ( >=dev-libs/openssl-1.0.1:0=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-dts/Manifest b/media-plugins/gst-plugins-dts/Manifest
index fe4a57636bd3..eab2e88b2d45 100644
--- a/media-plugins/gst-plugins-dts/Manifest
+++ b/media-plugins/gst-plugins-dts/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
+DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 EBUILD gst-plugins-dts-1.14.3.ebuild 427 BLAKE2B d636ec060d753c9d595966e5c5fee3286e3528d9505ee6cdc352afc610aef4a387d5521247f535c48388bf3b491f7374d8323730289aed2bfed1b182aed2f74b SHA512 5ebe8f644b2961996e24a71f61a425d812ee7d3e7cb25d3b9e391b20173cc4205cd3e1f22f86f41c2772f9e6964c2d61b3c1e64817aeb018229e30a320bec658
+EBUILD gst-plugins-dts-1.14.5.ebuild 429 BLAKE2B 8f8811ce2acb4e2d4af8944ac56bbf0b656f2919f43f7c8932ea8a449bb7fb2e0afc086104d50fd1a9fdc47a41da8e7c9ed8a70ea9136c0c6c07e5d60b723213 SHA512 b58b492f6454ebb77535e3c13c6f64e895862ece9f088d07c140a0b9cd724fd52f48e8e15ffb36f5fcb0a12c8a333f492f3b14025f0653bd42aede2ae2f995a9
 MISC metadata.xml 266 BLAKE2B 3180109d2a1479e9436a76fb478dfb1b23db0daedbf0ef264a469fbbfecd858adf6ec01f3fdc5c56270d0a9e1e150ac947f4a1f893e967d6b1dc1f1b8f6d4ccb SHA512 aa2ce82fa0c848119ff309462722e1d7897da904f9e1dc9ae12dd61582823b69cf5a40faf8da0825ec397d2f01d44e82cb56730d9545abd619a17696091eca75
diff --git a/media-plugins/gst-plugins-dts/gst-plugins-dts-1.14.5.ebuild b/media-plugins/gst-plugins-dts/gst-plugins-dts-1.14.5.ebuild
new file mode 100644
index 000000000000..ef9b7fc44b42
--- /dev/null
+++ b/media-plugins/gst-plugins-dts/gst-plugins-dts-1.14.5.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="DTS audio decoder plugin for Gstreamer"
+KEYWORDS="~amd64 ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd"
+IUSE="+orc"
+
+RDEPEND="
+	>=media-libs/libdca-0.0.5-r3[${MULTILIB_USEDEP}]
+	orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-dv/Manifest b/media-plugins/gst-plugins-dv/Manifest
index 0ebc4e941271..6048b9d474de 100644
--- a/media-plugins/gst-plugins-dv/Manifest
+++ b/media-plugins/gst-plugins-dv/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
+DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
 EBUILD gst-plugins-dv-1.14.4.ebuild 417 BLAKE2B 62a8380b6888cf0675a3897f4a10a38860603c65e218e181dfd81ffc4f3ce1a2582b2ab3114923e0cbfe947405856a7df9d2817b9f0d2b6b6a542e029acbe3f9 SHA512 76160966a2fea0b5fb0a08efda8680e6ed6ec6cfdf66cb8329973a83af7e55737e615db6c6fd5f6e31e0c716341608303ee0061503559f033680d66da7db67ae
+EBUILD gst-plugins-dv-1.14.5.ebuild 422 BLAKE2B cce03405c7fa735bf6caf8010fe13c608a4ae61cedae377f7b206610a2551ac02fe78a732ef3f0fc3b15d05e35e6b7febb19ef019ccd75e38aee2de359aed332 SHA512 aa906f037dad85d0a35513f6729abf4c38affd96bfb8956e224373b0a227b152f79a8a3e5a58c6364822635291f201cb9fd65fd3de6513d59f94f2d5b1bf04b1
 MISC metadata.xml 380 BLAKE2B e30d4f36d092c662f4b2caf33ae705dcee14cadb22174b125686c45a8724a880b291d4683fbf6b06a1e8003cf18be831a368d617d872904a58b1e3fe70ae7ca6 SHA512 bcbeccb0d35ae268383fd3cff3c5739301777233f6769556b5793b3b34a0c5c6e6bbcafcad392e22a8ee441698dc508d9638c1c53eaa17b692ecf5a40ee6f27c
diff --git a/media-plugins/gst-plugins-dv/gst-plugins-dv-1.14.5.ebuild b/media-plugins/gst-plugins-dv/gst-plugins-dv-1.14.5.ebuild
new file mode 100644
index 000000000000..465e0b03d153
--- /dev/null
+++ b/media-plugins/gst-plugins-dv/gst-plugins-dv-1.14.5.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-good
+
+inherit gstreamer
+
+DESCRIPTION="DV demuxer and decoder plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+IUSE=""
+
+RDEPEND=">=media-libs/libdv-1.0.0-r3[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+GST_PLUGINS_BUILD="libdv"
diff --git a/media-plugins/gst-plugins-dvb/Manifest b/media-plugins/gst-plugins-dvb/Manifest
index fefd18ba9de9..de0897678f4d 100644
--- a/media-plugins/gst-plugins-dvb/Manifest
+++ b/media-plugins/gst-plugins-dvb/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
+DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 EBUILD gst-plugins-dvb-1.14.3.ebuild 410 BLAKE2B 0d3f17d0e7ef10d8e312010c90c92cd9aa9e570bffe7fe93f496e8f8fee444276f9bc23c37e23da3b36fd3222e00117a1f64a847c89460d6c114632e8071d9af SHA512 7006863c78c8139b58b15f351b132457413a0244c02cb7334f5e595ab855367afb6c2a278abb45a2164759dbc65f3d2b392471a5416b65c0f84c3328ec666ae9
+EBUILD gst-plugins-dvb-1.14.5.ebuild 416 BLAKE2B 62b29f77967c44963584c82d5c8623c1b4516b31851e209579ef8269ce1ecbbfd1653fd2c0e3ac80cf754b259163d6170d0ea2e2a24e6d118ddd56a1d027f3ca SHA512 7f1db889d2c6501fb72e68ceca8c12e144547f09103d4070d0743d779e60c7958915be789d902fe65e0b9c0b640aa55cfbdd3598adb4a2aac0b1114775296b97
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.14.5.ebuild b/media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.14.5.ebuild
new file mode 100644
index 000000000000..86fc62f5fffb
--- /dev/null
+++ b/media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.14.5.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPION="DVB device capture plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="virtual/os-headers"
+
+src_prepare() {
+	default
+	gstreamer_system_link \
+		gst-libs/gst/mpegts:gstreamer-mpegts
+}
diff --git a/media-plugins/gst-plugins-faac/Manifest b/media-plugins/gst-plugins-faac/Manifest
index fb24fef74ace..2e5bfcba97f1 100644
--- a/media-plugins/gst-plugins-faac/Manifest
+++ b/media-plugins/gst-plugins-faac/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
+DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 EBUILD gst-plugins-faac-1.14.3.ebuild 356 BLAKE2B c996b11529180a9f598d908476ebe6d643af9b20303eb3a8bfd077776b9cfe0d08446c636945f314a396aa98b09624e95da56ac96248f608ca17d2f6e5f17a53 SHA512 ab2ec9b516cfd376565bb345206074f8e891c7c8cc0cac8564ca020f38d7322e157c087295764078e378838f7f1103428898680bbdee9f03b16e4c523bcd00b2
+EBUILD gst-plugins-faac-1.14.5.ebuild 361 BLAKE2B a3cfbfbd96ff53be0a529b329b1ae0783f0f117fdf721f26158c4efb95fd180e70f3ea2179e171ab7689bba32a43fe1f599ce78245b43c0e7d545d48852307bb SHA512 137ff6f9a413f2f45b1d44f03eb2182bafe3dd23fe846b53e0f95590017c43c717484dbda17f69ad586ee2a507e61d2bce35400fd28cc240d66989743ecc0d63
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-faac/gst-plugins-faac-1.14.5.ebuild b/media-plugins/gst-plugins-faac/gst-plugins-faac-1.14.5.ebuild
new file mode 100644
index 000000000000..c87efdcf6c90
--- /dev/null
+++ b/media-plugins/gst-plugins-faac/gst-plugins-faac-1.14.5.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="AAC audio encoder plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-faad/Manifest b/media-plugins/gst-plugins-faad/Manifest
index 50ea08c5eccd..5950f385e39b 100644
--- a/media-plugins/gst-plugins-faad/Manifest
+++ b/media-plugins/gst-plugins-faad/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
+DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 EBUILD gst-plugins-faad-1.14.3.ebuild 383 BLAKE2B b15cae1004f230ae03cbe4c9e6a21d67816857435382d2bbc1351f7553d1da4720d0c03fde762706e743817ac4c7440e3d7b3b4da23a750a4dd96aab609c3052 SHA512 c8edb29487e0de0adf6659d8188deab21261b330a234ecbb7f67c61400dc00bfeac02d5b109df2d60be9732ee84cc28a2c5d22ae685a4f466d1a8e47fb54835c
+EBUILD gst-plugins-faad-1.14.5.ebuild 389 BLAKE2B 8e1559413c82b54164833a3dddd741bfabfd54c2301e6e5e4ed2bb99735acf55715d21aa588dd5d0d0cf724e9dcf5d4ada6bd9995f222fe8e70cbf5cd8ee364d SHA512 186b5de09fcd6e6cfc8e65633942d06cd839b50c57fd8d1ac9f6e8aa99135caa8672f2f6fcc953ff39db2c5bcac7c6683f1ee5376a2ccbbf57272d26e1ff28a2
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-faad/gst-plugins-faad-1.14.5.ebuild b/media-plugins/gst-plugins-faad/gst-plugins-faad-1.14.5.ebuild
new file mode 100644
index 000000000000..66fadd19f6f1
--- /dev/null
+++ b/media-plugins/gst-plugins-faad/gst-plugins-faad-1.14.5.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="AAC audio decoder plugin."
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=media-libs/faad2-2.7-r3[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-flac/Manifest b/media-plugins/gst-plugins-flac/Manifest
index 84a6f815c743..1d29e0589c0b 100644
--- a/media-plugins/gst-plugins-flac/Manifest
+++ b/media-plugins/gst-plugins-flac/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
+DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
 EBUILD gst-plugins-flac-1.14.4.ebuild 410 BLAKE2B c648cc6326c14d01b2f27a130ce8bb928ae7f9b9c808134158377e7ce3f6b79b9e11ac0d432ef13297d786f92b4e697433dfa77735893e234afef83fae4b9001 SHA512 a066d2b9eea601930b5e0482db463f5057e8758c82367325533003772a18ef74f96cb8aed710395a5d4e894192afde878372f9d1ec7e8364e05a3ddd4ad54767
+EBUILD gst-plugins-flac-1.14.5.ebuild 418 BLAKE2B 9426ad39be3a7ea0f9533692daabf90a6762fa9fe3c024b69f13343a3f380a41ab49ee2cb4403065fb0c0d36f17fc559f512fff7025f52f10178bd621e9f2295 SHA512 5b6afae196878fc3c7485a20fd88fe1089d2f4d1993efd2eb16d186bfc12e133a7f1941bc9fd85233004cd0db19f2c98f2c6dbd31d5d5c80641638e90c7440e6
 MISC metadata.xml 555 BLAKE2B 0a6c97712429505d543caaa732d716a95e4f6f5256aeb202da38bd2399ceb335e1fc6079279c96848d479d3fa3e2b8bb1c92b37ba284204b1936078d0175caf3 SHA512 2ffe5f5f8ef59e30a7da2efe1b5e88858c5f27776b7f48a7748f9cd72a18d5c97ddb239609c7bab808de874f0a51bf886ec24e395641fac995c8d3f041271e7d
diff --git a/media-plugins/gst-plugins-flac/gst-plugins-flac-1.14.5.ebuild b/media-plugins/gst-plugins-flac/gst-plugins-flac-1.14.5.ebuild
new file mode 100644
index 000000000000..16f41aeecc3e
--- /dev/null
+++ b/media-plugins/gst-plugins-flac/gst-plugins-flac-1.14.5.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-good
+
+inherit gstreamer
+
+DESCRIPTION="FLAC encoder/decoder/tagger plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=media-libs/flac-1.2.1-r5[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-gdkpixbuf/Manifest b/media-plugins/gst-plugins-gdkpixbuf/Manifest
index c54d3dfe95f8..3235e2a3f243 100644
--- a/media-plugins/gst-plugins-gdkpixbuf/Manifest
+++ b/media-plugins/gst-plugins-gdkpixbuf/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
+DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
 EBUILD gst-plugins-gdkpixbuf-1.14.4.ebuild 485 BLAKE2B 606da6ea898771fa63c0e1868330ec6788ac5f0ae0260d68afdf412219925c01598e9f573cd2bbc24007f46fb2cbba863341e5aee31314104673d95bc94aaf9a SHA512 e11212f66c0fcf1fde76a3dadbbce4093790e3f5a631830e7f247f9beac112dadba7c25eb6e0a887c2a187a58b19016b891d510c32595e3798dca89293d8a965
+EBUILD gst-plugins-gdkpixbuf-1.14.5.ebuild 492 BLAKE2B 40c59ea3d1e786077221aece54fd43bc311a9b4eb3c1252d4704ad71c8bc365edba152ec52856213ffa27fd646d7dd92baae64edcc02766ee322b7b3f1e65432 SHA512 fef7f6ba5dee43ec8e39b37295d4f60293b63449917b2e89c4fd3af6d2c750eadf54b54d2badbc745e31b9c08ccc2f6d70d45c5c7bc629f18a2989fe54fc7e90
 MISC metadata.xml 610 BLAKE2B e0597a0e835fd058d1d172bef6cb6616efbd83b3f97e9b9d644afa6a68956dc97b37385ba7b5996468911f9da16e54b2dec18d9657ad8b1b6a4dcd71cb229f7e SHA512 472dddb540087c89be5a85ab67733d345bf039a95fc1a7bd2ec6ce3b08b8556b2676af77b93ee903bc8ace178963935b21dfcfc6c1c0a6ecab5a7429d60e5cbd
diff --git a/media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.14.5.ebuild b/media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.14.5.ebuild
new file mode 100644
index 000000000000..3ca715fb4ec5
--- /dev/null
+++ b/media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.14.5.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-good
+
+inherit gstreamer
+
+DESCRIPION="Image decoder, overlay and sink plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=x11-libs/gdk-pixbuf-2.30.7:2[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+GST_PLUGINS_BUILD="gdk_pixbuf"
+GST_PLUGINS_BUILD_DIR="gdk_pixbuf"
diff --git a/media-plugins/gst-plugins-gtk/Manifest b/media-plugins/gst-plugins-gtk/Manifest
index a2b8cf083136..a3328d7f43e7 100644
--- a/media-plugins/gst-plugins-gtk/Manifest
+++ b/media-plugins/gst-plugins-gtk/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
+DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
 EBUILD gst-plugins-gtk-1.14.4.ebuild 1198 BLAKE2B 043b5ad75eece99caa732e1baab41066c647e5d43ab1d41dde493372dbcea6ad01f431b20ddd764bb1f334414d9b24de934a3dd7015f5dfb2b79e7db5c12b11d SHA512 306dad8ddb3652f3860ad5495f3539471346476604dbd653358913693c0979c1f4b9dc3600473aaa4f9292aa8b35213256387ee80d8214d0e8f367c45b6b6134
+EBUILD gst-plugins-gtk-1.14.5.ebuild 1206 BLAKE2B 4e3df571fa2292b2bfaa4d8e4101a27d53a4f6086a6d35bb39438aacad707abed0b08402eff26204d8396c1b1ab05f0608901f21ca64072fd417c327a233d678 SHA512 f32f9a4275c046e39debf6fb45dc9eaa322f1742769af84921e252e96dcd161eebbdefe85fdf977b51e029f2b9393396f9559ef365b24ef258e3b0a051b75588
 MISC metadata.xml 790 BLAKE2B 609210afdad563f5d63ea609ac6a65301907d447a137537aa9451ce6bf5774f9a15a8294a4e11b72697e123a4ffac44cefa5f6cf820a78bd998cd581e7ec720b SHA512 8ca80354a5c57ccbc941bc62cd7fc1b3bfbd2223901c24afac0ade01ab751e790cf9bafc4e0d4a3074606be99ac7aae10a45a9f7c65068342495f2995c956fa5
diff --git a/media-plugins/gst-plugins-gtk/gst-plugins-gtk-1.14.5.ebuild b/media-plugins/gst-plugins-gtk/gst-plugins-gtk-1.14.5.ebuild
new file mode 100644
index 000000000000..c7162ff5ab83
--- /dev/null
+++ b/media-plugins/gst-plugins-gtk/gst-plugins-gtk-1.14.5.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-good
+
+inherit gstreamer
+
+DESCRIPTION="Video sink plugin for GStreamer that renders to a GtkWidget"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="+egl gles2 +opengl wayland +X" # Keep default IUSE mirrored with gst-plugins-base
+# egl, wayland and X only matters if gst-plugins-bad is build with USE=opengl and/or USE=gles2
+# We mirror egl/gles2/opengl/wayland/X due to automagic detection from gstreamer-gl.pc variables;
+# we don't care about matching egl/wayland/X if both opengl and gles2 are disabled here and on
+# gst-plugins-base, but no way to express that.
+
+# We only need gtk+ matching backend flags when GL is enabled
+GL_DEPS="
+	>=x11-libs/gtk+-3.15:3[X?,wayland?,${MULTILIB_USEDEP}]
+"
+RDEPEND="
+	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP},egl=,gles2=,opengl=,wayland=,X=]
+	>=x11-libs/gtk+-3.15:3[${MULTILIB_USEDEP}]
+	gles2? ( ${GL_DEPS} )
+	opengl? ( ${GL_DEPS} )
+
+	!<media-libs/gst-plugins-bad-1.13.1:1.0
+"
+DEPEND="${RDEPEND}"
+
+GST_PLUGINS_BUILD="gtk3"
diff --git a/media-plugins/gst-plugins-hls/Manifest b/media-plugins/gst-plugins-hls/Manifest
index b880c76555c7..45fd21a1cd51 100644
--- a/media-plugins/gst-plugins-hls/Manifest
+++ b/media-plugins/gst-plugins-hls/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
+DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 EBUILD gst-plugins-hls-1.14.3.ebuild 1120 BLAKE2B 2441b6b9f7e2b8d9aa2c08eea70d1a6fcdc2217ffad71027662ab1303e9b441f243da35844935785d09142e43c67778cc8347e62ea49ad12d455d4b38073f74d SHA512 c2bb1322a221b6e78f03dc7597f321db63a05fbcbee864f1c0f5bc5f3ff26dc1efc046210af1b710eff1b4a89f46633055156f3bd79703e830d084a35e30f8e5
+EBUILD gst-plugins-hls-1.14.5.ebuild 1122 BLAKE2B 5eaebb1e0907ccf4df50232140df19147c9ec693e4f717977ea4f83092f11eb38067438bfa2dfc92497a3880dd19dbd6daad40874424dde4c404c95e4347a358 SHA512 3ec9196283711d56f5d4e3286abb1aaa9c49b5258c15f6d849be0487b718c0ebe9e18794bd4ec079cdca48b3e8ab6f72277c17a58413b04404a0c2dcbe4a9a52
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-hls/gst-plugins-hls-1.14.5.ebuild b/media-plugins/gst-plugins-hls/gst-plugins-hls-1.14.5.ebuild
new file mode 100644
index 000000000000..24632b55ea69
--- /dev/null
+++ b/media-plugins/gst-plugins-hls/gst-plugins-hls-1.14.5.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="HTTP live streaming plugin for GStreamer"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-libs/nettle:0=[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+
+	# FIXME: gsturidownloader does not have a .pc
+	# gstreamer_system_link \
+	#	gst-libs/gst/uridownloader:gsturidownloader \
+	#	gst-libs/gst/adaptativedemux:gstadaptivedemux
+
+	local directory libs
+	directory="gst-libs/gst/uridownloader"
+	libs="-lgobject-2.0 -lglib-2.0 -lgstreamer-1.0 -lgstbase-1.0 -lgsturidownloader-1.0"
+	sed -e "s:\$(top_builddir)/${directory}/.*\.la:${libs}:" \
+		-i ext/hls/Makefile.{am,in} || die
+
+	directory="gst-libs/gst/adaptivedemux"
+	libs="-lgobject-2.0 -lglib-2.0 -lgstreamer-1.0 -lgstbase-1.0 -lgstapp-1.0 -lgsturidownloader-1.0 -lgstadaptivedemux-1.0"
+	sed -e "s:\$(top_builddir)/${directory}/.*\.la:${libs}:" \
+		-i ext/hls/Makefile.{am,in} || die
+}
+
+multilib_src_configure() {
+	gstreamer_multilib_src_configure \
+		--with-hls-crypto=nettle
+}
diff --git a/media-plugins/gst-plugins-jack/Manifest b/media-plugins/gst-plugins-jack/Manifest
index 6433bd776972..064d702b2950 100644
--- a/media-plugins/gst-plugins-jack/Manifest
+++ b/media-plugins/gst-plugins-jack/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
+DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
 EBUILD gst-plugins-jack-1.14.4.ebuild 377 BLAKE2B ca497e06d8a606f1679f302d0734565f74e273ce66d4070848b3e781059621fd693657fc5da9be777d6721c008100908aa25badb4b32cfabddc4f96f97c99352 SHA512 4547ee57176a6de05c4c7798c9ad80cce4d758f5e670f7ef808ff9da08d2a6c1c8d94f00c3b830809b27d641d6b3f6d66a4b554848fe77c7ff7f0694f5b09e54
+EBUILD gst-plugins-jack-1.14.5.ebuild 385 BLAKE2B d789e4292075e815e1c87d17017554a54c19b71ca060a21d6f2c34a6860429b9d575aa03a4d86c8b7c43f23369a98118dbd5786dc014d6eea96a0bdd88733227 SHA512 9e7a0bf6a2fc8b7666286035389d6f3012bc66b7c6cd4e13f45034d3969d5b29b0360a96c63fd1e7f57887775cb11a864371c100825e051198646ef29a3cd7c3
 MISC metadata.xml 487 BLAKE2B 182c55b79c188f12dcc000cecf9c507933183ab62a78c806b6f43918af528c1c7bf3adf435ad077f689a2b64706b7517b14393500dc4d1b7f2cc14b45dd6b764 SHA512 811374b3dabbff1084c5b1b6fb502197f58da02da195b922ce7556ca6e0f3668f266a14ba1a03ff352edb89a0cff9550e7d59f3f4e116ff63a22c6e8436ef6b8
diff --git a/media-plugins/gst-plugins-jack/gst-plugins-jack-1.14.5.ebuild b/media-plugins/gst-plugins-jack/gst-plugins-jack-1.14.5.ebuild
new file mode 100644
index 000000000000..df37943d312b
--- /dev/null
+++ b/media-plugins/gst-plugins-jack/gst-plugins-jack-1.14.5.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-good
+
+inherit gstreamer
+
+DESCRIPION="JACK audio server source/sink plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+IUSE=""
+
+RDEPEND="virtual/jack[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-jpeg/Manifest b/media-plugins/gst-plugins-jpeg/Manifest
index 8cb4b96f4830..1dc3e1b63e2d 100644
--- a/media-plugins/gst-plugins-jpeg/Manifest
+++ b/media-plugins/gst-plugins-jpeg/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
+DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
 EBUILD gst-plugins-jpeg-1.14.4.ebuild 372 BLAKE2B 44998cbc3fb08920cddf20c4d088141ed84bdc611b0a3be2523e03c77246ed05a4ead0614aee16e7d983c1c5dbcc745f8b98e32944a329e3fac844ae291d4035 SHA512 eab6f9a1d2e3bd85a72148232e12b9c6a2f7c50191e16c7be152b33fe3d0d38c1f1585cdc8e238fd6828ce80479649055e5d652a77c5ea87002e2a935010ff49
+EBUILD gst-plugins-jpeg-1.14.5.ebuild 380 BLAKE2B d1641575758bd70b5142df2fd87b0c4f45a11879de9533210e8eca036d9c02594731cf627293b19a3a9c7bac100f5ed4a21b862dc733a417b327edded8c8aaac SHA512 10b0e72b199ca568597d95fd23b41cbaff67298ef6ee09dc3a92fb85e91cae2b0c0c6855da76a7cdcbefca02292dc9efc0780f62b6356a6e9a0df848f9f017ed
 MISC metadata.xml 659 BLAKE2B 8da81502aaf3eecb4ef62469b494598b329cb7e134511df9bd4269807882564e052ec76ddb50640203d96c08fa80deb3cb96d2b2c3c8dfae21fe296b87351ff5 SHA512 c4d076bdd3a4cf70540a9cc56c91a8e805f0a809065b629970158ca002f3cc03f3b7b91615121813030f510eb2e9a912aa4ca79504a20e023cc36f1fa3acf329
diff --git a/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.14.5.ebuild b/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.14.5.ebuild
new file mode 100644
index 000000000000..c5eb6356831b
--- /dev/null
+++ b/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.14.5.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-good
+
+inherit gstreamer
+
+DESCRIPTION="JPEG image encoder/decoder plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-kate/Manifest b/media-plugins/gst-plugins-kate/Manifest
index 2a74e57c2b24..429180d011a0 100644
--- a/media-plugins/gst-plugins-kate/Manifest
+++ b/media-plugins/gst-plugins-kate/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
+DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 EBUILD gst-plugins-kate-1.14.3.ebuild 390 BLAKE2B 8795d832c281c2a40864e3297a037f6f5942f0c25cb67fd01d4612dce9817a6bf961a6d0b93a7c403eb7f647a48f724eebfc727c797e2038de181d2996511738 SHA512 30b6266fb339b27d10267efc8b285fa42646eac68f976cdb730a56dbe7366c1687488b357f716a938b9328b3a7bcee2f33b164ef646a422370cce815a254277d
+EBUILD gst-plugins-kate-1.14.5.ebuild 387 BLAKE2B 338a156291cd670bd4ec0f3adfd0bdeaed80e2614dd4c67a8c1d3fac80e90d0d013b572bd4d92cdc0bed7280b2e0f3896265f704f3e0867de3ca9473e889a786 SHA512 ce64c73c0321e7928a6e184cb83f255b2e2f3550d1590d8c9f755be80a040e1eea31fb98d818907a80d43710d583d70c02099d4692ed282571e2497f93e340d5
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-kate/gst-plugins-kate-1.14.5.ebuild b/media-plugins/gst-plugins-kate/gst-plugins-kate-1.14.5.ebuild
new file mode 100644
index 000000000000..9b34138051e7
--- /dev/null
+++ b/media-plugins/gst-plugins-kate/gst-plugins-kate-1.14.5.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="Kate overlay codec suppport plugin for GStreamer"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=media-libs/libkate-0.1.7[${MULTILIB_USEDEP}]
+	>=media-libs/libtiger-0.3.2[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-ladspa/Manifest b/media-plugins/gst-plugins-ladspa/Manifest
index 294983d943af..46561295a04a 100644
--- a/media-plugins/gst-plugins-ladspa/Manifest
+++ b/media-plugins/gst-plugins-ladspa/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
+DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 EBUILD gst-plugins-ladspa-1.14.3.ebuild 319 BLAKE2B d8015bae153cabbb1fb5cb8d13f67143eed82669910a0305f5a020005d5025cd1431be16a2bd21bad3c15e5667d7f16918c75f96cf7aa92cd22491968453579a SHA512 e225f08586703a6f693149503c2b36340d7cbc6c195edb0c900e718406f5adb460f33bcf0a597b7836c4bb3ca74ff76b1b0868c8df9ae9cce69d7dad0fce6643
+EBUILD gst-plugins-ladspa-1.14.5.ebuild 321 BLAKE2B 95f42022e5b6024f91d7ae187bb5502fb78e5d2a433c2db2727a1bdf82c170eed809cd39148efdaaff981c90a9ad77ef0fc48080eb2cfa6ad44639fea3c3c2e4 SHA512 e281fe575a2fd400e23c035a3c0fab32a0f798aefca4422156cd42e2de8e991b0c0395e42e3a46a50ac8cb5497f84b2379b99c252b052be581b10fd91c4a2e1f
 MISC metadata.xml 373 BLAKE2B 6e4682246da86a7f498c11bb63a8c8acd13d6b62c527db46a4030ae641d8f86d8e6fdfb67af1e53043fd3ea0c54086d67944c99a08f693a15e59d887fd99c977 SHA512 e0a9334a77c4ab15b765c27ace9033ea1aac985a2050e5048dccc4af340ed4fab99b79c6b40a2b668b2559d5bcdcd2076091f7376af3b973df8eb3236ce43956
diff --git a/media-plugins/gst-plugins-ladspa/gst-plugins-ladspa-1.14.5.ebuild b/media-plugins/gst-plugins-ladspa/gst-plugins-ladspa-1.14.5.ebuild
new file mode 100644
index 000000000000..5e1289c3a3a5
--- /dev/null
+++ b/media-plugins/gst-plugins-ladspa/gst-plugins-ladspa-1.14.5.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="Ladspa elements for Gstreamer"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-lame/Manifest b/media-plugins/gst-plugins-lame/Manifest
index dfa910744d77..4bdc3977ea93 100644
--- a/media-plugins/gst-plugins-lame/Manifest
+++ b/media-plugins/gst-plugins-lame/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
+DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
 EBUILD gst-plugins-lame-1.14.4.ebuild 395 BLAKE2B e4df2159637a426ddf6386117ab430b4d5156acedc6dfb742e792c02f8366858eb7dd552db44edf21aaf78b4837288f4657da8e19004a0d4d8ff9cd618fb2eea SHA512 55624898934b267b1a53d717a05bf560e1babd624fadcd40667da008a677b9c6614ee4e4a98bb07106c556974adab7178b5879f088b93e88328622ec769baf2c
+EBUILD gst-plugins-lame-1.14.5.ebuild 400 BLAKE2B 462d66216c8075af340581b9751c8d0acf3505d5a9d342e811b3e8399467da1b35925cd6ae6589eaa23c188c9a94dc2c07d62844a5828310656c22d08618b643 SHA512 02c9a20a465e743c7bee8db4dc84c0e7141445413985519459507d9f7ab1255b791396858bb56453aabb3c3bbb642fa4fee70860b2c72865eea28e46a7e425db
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-lame/gst-plugins-lame-1.14.5.ebuild b/media-plugins/gst-plugins-lame/gst-plugins-lame-1.14.5.ebuild
new file mode 100644
index 000000000000..91dd83b61602
--- /dev/null
+++ b/media-plugins/gst-plugins-lame/gst-plugins-lame-1.14.5.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-good
+
+inherit gstreamer
+
+DESCRIPTION="MP3 encoder plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-libde265/Manifest b/media-plugins/gst-plugins-libde265/Manifest
index 76c21024b912..7b446a41bb82 100644
--- a/media-plugins/gst-plugins-libde265/Manifest
+++ b/media-plugins/gst-plugins-libde265/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
+DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 EBUILD gst-plugins-libde265-1.14.3.ebuild 321 BLAKE2B 7ec911e89386954858c840e4f23d8eb50e1082a43c063b99e26b88621252433caa294498588d2d22f2dc37d9a707de3610ada82ab22992702582c20d4cf78d8b SHA512 7303f743823d9fdd4cda1391f7f119080e508bb2fd9165d7a3affd1d519fd4f70db5ef3e33bbe70a45487b35b0b022a12ca20f54132dd64aef55535753e46e81
+EBUILD gst-plugins-libde265-1.14.5.ebuild 323 BLAKE2B 85406462615a7b91ca7912d047041f6a92a50bd2aaaaa85d3f5e616fb95bcb15d3676dd5715319fdf2f89754c1e84678aa38ae39f9d932ea14d30523544c3131 SHA512 19b546e7d640d29543d41adf699c2a4f5d25027ec2e4c380834823068771536ee69fe313ca41e9893c207e4d2f918057d1a33a83db04cfce0325451899f7948d
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-libde265/gst-plugins-libde265-1.14.5.ebuild b/media-plugins/gst-plugins-libde265/gst-plugins-libde265-1.14.5.ebuild
new file mode 100644
index 000000000000..fe6e528f0445
--- /dev/null
+++ b/media-plugins/gst-plugins-libde265/gst-plugins-libde265-1.14.5.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="H.265 decoder plugin for GStreamer"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=media-libs/libde265-0.9[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-libmms/Manifest b/media-plugins/gst-plugins-libmms/Manifest
index c3e866da833a..f3004c7557a6 100644
--- a/media-plugins/gst-plugins-libmms/Manifest
+++ b/media-plugins/gst-plugins-libmms/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
+DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 EBUILD gst-plugins-libmms-1.14.3.ebuild 408 BLAKE2B 3e0b4142548c3188d77a1e949980ad8bef258de17869053274026160e886e66b16470e46107983ab7fa8a7cd39f286500c1f6909501acd48e1667da55dcdf36c SHA512 abd69100668e74c8e205aa3631ff2b4019979267ea9df2ca2b9076bad5d2c37254b5ee875e7b146a6ede283ea319d6b2b1bd0f5cbf5bf78242655b1c296e462b
+EBUILD gst-plugins-libmms-1.14.5.ebuild 413 BLAKE2B 53ca0d6350435c4de2a050dde7c3db97142ce63cb11f03c3e66ec3f5a68f3c09dc5278cda5281a9d1175c87780d2695353fb13aff03e76652e0921c3d491a5fb SHA512 b66ec2de612e3f0c8c9ac863b859337ef09a8140dc5e52b2603856aac3b195965fce7e5037b1ac616eab535e80c9a79c501dd0849639de4ff7db2b7f0c977f74
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-libmms/gst-plugins-libmms-1.14.5.ebuild b/media-plugins/gst-plugins-libmms/gst-plugins-libmms-1.14.5.ebuild
new file mode 100644
index 000000000000..b298ff380c46
--- /dev/null
+++ b/media-plugins/gst-plugins-libmms/gst-plugins-libmms-1.14.5.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="Microsoft Multi Media Server source plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+IUSE=""
+
+RDEPEND=">=media-libs/libmms-0.6.2-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-libpng/Manifest b/media-plugins/gst-plugins-libpng/Manifest
index a65215b5c824..351541af993f 100644
--- a/media-plugins/gst-plugins-libpng/Manifest
+++ b/media-plugins/gst-plugins-libpng/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
+DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
 EBUILD gst-plugins-libpng-1.14.4.ebuild 369 BLAKE2B 4e208156afc16ca1e64c073cceadd08acbfb7020021e7c739120787cbce779c87fac19c743b0544076cfc7d20b5a06e1702075404764bd376ada9c8b50c24eca SHA512 33b405b800e2cb18f2ae74532a52fc02b7a4d2d16be18609988121fbe1f106f74531b2e2e4e347a64208549e7cfe857139b43500352842cac29a47069725cef4
+EBUILD gst-plugins-libpng-1.14.5.ebuild 375 BLAKE2B 33cfcc5fc73c91eb729d682ca3ea3ea1ddfa8bf9437856c7cf42971307aeba10d26e997bf088a0f9278e4850c9e0e5f756857c9d2045031e127638372cf905cd SHA512 1cc791464695aede1aa97087d03a1c0fddc83209dcd3be05581d8a7148ebb8b0c8a3880fd4b2b395d7ebc0b63a4cf995351bcb11148bc56401e04614f3b209da
 MISC metadata.xml 483 BLAKE2B 3c07bc4538ab8a6e0f2ca484f7b67a41d60f672714f17a1555eb2ebbcbbf14fe8e16f21360007789400352d3c1540c1644fd1402a12b639306a3068e5c9be822 SHA512 6d536bf8813f1f4d6b402487852ef1372172cb42c01d0a57af6b70166896deea5db36bed91f78ea18c1cdb8f809e5b5514f2b91a7668efeea170bee422d8a3a7
diff --git a/media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.14.5.ebuild b/media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.14.5.ebuild
new file mode 100644
index 000000000000..f176c7b8710c
--- /dev/null
+++ b/media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.14.5.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-good
+
+inherit gstreamer
+
+DESCRIPTION="PNG image encoder/decoder plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-libvisual/Manifest b/media-plugins/gst-plugins-libvisual/Manifest
index 6321591b6bb3..dfbef43d5d68 100644
--- a/media-plugins/gst-plugins-libvisual/Manifest
+++ b/media-plugins/gst-plugins-libvisual/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-base-1.14.4.tar.xz 3703232 BLAKE2B b22c44b857bc4f1972f03752cc1afb35c8d76e2d0c4a06c574af0ac4f3a91080c584ae4e4fc2a263ee879a53d58505c24a756ebc051d81ec62661c4f9e532f0e SHA512 42c59df9f2d848108f12afa0466acbcfa5ccda64e4d0d44608d4268abed20f2e036713de04e7d71feaed1868ad742c5bcb55ae0eef5dec8e19e053dc8541b8af
+DIST gst-plugins-base-1.14.5.tar.xz 3717076 BLAKE2B 461e90df614c60d7efce6fabcf8ad7a5cb68b5fc01b05761fa441d838d3155b5a2e7f9b9420b7e48b2eec49e4bcfbd39009a662db03a923f42c6f45c782795cd SHA512 4e81c44a5ea3b910f96d3e9251ba38a79feacead4f96adb92eab5a650695ca8d5313e3ec1df78fec04376cf3152d2eefd4d39f6c11dadc98a11e55bbf8c8ccdc
 EBUILD gst-plugins-libvisual-1.14.4.ebuild 627 BLAKE2B 6d26d67a7dbff2acb9406f991d410f5a012c36523e6ff51b50aab44dafdcbce8f37d56705784a58528b3ddfd6daf81f6631a39e34e7d844fdb0818a0cbb8dda6 SHA512 e645d1a44fe4c866fc468361e93e560c47a56b153ba2d8d9946c71ce0079470e5d1734294039ff89207e2bd22a5d4177cd63faa65ae42a3839a882b84a2a5695
+EBUILD gst-plugins-libvisual-1.14.5.ebuild 631 BLAKE2B 9ee4fc9b90762d2f0e9d354d286972d6b23d67c44dd408be5f9ac8db02476c8802c284590cedcd01a5f569a8e6a55013a72820b2a2ca77664a76d0f1d2c3636f SHA512 e6e00bcddae2c11b397856b740814835fd0304dced6f1b22f4a342aeb8e67acf49f448c37ea9acf253088c96887b08f21f676ac0abfa8f8ca924a452dc0508ef
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.14.5.ebuild b/media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.14.5.ebuild
new file mode 100644
index 000000000000..671698877065
--- /dev/null
+++ b/media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.14.5.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-base
+
+inherit gstreamer
+
+DESCRIPTION="Visualization elements for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+IUSE=""
+
+RDEPEND="
+	>=media-libs/libvisual-0.4.0-r3[${MULTILIB_USEDEP}]
+	>=media-plugins/libvisual-plugins-0.4.0-r3[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	gstreamer_system_link \
+		gst-libs/gst/audio:gstreamer-audio \
+		gst-libs/gst/video:gstreamer-video \
+		gst-libs/gst/pbutils:gstreamer-pbutils
+}
diff --git a/media-plugins/gst-plugins-lv2/Manifest b/media-plugins/gst-plugins-lv2/Manifest
index 61429881d22c..dd94d35a20e8 100644
--- a/media-plugins/gst-plugins-lv2/Manifest
+++ b/media-plugins/gst-plugins-lv2/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
+DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 EBUILD gst-plugins-lv2-1.14.3.ebuild 363 BLAKE2B d01960509cb629f29b87e578b11b7bd1f6f23e89134f30494cfe4d900d10c4fd38ddf37d83e0ffc50e3691d3c1933a8fc109622da6912dc4970ca50d396ef749 SHA512 780c562eafdb72c3b32ced3f9f03834dd584f0a36d43a0d1287183596d7d721b51cfe7769371b063740dc3d34029a2ee75895ee15516c8acac2026b0677ecf4a
+EBUILD gst-plugins-lv2-1.14.5.ebuild 365 BLAKE2B 469472ede8feb17bf4db250a998295a087eefa7072ef4eecf309f923c1aea9e3f9dbaf3970e99125d649761b8c7787ffaedf33cfb53e75ff520286d41fa640ea SHA512 a5f10ec83e8ee427bc492c3a1bdee70165cf578bde1de7a35463919df1ba20f28c740ba90a985860214cfb0c3b333817a71248a64f80ba2da00aa3c10428c217
 MISC metadata.xml 373 BLAKE2B 6e4682246da86a7f498c11bb63a8c8acd13d6b62c527db46a4030ae641d8f86d8e6fdfb67af1e53043fd3ea0c54086d67944c99a08f693a15e59d887fd99c977 SHA512 e0a9334a77c4ab15b765c27ace9033ea1aac985a2050e5048dccc4af340ed4fab99b79c6b40a2b668b2559d5bcdcd2076091f7376af3b973df8eb3236ce43956
diff --git a/media-plugins/gst-plugins-lv2/gst-plugins-lv2-1.14.5.ebuild b/media-plugins/gst-plugins-lv2/gst-plugins-lv2-1.14.5.ebuild
new file mode 100644
index 000000000000..e492e0f0ac16
--- /dev/null
+++ b/media-plugins/gst-plugins-lv2/gst-plugins-lv2-1.14.5.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="Lv2 elements for Gstreamer"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=media-libs/lv2-1.14.0-r1[${MULTILIB_USEDEP}]
+	>=media-libs/lilv-0.24.2-r2[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-modplug/Manifest b/media-plugins/gst-plugins-modplug/Manifest
index 07cf95a1f94d..b2e2de71ba88 100644
--- a/media-plugins/gst-plugins-modplug/Manifest
+++ b/media-plugins/gst-plugins-modplug/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
+DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 EBUILD gst-plugins-modplug-1.14.3.ebuild 366 BLAKE2B 347cbb40659f69dbb3df4ca316e91e1c7a6c5ee8521dcaae94df6e1d2cf8b61283ecd275c27acb3239758f58cee7d6812870818a678e3926a81417e5d26776bf SHA512 4f344b4963b0ee7f615079073722ba6c71eca2633924e457fe1c71b63763edc2c1739a920f89ce67b3a75895a44e55cc0d05ba4034115afd01f6ac34edc9a12e
+EBUILD gst-plugins-modplug-1.14.5.ebuild 371 BLAKE2B b5fa40220e069adb81f8c9cc43e8f1313e2f409efedb261bb8b0cf7efc3b15439d2e660afdd843aa192920dab1ef1a4041dec65678fe46b8ea254701e8532d63 SHA512 39943c4c11ba456fc3e73e45b8bca9c3c6cd9b0a3e77bdb4152b15a17e1629ef9c083b383755fd9f3c441516fe34236fe659287da8ff485ef7219a5ca68b0fc4
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.14.5.ebuild b/media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.14.5.ebuild
new file mode 100644
index 000000000000..eb2a94adde71
--- /dev/null
+++ b/media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.14.5.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="MOD audio decoder plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND=">=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-mpeg2enc/Manifest b/media-plugins/gst-plugins-mpeg2enc/Manifest
index f86b36a307e2..01496278d80e 100644
--- a/media-plugins/gst-plugins-mpeg2enc/Manifest
+++ b/media-plugins/gst-plugins-mpeg2enc/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
+DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 EBUILD gst-plugins-mpeg2enc-1.14.3.ebuild 336 BLAKE2B 91af84a87c7b6e038b617ff47b5a89eeb7d38e6e6ed8071052ab1c5788809ffdeaed4761d0d28bb4b3dea81c364f646362473c9919a8e7eb4725f9223f317256 SHA512 41684e4cb9e05c6f7b207135e6e3abc900fcc5acc0d71f1f5b9d9d647d67d0100ecb1f2dfc98dcc449e8969d830b5fd83e96625e68d7743a54961d52a54cb39e
+EBUILD gst-plugins-mpeg2enc-1.14.5.ebuild 338 BLAKE2B d9f7606e2f158dcccdd04fedbc47accdaaf65e0d17caf39b9878cc0e0af378c9712c4643660f784704bc209230d53419453b8cbb15c83560029a97dfc3996e94 SHA512 c743292089c61e07d7a67f68d104a98888105cb15a945bbbff455b36483ddf1682300f6bd59ed2ea614287573e37ad0306925bd6a4e63a44dbab4c31f96d06d1
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-mpeg2enc/gst-plugins-mpeg2enc-1.14.5.ebuild b/media-plugins/gst-plugins-mpeg2enc/gst-plugins-mpeg2enc-1.14.5.ebuild
new file mode 100644
index 000000000000..251924e182d4
--- /dev/null
+++ b/media-plugins/gst-plugins-mpeg2enc/gst-plugins-mpeg2enc-1.14.5.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="MPEG-1/2 video encoding plugin for GStreamer"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=media-video/mjpegtools-2.1.0-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-mpg123/Manifest b/media-plugins/gst-plugins-mpg123/Manifest
index b9c22719d344..43cb0513d180 100644
--- a/media-plugins/gst-plugins-mpg123/Manifest
+++ b/media-plugins/gst-plugins-mpg123/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
+DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
 EBUILD gst-plugins-mpg123-1.14.4.ebuild 382 BLAKE2B 6e8a4f46ea58a2d55e6db9028bdbc0f0c854b484ae4c2a419dfebcbce89ffc75a625c3851f7209f912e76018c587ac4dbd41637617ee0d1f7cb23dc4d25f63b7 SHA512 feb34596b20e947a2d9724b992c3756518a032536a5f940073cceb12cc7341ebca3512aec7b6bf9ca67afcfe3c772c4f53e9fe13459662fa31cbdbc703a2b4f9
+EBUILD gst-plugins-mpg123-1.14.5.ebuild 390 BLAKE2B edfbee4a1e46fdf63ab1455a9d732e927ea0c180394340fba8e70e8c379878d4893cedcd7bf38db3b10f5055aa273492f456ce156b9e58ddc263b1dcce959eff SHA512 e454cccb273f2648eddd283b9f9f287dfb3cddf9290c6d469f027cd3ba2cdf5d9b852dbcacb1cb1d0661838687b633cd08c898a364affd72ab23551122e49d23
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-mpg123/gst-plugins-mpg123-1.14.5.ebuild b/media-plugins/gst-plugins-mpg123/gst-plugins-mpg123-1.14.5.ebuild
new file mode 100644
index 000000000000..ec432bb0210b
--- /dev/null
+++ b/media-plugins/gst-plugins-mpg123/gst-plugins-mpg123-1.14.5.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-good
+
+inherit gstreamer
+
+DESCRIPTION="MP3 decoder plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+IUSE=""
+
+RDEPEND="
+	>=media-sound/mpg123-1.23[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-mplex/Manifest b/media-plugins/gst-plugins-mplex/Manifest
index 85c3648e46d1..38d062cd7b2f 100644
--- a/media-plugins/gst-plugins-mplex/Manifest
+++ b/media-plugins/gst-plugins-mplex/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
+DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 EBUILD gst-plugins-mplex-1.14.3.ebuild 417 BLAKE2B 2e1d5f8bb388c861c1dc8dfbcaa38e7bafb4b2ea3f36d688cce9334c0227dfcc2665aa26704f0639ed95b8e44a9399b5767152f3933e09d227b8a28d6797b315 SHA512 e334deafc02bf04426988678cbd6e81e06c43e93b8c1e2f4ffe58f354b64a1c818ba28b14072dc51ad1a0d897474ce00a95a2d202f0f9a43b67cff24c4bdef7b
+EBUILD gst-plugins-mplex-1.14.5.ebuild 420 BLAKE2B 7308d13b610d1704c4d14b9b6d1c383acb1fa99105d92c6aa1de3257ba34e70636feb675428c0951e49f2c3f530a44a8897016a8307a16a15d52df325ec25f27 SHA512 42b93f155e8c9ba0d0957d2aa189653c7686bd898c290762a10199dd016bfab2d1f5f01f487c75b26071da0036f033b4d5a3472a7745499a27fd7b4f1dfd6980
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-mplex/gst-plugins-mplex-1.14.5.ebuild b/media-plugins/gst-plugins-mplex/gst-plugins-mplex-1.14.5.ebuild
new file mode 100644
index 000000000000..a9ae2c4c94ea
--- /dev/null
+++ b/media-plugins/gst-plugins-mplex/gst-plugins-mplex-1.14.5.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="MPEG/DVD/SVCD/VCD video/audio multiplexing plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+IUSE=""
+
+RDEPEND=">=media-video/mjpegtools-2.1.0-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-neon/Manifest b/media-plugins/gst-plugins-neon/Manifest
index 3eb123a3b0e8..050573ecfe59 100644
--- a/media-plugins/gst-plugins-neon/Manifest
+++ b/media-plugins/gst-plugins-neon/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
+DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 EBUILD gst-plugins-neon-1.14.3.ebuild 336 BLAKE2B 1d3b7ac4b8be7cbdec72c3b1e3a1256850483287d33255796ac32272f5a1da802354377a793d027119ca88fcf8e69faa6bb17f9a4e7b8baebf5b7275f67d8440 SHA512 0d198455770058ed4a462c926278a293af665f88f7d8a41ed6367e4e54e1b7834e9e035368bec7e9a6eebdf0a9eb71c6e0bba2883b777c43f90afbffc881e6a3
+EBUILD gst-plugins-neon-1.14.5.ebuild 341 BLAKE2B 943dd27b69f27284bbf7c6728d5e41eebbc14ca3cc3c1f3c1940d4f4f9eb36b9b4e79fc7b9eb8a4ee595b445b51047870f689d432d9a5aa0d110bf2ebf907121 SHA512 572db11e0d7c6f7ad5a34e99f8223c496b87510600c0b2724281752aac5715f30bc9bee52670e64cda0fa1f13c529d240baaf4c68b7996d7f2611a944c5e73ab
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-neon/gst-plugins-neon-1.14.5.ebuild b/media-plugins/gst-plugins-neon/gst-plugins-neon-1.14.5.ebuild
new file mode 100644
index 000000000000..d96d4946cf01
--- /dev/null
+++ b/media-plugins/gst-plugins-neon/gst-plugins-neon-1.14.5.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="HTTP client source plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND=">=net-libs/neon-0.30.0[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-ofa/Manifest b/media-plugins/gst-plugins-ofa/Manifest
index b2f88c0dad2a..12b531acd13b 100644
--- a/media-plugins/gst-plugins-ofa/Manifest
+++ b/media-plugins/gst-plugins-ofa/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
+DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 EBUILD gst-plugins-ofa-1.14.3.ebuild 385 BLAKE2B b8830639822d7aebf1f15011e73f5264e46c33776bc1eba49481fc755fa2c2c555ff8f745f1f4e3820fc45f5dc6812814b34f9a0873b62c79202847481b3549b SHA512 c93f156cb16f5029391ff9ee81c4516340abf446bfb6be573102a8a9564c89a2f6681a7051be0d34d04e1c3efde2531ec735b18f91bdeda586073e2fce459f9e
+EBUILD gst-plugins-ofa-1.14.5.ebuild 387 BLAKE2B d0b3f76277edb0256e995443db3f08d8a0f216bc3e8f1b2cbd43615481e17fd59ec84d857f6a9daa5d1e283da591958e0b325527ad01188bc3829bc442ec9b33 SHA512 62e4774316dc037fae0830d668e0c2a69fca50138ca7bdfe2a24a3f698366c7bd3aec45abb61b44fb3e04c439dbda76563d411666921cad858d36848ce373a3c
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-ofa/gst-plugins-ofa-1.14.5.ebuild b/media-plugins/gst-plugins-ofa/gst-plugins-ofa-1.14.5.ebuild
new file mode 100644
index 000000000000..a4e7faf73803
--- /dev/null
+++ b/media-plugins/gst-plugins-ofa/gst-plugins-ofa-1.14.5.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="MusicIP audio fingerprinting plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=">=media-libs/libofa-0.9.3-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-opencv/Manifest b/media-plugins/gst-plugins-opencv/Manifest
index 80f40887878f..e1ddfa549312 100644
--- a/media-plugins/gst-plugins-opencv/Manifest
+++ b/media-plugins/gst-plugins-opencv/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
+DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 EBUILD gst-plugins-opencv-1.14.3.ebuild 656 BLAKE2B 46f4180df979524651d4fcb9f518b706e86380b4fea552556af0dabfd86c051d88bcb9afa9a20b8d5a622f64d17212c6141a06797883f31893fd5fc15d6561a5 SHA512 c7d027e0b5b69b54448fe7917f6332e8199c2ffb5269189cd09413d5050d77a83f7eaded9bad9a09cafc88e946cee94ab80ad32d23d58a01172ac4b0b0176df5
+EBUILD gst-plugins-opencv-1.14.5.ebuild 653 BLAKE2B 05ecce2928ca20f9219972e6fcdd021cb0bf2aaef253b908b1627abb6e48fdf245268ab55c660f32ffc63203d04bb7e28cf40475457f7a29c8d8220027102ca7 SHA512 94d76147f6be27b1e7ff6b321adfbc6a94cc1a9b99a8c9ea575b4ff6417eec2c00cf8e6a3b54370c5ab8801a237ff6180d6c969d8b4e909948b322ce22c6bb0e
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.14.5.ebuild b/media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.14.5.ebuild
new file mode 100644
index 000000000000..ca235c56e79f
--- /dev/null
+++ b/media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.14.5.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="OpenCV elements for Gstreamer"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=media-libs/opencv-2.3.0[contrib(+),${MULTILIB_USEDEP}]
+	<media-libs/opencv-3.5
+"
+DEPEND="${RDEPEND}"
+
+# Ships the opencv separate helper library as part of gst-plugins-opencv as it depends on OpenCV
+multilib_src_compile() {
+	emake -C gst-libs/gst/opencv
+	gstreamer_multilib_src_compile
+}
+
+multilib_src_install() {
+	emake -C gst-libs/gst/opencv DESTDIR="${D}" install
+	gstreamer_multilib_src_install
+}
diff --git a/media-plugins/gst-plugins-openh264/Manifest b/media-plugins/gst-plugins-openh264/Manifest
index 15972cbcfb34..ee9964ebac02 100644
--- a/media-plugins/gst-plugins-openh264/Manifest
+++ b/media-plugins/gst-plugins-openh264/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
+DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 EBUILD gst-plugins-openh264-1.14.3.ebuild 330 BLAKE2B ca7a30601574cc92a178ff2d2c42c08675a886ee253fb023b64432ec67b9d5974484ab4be01310b17179ce1da8a3ea9e755884ace8bd2e08f000dc4ee673d674 SHA512 6f5f785ff6191cc09ee7c38caab00e2fc4e3ff3b44554539bf32ac042dbb9f1a93a9663c710395a8fcc87d49315ef5969cb51b4ae59a94b0724a94b43b0e7269
+EBUILD gst-plugins-openh264-1.14.5.ebuild 332 BLAKE2B 18c1cdee92f2c5d6b67da749501b102d83d3438d1c3876004e75ca17573aab1ab61f297df7a6cbcb4e9ca67e6e8593648addb6f943978a9da68bb844b7359599 SHA512 7c37d44e1aa7dce2b639281484d569a78210426e49e25c9ebedea1e568cbfd8c17b6396e9f836d9e7776affd6db3415729618dab16b49ca23c717b3353e998fd
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-openh264/gst-plugins-openh264-1.14.5.ebuild b/media-plugins/gst-plugins-openh264/gst-plugins-openh264-1.14.5.ebuild
new file mode 100644
index 000000000000..537152c10af2
--- /dev/null
+++ b/media-plugins/gst-plugins-openh264/gst-plugins-openh264-1.14.5.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="H.264 encoder/decoder plugin for GStreamer."
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=media-libs/openh264-1.3[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-opus/Manifest b/media-plugins/gst-plugins-opus/Manifest
index a8c06c084743..154dcd33da03 100644
--- a/media-plugins/gst-plugins-opus/Manifest
+++ b/media-plugins/gst-plugins-opus/Manifest
@@ -1,4 +1,7 @@
 DIST gst-plugins-bad-1.14.4.tar.xz 4678032 BLAKE2B 098d0b0600efb9f7926295fdc34d448bf9c9a719b9061d5be2282c6f5d09550b52f7ee78e90398577c21db2bf05510d74a5880d1d401a4931a0dea2b81509973 SHA512 a5bef1863110ae25ef4c75ad2cdbbde011e1d1a722754cc0372e8de9c81aee9159e2301d90d6f9b04b66a20887abe20de20d74dbe207d20102e8081130eaf839
+DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 DIST gst-plugins-base-1.14.4.tar.xz 3703232 BLAKE2B b22c44b857bc4f1972f03752cc1afb35c8d76e2d0c4a06c574af0ac4f3a91080c584ae4e4fc2a263ee879a53d58505c24a756ebc051d81ec62661c4f9e532f0e SHA512 42c59df9f2d848108f12afa0466acbcfa5ccda64e4d0d44608d4268abed20f2e036713de04e7d71feaed1868ad742c5bcb55ae0eef5dec8e19e053dc8541b8af
+DIST gst-plugins-base-1.14.5.tar.xz 3717076 BLAKE2B 461e90df614c60d7efce6fabcf8ad7a5cb68b5fc01b05761fa441d838d3155b5a2e7f9b9420b7e48b2eec49e4bcfbd39009a662db03a923f42c6f45c782795cd SHA512 4e81c44a5ea3b910f96d3e9251ba38a79feacead4f96adb92eab5a650695ca8d5313e3ec1df78fec04376cf3152d2eefd4d39f6c11dadc98a11e55bbf8c8ccdc
 EBUILD gst-plugins-opus-1.14.4-r1.ebuild 1248 BLAKE2B 3d4e072c529f8ed0c0310c7f371f273af4ef74226b41eb350ef2a3bc5fd17b5b953c17884e3f95ffdfaa34b6f8dc56d6bbcf048225c606436b856f0e8373f75a SHA512 f91065bb4a536ec9e7fb65f18daed71c1e3367f1b69adf60c51d56461e0b88843660eadf5bc08f2264c8329f63997bfb29447ecb2e0c565c0645383324eabb11
+EBUILD gst-plugins-opus-1.14.5.ebuild 1256 BLAKE2B 38fe7b8760c8dfcd38a42e936d2f2cbfd268cfa89d9356874c83b4caff253734042c4a695d400243ca7854cb8ccf167c0770343077c58cdd17c47f7c070139f0 SHA512 172cfea4aa5a889a28d7de316787b42bc1109d1e3077c85afc454220f7981a4fbc6878b211447df02fa199c693bb0e3266b7765a1b827000385ed4b2e63a859d
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-opus/gst-plugins-opus-1.14.5.ebuild b/media-plugins/gst-plugins-opus/gst-plugins-opus-1.14.5.ebuild
new file mode 100644
index 000000000000..070d047fd926
--- /dev/null
+++ b/media-plugins/gst-plugins-opus/gst-plugins-opus-1.14.5.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-base
+
+inherit gstreamer
+
+DESCRIPTION="Opus audio parser plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+IUSE=""
+
+COMMON_DEPEND=">=media-libs/opus-1.1:=[${MULTILIB_USEDEP}]"
+
+RDEPEND="${COMMON_DEPEND}
+	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP},ogg]
+"
+DEPEND="${COMMON_DEPEND}"
+
+src_prepare() {
+	default
+	gstreamer_system_link \
+		gst-libs/gst/tag:gstreamer-tag \
+		gst-libs/gst/pbutils:gstreamer-pbutils \
+		gst-libs/gst/audio:gstreamer-audio
+}
+
+# Everything below is for building opusparse from gst-plugins-bad. Once it moves into -base, all below can be removed
+SRC_URI+=" https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-${PV}.tar.${GST_TARBALL_SUFFIX}"
+
+src_configure() {
+	multilib-minimal_src_configure
+	S="${WORKDIR}/gst-plugins-bad-${PV}" multilib-minimal_src_configure
+}
+
+src_compile() {
+	multilib-minimal_src_compile
+	S="${WORKDIR}/gst-plugins-bad-${PV}" multilib-minimal_src_compile
+}
+
+src_install() {
+	multilib-minimal_src_install
+	S="${WORKDIR}/gst-plugins-bad-${PV}" multilib-minimal_src_install
+}
diff --git a/media-plugins/gst-plugins-oss/Manifest b/media-plugins/gst-plugins-oss/Manifest
index 79aa619021e6..79998eb903cb 100644
--- a/media-plugins/gst-plugins-oss/Manifest
+++ b/media-plugins/gst-plugins-oss/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
+DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
 EBUILD gst-plugins-oss-1.14.4.ebuild 376 BLAKE2B 6b401a5a47f045a671f4790268d967c5f8c9ab0cb3a7900e7403231eb82b8eb0e78bbc7273d461892da2163de35844bea9e49ad738366e990caa4071aca7e75d SHA512 70d98f7b864776e4dc8111c13bacb8407ab4df55210f064aa8da5772fbd427107bbbf93b97b3f195dbf42b91e061c0ebef966a8710b4be2ffcb13e3ca34a47b2
+EBUILD gst-plugins-oss-1.14.5.ebuild 384 BLAKE2B 0e16b02b270bdca98cf535c1daf2174b075c190a351717f53e1c392c1eac7dd85e82e8115e63b35b53aa11a562a36c0a26a8004b2c229104bf00712ee8347f9b SHA512 73afae7f4333ecde42e555a45410d8112d34ec3237204f3eb5d324cc8eb01f9a673debe7bdeb7b648a11ae1f487bb53a41b1228f06e55a09fc68cd093f77e708
 MISC metadata.xml 488 BLAKE2B 72817781f31070fbba548a5a0e724d3a3a419f55b2c1ba1155e88f66b0f779d34fc5705c39d60ecc5c40a9ba47ed568aa2458c0557de1795ddacadf54b39a436 SHA512 6ab36e28308e33d9b2e74a419ed558c913510f23bee1fd1a58ff87c6937dc2c3b4c8c683831e771460258424e89797a6b8c5ebed95cb87506ae7d67c11b2c243
diff --git a/media-plugins/gst-plugins-oss/gst-plugins-oss-1.14.5.ebuild b/media-plugins/gst-plugins-oss/gst-plugins-oss-1.14.5.ebuild
new file mode 100644
index 000000000000..e1e671a3613b
--- /dev/null
+++ b/media-plugins/gst-plugins-oss/gst-plugins-oss-1.14.5.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-good
+
+inherit gstreamer
+
+DESCRIPTION="OSS (Open Sound System) support plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND=""
+DEPEND="virtual/os-headers"
diff --git a/media-plugins/gst-plugins-pulse/Manifest b/media-plugins/gst-plugins-pulse/Manifest
index c61622668bfa..dbdcfb2009c6 100644
--- a/media-plugins/gst-plugins-pulse/Manifest
+++ b/media-plugins/gst-plugins-pulse/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
+DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
 EBUILD gst-plugins-pulse-1.14.4.ebuild 457 BLAKE2B 710029c2982bfdfe57f2af044e868234a7eb6dbe7a40b5fbc246d4627ed3109eb10d570755da7f1d20b4ba2280635cc0654fa0be8143894902e7a2d323ece4b2 SHA512 c17bc2ff852a4773a0e11183e545d4732f3ec69c46f8f7aa579f5ae13a5ba2521996836f3a735cf162f58f28c56df57cdad586ef64c4a183d407cb0e3f534943
+EBUILD gst-plugins-pulse-1.14.5.ebuild 465 BLAKE2B 81b961900796868c39c80c04640f18c75fb62aa3287beaab7da830e1b9264e20952bce0ad3e93d3335c036b10ec338c59dc8f342feb1056e0a3872250d9e1815 SHA512 7e3383e55407e10d0935ffa4558caeecb7102ba4a4d12234f46b37691afea52d9d41fbfe7c2e627ac7f690b6010e2a872ec3f46a4cb33a3aa8f238ace3671f88
 MISC metadata.xml 610 BLAKE2B c8d30b8baa2a2dc5dc43b2a0f5badcb212567f7ce4873f58b1662b3454c8232a4916f10470bb98c3dae745f818f0e02d7266542d44d3fd4b9eb7edf99bf2a419 SHA512 0f0fa4496446fbaa649c3d76538c4960ca0d7918b40e305aa0da8516e79ef25c10136b0097fd687cb968c37de636b57ae667be1bc3197a571f557400a9c0c478
diff --git a/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.14.5.ebuild b/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.14.5.ebuild
new file mode 100644
index 000000000000..bdab9cb1ba14
--- /dev/null
+++ b/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.14.5.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-good
+
+inherit gstreamer
+
+DESCRIPTION="PulseAudio sound server plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE=""
+
+RDEPEND="
+	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP}]
+	>=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-raw1394/Manifest b/media-plugins/gst-plugins-raw1394/Manifest
index d4afb340aee2..ae40e0d556b6 100644
--- a/media-plugins/gst-plugins-raw1394/Manifest
+++ b/media-plugins/gst-plugins-raw1394/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
+DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
 EBUILD gst-plugins-raw1394-1.14.4.ebuild 514 BLAKE2B d499ca202c465c73bb7dd0713e6f73326cefa36d228db31ac47db5bb8e6b296fcabbb53895100902a24f0b26d3d73b2f224a43c6d4ea74268196e76dd3741f6a SHA512 77b2bbf8e74f73dfef7652c7b8085a80720fd0d44fe15bf8af80d8078b05e466614ddca19be0b542969f0b295cb170786fb1b4f3f83beef3afcfee660b10fc0d
+EBUILD gst-plugins-raw1394-1.14.5.ebuild 518 BLAKE2B d9a8701ce1d81ec76c7f83fa0d5d02ee8824117fed3165f7931046f48904b138a4b24730c72cd17f00eb5fdf2ff5cb8437110f3b03b14d80bf22e4a9a2735306 SHA512 92aac9526c5035e8da04773b11d25d57a461f642356159dcafb91f88e18ebd9cfba360fd81048963833653dbdb50c353866a9ad1f2d4e9cec43aca29d02c06e4
 MISC metadata.xml 548 BLAKE2B affa90bfebf1a2616bfe7262f0850227bdb4aac3580924c58fda8c1c9c89fb288252c921c73404149d02c8f1d38f61840301bdfdea01608a3db14e5e8b0b08a6 SHA512 ad3c3f4e095d868f0df4f869fe521f3c51ada956f578b995bd9e7161ef679c5c395434a76f4ddcfe1242dc37790e8f1ffe0167c8a50c686d434747563c151031
diff --git a/media-plugins/gst-plugins-raw1394/gst-plugins-raw1394-1.14.5.ebuild b/media-plugins/gst-plugins-raw1394/gst-plugins-raw1394-1.14.5.ebuild
new file mode 100644
index 000000000000..16a16e5a4dd9
--- /dev/null
+++ b/media-plugins/gst-plugins-raw1394/gst-plugins-raw1394-1.14.5.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-good
+
+inherit gstreamer
+
+DESCRIPTION="Fiwewire DV/HDV capture plugin for GStreamer"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=media-libs/libiec61883-1.2.0-r1[${MULTILIB_USEDEP}]
+	>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
+	>=sys-libs/libavc1394-0.5.4-r1[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+GST_PLUGINS_BUILD="dv1394"
+GST_PLUGINS_BUILD_DIR="raw1394"
diff --git a/media-plugins/gst-plugins-resindvd/Manifest b/media-plugins/gst-plugins-resindvd/Manifest
index 4e05275a807b..a6fbea039a18 100644
--- a/media-plugins/gst-plugins-resindvd/Manifest
+++ b/media-plugins/gst-plugins-resindvd/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
+DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 EBUILD gst-plugins-resindvd-1.14.3.ebuild 452 BLAKE2B d9a19027ecebd7ebedbf32f72874bf4f79bb071193afc969a8d7a1c4254c30f1dff52545791746b6a40b18c1cc7be8bec568f5028e9782a0f0f943e7fa5247e2 SHA512 c5c585e79b1736762b647fbcf3d49257238d8d008d2e71b8c8c1c2cda3202d002e592a0403428f5d3e7b506f48b74dfc9c126af6f070e8250eef03f57f3a1f14
+EBUILD gst-plugins-resindvd-1.14.5.ebuild 458 BLAKE2B 78fe119f9c09aec03376108252323c51c1d0a9dfb0cf949774541e71ffa60c18b5daeec983eddff7775ff45d3410f9cf5b86b1f8098d80fcecd41ab6e41b5bcc SHA512 4cb5f9e7d829886735d8beb22cc74926d96d845571d3c288414696527d2257a431312251c7722b9c641ab98251d19a2dea43f1fbdccee168b69727a3a02e2255
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.14.5.ebuild b/media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.14.5.ebuild
new file mode 100644
index 000000000000..ab22ad1bedcd
--- /dev/null
+++ b/media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.14.5.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="DVD playback support plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+IUSE=""
+
+RDEPEND="
+	>=media-libs/libdvdnav-4.2.0-r1[${MULTILIB_USEDEP}]
+	>=media-libs/libdvdread-4.2.0-r1[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-rtmp/Manifest b/media-plugins/gst-plugins-rtmp/Manifest
index 61479f06aecd..29ecdc5f80e1 100644
--- a/media-plugins/gst-plugins-rtmp/Manifest
+++ b/media-plugins/gst-plugins-rtmp/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
+DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 EBUILD gst-plugins-rtmp-1.14.3.ebuild 332 BLAKE2B a06f090240d6d552c0d8b8cfec19a0b3dd8c3018677036619f27d04ffea008b074afb61b158a404abdafa773c948020cfec3c6ef9e362ba8d7bdfd8767ddaa80 SHA512 c08539c5e593a9aa6c95e84e537657a203b2b3a6e9830f66a94e9b6789141892411036dae076c6fb00ce978dc3a85b27cf24017b62698c79c3d9d36eef89ef45
+EBUILD gst-plugins-rtmp-1.14.5.ebuild 334 BLAKE2B 9049dfb3d5201f983f52fe820474be110875b42a460a24462c9b9ab7eeae6a6ecd3c7252a9d2138366b2453a370d1b2ed4d84d0c59fd9feb19f1134c330d01b1 SHA512 2a850656f8e725a129c9e4ff40ab0ae146f270bf01d0c268602fa903644be42a4bc1affb9140621752b30988eb2811c0e909d2ded3b81874d2f875ae5e715b15
 MISC metadata.xml 419 BLAKE2B 8e461a2732df916b2d78bf38497df7061a3617920e155157f6cd62e5658187ea94d4ad328533c950a9554bbd9f3c427a1b616a7a882bfc977b349746ced681fb SHA512 c157a5142e10bd93420db567edc321580c57872558473b0181fed12b688164dcd928cb19c983b61602583edcbf333ac685dec141be5cfc5a207f8b849f64046d
diff --git a/media-plugins/gst-plugins-rtmp/gst-plugins-rtmp-1.14.5.ebuild b/media-plugins/gst-plugins-rtmp/gst-plugins-rtmp-1.14.5.ebuild
new file mode 100644
index 000000000000..939b7ec9a0f5
--- /dev/null
+++ b/media-plugins/gst-plugins-rtmp/gst-plugins-rtmp-1.14.5.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="RTMP source/sink plugin for GStreamer"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-shout2/Manifest b/media-plugins/gst-plugins-shout2/Manifest
index 8a2f99872f4c..8bb4826196d5 100644
--- a/media-plugins/gst-plugins-shout2/Manifest
+++ b/media-plugins/gst-plugins-shout2/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
+DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
 EBUILD gst-plugins-shout2-1.14.4.ebuild 346 BLAKE2B 43d9409aec1c930a7ab170f0469426de65e97f64d3580e3d8c8855b7281ab4b517b2607ecd58dc76ef4fe3de4f25279aee001f75f383d2b2143d6917f364cbfb SHA512 d2230cdd0ed2e995fbd1f0269a4cc22e6574f0d3b2d9a60aa77ae424b7209e84371c37887a0a0b2b81e3aba32c8c5f841d9fd573692cf2d797d547f4949c94f7
+EBUILD gst-plugins-shout2-1.14.5.ebuild 351 BLAKE2B 93c9978e167b928204be1bd1b083f7c508547417533a6293decfbdaec48d851da24f0131ec3d412b31868b5c98ebe9f9afb3cb1ff446ca74ad0cb3b3be7db013 SHA512 730db94b1a3dd102b040a664af80fe4b4eafa859418048c51470f36bd372cc4597d408bf9496ed368aa7060dd885b1417947e8c3807e74210059d6c743808edd
 MISC metadata.xml 478 BLAKE2B 4c7e5bbe6d79d01544434b93b998847f6c5e3fa7bf2b979c9ff0238d75c0f1ac5693cb4224073926b6cf098a661fc5064f9ba2db3dd2b121093ee78cf905b1ea SHA512 a24a36ebfdfc159df5e23891118ea4e21855a4db31c1ddee9a081c55597be4f34014adbf0a46712d202f1557f2a63e776382c86ce5193465f35868c91114cc52
diff --git a/media-plugins/gst-plugins-shout2/gst-plugins-shout2-1.14.5.ebuild b/media-plugins/gst-plugins-shout2/gst-plugins-shout2-1.14.5.ebuild
new file mode 100644
index 000000000000..095bac7572b9
--- /dev/null
+++ b/media-plugins/gst-plugins-shout2/gst-plugins-shout2-1.14.5.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-good
+
+inherit gstreamer
+
+DESCRIPTION="Icecast server sink plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND=">=media-libs/libshout-2.3.1-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-smoothstreaming/Manifest b/media-plugins/gst-plugins-smoothstreaming/Manifest
index 03ba44d3c6f9..3af040482621 100644
--- a/media-plugins/gst-plugins-smoothstreaming/Manifest
+++ b/media-plugins/gst-plugins-smoothstreaming/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
+DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 EBUILD gst-plugins-smoothstreaming-1.14.3.ebuild 1356 BLAKE2B 13243bf1f53db280eb0f8076e84ade16e91341404cef5343883afe4fd49d432cc7bc5bae11e6a9ba8920a91a8bd8eac9a5d0b4a411000c8de01859099e572621 SHA512 d470e7f1c6f1b10b90bb703c03e00f8e90a52f296d9a52a4680bab34972397a5ba643cee922d4d871a7caa09df7d05980905ea1315490889d51a437cd6d4b8c2
+EBUILD gst-plugins-smoothstreaming-1.14.5.ebuild 1358 BLAKE2B fbecb012ba9f34875c616f057b9731a0ffd7d9dacffef8d1a82afaf03f8f5dfd1e7102b972d8451cefdaf947a502f33c5e2c52c4ccf08aba04a704cad06a68d5 SHA512 39b98f6487664c325709bd1875203ca8e652d84a7774ad81791aa47271970b032818b691fa3ff28489952914ea982e010d5592d02e97a4ef3146e66bf529f870
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-smoothstreaming/gst-plugins-smoothstreaming-1.14.5.ebuild b/media-plugins/gst-plugins-smoothstreaming/gst-plugins-smoothstreaming-1.14.5.ebuild
new file mode 100644
index 000000000000..3b3c77f7d046
--- /dev/null
+++ b/media-plugins/gst-plugins-smoothstreaming/gst-plugins-smoothstreaming-1.14.5.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="Smooth Streaming plugin for GStreamer"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+
+	# FIXME: gsturidownloader does not have a .pc
+	#	gst-libs/gst/uridownloader:gsturidownloader \
+	#	gst-libs/gst/adaptativedemux:gstadaptivedemux \
+	#	gst-libs/gst/isoff:gstisoff
+	gstreamer_system_link \
+		gst-libs/gst/codecparsers:gstreamer-codecparsers
+
+	local directory libs
+	directory="gst-libs/gst/uridownloader"
+	libs="-lgstbase-1.0 -lgstreamer-1.0 -lgobject-2.0 -lglib-2.0 -lgsturidownloader-1.0"
+	sed -e "s:\$(top_builddir)/${directory}/.*\.la:${libs}:" \
+		-i ext/smoothstreaming/Makefile.{am,in} || die
+
+	directory="gst-libs/gst/adaptivedemux"
+	libs="-lgsturidownloader-1.0 -lgstapp-1.0 -lgstbase-1.0 -lgstreamer-1.0 -lgobject-2.0 -lglib-2.0 -lgstadaptivedemux-1.0"
+	sed -e "s:\$(top_builddir)/${directory}/.*\.la:${libs}:" \
+		-i ext/smoothstreaming/Makefile.{am,in} || die
+
+	directory="gst-libs/gst/isoff"
+	libs="-lgstbase-1.0 -lgstreamer-1.0 -lgobject-2.0 -lglib-2.0 -lgstisoff-1.0"
+	sed -e "s:\$(top_builddir)/${directory}/.*\.la:${libs}:" \
+		-i ext/smoothstreaming/Makefile.{am,in} || die
+}
diff --git a/media-plugins/gst-plugins-soundtouch/Manifest b/media-plugins/gst-plugins-soundtouch/Manifest
index 63153806487e..08d9e960b875 100644
--- a/media-plugins/gst-plugins-soundtouch/Manifest
+++ b/media-plugins/gst-plugins-soundtouch/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
+DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 EBUILD gst-plugins-soundtouch-1.14.3.ebuild 360 BLAKE2B 206ce13fa48219b2ff90a26e5981fae94b6a5735e999c88a634a515669934b217ef8f643a978e47bcde632179aacb14386b399ba66480c294ce44786be6a161f SHA512 c787f1aaf44156b972be8ba60ecb1424297c970c4662706cd40fc19d23a4fbe757ba2bc8d698ce56797d44d076bfc5c01b3ca2ea853498d00020fb64d42385e4
+EBUILD gst-plugins-soundtouch-1.14.5.ebuild 362 BLAKE2B 434e603dd8d05c6eb2868dc2965e193dd01880780c91ed9675cab55f67be9eec20099603d8246f2dbe530041e24cca982f2ad93d9724e05318667c81cddce524 SHA512 9450875a185e178a76ab3c22d18f1ce46173d65591d73590a97b221f9c234ac51afa1defc2034fe77dc88581cf55b4691319f6ab22da6f2a534e2f31d2e60264
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-soundtouch/gst-plugins-soundtouch-1.14.5.ebuild b/media-plugins/gst-plugins-soundtouch/gst-plugins-soundtouch-1.14.5.ebuild
new file mode 100644
index 000000000000..78edac2abb96
--- /dev/null
+++ b/media-plugins/gst-plugins-soundtouch/gst-plugins-soundtouch-1.14.5.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="Beats-per-minute detection and pitch controlling plugin for GStreamer"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=media-libs/libsoundtouch-1.7.1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-soup/Manifest b/media-plugins/gst-plugins-soup/Manifest
index dcc7cba2e8b4..9a3616e348f0 100644
--- a/media-plugins/gst-plugins-soup/Manifest
+++ b/media-plugins/gst-plugins-soup/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
+DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
 EBUILD gst-plugins-soup-1.14.4.ebuild 414 BLAKE2B 81b9d822b76f819543d331bd8fe485e499ec45c7bd74fd45d99dc2750f44bfc67f9617c00be1596741c50f39069f468bdf79bb4b2369cd71b857ee35422eb706 SHA512 a45790c8666caa22d828c672ab0acde3bc5dae5ea5656fc6096fab55b40b15d930ff1a7b65049d55628596071ed6a8593fcbecbe089f4dbd0316e68c10b0323f
+EBUILD gst-plugins-soup-1.14.5.ebuild 422 BLAKE2B 62f1a843223eba150b5511bc10959fa8de2d13590171f9c0f8174dbad127cad43614c718a2eb8a1a0c1acd0e86df591caac9839578e71127a5c1239016bf7862 SHA512 4aa1f41c686edf3a7e7d45baeb63de3731bd9163668d5f35bf915cb45435ceae113dd2b2910d84dcd0c5392de214c0400d61f7e06ebdb73ae3c858bc7aef2025
 MISC metadata.xml 552 BLAKE2B d1dddafba0b921d7484d1c52567a8b9fbecc611b5234bc602cef79c7953a2a3a9bb423bc929055127ab894506409ddd8e8a71cb432169b1370e65b83b2e4341e SHA512 ce8b5a2a0d33e00ef141b82b3c6d192e31b681f016f431f1306d2066677d7fac66135129f57d25f9d13644c9d3976baf74fa6e6f65f5feebee045b82d04e2d8c
diff --git a/media-plugins/gst-plugins-soup/gst-plugins-soup-1.14.5.ebuild b/media-plugins/gst-plugins-soup/gst-plugins-soup-1.14.5.ebuild
new file mode 100644
index 000000000000..925ff0d4dd6d
--- /dev/null
+++ b/media-plugins/gst-plugins-soup/gst-plugins-soup-1.14.5.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-good
+
+inherit gstreamer
+
+DESCRIPTION="HTTP client source/sink plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
+IUSE=""
+
+RDEPEND=">=net-libs/libsoup-2.48:2.4[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-speex/Manifest b/media-plugins/gst-plugins-speex/Manifest
index 072184544fbc..3482b0d4094a 100644
--- a/media-plugins/gst-plugins-speex/Manifest
+++ b/media-plugins/gst-plugins-speex/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
+DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
 EBUILD gst-plugins-speex-1.14.4.ebuild 380 BLAKE2B 2470d4caf3708cfc7ede8dfbd3df039b49dc802e6315527d714a5889d6232895e02a54e921cc35dedf5e9c17babd38cf5ea5b78545fd5e6125a18c7c352deed7 SHA512 aad10e56466c57b9ac77b0965ba7ade9b18928590a74ede9e41ee1eca34475aa5ebc48d3f801b8e313fe901962a28029c1c7f6a77373c7d006850b472557a752
+EBUILD gst-plugins-speex-1.14.5.ebuild 386 BLAKE2B f7efd28934d5cb22115f37c1717959fa5d0734c6d30bad7079aa82cfe930de4a68eccc27cb370ddd268d6dab6c1a3ed12d16110cc64fcfd45c371fa275814818 SHA512 1766a4cde3ec3f76717f820628e62e0e8796d6ba2d29ba0688f634d175b0e6970bca62812f4a4eec0548164164d0ec6f8c62197a8f35fc2aef2bf62d0c64bf9a
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-speex/gst-plugins-speex-1.14.5.ebuild b/media-plugins/gst-plugins-speex/gst-plugins-speex-1.14.5.ebuild
new file mode 100644
index 000000000000..891214b2286a
--- /dev/null
+++ b/media-plugins/gst-plugins-speex/gst-plugins-speex-1.14.5.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-good
+
+inherit gstreamer
+
+DESCRIPTION="Speex encoder/decoder plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-srtp/Manifest b/media-plugins/gst-plugins-srtp/Manifest
index 9d597efa33d8..7dae5440a294 100644
--- a/media-plugins/gst-plugins-srtp/Manifest
+++ b/media-plugins/gst-plugins-srtp/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
+DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 EBUILD gst-plugins-srtp-1.14.3.ebuild 383 BLAKE2B a7b0328ce6ef8bede9a9f21759571b469a67e66399363ad58795a135956049bcf5f94d752fa77d49a2a56389053415e6dec1984fe2e029ef9d4577100426fde6 SHA512 125381a656a7d8e29b2aee9ff2bf72a6541ce65949afde23e15f7b7d7ce46b52f1cf28f5fa22df18d264807844d3a0bb3e5d57dd18017ef3c677e28ce8128456
+EBUILD gst-plugins-srtp-1.14.5.ebuild 390 BLAKE2B d0db5ce7f3b360486cead14fe6ba7c9a09336a096c12ef312dfe672346a9dde121f68a4c729894ac273b31dac869c81a4f2775d4c830cc6e1e522c2adbc0dbf9 SHA512 68f1ca735880982fb9dda75b6bcf1da6f22dd57360ff5586456a9a3b60dbeabd6cbbd5485aaccfc8ac8cebe5a8b4aee4d1c634049cfb31c6593183d5fe8bc1ff
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-srtp/gst-plugins-srtp-1.14.5.ebuild b/media-plugins/gst-plugins-srtp/gst-plugins-srtp-1.14.5.ebuild
new file mode 100644
index 000000000000..60100c4ef669
--- /dev/null
+++ b/media-plugins/gst-plugins-srtp/gst-plugins-srtp-1.14.5.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="SRTP encoder/decoder plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=net-libs/libsrtp-2.1.0:2=[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-util/glib-utils"
diff --git a/media-plugins/gst-plugins-taglib/Manifest b/media-plugins/gst-plugins-taglib/Manifest
index 626e42f4a8f6..ae8ad3c3e6bd 100644
--- a/media-plugins/gst-plugins-taglib/Manifest
+++ b/media-plugins/gst-plugins-taglib/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
+DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
 EBUILD gst-plugins-taglib-1.14.4.ebuild 397 BLAKE2B 65c28267767dd74cabe5b0d626f3fd12464f9d323b389575f8fbc6c43f9ad0d99aea5a615808147621ab615c3611710c2768ef3152be9ee535621b225cddd7ef SHA512 e65c02d4bae55ee441c8f015a0ad7042f067a049bbabc8da4f40ab76b50ce982530b8379ee0448edc3e13fdefbec9069c2e270a289a9474600eb0219f3c5a2d3
+EBUILD gst-plugins-taglib-1.14.5.ebuild 404 BLAKE2B a1b15792fbe0d7fc6a6f7049c3dcbb807b103a648f2007548619ede192b2e4aa31adceaa36339b93bc195a9336937d97167cf3997d1d5ea4c78a50a944a23528 SHA512 dfe1848b53772c85d2d9e5017d72c3aa18e0477fc57ebd4fff88d82f710dd126220056a49a0cf717c0c974132e08e606c9156d2fa6de0bb5dff5f37d88358fe8
 MISC metadata.xml 472 BLAKE2B 2ddad354e550883322f2276a979d7cace56275d6b0ebe9301c40a6204043c0a05b0efae27cea079bdf1c0c04b8f588ab39e080d8b0e4f405c0d0287a00c4c746 SHA512 8ddf53f0cf2e92dbc2adc5f4910b2a6fab0b0ac68eb9c9c33fd94809714d0f10d0d9d546df012a70c5d9a13adce7cccc232be4fc107b63c4649ba3ff0ff32444
diff --git a/media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.14.5.ebuild b/media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.14.5.ebuild
new file mode 100644
index 000000000000..adb3bd6f2856
--- /dev/null
+++ b/media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.14.5.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-good
+
+inherit gstreamer
+
+DESCRIPTION="ID3v2/APEv2 tagger plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=media-libs/taglib-1.9.1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-twolame/Manifest b/media-plugins/gst-plugins-twolame/Manifest
index d66775870c2e..a87198364c66 100644
--- a/media-plugins/gst-plugins-twolame/Manifest
+++ b/media-plugins/gst-plugins-twolame/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
+DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
 EBUILD gst-plugins-twolame-1.14.4.ebuild 359 BLAKE2B b2c6acbc01e825bce562e533131297990c7741e9225bcd5b2c0ad24c3ee814ed6dd6d52cec0db3492a1b537acb42541a90bbe52dd356e8cbb8b07d7a175819fa SHA512 242ade188f67cc8b3f92914396943207ee40f15f2005593a937fe8e7affd833f84cf8066aeee72b2dc2adeea9ebb58bc18ca4582a70a91c5700a7aa493f658a1
+EBUILD gst-plugins-twolame-1.14.5.ebuild 364 BLAKE2B 16875bff3d1dbe6a404764000c266191c4c69cbbbdd1a72a72e6cb0caa1084f84374bfe09a994eb549445037bea74a8b756a16e86e9e7174bdceeca7b81fc017 SHA512 792565377d730aab878f0260e2379ae32878b99daec248453ca0d51bde0960b3f53a0d02e776cf2bc25f1e50930b48eeab0f9ba3c6f19f38ea7d20aa84b2d7f0
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-twolame/gst-plugins-twolame-1.14.5.ebuild b/media-plugins/gst-plugins-twolame/gst-plugins-twolame-1.14.5.ebuild
new file mode 100644
index 000000000000..0eaeaae17fd0
--- /dev/null
+++ b/media-plugins/gst-plugins-twolame/gst-plugins-twolame-1.14.5.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-good
+
+inherit gstreamer
+
+DESCRIPTION="MPEG2 encoder plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-uvch264/Manifest b/media-plugins/gst-plugins-uvch264/Manifest
index 1575b33de68e..7946dc7c45c4 100644
--- a/media-plugins/gst-plugins-uvch264/Manifest
+++ b/media-plugins/gst-plugins-uvch264/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
+DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 EBUILD gst-plugins-uvch264-1.14.3.ebuild 801 BLAKE2B 3b1a58f9d31cac0bab20a2fb75a99b9c126350b63c4f17513e62c9929051d27a270f1edbca728093c6436cf18db08011978ee413b05a17eaa8e18a24fe5f5390 SHA512 5c042179d5a2a557ff759c1f9fb3c426abb6969de0a31302981dd451345348b6d87d359582709393dc039ed540a8a5b038562b99d77fc7541f8680117c367355
+EBUILD gst-plugins-uvch264-1.14.5.ebuild 803 BLAKE2B 6a9b60be07ace1a2d71f09b356f46497a673a7ca6a53a7acb604b193079a7fc2badd843cf9eb4a072226772ec86da07457e9d254024817fd21fc360c372dd8d2 SHA512 ecfa625f59f73250f3e4c72d5a9582b5a40c4b238537502fabfb78fc6e8903ea5229714361e8bd96912f0e8c629f34e5b30b42f4aa06032914127cb4be4dfb5c
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-uvch264/gst-plugins-uvch264-1.14.5.ebuild b/media-plugins/gst-plugins-uvch264/gst-plugins-uvch264-1.14.5.ebuild
new file mode 100644
index 000000000000..b2560f32fb95
--- /dev/null
+++ b/media-plugins/gst-plugins-uvch264/gst-plugins-uvch264-1.14.5.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="UVC compliant H264 encoding cameras plugin for GStreamer"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	virtual/libgudev:=[${MULTILIB_USEDEP}]
+	virtual/libusb:1[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+
+	# FIXME: gstbasecamerabin does not have a .pc
+	# gstreamer_system_link \
+	#   gst-libs/gst/basecamerabinsrc:gstbasecamerabinsrc
+
+	local directory libs
+	directory="gst-libs/gst/basecamerabinsrc"
+	libs="-lgobject-2.0 -lglib-2.0 -lgstreamer-1.0 -lgstbase-1.0 -lgstapp-1.0 -lgstbasecamerabinsrc-1.0"
+	sed -e "s:\$(top_builddir)/${directory}/.*\.la:${libs}:" \
+		-i sys/uvch264/Makefile.{am,in} || die
+}
diff --git a/media-plugins/gst-plugins-v4l2/Manifest b/media-plugins/gst-plugins-v4l2/Manifest
index 1f7ec698bcb2..307c1060564b 100644
--- a/media-plugins/gst-plugins-v4l2/Manifest
+++ b/media-plugins/gst-plugins-v4l2/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
+DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
 EBUILD gst-plugins-v4l2-1.14.4.ebuild 660 BLAKE2B b226340d7270d0582203a7dba0572b952f47f04db95cf1da23fd4b6628c13fa8dac334b404ff3306088998d8988fb05174a3785ae20de97bca1d052a08f47495 SHA512 d6e45c89226b36bdafb2c9713cf01735f2cf45127bd5e299cabbb8b8c6bb0f3bcbb068b917b1ad3e136ce09dea1bdf5b189ab68c80db769dbdefa0089b02c897
+EBUILD gst-plugins-v4l2-1.14.5.ebuild 668 BLAKE2B 815b2d5ad9472a2bf3e47fd4bff34f22d1392458772497ea893a02d426d22ea98d8faf72008947ad67480230ca213e2ad4261714ec3385b1f9839941467179b6 SHA512 c1862d3a57603627fd52d0ed3b53fed430780655ced9f95b7bff2e8107910e837bf0f6748a143f673daf32661c40e8f15e597e6e5524ed7249e613e7c9fc230e
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.14.5.ebuild b/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.14.5.ebuild
new file mode 100644
index 000000000000..b64ad19c99a0
--- /dev/null
+++ b/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.14.5.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-good
+
+inherit gstreamer
+
+DESCRIPION="V4L2 source/sink plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="udev"
+
+RDEPEND="
+	>=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}]
+	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP}]
+	udev? ( >=virtual/libgudev-208:=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	virtual/os-headers
+"
+
+GST_PLUGINS_BUILD="gst_v4l2"
+
+multilib_src_configure() {
+	gstreamer_multilib_src_configure \
+		--with-libv4l2 \
+		$(use_with udev gudev)
+}
diff --git a/media-plugins/gst-plugins-vaapi/Manifest b/media-plugins/gst-plugins-vaapi/Manifest
index 7df7b599ae40..84c486fcc8d5 100644
--- a/media-plugins/gst-plugins-vaapi/Manifest
+++ b/media-plugins/gst-plugins-vaapi/Manifest
@@ -1,6 +1,8 @@
 AUX 1.14.1-fix_no_GL.patch 968 BLAKE2B 31c0857fd971f574455d9fb74ae73590f868c50f60d145fb16a2370ed84a34d3069b68ec3d4b810e023f4fe76dc0608281a0d68f5169ec1e7fa17c0424b09eb1 SHA512 56bb4fcede23a85b52efdd4c008665caef1c78097c899261c8ea702bf04cb91a12175eedcf00b0b3f74de43b80d83dee2a043f1552e2f852f7d372e7b112f5e0
 DIST gstreamer-vaapi-1.14.1.tar.xz 1064992 BLAKE2B bae42e3cafc6d1e5799a8ef795f9e1f6a6ac60b6878aea1aed81550fd7e408c5104b5ea89d6e5f7535ac8d21fe5f14fccf061e15eb68a7c1c60c29ad4a4deabb SHA512 f1eecb61cb92439d93a47ac162a5cda8a456dbb205594f378e8adf98c45e4cd59553ccfd3bbcf1c6a568c6af5e7834bbfb0ea17610f0c7e7c9e268a4eeb5b020
 DIST gstreamer-vaapi-1.14.3.tar.xz 1070536 BLAKE2B 7e3458702072d96acc31c1ac5c4ec9f23f6d618ba922884fb141a0897a04959da7f34c7abff7765f086357d3f8f7532a1582508d117c199f76338ebd3723c6ae SHA512 b89acf63c2900b0cd588cce1a06d959a4f8bbe929c237fce985d3cfce7b94d43a3317f06a42fa77e3ff790fff8a81c8bbeeed7ac797794e4cc3342f18faa69e3
+DIST gstreamer-vaapi-1.14.5.tar.xz 1068344 BLAKE2B b98363981dc7f111fc8c15188d31dea394b7f6cf300050b95d564b75020931a0f8690d11410f2d3d18d6649ef2ee290c933c3731b4bc3ca43bffb57a4c1bf542 SHA512 287df56ad9bb3fd0754b9f307082eb180c8f0b622e2c9436c5dcf2272a5fb620cb18970726d231688837d52cb169a10e98e14160e51fd82198c34ea612c0d60b
 EBUILD gst-plugins-vaapi-1.14.1.ebuild 4370 BLAKE2B 8d60914ba1e5e0bd34b52b475e9983ef3b3a87a0ac6b7c0eb6371ecb117d0815d9b95ce3e77204d244fd89646f4a2192951a905e9344876dd0ec4e488e9baa50 SHA512 d06e03d685ec3ef91910528bd64bdefe62f57d01bddc1fda9c86a74db7c36a638e229dd6beaa76b52ed4c6889a79d5e2cfa761b72fcd864b06be202924dd6f9c
 EBUILD gst-plugins-vaapi-1.14.3.ebuild 4319 BLAKE2B 3ca09ab2034b20d6d7743bc4bb20a1fd5ffe3f70f67033ff8f368f902c0dff118bac399c1d5276ecb57cf33dd9edb6efb946554d36886c59023cdc09e36cde1f SHA512 c7099d59ec2f42addba8f79ccdeb6737fa9f509455d16be184960166281129922fa6c455d09af63cae90b53a7efd0ee350f7e2f474421208d1feb1380436cb99
+EBUILD gst-plugins-vaapi-1.14.5.ebuild 4322 BLAKE2B 18b1906fb1217bd45a1f52905231b991be440ddf6003ba5af446048f343da23f851a28bc46812eed214a1e1be26c0536f41390e8c029e54d5a81f37da72ffbb2 SHA512 fea91142756160de127c068ce792083cad21952f8278aea31191541235c763bd979eb2e1dc4daf3beec73e65395320ee17a5ef704c86fc843e086915eec64a6c
 MISC metadata.xml 433 BLAKE2B d46828441b89363cce84ff10747ad13f30329aea96cf2acd2fc7deb786c3f3ec0ec5a86011657d39ac905f9f33a3904b38860b16f53cfb150530cc4142f1beed SHA512 366bbe78a862a65a8b82ee43521508db5766cde3a72f4ad8e7f0b703dc23347589e07dcfdb3f3ec12e62ac91adb38b2a58cee5dff4732069ac2b8724524a405b
diff --git a/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.14.5.ebuild b/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.14.5.ebuild
new file mode 100644
index 000000000000..7212411033f3
--- /dev/null
+++ b/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.14.5.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib-minimal
+
+MY_PN="gstreamer-vaapi"
+DESCRIPTION="Hardware accelerated video decoding through VA-API plugin for GStreamer"
+HOMEPAGE="https://cgit.freedesktop.org/gstreamer/gstreamer-vaapi"
+SRC_URI="https://gstreamer.freedesktop.org/src/${MY_PN}/${MY_PN}-${PV}.tar.xz"
+
+LICENSE="LGPL-2.1+"
+SLOT="1.0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+drm +egl gles2 +opengl wayland +X" # Keep default enabled IUSE in sync with gst-plugins-base and libva
+
+# gst-vaapi configure is based around GL platform mainly, unlike gst-plugins-bad that goes by GL API mainly; for less surprises,
+# we design gst-vaapi ebuild in terms of GL API as main choice as well, meaning that USE opengl and/or gles2 is required to
+# enable opengl support at all and choices get chained from there.
+# One or multiple video output are required: drm, x11, glx, egl and/or wayland;
+# but GL API is our main trigger, thus USE=egl should be ineffective if neither gles2 or opengl is enabled;
+# So "|| ( drm egl opengl wayland X )" would be wrong, because egl isn't built with USE="egl -opengl -gles2", ending up with no video outputs.
+# As we ensure at least one working GL output with other REQUIRED_USE, we can put gles2/opengl in REQUIRED_USE instead of egl, solving the issue.
+# gles2 API only supported windowing system (on linux) is EGL, so require it
+# opengl API only supported windowing systems (on linux) are EGL and GLX, so require one of them (glx is enabled with USE="opengl X")
+REQUIRED_USE="
+	|| ( drm gles2 opengl wayland X )
+	gles2? ( egl )
+	opengl? ( || ( egl X ) )
+"
+
+# glx doesn't require libva-glx (libva[opengl]) afaics, only by tests/test-display.c
+# USE flag behavior:
+# 'drm' enables vaapi drm support
+# 'egl' enables EGL platform support (but only if also 'opengl||gles2')
+# - 'egl' is exposed as a USE flag mainly to get EGL support instead of or in addition to GLX support with desktop GL while keeping it optional for pure GLX cases;
+#   it's always required with USE=gles2, thus USE="gles2 opengl X" will require and build desktop GL EGL platform support as well on top of GLX, which doesn't add extra deps at that point.
+# 'gles2' enables GLESv2 or GLESv3 based GL API support
+# 'opengl' enables desktop OpenGL based GL API support
+# 'wayland' enables non-GL Wayland support; wayland EGL support when combined with 'egl' (but only if also 'opengl||gles2')
+# 'X' enables non-GL X support; GLX support when combined with 'opengl'
+# gst-plugins-bad still needed for codecparsers (GL libraries moved to -base); checked for 1.14 (recheck for 1.16)
+GST_REQ="${PV}"
+GL_DEPS="
+	>=media-libs/gst-plugins-base-${GST_REQ}:${SLOT}[egl?,gles2?,opengl?,wayland?,X?]
+	media-libs/mesa[gles2?,egl?,X(+),${MULTILIB_USEDEP}]
+"
+RDEPEND="
+	>=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}]
+	>=media-libs/gstreamer-${GST_REQ}:${SLOT}[${MULTILIB_USEDEP}]
+	>=media-libs/gst-plugins-base-${GST_REQ}:${SLOT}[${MULTILIB_USEDEP}]
+	>=media-libs/gst-plugins-bad-${GST_REQ}:${SLOT}[${MULTILIB_USEDEP}]
+	>=x11-libs/libva-1.4.0:=[drm?,wayland?,X?,${MULTILIB_USEDEP}]
+	drm? (
+		>=virtual/libudev-208:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libdrm-2.4.46[${MULTILIB_USEDEP}]
+	)
+	gles2? ( ${GL_DEPS} )
+	opengl? ( ${GL_DEPS} )
+	wayland? ( >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}]
+		x11-libs/libXrender[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.12
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+multilib_src_configure() {
+	local myconf=()
+	if use opengl || use gles2; then
+		myconf+=(
+			$(use_enable egl)
+			--with-glapi=$(usex opengl 'gl,' '')$(usex gles2 'gles2,gles3' '') # It's fine to have extra commas passed
+		)
+	else
+		myconf+=(
+			--disable-egl
+			--without-glapi
+		)
+	fi
+
+	if use opengl && use X; then
+		myconf+=( --enable-glx )
+	else
+		myconf+=( --disable-glx )
+	fi
+
+	ECONF_SOURCE=${S} \
+	econf \
+		--disable-static \
+		--disable-debug \
+		--disable-examples \
+		--enable-encoders \
+		$(use_enable drm) \
+		$(use_enable X x11) \
+		$(use_enable wayland) \
+		--without-gtk \
+		"${myconf[@]}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-plugins/gst-plugins-voaacenc/Manifest b/media-plugins/gst-plugins-voaacenc/Manifest
index 98876667fba0..ce99691ca2e8 100644
--- a/media-plugins/gst-plugins-voaacenc/Manifest
+++ b/media-plugins/gst-plugins-voaacenc/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
+DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 EBUILD gst-plugins-voaacenc-1.14.3.ebuild 319 BLAKE2B f88aacd8bfad7c6e95848c6f874784109629cfefe5564408d8d5a02cd65cb2a69a3a1b1df6f484ebcc31c62b78476aeaddc05af9fe08f6ee61667dce347d905d SHA512 8889792a4f5c405bf46f6af72ab1661923d30b56de4c03391325a3fd75c8f147b43c41623d7eb3afaad0a5a0af7db8f9b7bf21f4b71d212f47797c24da1d2f81
+EBUILD gst-plugins-voaacenc-1.14.5.ebuild 321 BLAKE2B 0069f1603caff5ccda14bdf0f303d1322910b6798a1f7fae27aa84ab1293bd96fb50706783635ca7cd003e7e6ae8f5840074ae26e645229cf461dc34ebc0cf35 SHA512 87839b051ac5eb714b01c9e88d1c4def2e1926f5d70d8743b304f75942daea4c77aee192dd7d360bc1d59927834e7366bed0c8faa92efae6e2d25d3f05071212
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-voaacenc/gst-plugins-voaacenc-1.14.5.ebuild b/media-plugins/gst-plugins-voaacenc/gst-plugins-voaacenc-1.14.5.ebuild
new file mode 100644
index 000000000000..b1e3d1b3008a
--- /dev/null
+++ b/media-plugins/gst-plugins-voaacenc/gst-plugins-voaacenc-1.14.5.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="AAC encoder plugin for GStreamer"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-voamrwbenc/Manifest b/media-plugins/gst-plugins-voamrwbenc/Manifest
index 234b7d21fb72..7ee2ab0f1b29 100644
--- a/media-plugins/gst-plugins-voamrwbenc/Manifest
+++ b/media-plugins/gst-plugins-voamrwbenc/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
+DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 EBUILD gst-plugins-voamrwbenc-1.14.3.ebuild 333 BLAKE2B 849e58b02cb05640c9a4dda1bc2691334811b202c375c7ff574efa1fd67bfa347f483cc23c72fb4b7bb02c231dfb57ac7b5ed91a25945d0211856dc193eef753 SHA512 12d3776153e1dbdeeac37b8ca9b7cff50109c201fb6ac3f5b288f8c859d7f67ac43fd74db0e3535528c003ec2f7214fb93b7e0ef11cd3487361caf6eda5c9322
+EBUILD gst-plugins-voamrwbenc-1.14.5.ebuild 335 BLAKE2B b035f5ebe469e10483235ee984f6f4c745ca566ce182cf3de3281f00722a9bc2242327fdce2db258ca62182757e5b7fe99d3b5c33c815e93cff187a967bfc7d9 SHA512 d648b7bd11eb431ecda11e7ecf949727658deeae32740f2c551169d16de1c21cad25db9556729f6108c727c788915008a8ff95b42efaddf57e0cc48fdf0f46a7
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-voamrwbenc/gst-plugins-voamrwbenc-1.14.5.ebuild b/media-plugins/gst-plugins-voamrwbenc/gst-plugins-voamrwbenc-1.14.5.ebuild
new file mode 100644
index 000000000000..a202cf5447bc
--- /dev/null
+++ b/media-plugins/gst-plugins-voamrwbenc/gst-plugins-voamrwbenc-1.14.5.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="AMR-WB audio encoder plugin for GStreamer"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-vpx/Manifest b/media-plugins/gst-plugins-vpx/Manifest
index 76d34616294e..8191a2764e04 100644
--- a/media-plugins/gst-plugins-vpx/Manifest
+++ b/media-plugins/gst-plugins-vpx/Manifest
@@ -1,4 +1,6 @@
 AUX 1.14.4-libvpx-1.8-compat.patch 2149 BLAKE2B 870fc4b5eeaffa7f735f76b706f84ab2c69687df4c3fe788932278ba8d3870c0b385976471c6e95e3cc081ce50b11324505079f7d966890527627d35169b2bc9 SHA512 bd35100ed2659daca956d6775d58c068852fa2a4f38e53746a5e1abd5fc156ca2d876638e4b39d8d62df520b73ea2aac8b5582363a182263d0cbb4184f900825
 DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
+DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
 EBUILD gst-plugins-vpx-1.14.4.ebuild 508 BLAKE2B 3f0db9c5914223a7cff2018083b1bd4f19072ea379cd5b829fc2216973a47945f309606fdb9451045b9815f29fb9496e65f6ff5ee91bdfff3633982bf2435a4d SHA512 943bd41bf9eee702696411b9d960b0d88ff9a0ab48b192728317091b5cacfd543872be7c0322b62e990f0ddaf752ab92b97689199799219f031526958dbb35dd
+EBUILD gst-plugins-vpx-1.14.5.ebuild 417 BLAKE2B 0abff71d0004afc59234e87c0278b4e02863faf71d936fd76aca6b043ba80cfda5dc1bef4790394e87651183af87c35dc0ffbdddd30b4f634d089c58c335c5d2 SHA512 df97b262b2f66f382e1d92ebc17a34a6c6da1f0799c1b88701ff8ee60cbb96145ed70d635d1b026faf4dda4b7592a91f71244a81e693091941b8338a8c608edd
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.14.5.ebuild b/media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.14.5.ebuild
new file mode 100644
index 000000000000..71267c125c09
--- /dev/null
+++ b/media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.14.5.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-good
+
+inherit autotools gstreamer
+
+DESCRIPTION="VP8/VP9 video encoder/decoder plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+IUSE=""
+
+RDEPEND=">=media-libs/libvpx-1.3.0:=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-wavpack/Manifest b/media-plugins/gst-plugins-wavpack/Manifest
index a202114c8427..306f9f100f58 100644
--- a/media-plugins/gst-plugins-wavpack/Manifest
+++ b/media-plugins/gst-plugins-wavpack/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
+DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
 EBUILD gst-plugins-wavpack-1.14.4.ebuild 401 BLAKE2B 3b6d875403846c934d35516b9d86576dae9db78d66884200b07f4868ec331ad02da8ba371b490a76241b671b126bcacb66278aeddadba06991fd112c8ef4171b SHA512 020d8531595e4c90272c63461e47a4f37d9385bfaf8577cef271c63d2f40f7c4db506fde158619930110659dfdcc2e736587d7b47a0a58817f892d346316748e
+EBUILD gst-plugins-wavpack-1.14.5.ebuild 406 BLAKE2B 04864aa291b52f4b7c003869955eb0ba1b688afe22618f9c1e98c4c129d8dab871c0b060b90fd251cac2d82ad75869dda776cbb0d9a25d6f0a137cf617ff2edd SHA512 09d97c12c4b4788ea9bb0e2eb97df1452077f877814ddad30a486a25555cdd0447296c81e88d9d00f07d5c8b0be32bc5882462a6d6173fcc01644f3e6cbfa8d2
 MISC metadata.xml 529 BLAKE2B 137cd943fda3cba7c57ece2b4eff3c1beb0c694dd564f11a82249171fc2bf17448a18aabd2ebf4eb21dfefef07c9a0a8a749df48e79e7709b56634d4ad8a8250 SHA512 31c1c1b8f7e462a53d6bd6cc68c310f5236c6ba52f3fac37775a30dcc0448b2fba900c1b2ef16f31566f03a3b823aa6de02ccaf033f6ec587d64a175aa57ade4
diff --git a/media-plugins/gst-plugins-wavpack/gst-plugins-wavpack-1.14.5.ebuild b/media-plugins/gst-plugins-wavpack/gst-plugins-wavpack-1.14.5.ebuild
new file mode 100644
index 000000000000..cd005f562b61
--- /dev/null
+++ b/media-plugins/gst-plugins-wavpack/gst-plugins-wavpack-1.14.5.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-good
+
+inherit gstreamer
+
+DESCRIPTION="Wavpack audio encoder/decoder plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+IUSE=""
+
+RDEPEND=">=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-x265/Manifest b/media-plugins/gst-plugins-x265/Manifest
index 7b6295340a20..d93fafc916dc 100644
--- a/media-plugins/gst-plugins-x265/Manifest
+++ b/media-plugins/gst-plugins-x265/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
+DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 EBUILD gst-plugins-x265-1.14.3.ebuild 315 BLAKE2B 7cb878e6f3b8b087bf7c8d0ac47bdae273e1435772a3aab655a568046b2ff34f0625b2b11e94da0c970de3e0af00b68c3f448662f5b8b6bdb339f9db4581394c SHA512 16495d7f764218030a9500c07afc138c5eaec9c55a34970b1f37c8c9f37118888f96aba8d1093f402f64243b3665361dbf9550e148dfbc3d5bee997c62e8a3b1
+EBUILD gst-plugins-x265-1.14.5.ebuild 317 BLAKE2B 53cb53c379fc5672e1ff5cedd110320e914b4c04fedcfef096c2cb8290be0f84f3c0a34e8aab8584d91730bf9eaf8cea1a9860cb4591f556fea58dd13a6face2 SHA512 a6ed59c7b288bd60098e3ab050922d4bb6f4a3d167646bd657e30a489eace4512634d35c10b82d710fae222ae857d9cd903edfc8bafab3e060d6bd8b24b29e1d
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-x265/gst-plugins-x265-1.14.5.ebuild b/media-plugins/gst-plugins-x265/gst-plugins-x265-1.14.5.ebuild
new file mode 100644
index 000000000000..be64d7ebefdf
--- /dev/null
+++ b/media-plugins/gst-plugins-x265/gst-plugins-x265-1.14.5.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE="gst-plugins-bad"
+
+inherit gstreamer
+
+DESCRIPTION="H.265 encoder plugin for GStreamer"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	media-libs/x265:=[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-ximagesrc/Manifest b/media-plugins/gst-plugins-ximagesrc/Manifest
index 19a308810173..c67d76258010 100644
--- a/media-plugins/gst-plugins-ximagesrc/Manifest
+++ b/media-plugins/gst-plugins-ximagesrc/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
+DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
 EBUILD gst-plugins-ximagesrc-1.14.4.ebuild 682 BLAKE2B 6acddf4e35c62bcb10de90e4c1658026dae67f41863a5a7c2f907963309d9140b93f846b37b84090865f212d33d76a65845ee1c20c72ce0ce3671d4b754204a0 SHA512 c719b4485e3237c2a4b428d39f5514bd82ee52417bec84bbbea39d59d8744d9cda454c8c833c7c04df6f37bb2029a422d66482b63d5e8811a1c3504557a2b8e7
+EBUILD gst-plugins-ximagesrc-1.14.5.ebuild 686 BLAKE2B 5849bc32debe8c596a8df37b6151d9991d366202b4b914fc5db1185ccc8c7c4e73554bfdb7fb27f9b6cbf67e5c57b4495c6a5fa5f79db3564350a7d3cad493f1 SHA512 af8ee5b5d165226b739610bcb3f60c99657d5c9ac4f889b882355c5024c4be569fb840361285bb75bdeae7da2bb77e194239c83f9cba1654348ddb0dc1bd3a32
 MISC metadata.xml 457 BLAKE2B 6af6de3816b28b279400abcc8e9fce070ce8ac5ce2f4ccbecff7d16ba0081bb277db520bd4efaeb07e48b220cf35baf09e0c68e7d99fab59eefc57c0881af49b SHA512 52d8e5e5f48b1e6a0f0e5742307348d66ec3302ffa32dc1dde2f98078621c242d431bf2354902f5ca17b277910cb733336219bc8c1598a1b4ea2c149fcbcf559
diff --git a/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.14.5.ebuild b/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.14.5.ebuild
new file mode 100644
index 000000000000..8ebedca57d22
--- /dev/null
+++ b/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.14.5.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-good
+
+inherit gstreamer
+
+DESCRIPTION="X11 video capture stream plugin for GStreamer"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="
+	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP}]
+	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXdamage-1.1.4-r1[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+"
+
+# xshm is a compile time option of ximage
+GST_PLUGINS_BUILD="x xshm"
+GST_PLUGINS_BUILD_DIR="ximage"
diff --git a/media-plugins/gst-plugins-zbar/Manifest b/media-plugins/gst-plugins-zbar/Manifest
index bc439085a1dd..a06f7c0ebd77 100644
--- a/media-plugins/gst-plugins-zbar/Manifest
+++ b/media-plugins/gst-plugins-zbar/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
+DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 EBUILD gst-plugins-zbar-1.14.3.ebuild 343 BLAKE2B 6c271e87a5cb16ec20cadf1781378bb78b763122413c13f6660cbae764c268c612a02e563d862953d8d0677f6afad035cfa5562fc2fb2adff6452d8d1e9244a3 SHA512 81ba6f608b3a02b81be984f5f834fe8a13515b4cd9cfa51ed8c640ff926682b22629c68a74c63b884f2ad1f4c895953b62206c1a2ec03caffdce988d0f01453b
+EBUILD gst-plugins-zbar-1.14.5.ebuild 340 BLAKE2B cbf2f8b7c76d6981415a00a18c8f52dfa387da6bc6d4adecce3f76bd9dddd8233ba838c2a345d76f2a7db0e0d529b59c5d6df2b734c716a42e1723eabb45d823 SHA512 41be0ddf118b5242aa144dcf0083a4137bad74ff900c1527cf7bda997d5e7e58087a21eb02fc37ce7c150841bed0017fed726c26f891bbf1239fff6cf3cc369a
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-zbar/gst-plugins-zbar-1.14.5.ebuild b/media-plugins/gst-plugins-zbar/gst-plugins-zbar-1.14.5.ebuild
new file mode 100644
index 000000000000..8ac232303b10
--- /dev/null
+++ b/media-plugins/gst-plugins-zbar/gst-plugins-zbar-1.14.5.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="Bar codes detection in video streams for GStreamer"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND=">=media-gfx/zbar-0.10_p20121015-r2[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/kodi-audiodecoder-modplug/Manifest b/media-plugins/kodi-audiodecoder-modplug/Manifest
index 1268fe428af3..caa87870aa13 100644
--- a/media-plugins/kodi-audiodecoder-modplug/Manifest
+++ b/media-plugins/kodi-audiodecoder-modplug/Manifest
@@ -1,6 +1,6 @@
-DIST kodi-audiodecoder-modplug-1.1.0.tar.gz 25619 BLAKE2B ca431badbfa6c7e765543b0e386895bce9ac7a2f6104e72713c146e5097e382ff8e56c1483e4688f1e373c2f6e97a76d95a78e2cab26141116c224a5c5f1e10b SHA512 38ddb6a86019cba493790df6a09de553fadec84943de98dd18dd8bc1b1741b498fc1e621adfb8d6b2dd983e7bd7014951cdcb8bd5d82c980594363c6626cff5e
 DIST kodi-audiodecoder-modplug-2.0.0.tar.gz 30001 BLAKE2B 9ce90103a9b50a37c3f6c8671ecf9986f2b31320fc483dfee6d97331cb56829a9641c8cd1efe1fa9edf6ada360bc1b10bfcff0022022f4ba097a191b52dae0e6 SHA512 8f1cbd95b4fd6dcd560dc615c161e733d7b3413a80abf91c19eb59137e7acf250c9bfd5561a722ddeb52afcc4cf7e2ab0d4f6d8bc5143ef18e0b2c431635063a
-EBUILD kodi-audiodecoder-modplug-1.1.0-r1.ebuild 706 BLAKE2B 92862756b7b7044744599432610e183623d3cad30fa27d087951ee3cccc0a7cc2f429e573e2dd6e257b5d609c907b7be1a1ea82ed380e4430ab7646b3a46d6a2 SHA512 fafce743382edf211c6787e2da919df3ec0f22820e2df2c3f00de683d78a3c5f70a4ebf3f7b3dfeb9f9d744034064164cb2aaa6593eda8a2a9d1085843f9e0df
+DIST kodi-audiodecoder-modplug-2.0.1.tar.gz 29996 BLAKE2B cf0f4e5f0ca74b3014ebdf4d539f8e9b27cb0b8c5f753866dd2955b1ddabdd60b444cb0b24db1de78b996dd982a6dabcb553a37a105455a399b25b3347961d87 SHA512 ad771a03726f8622f5bba2b98b5ee6484f83c8c66eded57d0d941551ba572c1014ca6f8f29a09a0cf3876db8b046c77db4ac81db6d5a7d51f5048e8aa37a2c77
 EBUILD kodi-audiodecoder-modplug-2.0.0.ebuild 746 BLAKE2B 6100bfca367bfb618d12a59bedfcb19d3930d574dbb502815b7ea04ae1413532369a8cf510020f318f911d16d17b073c6439c2f991b70c1a4d3c2fa6a17eb4eb SHA512 cd60e7b2c102078b7f49b851a221ebc3602fb41c8876947b88efd75e2931369d92163802c62e40a7e768753c53b089ed5a29e86908796384914b236fdb28792c
-EBUILD kodi-audiodecoder-modplug-9999.ebuild 748 BLAKE2B 1c32d152f205d12c546b935629dfaf1a4aa34ed861534c3d0ab23088b6c6a27cd605fb923540d6e784b8819191881a9c432ddb8a1ae2829a40a1496ca62c4cd7 SHA512 0afef5a333c6441e201fab8f45ab544152c6b6af6711c5fa3c716c9172a9d35df2e3db801879d13f5d2e05b0eec169aedc586443050e44b21d3bf6c97ab1adf3
+EBUILD kodi-audiodecoder-modplug-2.0.1.ebuild 715 BLAKE2B b90fffd3454f4bb47b10a751283fc640ba22049fa7217a486dfabcb7eac2b1cb6ac79c1fb8b20ee6bebb1e461568f488a11e6aeba91757747e941638604d63b8 SHA512 8edf72c5b5902e96549f7570bbbf846daff3984d030afd0a7eb131f9da0e26d8b0896197e11c0ea954f9cedd4020d4967ac03b5cb403646e7058f45e0247b0d1
+EBUILD kodi-audiodecoder-modplug-9999.ebuild 716 BLAKE2B 008424e46e420ae2f1953f70357d33a4c9a9df3b28d1178feef6e209a0b550a3306a2562e4a3de189ae02caa7acb259ff465435b328836515d9dbac28d4873de SHA512 9613bec71fbffa2cee9d76f9e72480a223573fbeac77dafc0af3030fab290086f22274e8b29d11247f0e0887324759f88c53ac0163bea3910c3d096d84976d8c
 MISC metadata.xml 442 BLAKE2B 7ac417393f7d1a671942b34984b98caf86a36c6b58ef5ad5eb49806e47ba2e5efad0f208c81343fc63c1949831fb9f8e5b83a16138d7a607ca900a0dce649709 SHA512 5b54a7fba19f53f9b07621207d7c71a95ee934e453bebd00a8a9c4f44831ac51f4055c033872ae937b9df9a9aba6d708bc067bb89f68284fff730dc349c2949b
diff --git a/media-plugins/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug-1.1.0-r1.ebuild b/media-plugins/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug-2.0.1.ebuild
index eee4b14ab81d..29fdbe5ef39b 100644
--- a/media-plugins/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug-1.1.0-r1.ebuild
+++ b/media-plugins/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug-2.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,9 +16,10 @@ case ${PV} in
 	inherit git-r3
 	;;
 *)
+	CODENAME="Leia"
 	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/notspiff/audiodecoder.modplug/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/audiodecoder.modplug-${PV}"
+	SRC_URI="https://github.com/notspiff/audiodecoder.modplug/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/audiodecoder.modplug-${PV}-${CODENAME}"
 	;;
 esac
 
@@ -27,8 +28,7 @@ SLOT="0"
 IUSE=""
 
 DEPEND="
-	=media-tv/kodi-17*
-	=media-libs/kodi-platform-17*
+	=media-tv/kodi-18*
 	media-libs/libmodplug
 	"
 
diff --git a/media-plugins/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug-9999.ebuild b/media-plugins/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug-9999.ebuild
index 4077a1296a9d..da4abae4e8bf 100644
--- a/media-plugins/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug-9999.ebuild
+++ b/media-plugins/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
@@ -29,7 +29,6 @@ IUSE=""
 
 DEPEND="
 	~media-tv/kodi-9999
-	~media-libs/kodi-platform-9999
 	media-libs/libmodplug
 	"
 
diff --git a/media-plugins/kodi-audiodecoder-nosefart/Manifest b/media-plugins/kodi-audiodecoder-nosefart/Manifest
index 06b326948329..92d2e2cf496c 100644
--- a/media-plugins/kodi-audiodecoder-nosefart/Manifest
+++ b/media-plugins/kodi-audiodecoder-nosefart/Manifest
@@ -1,6 +1,4 @@
-DIST kodi-audiodecoder-nosefart-1.1.0.tar.gz 59921 BLAKE2B 617b001325a43e25ab6541534a33b7e43d4f67d754bb741e0172705b27413bdc98a93afbcf3e00bae25f1d4709f589a9588d70109a1c4c2cb89b4d8be9dce2d1 SHA512 c85768e3b7b31607429d85f6d2f9254bb42a4500a0e42b0a76d953a87b6d2275cef4ed922eb7a2af51770b90cb35403171df6258dae9157683be0a07304f6e6b
 DIST kodi-audiodecoder-nosefart-2.0.0.tar.gz 61006 BLAKE2B 8c3499b8820eb124f6532f722fae39c10880b31d58dce81a1170ae18005047b2ecdb7f9963e1a957de61beaf4a89d682580ea62e739bdc3045e0cd6402685394 SHA512 8dfcae6e81553bccb093dac2aefdbea6e405ebcf3c3505b4647a4970f46ec8aa2f45690a0fd73ff356d074c86c670ab0a60ff5a049dd1e54de3100457fbae935
-EBUILD kodi-audiodecoder-nosefart-1.1.0-r1.ebuild 683 BLAKE2B df56a62216666abde98c9750250b2702cc1f4664ab2ca24b09344e88f362a0448168eb197f408f82f2d954311bebf6bf596257f13b78c34f9d05eadd53634669 SHA512 cffffb04e7b7b91be4b5e3a51669c8b3c8f96c7b33e2396a8314c518b865a33ff05760f9a538c23313070d7bddda89fd94e2182f411d62a6c5a554c2339fe16b
 EBUILD kodi-audiodecoder-nosefart-2.0.0.ebuild 723 BLAKE2B 710cb2781dd91060752684b0ff799c13bfabb5ae90c6b420008d929257291a6900af663935c4194d4d0a5e6e396a84e05748febb0bc393864bb44da55186c5f3 SHA512 b929e8f7c3b793755b3a43452b3023215c891500f0455678218601aba2e67af4666ccfbc1ac6ce2e380a3c8d39130318e4269acc384d5dc8a44cc4d8fdf6f92d
-EBUILD kodi-audiodecoder-nosefart-9999.ebuild 725 BLAKE2B 1e61761fa789b3c4e900828b718fa45225b2a55115069dde7cfdabcb2062478efa0061cc1c539f574879ff474231770a9c36da8b968a8700fa5db73cb3e67ede SHA512 beae47b0245e11940a3896876309b7e43497b0f85048d91230683926c52f7aaf7833cd6c931f839213d7b511ab077491dc28c169cd1dff9f03a7c06701388b0a
+EBUILD kodi-audiodecoder-nosefart-9999.ebuild 725 BLAKE2B 9c3b4acc7004c09a20a122a02d1f21872be18c94c09ab19f056f540a6d72a648eb72cce004817156b501b913033db5d65a5a0a6441c458d82fc35e9405f02260 SHA512 7b3086f71fe8f502e0355e42779dd36f0c600bb2771257b3e6815b79a08a403af24135a68b72cf1d945c27445aa36fa90ef2925cfe17310f61e358122513fc9c
 MISC metadata.xml 444 BLAKE2B f2946063cbdf62c0e0eddbb32b3a9f42a7e03c52975934a191a19e0bd59c97bf8bc70b55eeaf45ad3cad54a7081d238cfbbe1e235cc23855d8a7404cac2d436d SHA512 9a6295c8af39d75437b1f56b8a91e234ac1578110e1e64b52ee5ade240bd43764a52ec843735e7e3814fea6a662937315db4ae5e0988c9c016c1f72ab12fe91a
diff --git a/media-plugins/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart-1.1.0-r1.ebuild b/media-plugins/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart-1.1.0-r1.ebuild
deleted file mode 100644
index b043af12512e..000000000000
--- a/media-plugins/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Nosefart decoder addon for Kodi"
-HOMEPAGE="https://github.com/notspiff/audiodecoder.nosefart"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/notspiff/audiodecoder.nosefart"
-	inherit git-r3
-	;;
-*)
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/notspiff/audiodecoder.nosefart/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/audiodecoder.nosefart-${PV}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-17*
-	=media-libs/kodi-platform-17*
-	"
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart-9999.ebuild b/media-plugins/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart-9999.ebuild
index 1266bc7680ef..d52c566cfceb 100644
--- a/media-plugins/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart-9999.ebuild
+++ b/media-plugins/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
diff --git a/media-plugins/kodi-audiodecoder-sidplay/Manifest b/media-plugins/kodi-audiodecoder-sidplay/Manifest
index f5cc9e7858b9..f3ad1bc403a4 100644
--- a/media-plugins/kodi-audiodecoder-sidplay/Manifest
+++ b/media-plugins/kodi-audiodecoder-sidplay/Manifest
@@ -1,6 +1,4 @@
-DIST kodi-audiodecoder-sidplay-1.1.0.tar.gz 9120 BLAKE2B aad141a6b3b6145906fd482149ab72345c86c692cea0b7cf92c52cf015d158aa54de0644f83080f5a25b5690c0e4d12c008924fe78793ac5fc1cbc8c555f114f SHA512 a6874cd7de1c3b0e33593b5c349f64303690f0d56a881bd399c300f8d22ea361ebc995b38f97be39af6bc006a6f0e11b905e70cc671857bcb989dcff90a2d0ee
 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
+EBUILD kodi-audiodecoder-sidplay-9999.ebuild 750 BLAKE2B a8afdeaabb49d72b60c89cf250868999a8fff67169657a6c3df9b0f6881ab12f7b2462831dff8aeb86af2135314b686dd828f51ede62922d9ba0af9664f0575a SHA512 c2755f549fd80636e6d1ca1b6b29e66d33f63125d1a608bf4a2bc31ae110adc1747e20c812f6ac0246586c23cbf5f0141af6944fed8b343bd13b6802ad8bd64c
 MISC metadata.xml 442 BLAKE2B afc3ae3f9157185ec41cbd144cce22ddd50be0f1409ccb2c764a88a0e448d6504904522d0a18bcf089ca85bbc4a8b05f51e795ec30fb9f7614479835b1ec1185 SHA512 4046b1455fe5c4cb63127751d2fbcc21b3b124609fbe0798c9675e50a837cabf1ef8d7d48103162633a6b47b36394feb1f15d45fc92f6266760de36ea614d6ea
diff --git a/media-plugins/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay-1.1.0-r1.ebuild b/media-plugins/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay-1.1.0-r1.ebuild
deleted file mode 100644
index 882888415e09..000000000000
--- a/media-plugins/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="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
-	;;
-*)
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/notspiff/audiodecoder.sidplay/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/audiodecoder.sidplay-${PV}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-17*
-	=media-libs/kodi-platform-17*
-	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 092cc74d4d6d..3efad63660e9 100644
--- a/media-plugins/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay-9999.ebuild
+++ b/media-plugins/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
diff --git a/media-plugins/kodi-audiodecoder-snesapu/Manifest b/media-plugins/kodi-audiodecoder-snesapu/Manifest
index c587f1f7d266..04ed4a55bf5b 100644
--- a/media-plugins/kodi-audiodecoder-snesapu/Manifest
+++ b/media-plugins/kodi-audiodecoder-snesapu/Manifest
@@ -1,6 +1,4 @@
-DIST kodi-audiodecoder-snesapu-1.1.0.tar.gz 38567 BLAKE2B 461164cfc9f81c5c4e644e7905b40a475cb19aeb2b9c91912d8a8e7fd2505141fe7d513e4986922c374226025226257b00415953379ec071f95c37ea2db0fb1e SHA512 f58d87ddc2da1734399872543f18a1a77f5bfd2b3adce42c8e4211a7e4e199a51a59aaccfbd7dff24e4599c9457276014233ab6213c231e2be7e6c7d09e08ffe
 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
+EBUILD kodi-audiodecoder-snesapu-9999.ebuild 720 BLAKE2B 87c2e57d1c3e0f56607529c8458409482f4d1470b2b7cf90358415d76ee450dd7e57ac05b9b7c219b442156627f0dba6ca36439f8f31b3ed396e996a2579e0fa SHA512 ce68dbf1877bb4e00edfb8fe8603da5a218a9c52a1198dd57f8c8899e7d818c217739693eb00221ef94baefdb36d236fdb9dbddd44906d53c246b59641ea71b3
 MISC metadata.xml 438 BLAKE2B 0b8c0545fe3ec7e6ead7eea42baa9255946bf7d27762d392899356ed45e1e7182d7087c25a56b34d114e6de8b95c8a5311fe90b0d52a9e7d007851ec22ab970e SHA512 9561349a81107c52fe83cada11fb8ab55c176fa4e410556741f5259503b7d43732bcf7debfa30a7c98fc7d1e5336abef914a7c31b9663556cd10fc7daf3dab14
diff --git a/media-plugins/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu-1.1.0-r1.ebuild b/media-plugins/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu-1.1.0-r1.ebuild
deleted file mode 100644
index f549197c1b8c..000000000000
--- a/media-plugins/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="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
-	;;
-*)
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/notspiff/audiodecoder.snesapu/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/audiodecoder.snesapu-${PV}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-17*
-	=media-libs/kodi-platform-17*
-	"
-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 4f9e8c3888ec..666a54134efe 100644
--- a/media-plugins/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu-9999.ebuild
+++ b/media-plugins/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
diff --git a/media-plugins/kodi-audiodecoder-stsound/Manifest b/media-plugins/kodi-audiodecoder-stsound/Manifest
index 7dc6e0a21812..c32a164a50f6 100644
--- a/media-plugins/kodi-audiodecoder-stsound/Manifest
+++ b/media-plugins/kodi-audiodecoder-stsound/Manifest
@@ -1,6 +1,4 @@
-DIST kodi-audiodecoder-stsound-1.1.0.tar.gz 62033 BLAKE2B 1aaf55b732ae2ac0a647963979afc3db79fc58ef0baee42ba15245c6a8d353cffd24bc9101113cbf302e7cf73bc504c621b480bcf3a09bd543601e0fbd691602 SHA512 462403bc3221cef4b64b12f25765fe89567e873a0aa9df7dfb4e649132500b5fec43f0551f7d359c2b4ee38ab8fcf03bc010e84d20bdd4b8665ad254568f9f60
 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
+EBUILD kodi-audiodecoder-stsound-9999.ebuild 720 BLAKE2B 8a6a4d1b8b2a9836586ad18006d1858fb50a4dbd4d4eea306b0ad84a76428553339d8786e29e1f3e273f39989d491d69044627edcda9fe4dc23b95b29e4b4f16 SHA512 34050281fca972539c94cc799a58caba1ad8a6ff0e5601ade2803587028966a5e59e7cb04126bd90e83bb18d5c83b0963bbe2db357670677da4a9f8e8a775b77
 MISC metadata.xml 437 BLAKE2B 36e61faf2f1098a85827d6f81536b35d874e325a7094d535b742c71b30afaf671ed77cf9d84993ebe5e2407ee316d72453a3e18b3cfe55c0d5ccd9691f3cf12f SHA512 a985c629c36655238f0125134c4f64ffae47add726888adf934b8b66aeb9622a12ac256703206b98ed39f29ecd0a0f9ad9043af80160a8d545a982c9fe659504
diff --git a/media-plugins/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound-1.1.0-r1.ebuild b/media-plugins/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound-1.1.0-r1.ebuild
deleted file mode 100644
index bcb6ded7e4ca..000000000000
--- a/media-plugins/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="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
-	;;
-*)
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/notspiff/audiodecoder.stsound/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/audiodecoder.stsound-${PV}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-17*
-	=media-libs/kodi-platform-17*
-	"
-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 09c82e122719..3443ac784761 100644
--- a/media-plugins/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound-9999.ebuild
+++ b/media-plugins/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
diff --git a/media-plugins/kodi-audiodecoder-timidity/Manifest b/media-plugins/kodi-audiodecoder-timidity/Manifest
index de2bda2ab760..1de642d16f14 100644
--- a/media-plugins/kodi-audiodecoder-timidity/Manifest
+++ b/media-plugins/kodi-audiodecoder-timidity/Manifest
@@ -1,7 +1,5 @@
-DIST kodi-audiodecoder-timidity-1.1.0.tar.gz 1785627 BLAKE2B 4adcb4c2331174d5f023b5698b5fa2a589df81575eb6e9b8b162f9054aa673ca49d516b94eb07b6c769f9301f6c991cfbbf9cd50eaea12d8580f3db97111d8d3 SHA512 d6bf19761a60306cfd89bf4cd654f8e6c6725c29d15da80bd22236add62051671cde1363ea9df1e5488cc8dcf8c31fc8b432466480d44af0141e639f5cf36a88
 DIST kodi-audiodecoder-timidity-2.0.1-Leia.tar.gz 1787950 BLAKE2B d0547f80eff154f2129d91077e25b0f51d19ee66ff371c7a11d4a7d0e3f479506961ea290a9a71643fd4a707dfe1ae29de7b5ed5fc7ccfd6e1d5625cf6d7138f SHA512 91db2fa954d441901ebce35189d642931882f5b20ca815af45dce67d3dbcb201a8920fb76e0e8074038f476a1dba1192cba28de7c374c76800cc50161f6915f1
-EBUILD kodi-audiodecoder-timidity-1.1.0-r1.ebuild 656 BLAKE2B beba8a19bb335695156398f9d662174073e596a70994027dc2a094dcec7e2b56ce2bdd0ecb204ca3368cca24215444a0b607c1d727d17cbde79a8e3de4140c09 SHA512 054da9c730713c80101442674ae5dd8430811982907bca2e4d5de5452864aa4c35b6b75d7c2cd96eb7debeae1721b7775223a977b0cce4defd3dffe7fb91c268
 EBUILD kodi-audiodecoder-timidity-2.0.1-r1.ebuild 734 BLAKE2B b68536d4c91317fb9ac15e22aab32e8277b21fcb8a8285c6ef20a8d032584252b9c428d7cd51b6a66cf594f07fda58267b6560e1594ee6693376938b0c303f29 SHA512 fa8e6195b67b43fb5db248aa9d63beb353ae5a06540a6aedf9e87fc3a9d5f4ef43b55962c54b3f3e372847328e7e39f2667a4a9826a4d2fe3c8388c9d5ec0d1d
 EBUILD kodi-audiodecoder-timidity-2.0.1.ebuild 708 BLAKE2B dbe849e00740a969bd20c0d281fd5599239ed989585af2fa0fc62ca2f574cbf44419b04131d3fe7cd9fa9c6e1ac7582ca20d41c74c99325baf4fb8ef842f98fc SHA512 fdada114d5c02b47f1b8827f38360ce740527e124c43f8c9cd4dafb98eb8dcfbaec5dbce238defebafa33c9361f644631cf4b48972af30047b9078fb22607703
-EBUILD kodi-audiodecoder-timidity-9999.ebuild 735 BLAKE2B bf90509fac7e82b7cebecb1c4ca237059b9de46d1eb9bd552578603577685e0319ef27ee5713a9ac7fe8ebf72eb66e6ae1f02a9c2447496ba808dc9ae5d15d4b SHA512 622ba2fa10dbe9e69ade56372288455ec6ebec90948556ba4cebf52dccdb195f4da6baba6c58be20212d945f62b26b018b6d7c9fa8294b4d1e70b495793fe899
+EBUILD kodi-audiodecoder-timidity-9999.ebuild 735 BLAKE2B 9ceeaeebaf1ffa79e1b5be963fd01efaad56ef0524c96c38e8cd99a1c57ed7e694156448f125f27afa6bbe6a8124f117594687f525b120f41c1396374af77e74 SHA512 2a2c5cd84d5b587a298f0a0c0de69eaa1674570c4a35eeae20cea512e420b4f1cf4a2e25a2c0be7c3cdeae27d266fbeb70692c4588f379d777f31280a03145e9
 MISC metadata.xml 444 BLAKE2B a8bc29439b6fada05640522f57d0c97d905ce14abee08f1cff2ab2e1fc36c20ca4491e836b9092ca4d0c7a2b9e66e66d6882b1c5c77b4973d038b294e7d82503 SHA512 924f94fe1923314c5ab70873705dd30874bdf52c5f2f1d13282c140b0080a71a483206c7554dacf0c4dbfcec9f4f4ac340e024b32fd9286f8ce69d52caa8aaa2
diff --git a/media-plugins/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity-1.1.0-r1.ebuild b/media-plugins/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity-1.1.0-r1.ebuild
deleted file mode 100644
index c539371a7f9a..000000000000
--- a/media-plugins/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Timidity decoder addon for Kodi"
-HOMEPAGE="https://github.com/notspiff/audiodecoder.timidity"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/notspiff/audiodecoder.timidity.git"
-	inherit git-r3
-	;;
-*)
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/notspiff/audiodecoder.timidity/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/audiodecoder.timidity-${PV}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-17*
-	"
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity-9999.ebuild b/media-plugins/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity-9999.ebuild
index e99b24fbb324..2fb758e00408 100644
--- a/media-plugins/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity-9999.ebuild
+++ b/media-plugins/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
diff --git a/media-plugins/kodi-audiodecoder-vgmstream/Manifest b/media-plugins/kodi-audiodecoder-vgmstream/Manifest
index a1da64c29c2e..1eef317b60d7 100644
--- a/media-plugins/kodi-audiodecoder-vgmstream/Manifest
+++ b/media-plugins/kodi-audiodecoder-vgmstream/Manifest
@@ -1,6 +1,4 @@
-DIST kodi-audiodecoder-vgmstream-1.1.0.tar.gz 235215 BLAKE2B de8253b3a619e0a9a3ab954967fe73081d72aaef37318862745e1378d21001cb9950a2849c0ae6320e9c968d2d0f2c16ca394315e30d08c5fda94e8faf599f45 SHA512 a0549ad7ef94a68bf3e1d77d222790acc15be06f124e148e980aa2f96956da659d5967e0ac034db9ccbb34416cd3a607e7607ec91d00ec12e4bf287766b76d0d
 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
+EBUILD kodi-audiodecoder-vgmstream-9999.ebuild 730 BLAKE2B e941ee6eeb3c1e19555b14bf68d0f704b877dae129f4237bc0cfa70c9ebc76a84f5fc686f0e961c90bff1036b76ed73d7c2aadc6145bc56fa5a1646b72bc2e57 SHA512 fe5c5592a130bbd3e7a64b17573b717823b1c2916c560fdf7d38b47cedeb4d0c7c2a9fc2945148d276625a8884d8b0ed40989f764e202ca76db45a8179fd9e18
 MISC metadata.xml 440 BLAKE2B 534e3b04fc69fd47da8b492744fc924ab8e3ffca3b8bb4ab06853dfd5e707f3131630ff06272548c3b05227a9d1cb110441a6b39315203918aca4dfc9fd1c52e SHA512 280074c2c911f1df1c0fbfaead6f51f49992accac7cff643e3d03a0b52f6b64cce156937430d950bc1c875c48c15632d703e5eb69a6c270bdbb25ea7faf7f03d
diff --git a/media-plugins/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream-1.1.0-r1.ebuild b/media-plugins/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream-1.1.0-r1.ebuild
deleted file mode 100644
index d655d51c8f1d..000000000000
--- a/media-plugins/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="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
-	;;
-*)
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/notspiff/audiodecoder.vgmstream/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/audiodecoder.vgmstream-${PV}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-17*
-	=media-libs/kodi-platform-17*
-	"
-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 dbd2e565982c..5406db9b4dd5 100644
--- a/media-plugins/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream-9999.ebuild
+++ b/media-plugins/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
diff --git a/media-plugins/kodi-audioencoder-flac/Manifest b/media-plugins/kodi-audioencoder-flac/Manifest
index a2e4a5daac56..6aa55b3e29d4 100644
--- a/media-plugins/kodi-audioencoder-flac/Manifest
+++ b/media-plugins/kodi-audioencoder-flac/Manifest
@@ -1,6 +1,4 @@
-DIST kodi-audioencoder-flac-1.1.0.tar.gz 18508 BLAKE2B 35c85811b4cc0c37bc14d28afc3c8189ee694bd6be0a4c547c0a930398cbc404d687a45b575e77f9b570170acad1df09b59d9c5823202fb4bc9dd19bcb9bff6d SHA512 1a89cd5cd02305b4121582e06a7e88dd745133fa0676d01a9c5f15af025050875a9fa59e74efa71bc5a9d85cb845050edecac507ccd8f4f1f3300016e74331b3
 DIST kodi-audioencoder-flac-2.0.1.tar.gz 20523 BLAKE2B 6ef8f51df7d0c0113389508e3d295b9adf7757684e42ab01ed19f4837881b2f9adfcfd6950f01fb0de54a772a7ea907afd3c4595b0df4b8fd2be647149a5a510 SHA512 4fcbfd4efe52b6983622367eefbbf09a9392c460160d6b4659df0e8b86a565a23f140a22728a2e40b033ad8cdbab68b786e90120dca034dd690217f8ba2b5c01
-EBUILD kodi-audioencoder-flac-1.1.0-r1.ebuild 660 BLAKE2B 50950c9cc03cae3969c4115ba8314ab6f3a3928b1c05e7d2037359c7cbced6a66c0e5615a3f26ab920e4936b2109965365538113a756e624e6f390f0b0625603 SHA512 d4f02a799422b55c5e5433eb135ccde8315a56d412ab8aa6f9d1fcc92bb8796a86506f871d98baa9866ad5170712a841e7c3ea74d1bedffd98ac85eedb72629c
 EBUILD kodi-audioencoder-flac-2.0.1.ebuild 660 BLAKE2B 18fb51dc940f5ef49f33a29304e0b4f4ced49a6337c9a46eeac530474d4dc84a8cfd43513ed14b6ee446e4d7b2efa584dd2e924ac8f396ddbb6ce7325b471785 SHA512 954d4337b5ddc2cb0e20c8ca658b9b8b520638f7a613dcc3265a884cca2f2c28042e9dad96a875fab1cac00e952e8dca17575af2bb3b8b76ed065ca91b95bd79
-EBUILD kodi-audioencoder-flac-9999.ebuild 661 BLAKE2B 54e3cabc5b1346cc543819651a904dca3f12eb719da6e4dd1dc35a847445e90d1789616e6fdb30d20a87b610538cd6b3b0b67ac5ebfbad77d9007462fb39a817 SHA512 7aca5a57f24763ab1ffea13a9eef71a40f392d9dd109ecc16885de4060b8f245fc9201f3153b6339da8bc8cb8c49559367159fc695a2e2d4a3e82309faa351ed
+EBUILD kodi-audioencoder-flac-9999.ebuild 661 BLAKE2B 7de9b563671d42b63a9878c9c3460a759b13c3681c467df8191678b3b4d3c9dd5d09be172bdd347d36d3752176449805e3da0c85ae7e532b8401dec98b913d56 SHA512 917e16cb442068946acebe3d1d61452c4c9df45c4c9c56de0ad2d3c9530a52cf2dc5e9c422cb6383702108b46e8a075286712f7686aa9c88fc8875da9bbbe5b0
 MISC metadata.xml 432 BLAKE2B 08bd867e97f6d3b7a103a557f95103159b2df2be3ef336f02d1f2551acc722d59331f981d4069451e33439730f0e9648cabb6c2f8559e214b421467759202c3b SHA512 2ef0c92e158ae0677b431163a8ca974a90c9d8acdf9fc95c563b152f1250657fcc0d64a212ff20ddd46585284ffd2e732088426b1e033b07862bfa889b7a4058
diff --git a/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-1.1.0-r1.ebuild b/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-1.1.0-r1.ebuild
deleted file mode 100644
index 949c5bd8e25c..000000000000
--- a/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Flac encoder addon for Kodi"
-HOMEPAGE="https://github.com/xbmc/audioencoder.flac"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/xbmc/audioencoder.flac.git"
-	inherit git-r3
-	;;
-*)
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/xbmc/audioencoder.flac/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/audioencoder.flac-${PV}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-17*
-	media-libs/libogg
-	media-libs/flac
-	"
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-9999.ebuild b/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-9999.ebuild
index 29993fc9d89b..326c9466c5e3 100644
--- a/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-9999.ebuild
+++ b/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
diff --git a/media-plugins/kodi-audioencoder-lame/Manifest b/media-plugins/kodi-audioencoder-lame/Manifest
index 763fb7043054..89da42f5fbca 100644
--- a/media-plugins/kodi-audioencoder-lame/Manifest
+++ b/media-plugins/kodi-audioencoder-lame/Manifest
@@ -1,6 +1,4 @@
-DIST kodi-audioencoder-lame-1.2.0.tar.gz 23109 BLAKE2B 9734a09e6ad3627080161114bd748e40fa15c0146cb8c16d805b902503aa28c85c9b337ad5bd66ed756204362ddb7ea9003313523920bc0975ca83fbd3296b8d SHA512 4f4ce910f9831e6f86615b0dc97c77ce60a834d5fd4e000976c6cd84d411eaa65e1a9b8a38edae7ff7c52d1a24c99f794b65c76432cfe4eeb286050e495190c1
 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
+EBUILD kodi-audioencoder-lame-9999.ebuild 648 BLAKE2B 1687f98de60926bb17ff9b6b2a465d9134ae2f671a82da9a0768198d4a374b39358214164077e4b9f261bf1dbd13b70b6609ba853db268c3c2248bde146196ac SHA512 3e8d4f9eaab56a67d65616a3145ae50eefcaa30ff5aa5c3aca8138d4ede1f6f38b2e243318debfccb8e74c5a9193abae0c1f166359b00a7ad06ef65d24f7242c
 MISC metadata.xml 436 BLAKE2B 89eb2bd7916bd6c206439984ddc7f84b5c04cdfe923b28f911f919720aec90449d40ffaa7d85306e486357d9e2b8b9681b3f3b79624dde542f2cdac218ffa75a SHA512 15bf6ae63d3265efca6ede0b1fd0849d266e58b555b2f1e593eb85752ddd62e56a1684ba33c0194368b564228c88fa55349e7ed088ac376f5b020045f3c4239f
diff --git a/media-plugins/kodi-audioencoder-lame/kodi-audioencoder-lame-1.2.0-r1.ebuild b/media-plugins/kodi-audioencoder-lame/kodi-audioencoder-lame-1.2.0-r1.ebuild
deleted file mode 100644
index 12208477a618..000000000000
--- a/media-plugins/kodi-audioencoder-lame/kodi-audioencoder-lame-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="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-17*
-	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 a30148d62097..0d70f244b676 100644
--- a/media-plugins/kodi-audioencoder-lame/kodi-audioencoder-lame-9999.ebuild
+++ b/media-plugins/kodi-audioencoder-lame/kodi-audioencoder-lame-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
diff --git a/media-plugins/kodi-audioencoder-vorbis/Manifest b/media-plugins/kodi-audioencoder-vorbis/Manifest
index e8b20b2660c4..ce582f1b365a 100644
--- a/media-plugins/kodi-audioencoder-vorbis/Manifest
+++ b/media-plugins/kodi-audioencoder-vorbis/Manifest
@@ -1,6 +1,6 @@
-DIST kodi-audioencoder-vorbis-1.1.0.tar.gz 14964 BLAKE2B df97adfd06660f95d060ddc18105a7279f09488f16ba2fd9ef640bcfbc92e676a9ff3b782a4aeae98a8dc9b169b4197221b5136798969995ceea85bdf569950c SHA512 db07cead7c814003ce231e650b9e66718b9dc3860363f5d1019e73ba3763b1e8d6dd68d0e4f37b3f0eafd6504b60f69ddd7414f8e790956036a350196a360408
 DIST kodi-audioencoder-vorbis-2.0.1.tar.gz 15878 BLAKE2B 66bed287d8af393d914678a3e8da13e73d969fe8dabdaa3ed3c579851f40456d12f32f7edf416eb2a9b8734a2868ed8c0d4eb0a22b70fbb74167f3de1cdca2e5 SHA512 ed560a014d135dc9bc57f0185afd3fc4636158309eb4029b0fa1392ef2109c7795902eb37ce051d99199e5834d530c67b63362fdfb9db500a27e10c39d49e1d9
-EBUILD kodi-audioencoder-vorbis-1.1.0-r1.ebuild 676 BLAKE2B 67c8dd994662554a3a6f7c6c5979ff1ca410de4619a7a6fbbe394531b96424d91b4704c23af5032252291a8eef61839dda95d4772ec39cdd7297bb0599203d18 SHA512 cceabc4aa4362734b44511207c8fdbb6bef546277c0eda87529d0b4b9652ccc959d438256d9c749c9c653cb78271648b52ced33c87eb7850e45ef43ed68ebfd2
+DIST kodi-audioencoder-vorbis-2.0.2.tar.gz 15881 BLAKE2B 78181ec315abbbc7a3594f11c5730d8e9913f4529ba449c230e18d8d0bdffcb26e756dd6af6ea390a575a5c47e7f34483cd93dbfc0f13e50e1b0fab0eb7b843d SHA512 9f6262cbd39735b6492e9d5a4f2fb0e0277d32428fab2aca463d104e7f49e68ce922c4ee633a830eb855aa42a7cff6392a98637bcc09e5dc19ee57807af02dd2
 EBUILD kodi-audioencoder-vorbis-2.0.1.ebuild 676 BLAKE2B a88b02c3d1675debe95a216a9f798fdd9d5a30963807d89869590fedaf4ef2fa6d2e69b52c540519a9bb18abdd4bf783d3b0afd0f185a74ee90fb02f6126664c SHA512 1d4172c6815c00d4ae4cb27a3f0616b39911defe8f0bc3ca2bfbbc14e28e6aad8d807759f220ae77424d80585cec21451a8229758eed08ecec710ffc1d2f345c
-EBUILD kodi-audioencoder-vorbis-9999.ebuild 677 BLAKE2B 686fdc05b819c57ac78fcea264c6f6c2da6bb61082943abfa6611107763b046b04502be68e6801b0a7cda8626927dd785bca0de5edf16a5ae209da01d9d5d51e SHA512 39a5479aa92049f2cb17378d83b194249a86b15f4e72ec6a2160178c878f7f37cdd2eb05a754ad6c4a03c08b9e8eb0f3d42fa2c91f0dc3e1a567cdf6c91318a2
+EBUILD kodi-audioencoder-vorbis-2.0.2.ebuild 801 BLAKE2B bc2db3d68cb7259d7b0e680fd556e0fb76b693b87514fe7b3f916840998b4cc733d9fa597f8e2f2adc377f62ba38bac0c22ca3c0f6c5d50bba48ba10b0f86379 SHA512 1608c55ec61d7c917e45dfc52da9a3ccd536554edb0b7eb552ee7319716e7deb020437e616476a716c097de03ed3fabc783029302a62aa956f3b993b39deef7c
+EBUILD kodi-audioencoder-vorbis-9999.ebuild 802 BLAKE2B 115475d322bc58f926678408804c8bb43547cf0fee6f6d78555a136c6c34767a8f74a20210c7fa45c07f4ed595bf62e80dfe34f051e6bc57f60a8fb16e378b32 SHA512 060d2897e8f8e13fb37e297088cc7484b9defc4286933607dd51e0d80767418228fbe77f631a9182def445a8bd70c469233a70a816591be5702c44ee44e7efd6
 MISC metadata.xml 436 BLAKE2B 3c9c2bb8e781568176bb6635269e8c7fb2761f0f64a192e04fc53f325a79e99b474220c5787d5c2f28dc3e3cbcb3e4aea177d561aa63c6d866f261382126a01d SHA512 e92cafa5a635c7e1ee82d7da9eb48138f7f5267d7b91983f9da417ed25435d87cf5dcc47192df499a8acaaefc0c38713a869a4ec6351dda4dddcdfd5a7d15cce
diff --git a/media-plugins/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis-1.1.0-r1.ebuild b/media-plugins/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis-2.0.2.ebuild
index ee8720fcd3b1..23e049537e7e 100644
--- a/media-plugins/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis-1.1.0-r1.ebuild
+++ b/media-plugins/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis-2.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,8 +17,9 @@ case ${PV} in
 	;;
 *)
 	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/xbmc/audioencoder.vorbis/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/audioencoder.vorbis-${PV}"
+	CODENAME="Leia"
+	SRC_URI="https://github.com/xbmc/audioencoder.vorbis/archive/v${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/audioencoder.vorbis-${PV}-${CODENAME}"
 	;;
 esac
 
@@ -27,7 +28,7 @@ SLOT="0"
 IUSE=""
 
 DEPEND="
-	=media-tv/kodi-17*
+	=media-tv/kodi-18*
 	media-libs/libogg
 	media-libs/libvorbis
 	"
@@ -35,3 +36,8 @@ DEPEND="
 RDEPEND="
 	${DEPEND}
 	"
+
+src_prepare(){
+	[ -d depends ] && rm -rf depends || die
+	cmake-utils_src_prepare
+}
diff --git a/media-plugins/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis-9999.ebuild b/media-plugins/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis-9999.ebuild
index 45b19d3b5cd7..d7c8a7af95c8 100644
--- a/media-plugins/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis-9999.ebuild
+++ b/media-plugins/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
@@ -17,8 +17,9 @@ case ${PV} in
 	;;
 *)
 	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/xbmc/audioencoder.vorbis/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/audioencoder.vorbis-${PV}"
+	CODENAME="Leia"
+	SRC_URI="https://github.com/xbmc/audioencoder.vorbis/archive/v${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/audioencoder.vorbis-${PV}-${CODENAME}"
 	;;
 esac
 
@@ -35,3 +36,8 @@ DEPEND="
 RDEPEND="
 	${DEPEND}
 	"
+
+src_prepare(){
+	[ -d depends ] && rm -rf depends || die
+	cmake-utils_src_prepare
+}
diff --git a/media-plugins/kodi-audioencoder-wav/Manifest b/media-plugins/kodi-audioencoder-wav/Manifest
index a1259b3a4671..4409ed95d4bf 100644
--- a/media-plugins/kodi-audioencoder-wav/Manifest
+++ b/media-plugins/kodi-audioencoder-wav/Manifest
@@ -1,6 +1,4 @@
-DIST kodi-audioencoder-wav-1.1.0.tar.gz 9743 BLAKE2B 912e5662338b9229c077e12fde9e9b7d7ffd0faea6dabc04cde315fe03aedb3c0d3305906fa5996254633e29418048e15d8ac0ec27735a19ac018cfea16d1f32 SHA512 002894dfebf427a86419f211f67abb34f68286573434272c39033ee281ad63d53acbe1d9288acd49abc991c770c577347512e018bebd627e0f722f300e961d85
 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
+EBUILD kodi-audioencoder-wav-9999.ebuild 620 BLAKE2B c2733ee92ea2d147cacf7b79babe024850397d5d900a0d8a518f627eb855a45338aae40acdff3dd82b745d81cf39d4458b007f4a1900769a66e356140ac818f7 SHA512 597cb2a460515f0a6f0cfb086002b9e65df68f42b6f1ba49ce2b11ee149b5f42ffcb590bd141a419e91eb4cf03a7a1f11c6a407a8b74059fb8771288e72d43d4
 MISC metadata.xml 436 BLAKE2B 3c9c2bb8e781568176bb6635269e8c7fb2761f0f64a192e04fc53f325a79e99b474220c5787d5c2f28dc3e3cbcb3e4aea177d561aa63c6d866f261382126a01d SHA512 e92cafa5a635c7e1ee82d7da9eb48138f7f5267d7b91983f9da417ed25435d87cf5dcc47192df499a8acaaefc0c38713a869a4ec6351dda4dddcdfd5a7d15cce
diff --git a/media-plugins/kodi-audioencoder-wav/kodi-audioencoder-wav-1.1.0-r1.ebuild b/media-plugins/kodi-audioencoder-wav/kodi-audioencoder-wav-1.1.0-r1.ebuild
deleted file mode 100644
index cac731125098..000000000000
--- a/media-plugins/kodi-audioencoder-wav/kodi-audioencoder-wav-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="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-17*
-	"
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 f53f0fe8eb8a..0b8fe73582e8 100644
--- a/media-plugins/kodi-audioencoder-wav/kodi-audioencoder-wav-9999.ebuild
+++ b/media-plugins/kodi-audioencoder-wav/kodi-audioencoder-wav-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
diff --git a/media-plugins/kodi-game-libretro-bnes/Manifest b/media-plugins/kodi-game-libretro-bnes/Manifest
index 7ee8d8908130..0d9359f42475 100644
--- a/media-plugins/kodi-game-libretro-bnes/Manifest
+++ b/media-plugins/kodi-game-libretro-bnes/Manifest
@@ -1,6 +1,8 @@
 DIST kodi-game-libretro-bnes-0.83.0.3.tar.gz 809447 BLAKE2B 4efcc72c60ceb433f755afe39058cffc2c39f9ad3726bd407b832b39fc4e4eb85287f6fc25cdbbebfe1b21db4b567fcd260544c1de544ddff2a94ab190c643d8 SHA512 371830f91cf3f7f47b45cd86ec7438a697e0acf886881e87c6dc9218d599e983cac0a540065b6d45b9228b20dd2c1bc264345ee454b55f68d13c62e33944bfd4
 DIST kodi-game-libretro-bnes-0.83.0.4.tar.gz 810686 BLAKE2B fc64d07a3629f00d658028a1f63ef4be640d511968bbd165019431563c84989c07fe11a132757b0ab64d0127e0b39d853525f615e25fea319bef2e8cb3435ea1 SHA512 5add79554a0064dfe9287961a20b80a5c8fd63598f173e254320b78347881f23c87653b742d6b759a1faa280496155c1822ef7ed4631c94fc35a99e7ca22932d
+DIST kodi-game-libretro-bnes-0.83.0.5.tar.gz 810684 BLAKE2B 803197c0f196c460d02b683874e2f47e986155310c1c2f7f8f7af74540965e9f94239b561e7143fcd878ba3be6612b441cc9f09ba351c3ddd5eef40a5b8c6ed3 SHA512 46851fe5665f4f69acfbb51b5ebdbc6fdd86016893d3c93956ef690956df127920229f3e9029337da6af388ef9e615fc17b969e3660d22c8a01a3f7116866483
 EBUILD kodi-game-libretro-bnes-0.83.0.3.ebuild 918 BLAKE2B c9c761aedbe59015af7a6fc15402c3c34a3a3e3c423267acb12d757a97050a96301c21c664aebe72d984e6a2b5e63595d789bc9cc034ae64cac93c19f6a300ca SHA512 8b1171895be885275766865df440a6308bf83af6b2a6ee491b18e0d64541be9094bba8f0bf1ac53d641b537462bfdaa9844ebf76953b07c11ada393160264963
 EBUILD kodi-game-libretro-bnes-0.83.0.4.ebuild 918 BLAKE2B c9c761aedbe59015af7a6fc15402c3c34a3a3e3c423267acb12d757a97050a96301c21c664aebe72d984e6a2b5e63595d789bc9cc034ae64cac93c19f6a300ca SHA512 8b1171895be885275766865df440a6308bf83af6b2a6ee491b18e0d64541be9094bba8f0bf1ac53d641b537462bfdaa9844ebf76953b07c11ada393160264963
-EBUILD kodi-game-libretro-bnes-9999.ebuild 919 BLAKE2B 9d2f6496eb711f031e755f08f7abeb65224d0c2b194cba1e74a91cfdfaafa83c27a65d54b9c65dd9da5b1dd885c0024020046d371d6e644f4ffce8a5f736d34f SHA512 fede4229be5f0fc1c176f81dca2584c27704bb535550fa9d7e9c5f35507b3ec60e8fd3772be5f832d8b318e2b9459611f1d57736de12d753a5635b451fe47fd0
+EBUILD kodi-game-libretro-bnes-0.83.0.5.ebuild 918 BLAKE2B c9c761aedbe59015af7a6fc15402c3c34a3a3e3c423267acb12d757a97050a96301c21c664aebe72d984e6a2b5e63595d789bc9cc034ae64cac93c19f6a300ca SHA512 8b1171895be885275766865df440a6308bf83af6b2a6ee491b18e0d64541be9094bba8f0bf1ac53d641b537462bfdaa9844ebf76953b07c11ada393160264963
+EBUILD kodi-game-libretro-bnes-9999.ebuild 935 BLAKE2B 83a8e87c7a6e4e9fe02a7fb941c9363ed81dd8b961387816909f28108eb52eb02ee34ac7544281f7831e62632921860b107499d3e097dda4fff394db2fd5c57a SHA512 89305fd524ed2d6d692659841495913cf02de54e62e01f7fff2167cbd38184311eba4ae7e8ec2ca2c6d7282339132682b425127f378827b7ffd288255e6a2512
 MISC metadata.xml 435 BLAKE2B 95279e9ee10da6bbfb0230876ffa825de81092b99616b91914710f9cb8f91b2db8ecac3c05f142f5b20d127775261fd474f504d57f6eec01d71e2a30c3617100 SHA512 90fd8905a33a079be3b487801b241b7e6c8ab7cb40c76136ab6ecd1edff19f60665ef74ed8d321db4c92b3fb8f821ec7a124b6882b10ba11bb78f5217b0d4c5b
diff --git a/media-plugins/kodi-game-libretro-bnes/kodi-game-libretro-bnes-0.83.0.5.ebuild b/media-plugins/kodi-game-libretro-bnes/kodi-game-libretro-bnes-0.83.0.5.ebuild
new file mode 100644
index 000000000000..960b86f16f9f
--- /dev/null
+++ b/media-plugins/kodi-game-libretro-bnes/kodi-game-libretro-bnes-0.83.0.5.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils kodi-addon
+
+DESCRIPTION="bNES GameClient for Kodi"
+HOMEPAGE="https://github.com/kodi-game/game.libretro.bnes"
+SRC_URI=""
+
+if [[ ${PV} == *9999 ]]; then
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-game/game.libretro.bnes.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~x86"
+	CODENAME="Leia"
+	SRC_URI="https://github.com/kodi-game/game.libretro.bnes/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/game.libretro.bnes-${PV}-${CODENAME}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-18*
+	games-emulation/libretro-bnes
+	"
+RDEPEND="
+	media-plugins/kodi-game-libretro
+	${DEPEND}
+	"
+src_prepare() {
+	echo 'find_library(BNES_LIB NAMES bnes_libretro${CMAKE_SHARED_LIBRARY_SUFFIX} PATH_SUFFIXES libretro)' > "${S}/Findlibretro-bnes.cmake" || die
+	default
+}
diff --git a/media-plugins/kodi-game-libretro-bnes/kodi-game-libretro-bnes-9999.ebuild b/media-plugins/kodi-game-libretro-bnes/kodi-game-libretro-bnes-9999.ebuild
index bdef35c1c517..c4ec85a581c1 100644
--- a/media-plugins/kodi-game-libretro-bnes/kodi-game-libretro-bnes-9999.ebuild
+++ b/media-plugins/kodi-game-libretro-bnes/kodi-game-libretro-bnes-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
@@ -34,5 +34,5 @@ RDEPEND="
 	"
 src_prepare() {
 	echo 'find_library(BNES_LIB NAMES bnes_libretro${CMAKE_SHARED_LIBRARY_SUFFIX} PATH_SUFFIXES libretro)' > "${S}/Findlibretro-bnes.cmake" || die
-	default
+	cmake-utils_src_prepare
 }
diff --git a/media-plugins/kodi-game-libretro-dosbox/Manifest b/media-plugins/kodi-game-libretro-dosbox/Manifest
index 3dc866f3f658..a25d735411d9 100644
--- a/media-plugins/kodi-game-libretro-dosbox/Manifest
+++ b/media-plugins/kodi-game-libretro-dosbox/Manifest
@@ -1,4 +1,6 @@
 DIST kodi-game-libretro-dosbox-0.74.0.3.tar.gz 53861 BLAKE2B bba95d96c9a313a96df7e3774573fdf43040efd23629242f1400a5a5ca8c2ebe948b68fba7d780ccd4cb3ca7cc4db74e23fece9d192e6988493a89eec19cdca7 SHA512 e802f5bdb1c9b82c5fa3224138f1956e4210aa532bea3ead20fba1a9349ef780f52d966b334beb498ab3433bd3822df7ae9e5cdcddbbf5b97318a5b65f4fc277
+DIST kodi-game-libretro-dosbox-0.74.0.4.tar.gz 54671 BLAKE2B d3bbea8b7ee5f7122f929af44632181d3ec59153573298027524ddfbe29f9bff69ff239172881f2e9315de4087f31dfb492de9f12a54b08859a1ed6a576b49fd SHA512 bb74b6cc535b95ca088140c3e39cafcce04b3f01917e126e403c1e9d35a4c581b92dcdad57c28c76acfedbf5ee331a7e9ea5cef48010145be638f606e3f8e9ab
 EBUILD kodi-game-libretro-dosbox-0.74.0.3.ebuild 936 BLAKE2B 1c14d09fdc0826fe59374b74ecbfe34d0bea34c7bc68311643aa0392de6a880b49ae01c2b0301f3fd71eff2cda3044250ab478635afa842e93b49c6d81d7d848 SHA512 c009b2dcc6c8e97cc41ff6b2c16757984d280e43813e1080cf535e75686c07d4fa3b73600795a954a1150de4c625813eb15a17fdf4d58afe99e401bd719986b7
-EBUILD kodi-game-libretro-dosbox-9999.ebuild 937 BLAKE2B 576962426c884f6dc83e1cfc5e4f0cae601a864f76953edc89b13d60921171bc125a96d2aaaf867ffa787274e8383d95af18481cabae85560729cf66c76ac3dd SHA512 5c000097c03656e34a99fb444414823852a0095b281d1f7e9471c542c2d0a703992d2eceea70dbffe9425dd50b5b73f335b66dec804a6e13604e2b3633da7932
+EBUILD kodi-game-libretro-dosbox-0.74.0.4.ebuild 936 BLAKE2B 1c14d09fdc0826fe59374b74ecbfe34d0bea34c7bc68311643aa0392de6a880b49ae01c2b0301f3fd71eff2cda3044250ab478635afa842e93b49c6d81d7d848 SHA512 c009b2dcc6c8e97cc41ff6b2c16757984d280e43813e1080cf535e75686c07d4fa3b73600795a954a1150de4c625813eb15a17fdf4d58afe99e401bd719986b7
+EBUILD kodi-game-libretro-dosbox-9999.ebuild 953 BLAKE2B 8254d5fa5c587479fd56c93d1db04a3b84fff450fedd59e1998452956e6ea026f9abea68835c180332d7aef0a90d744cd6fa8beed53e0d1349bddce4e9ca3d89 SHA512 e096b1bb90b90bdd2b8fe1cf62c47583eefff38f356b1555f84feb5fce333dd4c995f943735360fb27ff9b3d9043f5422240c23feb8f84eb6eac822c78352ac2
 MISC metadata.xml 439 BLAKE2B 26e660170befb49f4f8cecc4e47a11a4edce7447eecfe8318dc00d5ce6aa4b1a54e6484a50ddf2004caefdaa8c56869e377c2607f2213e73cbcc95d67ae90fee SHA512 fc9f630ac1c8cb229608ac0ee16398a529e1698a254abaa79f786c9ffb543558577ae06c02f2142bd9f3d405457c73a0b8be0f46bf656af1d24c645704d2f560
diff --git a/media-plugins/kodi-game-libretro-dosbox/kodi-game-libretro-dosbox-0.74.0.4.ebuild b/media-plugins/kodi-game-libretro-dosbox/kodi-game-libretro-dosbox-0.74.0.4.ebuild
new file mode 100644
index 000000000000..8d15e745cc22
--- /dev/null
+++ b/media-plugins/kodi-game-libretro-dosbox/kodi-game-libretro-dosbox-0.74.0.4.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils kodi-addon
+
+DESCRIPTION="DOSBox GameClient for Kodi"
+HOMEPAGE="https://github.com/kodi-game/game.libretro.dosbox"
+SRC_URI=""
+
+if [[ ${PV} == *9999 ]]; then
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-game/game.libretro.dosbox.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~x86"
+	CODENAME="Leia"
+	SRC_URI="https://github.com/kodi-game/game.libretro.dosbox/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/game.libretro.dosbox-${PV}-${CODENAME}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-18*
+	games-emulation/libretro-dosbox
+	"
+RDEPEND="
+	media-plugins/kodi-game-libretro
+	${DEPEND}
+	"
+src_prepare() {
+	echo 'find_library(DOSBOX_LIB NAMES dosbox_libretro${CMAKE_SHARED_LIBRARY_SUFFIX} PATH_SUFFIXES libretro)' > "${S}/Findlibretro-dosbox.cmake" || die
+	default
+}
diff --git a/media-plugins/kodi-game-libretro-dosbox/kodi-game-libretro-dosbox-9999.ebuild b/media-plugins/kodi-game-libretro-dosbox/kodi-game-libretro-dosbox-9999.ebuild
index 3e5fcb2608a7..5023eb5cc6e6 100644
--- a/media-plugins/kodi-game-libretro-dosbox/kodi-game-libretro-dosbox-9999.ebuild
+++ b/media-plugins/kodi-game-libretro-dosbox/kodi-game-libretro-dosbox-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
@@ -34,5 +34,5 @@ RDEPEND="
 	"
 src_prepare() {
 	echo 'find_library(DOSBOX_LIB NAMES dosbox_libretro${CMAKE_SHARED_LIBRARY_SUFFIX} PATH_SUFFIXES libretro)' > "${S}/Findlibretro-dosbox.cmake" || die
-	default
+	cmake-utils_src_prepare
 }
diff --git a/media-plugins/kodi-game-libretro-fceumm/Manifest b/media-plugins/kodi-game-libretro-fceumm/Manifest
index 100e748d20c0..dba05cb362a5 100644
--- a/media-plugins/kodi-game-libretro-fceumm/Manifest
+++ b/media-plugins/kodi-game-libretro-fceumm/Manifest
@@ -1,4 +1,4 @@
 DIST kodi-game-libretro-fceumm-0.0.1.9.tar.gz 778156 BLAKE2B a7a03d2df6cc4fbf89aa0a8b4320deb7ced5d452c045d3583fdd17dcdc2dbcf59a99ea323bc0b15355889522e2f3bf572d4b0c260dc381c2630bf58c8c7cd2ec SHA512 772b69afff01e26d04fcc33d06e35da0329a1315f0e3ef01b51cc8459d145af782b6dd72b5b460de8dd7a59e308bf4922b2d77b62be1c5561b9debf3bbe36b60
 EBUILD kodi-game-libretro-fceumm-0.0.1.9.ebuild 939 BLAKE2B 48ab5737ea23f7669568b95628117efa263cd71978374638d09909acd254b555baa3ea59e00c55f7877e358d9272177ef6a4ee18a9aa71fbf5ccaf59f9ecf3c5 SHA512 cb953d2002b8de35a222bc6e581899d560a615e9895edcf33d5f1c5e5d19d022447818d75bc58b9505b98ed4e5efb0e4dd0a9eabaed593c1ff615f60ae2a3756
-EBUILD kodi-game-libretro-fceumm-9999.ebuild 940 BLAKE2B 2d2caab71b14297b2a835c7c05a2895d2d223af07957595fc74c7333207128c7ed8b2ccf820e033b4e855d7c755b19ae7917ced1406ca1a23148e42c8ea91ae0 SHA512 ee17de7c977e863fd355e354e356c4dd9a1dbb97858132aa92e971bf8924a2a22ed9adc5470c1f82e32467fbbfe91c7063526041083b03b708f973cfbfde549b
+EBUILD kodi-game-libretro-fceumm-9999.ebuild 956 BLAKE2B 62043d9d5b2f043f9e106a6c7c6b5606ff28460f7d5d17f9dc9cdc9ebe487ad16d9738d7e299df33b22322e616e022e3e3a7960ca1151e4f0a81ed4510c4e6ed SHA512 e2313d5ff32efd5ee12ae96b9a57b63415bf70aa10539b7e4596915c5b9ab2260076cf539120fe8642d5826f3be2a17292983fea8bf7705b6b41e561b471d264
 MISC metadata.xml 442 BLAKE2B 4667a846f933ec1e23c3ec051912d1ba46d1ee1ca41d082928efa5fe9cf89e9e1d50ccdb589e63426c2103f2580c782e4cbe0a59ca9396099c7a669838645dc5 SHA512 92e19b68682d05f6b51ba04e0478419d7f940ed29b28595f0698cbb2fef0c89c7aa44f30acaf90fa21121f8ebf018012391766e33563eea3bee606ca0532a76e
diff --git a/media-plugins/kodi-game-libretro-fceumm/kodi-game-libretro-fceumm-9999.ebuild b/media-plugins/kodi-game-libretro-fceumm/kodi-game-libretro-fceumm-9999.ebuild
index e80efcb5cc4f..dd15a631b6bb 100644
--- a/media-plugins/kodi-game-libretro-fceumm/kodi-game-libretro-fceumm-9999.ebuild
+++ b/media-plugins/kodi-game-libretro-fceumm/kodi-game-libretro-fceumm-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
@@ -34,5 +34,5 @@ RDEPEND="
 	"
 src_prepare() {
 	echo 'find_library(FCEUMM_LIB NAMES fceumm_libretro${CMAKE_SHARED_LIBRARY_SUFFIX} PATH_SUFFIXES libretro)' > "${S}/Findlibretro-fceumm.cmake" || die
-	default
+	cmake-utils_src_prepare
 }
diff --git a/media-plugins/kodi-game-libretro-nestopia/Manifest b/media-plugins/kodi-game-libretro-nestopia/Manifest
index b10c1fbba8ff..ca8d3a0fb108 100644
--- a/media-plugins/kodi-game-libretro-nestopia/Manifest
+++ b/media-plugins/kodi-game-libretro-nestopia/Manifest
@@ -1,6 +1,10 @@
 DIST kodi-game-libretro-nestopia-1.50.0.3.tar.gz 793893 BLAKE2B 89015bb8c687685264e4a8c34cf1caad87cfa1a3611cbd67b540ddb31e9e75049eed328b51c69702e92e358a659d4e503ccdac1b52b7db70688e1236529536ad SHA512 4c41db8c77d24301f00b9d0283c948ae3c4176228e733a316fa5b2eba60ceea4dd094f48270d545008f144d3316cf5f8f190017f70e8378b9fbcbcdb2d8220e6
 DIST kodi-game-libretro-nestopia-1.50.0.4.tar.gz 793616 BLAKE2B 29bbf63f7ef66abf0756399760d882685b4b58cf8a2ac23ce879ea7c7941425828f2bc2d929326ffc3dd7eb51259fdba49264594f2d0759bc20cc6a05a8ca5ac SHA512 58535b305d1aa6ba498c07cbfad09efcfd0e8dd7f251fb973188beeacd07d3ebfa48c639e73a07501019acb88e29cf1ff1b8a685235d7ef69cedb127bba6e44e
+DIST kodi-game-libretro-nestopia-1.50.0.5.tar.gz 793600 BLAKE2B 68bca2ce1790df5f820d5e883b95781b31e6e81d48148da1b2e32ab6016712aff3423db41da3267ad3f6cdfdfc7842ba27ef9f74d5febdb1b42e753847edbe29 SHA512 69a0511dfb4e81de976931c3aeb0d7cab3de3f503816193c7688565faa287b4501e20f11caa4ba85383487ea0ce2156d71bf39076f664e31b42d33c406ef4239
+DIST kodi-game-libretro-nestopia-1.50.0.6.tar.gz 793622 BLAKE2B 5415c0c23f06432b0a0a01b8f9959301432b5221c340f540a440c52ec7fa6dbcb40a77f4894324473f6deba39a0e3af53cedce75e2f173e102d7ccded2852333 SHA512 264fe60a586f27c29175172218f6cd205d7558b4848e95a19808f326ce52f32a2d5f60e6b22ef27417739ec40ba766e7cc9e6fd360bdd167d946f3e2ce19333c
 EBUILD kodi-game-libretro-nestopia-1.50.0.3.ebuild 954 BLAKE2B b7551d165e179efe08fd9a61514b63930d61863f1680d32419882df58bc41a8798287955ea552581beec39627c56e78e63ddd6081be4af3d6335479eb8dc5cee SHA512 e49b56f835dcb3afcef6a5a4fa7e1afa74ac656cf978e6f7800b9a686d96aa69a813d501e9213110907a9a9efbcf757d78659b20b306a19369e213fa2d0e3628
 EBUILD kodi-game-libretro-nestopia-1.50.0.4.ebuild 954 BLAKE2B b7551d165e179efe08fd9a61514b63930d61863f1680d32419882df58bc41a8798287955ea552581beec39627c56e78e63ddd6081be4af3d6335479eb8dc5cee SHA512 e49b56f835dcb3afcef6a5a4fa7e1afa74ac656cf978e6f7800b9a686d96aa69a813d501e9213110907a9a9efbcf757d78659b20b306a19369e213fa2d0e3628
-EBUILD kodi-game-libretro-nestopia-9999.ebuild 955 BLAKE2B 151a5f1b37ce54d2b6bf0203388e64c66ef777d02e3cd34a194546a136f74b0734cdcecb25720d1844f8451e4982b960db8d837d74ec2a0cdc57baae41ee3a0d SHA512 6359f6a364e4575dec5d6cfc4e566af5f845afba932935c91d8c27cdde24557b4cdb06841b5721fe1494404a014ba0b0d1217881dbd0c1abac1ed5d24832e32d
+EBUILD kodi-game-libretro-nestopia-1.50.0.5.ebuild 954 BLAKE2B b7551d165e179efe08fd9a61514b63930d61863f1680d32419882df58bc41a8798287955ea552581beec39627c56e78e63ddd6081be4af3d6335479eb8dc5cee SHA512 e49b56f835dcb3afcef6a5a4fa7e1afa74ac656cf978e6f7800b9a686d96aa69a813d501e9213110907a9a9efbcf757d78659b20b306a19369e213fa2d0e3628
+EBUILD kodi-game-libretro-nestopia-1.50.0.6.ebuild 954 BLAKE2B b7551d165e179efe08fd9a61514b63930d61863f1680d32419882df58bc41a8798287955ea552581beec39627c56e78e63ddd6081be4af3d6335479eb8dc5cee SHA512 e49b56f835dcb3afcef6a5a4fa7e1afa74ac656cf978e6f7800b9a686d96aa69a813d501e9213110907a9a9efbcf757d78659b20b306a19369e213fa2d0e3628
+EBUILD kodi-game-libretro-nestopia-9999.ebuild 971 BLAKE2B b1dcdef31d772cf2a95f9e4fd514ac44c32840deb8948be9de84770ab97471cc2fef205d84bce8a4d29e242adf52e2fc2fbd1edef2df8b9ebf9e4881e422524e SHA512 bbb4f9a461c1753506cafaede37c16bfa04e2e06b7cfca841c8be082de5324c509b8820bd00322fda8cf517ea53a709adf35558b3ee27827ca64b9e8e548fd96
 MISC metadata.xml 443 BLAKE2B f63ddf38e72790cb7ca64c570672adf8d71bbd68d747c15f5c09b353af76eb4aa65c5eb3f3ce18f6bf93cec3657c9b01bae2958e03dcd658053fc314f97bc10b SHA512 c77d6255db65c02a2b74208198f1807982529ee6c7f2d4ba6538e5d35ccf0683757730c0e7b9a713712172ad059540eb6d4b614f9ff16293f1eaaa1631500d1a
diff --git a/media-plugins/kodi-game-libretro-nestopia/kodi-game-libretro-nestopia-1.50.0.5.ebuild b/media-plugins/kodi-game-libretro-nestopia/kodi-game-libretro-nestopia-1.50.0.5.ebuild
new file mode 100644
index 000000000000..49c4284c2283
--- /dev/null
+++ b/media-plugins/kodi-game-libretro-nestopia/kodi-game-libretro-nestopia-1.50.0.5.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils kodi-addon
+
+DESCRIPTION="Nestopia GameClient for Kodi"
+HOMEPAGE="https://github.com/kodi-game/game.libretro.nestopia"
+SRC_URI=""
+
+if [[ ${PV} == *9999 ]]; then
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-game/game.libretro.nestopia.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~x86"
+	CODENAME="Leia"
+	SRC_URI="https://github.com/kodi-game/game.libretro.nestopia/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/game.libretro.nestopia-${PV}-${CODENAME}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-18*
+	games-emulation/libretro-nestopia
+	"
+RDEPEND="
+	media-plugins/kodi-game-libretro
+	${DEPEND}
+	"
+src_prepare() {
+	echo 'find_library(NESTOPIA_LIB NAMES nestopia_libretro${CMAKE_SHARED_LIBRARY_SUFFIX} PATH_SUFFIXES libretro)' > "${S}/Findlibretro-nestopia.cmake" || die
+	default
+}
diff --git a/media-plugins/kodi-game-libretro-nestopia/kodi-game-libretro-nestopia-1.50.0.6.ebuild b/media-plugins/kodi-game-libretro-nestopia/kodi-game-libretro-nestopia-1.50.0.6.ebuild
new file mode 100644
index 000000000000..49c4284c2283
--- /dev/null
+++ b/media-plugins/kodi-game-libretro-nestopia/kodi-game-libretro-nestopia-1.50.0.6.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils kodi-addon
+
+DESCRIPTION="Nestopia GameClient for Kodi"
+HOMEPAGE="https://github.com/kodi-game/game.libretro.nestopia"
+SRC_URI=""
+
+if [[ ${PV} == *9999 ]]; then
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-game/game.libretro.nestopia.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~x86"
+	CODENAME="Leia"
+	SRC_URI="https://github.com/kodi-game/game.libretro.nestopia/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/game.libretro.nestopia-${PV}-${CODENAME}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-18*
+	games-emulation/libretro-nestopia
+	"
+RDEPEND="
+	media-plugins/kodi-game-libretro
+	${DEPEND}
+	"
+src_prepare() {
+	echo 'find_library(NESTOPIA_LIB NAMES nestopia_libretro${CMAKE_SHARED_LIBRARY_SUFFIX} PATH_SUFFIXES libretro)' > "${S}/Findlibretro-nestopia.cmake" || die
+	default
+}
diff --git a/media-plugins/kodi-game-libretro-nestopia/kodi-game-libretro-nestopia-9999.ebuild b/media-plugins/kodi-game-libretro-nestopia/kodi-game-libretro-nestopia-9999.ebuild
index f57205d81698..d08d797471c4 100644
--- a/media-plugins/kodi-game-libretro-nestopia/kodi-game-libretro-nestopia-9999.ebuild
+++ b/media-plugins/kodi-game-libretro-nestopia/kodi-game-libretro-nestopia-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
@@ -34,5 +34,5 @@ RDEPEND="
 	"
 src_prepare() {
 	echo 'find_library(NESTOPIA_LIB NAMES nestopia_libretro${CMAKE_SHARED_LIBRARY_SUFFIX} PATH_SUFFIXES libretro)' > "${S}/Findlibretro-nestopia.cmake" || die
-	default
+	cmake-utils_src_prepare
 }
diff --git a/media-plugins/kodi-game-libretro-snes9x/Manifest b/media-plugins/kodi-game-libretro-snes9x/Manifest
index 92ce114f42e4..0cf471b345cb 100644
--- a/media-plugins/kodi-game-libretro-snes9x/Manifest
+++ b/media-plugins/kodi-game-libretro-snes9x/Manifest
@@ -1,6 +1,8 @@
 DIST kodi-game-libretro-snes9x-1.58.0.6.tar.gz 1373392 BLAKE2B 6d17ac222eeae8e23aa76ab0b1aafe805f260b14c210715275afb370c2c52381013b48805477d01389fa1067e14f24465f35449dd95e309dfec7ac93b090df72 SHA512 3cc3b5eda830223a447dda4efb0438db679222200cae07d59f0879f95b1d252972186a241a74d0fa4668697a4ef8d2860923a43c7f4223af4ce794e937f255aa
 DIST kodi-game-libretro-snes9x-1.60.0.7.tar.gz 1374792 BLAKE2B f6a253ece719f1bbdbcf85b8333c4b329dbe4c7fac20da924c263d4cca97d64c1912d0d63390dbe83e49efe32fb4c99f3f6a63dbd5bcd98b7b549ab5e586fb79 SHA512 aa85be7de5030e7b7600e0e3295e22dbad24a1989c58b515bc39adbdb044270588c7848705c04586e37a6419d06efea38983973e8f6870c48dc979a2b3fc9101
+DIST kodi-game-libretro-snes9x-1.60.0.8.tar.gz 1374781 BLAKE2B 9b99c943aef5c74400a270495cbe0326e2523ebefa78e5f8f76bd1b6a6de163b5ffc8da09c1b3773f7dc31efae7005a1925c10bba6e326dd25319cc4dcfc9121 SHA512 62ae9a66d95650f067458c0ecb9a82d9e69b06b62ac80de5c13274ce4dff49966e4a2a9b7c8ac4c754dc1f11718a729e3bed042cb5afa6c9f1ed05026118193c
 EBUILD kodi-game-libretro-snes9x-1.58.0.6.ebuild 936 BLAKE2B 07dbe84fc0d58fd3df1bfe6454b158affbcf427bb6956e84917e03c2dbc2dd9d82a1ab12bc845d77b273d23997047c8701b3555539997913d9a164a7379bcd68 SHA512 4506b2c017c187e1acd3b6768bfa7118a3b68200e414db52f396cc9ef9988ecaae3e0302284ae9afda2060316b5facee44d2ee9f502a146f8bc46dc23c84aab0
 EBUILD kodi-game-libretro-snes9x-1.60.0.7.ebuild 936 BLAKE2B 07dbe84fc0d58fd3df1bfe6454b158affbcf427bb6956e84917e03c2dbc2dd9d82a1ab12bc845d77b273d23997047c8701b3555539997913d9a164a7379bcd68 SHA512 4506b2c017c187e1acd3b6768bfa7118a3b68200e414db52f396cc9ef9988ecaae3e0302284ae9afda2060316b5facee44d2ee9f502a146f8bc46dc23c84aab0
-EBUILD kodi-game-libretro-snes9x-9999.ebuild 937 BLAKE2B a78c39328e36a75286f8b6c96c85078c63f8c19247f69de5a12ab59cc87260b68d1d6659d17516ac309749e1a2a96b233c941e7af8ae125a4766b2d6724cc2b4 SHA512 029868005baedc33272ffa0f8b6de702c75ed0058e176b986e87d1e2f7c1b1a501313eca57f79c37e60783aeb68b33ce2464393f66dec36ed6e870fd77c2d4bd
+EBUILD kodi-game-libretro-snes9x-1.60.0.8.ebuild 936 BLAKE2B 07dbe84fc0d58fd3df1bfe6454b158affbcf427bb6956e84917e03c2dbc2dd9d82a1ab12bc845d77b273d23997047c8701b3555539997913d9a164a7379bcd68 SHA512 4506b2c017c187e1acd3b6768bfa7118a3b68200e414db52f396cc9ef9988ecaae3e0302284ae9afda2060316b5facee44d2ee9f502a146f8bc46dc23c84aab0
+EBUILD kodi-game-libretro-snes9x-9999.ebuild 953 BLAKE2B 9eee743aed38fcb6da06ab1a38523f8edcfe55e9e6f5b555a00a4d76219cbe8fa9745c00579fe1f1d0476100da85041fe17913d17748ddd5023eee347fd7e931 SHA512 d8b2098aa85d814193824b5667b79a79c4d1dbbba54673a380b6a5b78208595cd42f1a08564566d02ef77f018a148afe5f40ae5e12f4e98babd7a988664f37c1
 MISC metadata.xml 439 BLAKE2B 6cec6faa75fdb35edf1f33f2a47d370318b8ab96f2c712571b33d22bc30130826cade398c3f7b4aee986e78baf9c3161b342215457b38d09994a1793b8704fdc SHA512 e3c0f999e2123aa2b23b0b29d1d6d24da0d804e435351c5971a2c60390c33bc3bf001571025cfe4ea7a76680a45be27f18169b201d16c8d8dcad9dbb55e9ebcb
diff --git a/media-plugins/kodi-game-libretro-snes9x/kodi-game-libretro-snes9x-1.60.0.8.ebuild b/media-plugins/kodi-game-libretro-snes9x/kodi-game-libretro-snes9x-1.60.0.8.ebuild
new file mode 100644
index 000000000000..de406700e0d6
--- /dev/null
+++ b/media-plugins/kodi-game-libretro-snes9x/kodi-game-libretro-snes9x-1.60.0.8.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils kodi-addon
+
+DESCRIPTION="Snes9x GameClient for Kodi"
+HOMEPAGE="https://github.com/kodi-game/game.libretro.snes9x"
+SRC_URI=""
+
+if [[ ${PV} == *9999 ]]; then
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-game/game.libretro.snes9x.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~x86"
+	CODENAME="Leia"
+	SRC_URI="https://github.com/kodi-game/game.libretro.snes9x/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/game.libretro.snes9x-${PV}-${CODENAME}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-18*
+	games-emulation/libretro-snes9x
+	"
+RDEPEND="
+	media-plugins/kodi-game-libretro
+	${DEPEND}
+	"
+src_prepare() {
+	echo 'find_library(SNES9X_LIB NAMES snes9x_libretro${CMAKE_SHARED_LIBRARY_SUFFIX} PATH_SUFFIXES libretro)' > "${S}/Findlibretro-snes9x.cmake" || die
+	default
+}
diff --git a/media-plugins/kodi-game-libretro-snes9x/kodi-game-libretro-snes9x-9999.ebuild b/media-plugins/kodi-game-libretro-snes9x/kodi-game-libretro-snes9x-9999.ebuild
index 7dee71b48dd0..4b6e38acdc5c 100644
--- a/media-plugins/kodi-game-libretro-snes9x/kodi-game-libretro-snes9x-9999.ebuild
+++ b/media-plugins/kodi-game-libretro-snes9x/kodi-game-libretro-snes9x-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
@@ -34,5 +34,5 @@ RDEPEND="
 	"
 src_prepare() {
 	echo 'find_library(SNES9X_LIB NAMES snes9x_libretro${CMAKE_SHARED_LIBRARY_SUFFIX} PATH_SUFFIXES libretro)' > "${S}/Findlibretro-snes9x.cmake" || die
-	default
+	cmake-utils_src_prepare
 }
diff --git a/media-plugins/kodi-game-libretro-twentyfortyeight/Manifest b/media-plugins/kodi-game-libretro-twentyfortyeight/Manifest
index d016db5ecec1..64ee509390cf 100644
--- a/media-plugins/kodi-game-libretro-twentyfortyeight/Manifest
+++ b/media-plugins/kodi-game-libretro-twentyfortyeight/Manifest
@@ -1,6 +1,8 @@
 DIST kodi-game-libretro-twentyfortyeight-1.0.0.106.tar.gz 94621 BLAKE2B 584e66eedb9956e75997fc8792652e0c5982150657169687976f0a52ecd07da1d50d2c43aed9379379a8cf1c668a1e9fda2c4c375910bbe02101d67f7813ff65 SHA512 2a30089b617bbbe62af7b17821e69d8c7bc8a393abbfdff5980b62753763595a93e6c326ee4ff17f4d48801399b325634d72c13ca22a30c4c490dfcc7c21952a
 DIST kodi-game-libretro-twentyfortyeight-1.0.0.107.tar.gz 94629 BLAKE2B e821c3ec34d46555048d8b76e8f6ddeb8afd6bcaaace32e057e8238eda9bc16ee3a24f2dab5c1d9e2bb94d5823c9c9eb51d912b5f1ebd061404566197a8bb037 SHA512 5a5a7ad82f42673cdc53595a06e484a2bc06ba93ba1a41e26a8d817dc70d342c3a5d74efead426504a5953b92dd5cb95048bf14bda4a4f96a881ffb3d1d2aa23
+DIST kodi-game-libretro-twentyfortyeight-1.0.0.108.tar.gz 94631 BLAKE2B 26d089df923d9c4cb09a84b17bdaeb9b847b6a199fc216a96000e5bb96065cab54ca7d51f38161ed02c2a47d4602385cad2ba8369947ed7b751fec4f76a34622 SHA512 ba9de6ea5434617d5cb36ed6d49c15dfe4603f73dc928c74e6a6c1dad83611eeecaabc0a9dce9ff19d410991c479385880ebe69f8ecd625781362d27df29feb8
 EBUILD kodi-game-libretro-twentyfortyeight-1.0.0.106.ebuild 920 BLAKE2B 3835705d8c3b3ce2f4c5d55a148a3b6fa675f7abd41541c1fdff6db29dca6fb646831c28ec12b5949dbe7d1624661e2cbd2ee0d2619442951d1ac0cc1d130240 SHA512 e7c20cb44039fd2eeebbfe89f84fa29690eb6239f2ecf17dde8b3831c2f71cb493a3ee62ac29e767715e2722c2ed930b3e8546c76faf050d4d57e907c8a5afc8
 EBUILD kodi-game-libretro-twentyfortyeight-1.0.0.107.ebuild 920 BLAKE2B 3835705d8c3b3ce2f4c5d55a148a3b6fa675f7abd41541c1fdff6db29dca6fb646831c28ec12b5949dbe7d1624661e2cbd2ee0d2619442951d1ac0cc1d130240 SHA512 e7c20cb44039fd2eeebbfe89f84fa29690eb6239f2ecf17dde8b3831c2f71cb493a3ee62ac29e767715e2722c2ed930b3e8546c76faf050d4d57e907c8a5afc8
-EBUILD kodi-game-libretro-twentyfortyeight-9999.ebuild 921 BLAKE2B 0a94bb2bb97930db926812cfd9689f82cf7c4d6dc3fd7db7b29243eb096c3016b3b46511ce885f2ccf8c037af054077a14192b25cb4b1ae4b5f5a368494e0b47 SHA512 6cffa64b7047b63ff251bd9efd5c126f6b0e05324e05192cb88e981865a0a4271a3a7a34de9e296ae98516fe02665e69de71d49e4a1a33211f6a0311a11ff761
+EBUILD kodi-game-libretro-twentyfortyeight-1.0.0.108.ebuild 920 BLAKE2B 3835705d8c3b3ce2f4c5d55a148a3b6fa675f7abd41541c1fdff6db29dca6fb646831c28ec12b5949dbe7d1624661e2cbd2ee0d2619442951d1ac0cc1d130240 SHA512 e7c20cb44039fd2eeebbfe89f84fa29690eb6239f2ecf17dde8b3831c2f71cb493a3ee62ac29e767715e2722c2ed930b3e8546c76faf050d4d57e907c8a5afc8
+EBUILD kodi-game-libretro-twentyfortyeight-9999.ebuild 937 BLAKE2B eb61dba3fedf6ba5810e8dd5071dc810a545e26d45cc756384eec2296cd3b8cc8f5adae9d285cb3a443694f6b139105e37d328624af3c49fcf31b26e1afe778f SHA512 949ec0841266d1584068fc0a086878d6b85afdd239187847ab32da627c8b905fb28101cb3dceef7d1b8ca552930979ef58c53f1bf28dec485a21fdc63759d87d
 MISC metadata.xml 424 BLAKE2B ebec5842d30789985a87b437a5684959fbd41f0d93389726be3bf30b07e49fb851c095f0b1e2edcd6245241f83bf37668ce6494ebcbb90b7e9d6421cbd15ce03 SHA512 3b407c1fad96600c9f9ce0c1f8cf0f3695a5cb41d66762e79b0e0428ad36af0eca33a0ee421d364fb979b661fbe62a047f48ed10f71fbd963e64c205d0174b5e
diff --git a/media-plugins/kodi-game-libretro-twentyfortyeight/kodi-game-libretro-twentyfortyeight-1.0.0.108.ebuild b/media-plugins/kodi-game-libretro-twentyfortyeight/kodi-game-libretro-twentyfortyeight-1.0.0.108.ebuild
new file mode 100644
index 000000000000..b31e25621de2
--- /dev/null
+++ b/media-plugins/kodi-game-libretro-twentyfortyeight/kodi-game-libretro-twentyfortyeight-1.0.0.108.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils kodi-addon
+
+DESCRIPTION="2048 for Kodi"
+HOMEPAGE="https://github.com/kodi-game/game.libretro.2048"
+SRC_URI=""
+
+if [[ ${PV} == *9999 ]]; then
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-game/game.libretro.2048.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~x86"
+	CODENAME="Leia"
+	SRC_URI="https://github.com/kodi-game/game.libretro.2048/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/game.libretro.2048-${PV}-${CODENAME}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-18*
+	games-emulation/libretro-twentyfortyeight
+	"
+RDEPEND="
+	media-plugins/kodi-game-libretro
+	${DEPEND}
+	"
+
+src_prepare() {
+	echo 'find_library(2048_LIB NAMES 2048_libretro${CMAKE_SHARED_LIBRARY_SUFFIX} PATH_SUFFIXES libretro)' > "${S}/Findlibretro-2048.cmake" || die
+	default
+}
diff --git a/media-plugins/kodi-game-libretro-twentyfortyeight/kodi-game-libretro-twentyfortyeight-9999.ebuild b/media-plugins/kodi-game-libretro-twentyfortyeight/kodi-game-libretro-twentyfortyeight-9999.ebuild
index a01c322557c3..852f780f1e27 100644
--- a/media-plugins/kodi-game-libretro-twentyfortyeight/kodi-game-libretro-twentyfortyeight-9999.ebuild
+++ b/media-plugins/kodi-game-libretro-twentyfortyeight/kodi-game-libretro-twentyfortyeight-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
@@ -35,5 +35,5 @@ RDEPEND="
 
 src_prepare() {
 	echo 'find_library(2048_LIB NAMES 2048_libretro${CMAKE_SHARED_LIBRARY_SUFFIX} PATH_SUFFIXES libretro)' > "${S}/Findlibretro-2048.cmake" || die
-	default
+	cmake-utils_src_prepare
 }
diff --git a/media-plugins/kodi-game-libretro/Manifest b/media-plugins/kodi-game-libretro/Manifest
index 0714147695b0..89f6e79ae0c5 100644
--- a/media-plugins/kodi-game-libretro/Manifest
+++ b/media-plugins/kodi-game-libretro/Manifest
@@ -1,4 +1,4 @@
 DIST kodi-game-libretro-1.1.0.tar.gz 101454 BLAKE2B 8fcd65c8221b0ec4d24a41361eebcf1a144906e86b46749625462d507ca2813b6fdd0cb63ef0fcbe29b1f11039dc5b9cdf3d24eae788e4c275200c93855eed7b SHA512 80cc868d57d4284085a7cd736930da6f1b2440cbd8667a20634c329c282e7f0b79158d4d510504a230427fae4d84d9ae29c7a76fab5e2a23820bfa72d75a8e91
 EBUILD kodi-game-libretro-1.1.0.ebuild 743 BLAKE2B bb123ac3ef9eddaa24ee8fe6f0bd1670705778107e1f72c7cfa951d0605b17b022810f92ac9beb943aa7ebf4f60558a5dea5ca7b5906e5e34a6488a25e5ff600 SHA512 fad956837ce81f71ea4329c9ef5df34e92ad1dc380ebe23329b537652180931bb4cb7d5ddb8653bbdd03cfbeb983eec6a3ca37ac22e6aaa85a1e4b5b2381aa8a
-EBUILD kodi-game-libretro-9999.ebuild 745 BLAKE2B 44e73ead231efe935fc1b9621d68a12610b862b3ca34e2eab70984dd02080d0b7b3c0e3addcdb6e468398bba74746f5e687a2a341107b5a3a607bf3815494742 SHA512 a406649f73ea82cd97d107316bd5b59a9464ddc597ff6153c8291f640f41d78ef29eb48979bcf4c25d3bf846609b7feb4b8ec87eb2885357b4764d1be5fe9a8b
+EBUILD kodi-game-libretro-9999.ebuild 745 BLAKE2B 53d49e0c582be13b34fa688409533dcaa8afe910f9c7464029129e12a49401843b507a800014ff3a3d580bc50b34c8e042a259e825ebb2219783d789c493d1f7 SHA512 6f58f179d5424becae61c19e3c8c677df41834032fcb7c5ef1d90e248e8570e5897cffa0a58a02cfb223211ab91942aa77b054dfacad14f489025a1e13bf5dc7
 MISC metadata.xml 436 BLAKE2B 89eb2bd7916bd6c206439984ddc7f84b5c04cdfe923b28f911f919720aec90449d40ffaa7d85306e486357d9e2b8b9681b3f3b79624dde542f2cdac218ffa75a SHA512 15bf6ae63d3265efca6ede0b1fd0849d266e58b555b2f1e593eb85752ddd62e56a1684ba33c0194368b564228c88fa55349e7ed088ac376f5b020045f3c4239f
diff --git a/media-plugins/kodi-game-libretro/kodi-game-libretro-9999.ebuild b/media-plugins/kodi-game-libretro/kodi-game-libretro-9999.ebuild
index 5f5c3e528872..7a362f9d0276 100644
--- a/media-plugins/kodi-game-libretro/kodi-game-libretro-9999.ebuild
+++ b/media-plugins/kodi-game-libretro/kodi-game-libretro-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
diff --git a/media-plugins/kodi-inputstream-adaptive/Manifest b/media-plugins/kodi-inputstream-adaptive/Manifest
index 090f7de77d46..8b6ca21d3eba 100644
--- a/media-plugins/kodi-inputstream-adaptive/Manifest
+++ b/media-plugins/kodi-inputstream-adaptive/Manifest
@@ -1,24 +1,4 @@
-DIST kodi-inputstream-adaptive-2.0.25.tar.gz 881743 BLAKE2B 210b23fe42a262696b2dc10efeee5303b3c859a5d1cb4a94cb3628f6d2ca17fb29d170c728a51e1ea6767ecaa79b2c56831169d960da569fe71f18fc474cb2d5 SHA512 51d65fc83f50f7544198666123eb82bcd55a6524b7bbbec403375013264d24ecf8c3f326c815df98f77458af121dc4d81e863cd5f6b9ae49a1fcd50207a37bbe
-DIST kodi-inputstream-adaptive-2.3.13.tar.gz 485053 BLAKE2B 1729ad38332ea00763eec342de37047cbc9d3d276cbf8e6586b716f26bca4048f36da58ed3ca8f1b77247616a6d2c111481d6b78f0510dc465923cab83d4fe9e SHA512 3a3891a0fc8439aab47014954e90cf72a6c373f250ead02dd91e00c43860fdb91ee8688e6e0776470056f55287d4c4c11cbd762065fa52e7e3c9dcaa12efcfbe
-DIST kodi-inputstream-adaptive-2.3.14.tar.gz 709587 BLAKE2B 3130ddd367cdbe0edbc5f14e060292ff66a864049a16dc10d6dd5500178c8f07a3f20fce5f95a8b5a44a57ee7ec7cdd782515b95f2e2dd79ee01a0fe37a9588c SHA512 3427d0552260580766e756f0800290c59d6cd1c48ba87f9e4397676fdfff19509bd3a0cf986447b228be7bb6c355b1aeb739b456b29a99f54934c4b6bfd822c6
-DIST kodi-inputstream-adaptive-2.3.15.tar.gz 709544 BLAKE2B 5e1d52c28f935dc8dde6cb15d800402bce5740e1b99ebe4c6210e07b34ba455a6af1883dae8c30013d3fd8bf03732d086aa38012f8daccc89ec805e67aea2850 SHA512 74dba29e6b9982257a4156416331fbaf189ef54c04c4f3b8d87dd1fea703ed29e70ff58f52af35735e3fea31f7a84127c34211cb5f6a11f1ba1d8c6586464fd3
-DIST kodi-inputstream-adaptive-2.3.16.tar.gz 709687 BLAKE2B 9462cc7d77c20f2b63ca22ddf284fbec1f90e672c1bc3251bc1eb57067832d9eac8111533820e5f7e50e4d26df2e9bf43c6b059b09c9f47a24e769539efc1755 SHA512 c4ab48af774ade61d36e44f459235956110354b3bc3b010a7ea6ccbf1309c0fe52917c72fd03ce0388afe5813f1571f2d0b89df59ff00101a8342b4ba45f9335
-DIST kodi-inputstream-adaptive-2.3.17.tar.gz 709839 BLAKE2B 55383716f7cd9e0b21b55cd86d2819b08fae7857ea88768311400401c90c1280a36b9dd404f769f30cff46eeb5d36b855064db1dd8c265d4d1231cc73bc0a1f2 SHA512 055fb4baccba713c7195fb7285053514006459ca3ba0197e0ca1bf507472161e4d449e30a8e6b77825c480c405dfee177ad6070f21f1ffacd6248e9e6288e18e
-DIST kodi-inputstream-adaptive-2.3.18.tar.gz 709886 BLAKE2B 5b96786aead7f51172f363018977a879c6ea7a490cb8908e6c201a64b6af88c0eb4ee2eac6fa8ca4305f7a2762f65cd5e9427e4de5c5c637ee60e4eb1cc501a4 SHA512 fbe281e9f89ce5987429231ca7ee2c42aec1016a9742a1783e9852a462ba6d209978096666536c9768cc580482abd1bb1767e3b63002329f90869206c4e297cc
-DIST kodi-inputstream-adaptive-2.3.19.tar.gz 712487 BLAKE2B df01185d734a3dd9f241e91fa392dd7696a37a34575715e46eb503fad82ffd5ceb1ded38531a8fa1a4055edcdd84a1b284fa3c7daf1b12106f7b6be390e87598 SHA512 a76c4a472fd4ecd756eb2936ebf0d1f49dad348747d40c80771bdaafb999bd6e9e32ca333d1d16fef3837e46ed60bef47ff68dccafcd4166e57e240a1d7b255c
-DIST kodi-inputstream-adaptive-2.3.20.tar.gz 712611 BLAKE2B 7771fd15e230e76cd9786348b86a0a561afbe250f7d78e2418f1fc189e52b46ee249316770fdd9aea7fb16c73df6f9579c73510e658a29aaa53c5c02c04bee9a SHA512 5a5bc68d6f10187d2ac8d7a0e196a6615b75642ffdae67efac16d7aa718a42c13df3f3485029876eff42fca415039549ead60db381477de9df2bde5fc7f34718
-DIST kodi-inputstream-adaptive-2.3.21.tar.gz 712611 BLAKE2B 129622e050d8881b2921d7cd730453ecd697d3041b7d4d1fed3449734a9923effe9f5e53dc6a72901b57b953df391908d9f7adbe5fe054320ea2b14b56719ed9 SHA512 a5f059e08c5002c42ec1a6ff2ceceecbcc4f9943d4dd4a7c87097ad58eed7827240bd6c2e4acd414ce6fd3326a2ef8d85372e245bea712d45148dc5328ff83a4
-DIST kodi-inputstream-adaptive-2.3.22.tar.gz 711950 BLAKE2B 5a3bf2df9492707f586b52d9ca556eafda69c7167e6bee17b3de749fbfc1b59c215550b5eb9f47c92b77641a29c88d9dfdea9359bde1968ffaf089b93a4ac5f1 SHA512 6dd73776b2962a6432202738d167ea3169cdbdd470672066bed39d12366cc33a28dd2809edb9ceb9255022d6076b1c3dd31828f60fee8e2d2dceffc0d58a6d6f
-EBUILD kodi-inputstream-adaptive-2.0.25.ebuild 799 BLAKE2B 49612b21ce2fce4f3fd32f5f15ef872ac3738bbee99210e68f68083e413c2bdc6a5eab012fde212e1ec6ab2fd998214a9ad30162ff60aebe52611892afb6ec4f SHA512 a088a71d77ced70bf1e697412f56f92ae3108d2e88a5a3cc1855b35ee89e2fd603f325e5efb70ceaf74af05b0003e9af55aa6511cede51195dcf9cb80e264336
-EBUILD kodi-inputstream-adaptive-2.3.13.ebuild 724 BLAKE2B 19f0d9d58d104d14b50b7691161378ef9621eaa162f08ada2a3d9f1d3de852a9e5024fc2947fe54802ccbaa224212c92501937774575109c21112111bfdeb8ef SHA512 35da00c5e89e54c8ba456a72ec02106652d2a873b556a54e98736927de12181a30dd67f45c487033917ec68a9e8edee1958e997c7ecacbbbf23d47910e797d4d
-EBUILD kodi-inputstream-adaptive-2.3.14.ebuild 724 BLAKE2B 19f0d9d58d104d14b50b7691161378ef9621eaa162f08ada2a3d9f1d3de852a9e5024fc2947fe54802ccbaa224212c92501937774575109c21112111bfdeb8ef SHA512 35da00c5e89e54c8ba456a72ec02106652d2a873b556a54e98736927de12181a30dd67f45c487033917ec68a9e8edee1958e997c7ecacbbbf23d47910e797d4d
-EBUILD kodi-inputstream-adaptive-2.3.15.ebuild 724 BLAKE2B 19f0d9d58d104d14b50b7691161378ef9621eaa162f08ada2a3d9f1d3de852a9e5024fc2947fe54802ccbaa224212c92501937774575109c21112111bfdeb8ef SHA512 35da00c5e89e54c8ba456a72ec02106652d2a873b556a54e98736927de12181a30dd67f45c487033917ec68a9e8edee1958e997c7ecacbbbf23d47910e797d4d
-EBUILD kodi-inputstream-adaptive-2.3.16.ebuild 724 BLAKE2B 19f0d9d58d104d14b50b7691161378ef9621eaa162f08ada2a3d9f1d3de852a9e5024fc2947fe54802ccbaa224212c92501937774575109c21112111bfdeb8ef SHA512 35da00c5e89e54c8ba456a72ec02106652d2a873b556a54e98736927de12181a30dd67f45c487033917ec68a9e8edee1958e997c7ecacbbbf23d47910e797d4d
-EBUILD kodi-inputstream-adaptive-2.3.17.ebuild 724 BLAKE2B 19f0d9d58d104d14b50b7691161378ef9621eaa162f08ada2a3d9f1d3de852a9e5024fc2947fe54802ccbaa224212c92501937774575109c21112111bfdeb8ef SHA512 35da00c5e89e54c8ba456a72ec02106652d2a873b556a54e98736927de12181a30dd67f45c487033917ec68a9e8edee1958e997c7ecacbbbf23d47910e797d4d
-EBUILD kodi-inputstream-adaptive-2.3.18.ebuild 724 BLAKE2B 19f0d9d58d104d14b50b7691161378ef9621eaa162f08ada2a3d9f1d3de852a9e5024fc2947fe54802ccbaa224212c92501937774575109c21112111bfdeb8ef SHA512 35da00c5e89e54c8ba456a72ec02106652d2a873b556a54e98736927de12181a30dd67f45c487033917ec68a9e8edee1958e997c7ecacbbbf23d47910e797d4d
-EBUILD kodi-inputstream-adaptive-2.3.19.ebuild 765 BLAKE2B cfe5860064cfc2b6c4731c60d2ac56431bb68395ba1ee9b63c0dff5ed0cf78487273530a22c6c84e561dc92b87feb382c7e20f6c30ad1100e1fbeea05cb7b674 SHA512 073856271b66d3e2754fba8d6b97efcde97ca3e22b6ceeb260f14495bf5ce7a029d13afb90159b2f79358131cc986942a87a01ddc56e965a596ae3370a8499e9
-EBUILD kodi-inputstream-adaptive-2.3.20.ebuild 765 BLAKE2B cfe5860064cfc2b6c4731c60d2ac56431bb68395ba1ee9b63c0dff5ed0cf78487273530a22c6c84e561dc92b87feb382c7e20f6c30ad1100e1fbeea05cb7b674 SHA512 073856271b66d3e2754fba8d6b97efcde97ca3e22b6ceeb260f14495bf5ce7a029d13afb90159b2f79358131cc986942a87a01ddc56e965a596ae3370a8499e9
-EBUILD kodi-inputstream-adaptive-2.3.21.ebuild 765 BLAKE2B cfe5860064cfc2b6c4731c60d2ac56431bb68395ba1ee9b63c0dff5ed0cf78487273530a22c6c84e561dc92b87feb382c7e20f6c30ad1100e1fbeea05cb7b674 SHA512 073856271b66d3e2754fba8d6b97efcde97ca3e22b6ceeb260f14495bf5ce7a029d13afb90159b2f79358131cc986942a87a01ddc56e965a596ae3370a8499e9
-EBUILD kodi-inputstream-adaptive-2.3.22.ebuild 765 BLAKE2B cfe5860064cfc2b6c4731c60d2ac56431bb68395ba1ee9b63c0dff5ed0cf78487273530a22c6c84e561dc92b87feb382c7e20f6c30ad1100e1fbeea05cb7b674 SHA512 073856271b66d3e2754fba8d6b97efcde97ca3e22b6ceeb260f14495bf5ce7a029d13afb90159b2f79358131cc986942a87a01ddc56e965a596ae3370a8499e9
-EBUILD kodi-inputstream-adaptive-9999.ebuild 767 BLAKE2B b2900266ac7b915fde25ba54d771751a6943d60546fdef8fdad322a1f9aebe9a85ba0ceb6945bbe4316959059af6ec6ccdd261fd86ef080a07b483ef4d35d59f SHA512 e02c3aee34a8b06658f03300cc3fe0766e0acc1cb9b1c3eae49ae787288b9788547c9325572ed9671dbbea8ec95d6f98daccb980991d0bd6c0dfed9afa7b7852
+DIST kodi-inputstream-adaptive-2.4.2.tar.gz 711951 BLAKE2B 17f29ffb9f6e0f0e109af85afba16e92fe8f0cef2d660b6e4abcda0265e8096fca83ad947de213a83eaea8b94cebf94da4f3266f32fce28776dbabc05477ef3c SHA512 218be820b4e7f05d9a3ffd330db785997afe225a994ed4187a1aaa13b28189453d4a82e3553210613aa644f9f98b30bfc7bc048a1ad9674521053ef21e2e26e0
+EBUILD kodi-inputstream-adaptive-2.4.2.ebuild 765 BLAKE2B cfe5860064cfc2b6c4731c60d2ac56431bb68395ba1ee9b63c0dff5ed0cf78487273530a22c6c84e561dc92b87feb382c7e20f6c30ad1100e1fbeea05cb7b674 SHA512 073856271b66d3e2754fba8d6b97efcde97ca3e22b6ceeb260f14495bf5ce7a029d13afb90159b2f79358131cc986942a87a01ddc56e965a596ae3370a8499e9
+EBUILD kodi-inputstream-adaptive-9999.ebuild 825 BLAKE2B 2a7eb0a26485c9eb5209c1f8ab8cb9ed332a61d7a0fc3f9b6d679558169a8f4a72fdbc6be25ee3df56a1b722ea310e85f6b45ff91c3bbeec0bdfd1374c25bc26 SHA512 03610785d2f6cca04d7862ebf5a3f79b20d536d33ff48d557fa612946eac5d25abfd6e01cc538528e5499c98ba5264fcef53d3431a421f474b587af4f93cfb67
 MISC metadata.xml 459 BLAKE2B eeb0ec3e241775f1953b2846edd160fcbe72d5990a256f5374e9aae5e45eef5f4c50225c72d371c0ca3d11a3b81eabd87a5de35952aa5f7676b4d7b79854ba71 SHA512 748df555db70e268d7f67b408428d949ecc04c49fcd143d984b47597c3c4ee86fd8066bf294598df926889525213f34182a790d442aced5fc2f39346f13e4d5c
diff --git a/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.0.25.ebuild b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.0.25.ebuild
deleted file mode 100644
index 962f5efbfe14..000000000000
--- a/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.0.25.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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"
-	GIT_COMMIT="c51b9a9b58a645f820883e6d99982277fc58aac5"
-	SRC_URI="https://codeload.github.com/peak3d/inputstream.adaptive/tar.gz/${GIT_COMMIT} -> ${P}.tar.gz"
-	S="${WORKDIR}/inputstream.adaptive-${GIT_COMMIT}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	dev-libs/expat
-	=media-tv/kodi-17*
-	=media-libs/kodi-platform-17*
-	=dev-libs/libplatform-2*
-	"
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.3.13.ebuild b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.3.13.ebuild
deleted file mode 100644
index 85e10272539d..000000000000
--- a/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.3.13.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=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.14.ebuild b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.3.14.ebuild
deleted file mode 100644
index 85e10272539d..000000000000
--- a/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.3.14.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Kodi's 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.15.ebuild b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.3.15.ebuild
deleted file mode 100644
index 85e10272539d..000000000000
--- a/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.3.15.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Kodi's 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.16.ebuild b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.3.16.ebuild
deleted file mode 100644
index 85e10272539d..000000000000
--- a/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.3.16.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Kodi's 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.17.ebuild b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.3.17.ebuild
deleted file mode 100644
index 85e10272539d..000000000000
--- a/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.3.17.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Kodi's 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.18.ebuild b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.3.18.ebuild
deleted file mode 100644
index 85e10272539d..000000000000
--- a/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.3.18.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Kodi's 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.20.ebuild b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.3.20.ebuild
deleted file mode 100644
index 039105147964..000000000000
--- a/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.3.20.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Kodi's 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"
-	CODENAME="Leia"
-	SRC_URI="https://github.com/peak3d/inputstream.adaptive/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/inputstream.adaptive-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	dev-libs/expat
-	=media-tv/kodi-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.21.ebuild b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.3.21.ebuild
deleted file mode 100644
index 039105147964..000000000000
--- a/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.3.21.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Kodi's 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"
-	CODENAME="Leia"
-	SRC_URI="https://github.com/peak3d/inputstream.adaptive/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/inputstream.adaptive-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	dev-libs/expat
-	=media-tv/kodi-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.22.ebuild b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.3.22.ebuild
deleted file mode 100644
index 039105147964..000000000000
--- a/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.3.22.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Kodi's 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"
-	CODENAME="Leia"
-	SRC_URI="https://github.com/peak3d/inputstream.adaptive/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/inputstream.adaptive-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	dev-libs/expat
-	=media-tv/kodi-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.19.ebuild b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.4.2.ebuild
index 039105147964..039105147964 100644
--- a/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.3.19.ebuild
+++ b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.4.2.ebuild
diff --git a/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-9999.ebuild b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-9999.ebuild
index 2fb43d0af921..8c3da94fa9c1 100644
--- a/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-9999.ebuild
+++ b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
@@ -31,8 +31,12 @@ DEPEND="
 	dev-libs/expat
 	~media-tv/kodi-9999
 	~media-libs/kodi-platform-9999
-	=dev-libs/libplatform-2*
 	"
 RDEPEND="
 	${DEPEND}
 	"
+
+src_prepare(){
+	[ -d depends ] && rm -rf depends || die
+	cmake-utils_src_prepare
+}
diff --git a/media-plugins/kodi-inputstream-rtmp/Manifest b/media-plugins/kodi-inputstream-rtmp/Manifest
index 6273170f9f6c..5a8470508752 100644
--- a/media-plugins/kodi-inputstream-rtmp/Manifest
+++ b/media-plugins/kodi-inputstream-rtmp/Manifest
@@ -1,10 +1,6 @@
-DIST kodi-inputstream-rtmp-1.0.4.tar.gz 7271 BLAKE2B c76b46fc1ba1bbe45084071ee0521b8f421a87886723abce3103867f8c542dbee364c9cb64a3e7237c59cfcc9afd910bb4ba5b749d5e1f6efa4ac215b1ced26d SHA512 659990b2cbe6e9119c650e151aaae0ccd33f8b9f5d6efd1436f4cb6c78beb51c8fae528b844278348066e1b10fe2a7fa6c05e32b54be82f5a750a5a14c8bd9d2
-DIST kodi-inputstream-rtmp-1.0.5.tar.gz 7271 BLAKE2B dfc7a80684d0c872761baf4e8603b491b6530cb0e8a5aad782f18165cb15ec54aaf7557b877eab74c87a46d68481aefecde2f0b15fc748c5a7800593f9033a45 SHA512 7a58ec265586fc0ffc8b1021aa1529d171c8ea14202f80b443d51dbfbfd8f0424a2b5f94687d302a3681e2931ac268e89e8d2e82635ac5b792cc8c9bd8f020af
 DIST kodi-inputstream-rtmp-2.0.4.tar.gz 18259 BLAKE2B 714090d52b1e46e79b88b34b3a400edb444668be2856eb92b61769ecec802be4a7fc1ab73380febbf0cb277b6a1758f2f4f81efb6d1c6c1d266691de6071f7cb SHA512 ac7a7f3f40f4c7d4ec176299ae0d8dd389f1e041d6633a65190e7e8a0a87e87142ebf4f80a36b7429524f7d1571ce5d1708ac753edae695b1d1d84de73e5d88f
 DIST kodi-inputstream-rtmp-2.0.5.tar.gz 18280 BLAKE2B ce906740bebaa33ffa813a94f8b73cc9640e9a7f08059d972c23dee5d811c57e33c43d7e41b690d693de86f238ff2c936f2375baae3db1b40033a539e6c0587a SHA512 178ecfedae24b2ca0b13de997861e89063eff929a6a1a2b0b6b3e32a45bddd238304466a9f1f52b6213db3faee93144ae77fc9c4045c3783780a50bc1ae11166
-EBUILD kodi-inputstream-rtmp-1.0.4.ebuild 659 BLAKE2B a2b0e2a99fa914ae03ab14db0f6d0aea5ef561c1bcf4d8885751096d0df4f99250388168066c391c24df2b56c60275c55045e1fb0a35d9484201c21c8079ef01 SHA512 4877df994ca70060b38976fa956ce5e8bfc196dc17c08c79e8c437468a7885fdab7752e9c6a550b861a84322b82d25d186d462f5ef7c613bc5f7fc931bac935b
-EBUILD kodi-inputstream-rtmp-1.0.5.ebuild 659 BLAKE2B a24a3762a845bfcf1f4096962c2fdd4d69101cda354ae3ff8436ccaa965cf203b6d5b102771112468cd86bca6b722ac909c73e2571a3d2d496d2e95ffa9109cc SHA512 956a5fefa57ad78b53e7ff85ee65e581e8abaa37c3e15ea3dcfd67c23fe0d5d2bda887e9e1c0a17d42e0a6e71e5117ae19689c7d1ec3ba1a5812d01f118c14d6
 EBUILD kodi-inputstream-rtmp-2.0.4.ebuild 684 BLAKE2B f8f25f5846d5576b656555155f213c817a18de0c20cb0a4c55952d694dc2e21420c5b8e21813c2744dfe23877ea408c3876efe66fbbc2e54642d6eefd5686c5a SHA512 39147f7f41ab05b76de6c4aa800b3ea292a6b4dfa6fde6d322f30822ba8319f0f08e9a090c4b45cc5d3bf59ab0fb0b5c9a621fc831f12d972e61d8057f73e2d6
 EBUILD kodi-inputstream-rtmp-2.0.5.ebuild 684 BLAKE2B 8e409021b820b4754f8e94ce3437bbab0716905d04d83a771d5a829fcf65741b4faf76c2d95c44eea74c3300cf7577059c072911c79b1ae426bf90e3f8c76d88 SHA512 e5665cee8ce8cb69436f18b0dfc891bfa780f4c770c3c074bc8bbf76ad54f3dee69cbd5eb345b503b475c4f6e67ac79546ad42cc7b1c70927867370aadb321b6
-EBUILD kodi-inputstream-rtmp-9999.ebuild 685 BLAKE2B 374e8719bcda88ec5c7f36aac819825302775dc1eca54d4c2027eddc3fbafc2096ec756103f51bd1e84f0a7523368813a66354edd980c2feef81a5a7a7b5cc65 SHA512 5440ea6b458366246f9d035854e7b990047eb10f347289ef0855375c9dde4f565104039aa516c79ea2ed8df92a56373f6328ac1189d21ed9c72db3607044d5c9
+EBUILD kodi-inputstream-rtmp-9999.ebuild 685 BLAKE2B 0545f647f9245492150b46328a66d62f3c7fdc07c485f5afbc0206e85ccbe6cd50215f6aa168f9b5c50ec44cc7ceb46fcbce1e6c611e3fdf211060a5da03e8b9 SHA512 5f055647e8ed89b0d65b48cf8ae436f5879377f8ed5e5c2dc724771509607f13290d299edd4b40e6dc73c551d0202b2117b9a7fab2a82b06c0505457ff9f6e70
 MISC metadata.xml 433 BLAKE2B 5b159068b2431fb4b669662f4e36d8768afbda1e076e866678c193590945ff0ba4d6c03228475dda7bb7ca5d204d09e0e5d5804baacbfa653563f199045a1c80 SHA512 0cb47e468304977fd3624c4ec07d254271406897eb4601eac57a68167463a8379e3d8cf4d4e0e4988ae78d832ae39da9a457ba30a7c0fbbe8a32fab4e5e94f53
diff --git a/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-1.0.4.ebuild b/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-1.0.4.ebuild
deleted file mode 100644
index 8381ea523095..000000000000
--- a/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-1.0.4.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Kodi's RTMP inputstream addon"
-HOMEPAGE="https://github.com/notspiff/inputstream.rtmp"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/notspiff/inputstream.rtmp.git"
-	inherit git-r3
-	;;
-*)
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/notspiff/inputstream.rtmp/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/inputstream.rtmp-${PV}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-17*
-	media-video/rtmpdump
-	"
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-1.0.5.ebuild b/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-1.0.5.ebuild
deleted file mode 100644
index c3055b7ab919..000000000000
--- a/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-1.0.5.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Kodi's RTMP inputstream addon"
-HOMEPAGE="https://github.com/notspiff/inputstream.rtmp"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/notspiff/inputstream.rtmp.git"
-	inherit git-r3
-	;;
-*)
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/notspiff/inputstream.rtmp/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/inputstream.rtmp-${PV}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-17*
-	media-video/rtmpdump
-	"
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-9999.ebuild b/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-9999.ebuild
index c866d60112af..9ca061b69f16 100644
--- a/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-9999.ebuild
+++ b/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
diff --git a/media-plugins/kodi-peripheral-joystick/Manifest b/media-plugins/kodi-peripheral-joystick/Manifest
index 18f5f1e6e3fa..6e8e833ad27e 100644
--- a/media-plugins/kodi-peripheral-joystick/Manifest
+++ b/media-plugins/kodi-peripheral-joystick/Manifest
@@ -1,10 +1,8 @@
-DIST kodi-peripheral-joystick-1.3.2.tar.gz 82787 BLAKE2B c3edcc037161e7f1b865b1761a1296e15d6428ac6f32907569f8b32d3a7ecd7e2c27103ce72079b92b4329818d6709209d8f7caea386223fef6e59df281774fd SHA512 9aa2e5d1af51b83abc0691fb9f6c7603d07c37b61fde898e2010d6370b9dca44275bd53caa2252479128360bc97eb8bd904d268a9c0cab7f2958c0b31f64ba1f
-DIST kodi-peripheral-joystick-1.3.3.tar.gz 84408 BLAKE2B 53ac931708319945c132c7a835fd37e4fcd2c003d64db32c7a888af116625746b96685563dd732873810f28adec20ff5dbed37bd66dcb6bff74cdd192f5a45bb SHA512 e566cfab838b471f4d5cd6d1bde48479868bf1e401e2d5512627f6cfad606c9ec359fade3612dc32424b4a5baffad82278d25906e59062bea9e8aea009754a78
 DIST kodi-peripheral-joystick-1.4.6.tar.gz 91142 BLAKE2B c80daf4e9a425c88ecb323d7f5ab7538aa5a8af06758723310f133f63ac65b74650f6374e4361e9086813474a6b84cf54bb8bc054d54eaec19c1ab32da5181e9 SHA512 ae42a295e548c6bda7a258d02d7a68ec3f34c66e88b1e3848181d8fb76da6ff83f19f8adc007e2697c096052fdd1ea9879b178aab9f8f4118f4d2d57691c2a7c
 DIST kodi-peripheral-joystick-1.4.7.tar.gz 90671 BLAKE2B 281a1d821586224ad155ac621fe5fd48c189733277c877799355bf432a580311967c7300cdd201ca9561f149b42b3327a320bd3641108d8c69cbfd27242ed4dc SHA512 89d9c993f598f7660fccfcc1926ad3b944d88586b0399b3e47524fe5a68665eec8fc7b196acd6d59e36488f830afef50c402ecd05d69cee75c21a69c538e9acd
-EBUILD kodi-peripheral-joystick-1.3.2.ebuild 763 BLAKE2B 529b4ab8aad7d7dca87cafbfec5bfd153a625da49b7a4bdfaa45593b2043abf3a3d3c526e94a0fd179aa768e90a6eceb13db3271bc25dd160a3379c6f5950259 SHA512 b3e15fc2640315e8df3e45a5554dd61a893f668c5aec593b37d82b4f15676ddaeb8c681a7e9a721c8ddfee40ea5ad2cd3692a1525f164d4ad563751565aa5460
-EBUILD kodi-peripheral-joystick-1.3.3.ebuild 763 BLAKE2B 529b4ab8aad7d7dca87cafbfec5bfd153a625da49b7a4bdfaa45593b2043abf3a3d3c526e94a0fd179aa768e90a6eceb13db3271bc25dd160a3379c6f5950259 SHA512 b3e15fc2640315e8df3e45a5554dd61a893f668c5aec593b37d82b4f15676ddaeb8c681a7e9a721c8ddfee40ea5ad2cd3692a1525f164d4ad563751565aa5460
+DIST kodi-peripheral-joystick-1.4.8.tar.gz 90965 BLAKE2B b9bb3aa6e1a5531c304f2f3466bac8f00cffcd771065052d41645f48316c7b246fa07823395aeaa484ca9839d1b8025e6640e7cb504d29642d52c02a1fb21553 SHA512 4ca692589050c225bb9ec45b79f3532a4c572c57b3c2400dd4afa398c3d77194136ffde7bc85b7d24700d7eafb0f813cc3fce5dc48d4de51869fad0f68679939
 EBUILD kodi-peripheral-joystick-1.4.6.ebuild 730 BLAKE2B 76309930faf2294995b1df7eef268c6ee8fea244a129bdc2c2a65e30018cd6fa4e9afb32398eb5e17c8a8956cec8439d321a01eb4015058f54e52ad06be52b69 SHA512 6fabf1aae054025f89177e8bf00672ef62679e31238c048bf7598e92391d82b43fc5815356bc083f3986c0256762c40f85c6849bb00ff5ed4442f0ed4d39ce95
 EBUILD kodi-peripheral-joystick-1.4.7.ebuild 730 BLAKE2B 475b3113d4f0edf85c7221641e8253a20d5c571a890a7e88f6e5e0df7d4ce73bbc5863e6938b921191f721d7d88e293ea3040bff8027f8340a47c08992849106 SHA512 2d4b90e94341f6b0435589c62505a02369081557e6fd71c30b90602c1991da05e2c36c8bde04cdd1eb0f0376beced8e9217421d9c0991cbfa34f9e04d83d02c5
-EBUILD kodi-peripheral-joystick-9999.ebuild 706 BLAKE2B 13ca341650081a44e85af4ef28ae8cdf8dcdd971aea9afdbb827044a842b95975de84eaf6f5b016588d32e8dff033ba3dee9cc08cd36aa99cb787ca636d60aa1 SHA512 4c476cd6488070ca7edda5be0d9dd55121d45a2aa9ec9787e08698cf56a1284cdee65dd231985b0c6d170327a8abe46a37ef36d7ab074ef9ef25abba8f8ed80e
+EBUILD kodi-peripheral-joystick-1.4.8.ebuild 770 BLAKE2B 1abec17a88f9daa0bf27aac34a59e7be3aa4bfe9e46b58c1f8eb8f280a882723459945444da1e6291a8769f5582f9a95b4d21a710e8657efd6376033256b8d51 SHA512 4d76e61711b1523c3817c694d34fba20fde4b6a838c43849f9e8dd20120f25a6720ad1695e72ad3c97da2e735e17b594b7469db7ffa9e943ef97f8ef7a4ed7dd
+EBUILD kodi-peripheral-joystick-9999.ebuild 746 BLAKE2B 8587f64e5d25b69e37dca398f428cf136e61e44db423dc46592acd3980479dbd7d35d4f3b1ffd417aa47f1a53d6de9a3f52fc3461e6d11885e9fa68cd83daf90 SHA512 d55628f1f733d9b88d6958f889e8f40dfb159c116d4d75c9a5d250571915286e2f9c006006891d44b65c68f48580af6f38fe8af472f3a99be85be6af6ebf8edb
 MISC metadata.xml 439 BLAKE2B 4713d97899dd9cb12cf064f17d88b197f872a38952d435445b0097c9cacd297dface9c9efbe034eafe595c7cccc3a37773fbf025c0fc45fe3283ea406785c47d SHA512 1489ac3199dbc3033892af4d492e843fff379a18a93059e4c0e164e9140411f8f7756d275b70214c375f4ee649d48786255aa6500c2b6b218f843295ebd6c29e
diff --git a/media-plugins/kodi-peripheral-joystick/kodi-peripheral-joystick-1.3.3.ebuild b/media-plugins/kodi-peripheral-joystick/kodi-peripheral-joystick-1.3.3.ebuild
deleted file mode 100644
index 019a5d3f0305..000000000000
--- a/media-plugins/kodi-peripheral-joystick/kodi-peripheral-joystick-1.3.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Libretro compatibility layer for the Kodi Game API"
-HOMEPAGE="https://github.com/xbmc/peripheral.joystick"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/xbmc/peripheral.joystick.git"
-	inherit git-r3
-	;;
-*)
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/xbmc/peripheral.joystick/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/peripheral.joystick-${PV}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	>media-tv/kodi-17.0.9999:0
-	=media-tv/kodi-17*:0
-	=media-libs/kodi-platform-17*
-	=dev-libs/libplatform-2*
-	dev-libs/libpcre
-	"
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-peripheral-joystick/kodi-peripheral-joystick-1.3.2.ebuild b/media-plugins/kodi-peripheral-joystick/kodi-peripheral-joystick-1.4.8.ebuild
index 019a5d3f0305..c7d5c665839c 100644
--- a/media-plugins/kodi-peripheral-joystick/kodi-peripheral-joystick-1.3.2.ebuild
+++ b/media-plugins/kodi-peripheral-joystick/kodi-peripheral-joystick-1.4.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,8 +17,9 @@ case ${PV} in
 	;;
 *)
 	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/xbmc/peripheral.joystick/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/peripheral.joystick-${PV}"
+	CODENAME="Leia"
+	SRC_URI="https://github.com/xbmc/peripheral.joystick/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/peripheral.joystick-${PV}-${CODENAME}"
 	;;
 esac
 
@@ -27,9 +28,8 @@ SLOT="0"
 IUSE=""
 
 DEPEND="
-	>media-tv/kodi-17.0.9999:0
-	=media-tv/kodi-17*:0
-	=media-libs/kodi-platform-17*
+	=media-tv/kodi-18*
+	=media-libs/kodi-platform-18*
 	=dev-libs/libplatform-2*
 	dev-libs/libpcre
 	"
diff --git a/media-plugins/kodi-peripheral-joystick/kodi-peripheral-joystick-9999.ebuild b/media-plugins/kodi-peripheral-joystick/kodi-peripheral-joystick-9999.ebuild
index db97e72f5d19..fd7b1226a274 100644
--- a/media-plugins/kodi-peripheral-joystick/kodi-peripheral-joystick-9999.ebuild
+++ b/media-plugins/kodi-peripheral-joystick/kodi-peripheral-joystick-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
@@ -17,8 +17,9 @@ case ${PV} in
 	;;
 *)
 	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/xbmc/peripheral.joystick/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/peripheral.joystick-${PV}"
+	CODENAME="Leia"
+	SRC_URI="https://github.com/xbmc/peripheral.joystick/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/peripheral.joystick-${PV}-${CODENAME}"
 	;;
 esac
 
diff --git a/media-plugins/kodi-peripheral-steamcontroller/Manifest b/media-plugins/kodi-peripheral-steamcontroller/Manifest
index 578609d33bdb..6d350d953369 100644
--- a/media-plugins/kodi-peripheral-steamcontroller/Manifest
+++ b/media-plugins/kodi-peripheral-steamcontroller/Manifest
@@ -1,2 +1,2 @@
-EBUILD kodi-peripheral-steamcontroller-9999.ebuild 757 BLAKE2B ec03f723fc37b77d073f3aed78e14be76fe97695c4da20e7e1f931b7f3fe32370fbfc7e7a2601f24239c54cb5120774cd6d56653bfd171eb79c35e922c9b6034 SHA512 c2daecee1b673e1b0e2532be5d870fc7f1c687bbb984fcc9d9d705a27977111263862279d278192b02ded3593900aea75f601b69fdcfa4609cf56fe3343ab6aa
+EBUILD kodi-peripheral-steamcontroller-9999.ebuild 757 BLAKE2B 7f8c7c591c6b7f450b60b37765d6b51c0b7ae38b1c416f47e31db8de66fd9fa2ed2f28bebe4210e7c17b69edaa69177bb056a88625d2ccdceec194c59b70df66 SHA512 6952c9ec0c5cfebdd33b5e1881634fe18e36637817e976598bc3b64d69c922b61ea1759f0adaf43ffc5360c23631bbcefe5e5eb7c96d7621c6c5726759f66865
 MISC metadata.xml 451 BLAKE2B 693a4209127aafd693b5d826563ea913406cdd3445ac138426c18f3c1e8de2d3fd76ff590d51e9df1986f6f0bad0529e56faa32799cceb9fda3ef94d9022d92e SHA512 2e596edc4ed91a27b5fcee8b99a7defbe08a2ee6a4579635484631dbf64b539854418921b393e63e68f045415e998d0a3facb70a786b87c5a4dc40409d2fa807
diff --git a/media-plugins/kodi-peripheral-steamcontroller/kodi-peripheral-steamcontroller-9999.ebuild b/media-plugins/kodi-peripheral-steamcontroller/kodi-peripheral-steamcontroller-9999.ebuild
index d357c789b6dd..a2853221614c 100644
--- a/media-plugins/kodi-peripheral-steamcontroller/kodi-peripheral-steamcontroller-9999.ebuild
+++ b/media-plugins/kodi-peripheral-steamcontroller/kodi-peripheral-steamcontroller-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
diff --git a/media-plugins/kodi-pvr-argustv/Manifest b/media-plugins/kodi-pvr-argustv/Manifest
index 524a47f33a36..a37f6ebb3d18 100644
--- a/media-plugins/kodi-pvr-argustv/Manifest
+++ b/media-plugins/kodi-pvr-argustv/Manifest
@@ -1,8 +1,4 @@
-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-3.5.4.ebuild 703 BLAKE2B 88426f2bd633dba02be419e2067a5860fba8ac022d16961ed2216eb34a1e7a8feae2520da95a1fa0bcd118c951a0ddbf36dcfccb016404eebba946849a4eb418 SHA512 b12ce181413e81ed518c09d8820985b1dd54a5aa64e64413f993a426c6bda743f52c6203e8769b198d446ed5f8a2248acdecbf95d8f9891cc2afdb9b17e8e4f0
-EBUILD kodi-pvr-argustv-9999.ebuild 705 BLAKE2B 3d5d932ddfca45f6066f6cd968350b378477b0accdda2aae9765dd09f132ecb153e1f4963873dac2a5845cf3c51e3ad58c4cfd5d916a2d20c02bf31143e6da74 SHA512 b52e751947d6fb1d8c723ce2b51e1f4355223088f33938881bdb6ef937d8dd8ea3af98cc3a3beacd2de805ae316f5c8640e31f2a444ed836085a56b781fd872a
+EBUILD kodi-pvr-argustv-9999.ebuild 705 BLAKE2B c9ec6b97b136d764164dbb6a33c5483aaf5dbbf4865e614b20a1b6408f5662a2523dc6ec04e1121bf3ae435e8f13ec41e529bf2ef23f1b3109f0a6434462006a SHA512 6b4c30f999371ef02e182974d8938f807cf935363a25ac005206209a0044a9391b4d7458039cefea5852975d67e190245d4709fad97302eb611d808276766c70
 MISC metadata.xml 431 BLAKE2B 7cf6fe3e6a6c6cec6b72acbe12ed6b95b8204c33f9f8473f6ed48831e189063b9b5584b579365bd5551cf9ba109bcf85b6ee1dc77eeb18871f049fa5490215f3 SHA512 ee08e760ff80ed37cbc40ea35ef0daebd9b8b7dd7a532123787a022fea25c9441912103dfb154491b81aab1f79675408c4fe4022c4937b03433df826bdfa90bb
diff --git a/media-plugins/kodi-pvr-argustv/kodi-pvr-argustv-2.5.4-r1.ebuild b/media-plugins/kodi-pvr-argustv/kodi-pvr-argustv-2.5.4-r1.ebuild
deleted file mode 100644
index 885a31c1a377..000000000000
--- a/media-plugins/kodi-pvr-argustv/kodi-pvr-argustv-2.5.4-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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="Krypton"
-	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-17*
-	=media-libs/kodi-platform-17*
-	dev-libs/jsoncpp
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-argustv/kodi-pvr-argustv-2.5.6.ebuild b/media-plugins/kodi-pvr-argustv/kodi-pvr-argustv-2.5.6.ebuild
deleted file mode 100644
index 885a31c1a377..000000000000
--- a/media-plugins/kodi-pvr-argustv/kodi-pvr-argustv-2.5.6.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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="Krypton"
-	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-17*
-	=media-libs/kodi-platform-17*
-	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 d1169d9e78b2..64d10d3212cb 100644
--- a/media-plugins/kodi-pvr-argustv/kodi-pvr-argustv-9999.ebuild
+++ b/media-plugins/kodi-pvr-argustv/kodi-pvr-argustv-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
@@ -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-demo/Manifest b/media-plugins/kodi-pvr-demo/Manifest
index 302b60cbe309..1ef537114acd 100644
--- a/media-plugins/kodi-pvr-demo/Manifest
+++ b/media-plugins/kodi-pvr-demo/Manifest
@@ -1,6 +1,4 @@
-DIST kodi-pvr-demo-2.4.3.tar.gz 33550 BLAKE2B 8ef109600dbd405f8425cb2a7ebb450282ab552a87e573f55867b0db30beb274a31d223715be24d578580e38c205958e0733a2f6ae37d7a38ad9c092a58b4322 SHA512 14d6abfdc6225d19873b60a118f6f777dfb442f410a057a1f7fdbf0764203088ee337cd0e15a4d4a3814e949776e38b8f91ec7ff99526163e8bf5b82a114e745
-DIST kodi-pvr-demo-2.4.6.tar.gz 33566 BLAKE2B 76438109320456da61315eafa5485b1c4601fa4b77da156c62f220a6cf41820cb27e9ea1975a5c1e2f4df2d337baa04616665114bd35a098e1fc75e076eb854b SHA512 d78baa3abc5a014be631395e599c85e2a49ef9bf683aef74848030a0b60e872ec35b55da4658013430eaea99640bbb146d1ccff7c596eb5339e1c45eb5e4b7ea
-EBUILD kodi-pvr-demo-2.4.3.ebuild 686 BLAKE2B e032700db8dafbf355298974a10f3f2df1bbe6e5da88c698b7bdbb4c93ece2069043cc1b148d9f2f1936f3cac67c8a41eb73bccbb51dd3cc50c7e9c95c423705 SHA512 ca3c9c634e3aa2690f07797667d0f75a637c96b882ad221cdef8216681c8a861832380f9e0439158cd35433d6f7c43d17ab4d23e015c63727a08411e3411cfa1
-EBUILD kodi-pvr-demo-2.4.6.ebuild 686 BLAKE2B e032700db8dafbf355298974a10f3f2df1bbe6e5da88c698b7bdbb4c93ece2069043cc1b148d9f2f1936f3cac67c8a41eb73bccbb51dd3cc50c7e9c95c423705 SHA512 ca3c9c634e3aa2690f07797667d0f75a637c96b882ad221cdef8216681c8a861832380f9e0439158cd35433d6f7c43d17ab4d23e015c63727a08411e3411cfa1
-EBUILD kodi-pvr-demo-9999.ebuild 688 BLAKE2B ac740eba5d1f8defde063ffaebdd57a2966809411b47264d174b55d6346e06dcdd6c3506cc6ce50ed067874e19880b5bf072be2f3daf50d75a58bb37789ead67 SHA512 3cc29b7e96d78727f2a2376c5f67e2a310be9f18389bef0caaba94a919989ee5efbe874f7cbf6ba3682245aac10e08a60a1f5e3ca63d3ae45867029533c06551
+DIST kodi-pvr-demo-3.6.1.tar.gz 35070 BLAKE2B f916f89dd701c5fa9b6f9ad4950115433382c94ec5cc73afb0c753b80c1850947ba4776e494842e9181595b5a8bdb0e38f3a6b0baeaa6b19dfe2fe104b2ac06b SHA512 ddcc0c91b9173920ab5a9e05622312e7363b85be74254e451cff7d415d09fe9b60f59acb75c66359eabc3e737921116c2232042a76dcabcf9e2d52d4d3e31a09
+EBUILD kodi-pvr-demo-3.6.1.ebuild 680 BLAKE2B 87d12755a3a90adfc581a0a25e01a0be13e52551fe3114fb0cb8f5329adfe5011480df5c9bf54ca4aa449c0f13157b7adc1b2c23b8e2bba212249c5dc105a16e SHA512 b9507d10a7ae7f5dbbff1970e7c88edb3e76d3a84b6ccf3927eaf2f457d9ed651c773735b996ebd84803176e4362e8b943990cff810fd1b95b7c9ff71a653b33
+EBUILD kodi-pvr-demo-9999.ebuild 682 BLAKE2B 6a571d5a90500dadd816e3221e77f73511026a1009958beebd03b93a89c3800652aa9da82c6e5be7beb50918116e1ce9701fb983a95e12c34c185f004b2d8895 SHA512 44e997dff56aeaa6a77d27a5b57693a5f5b9542b0c9294677b2f3375f816049be26691268a1a7ba95888174d4d307af74e2e20acf915110d498dfea206d92f6d
 MISC metadata.xml 436 BLAKE2B 657769c7828eb3034e2d71aba8377aa2f7d9e4d314904e24e17f08659c2e58ade1c24d1903b9b30c5f96322c4c9ab85c92fceb41c468afda496d52bc9f4c5a7e SHA512 a60cfa34672d7940ea934fbc3dc6c2b0e11c0ff59cecd7d41dae08d040172c65e70117748ced3a74c5a772af9ebd00259e91db26cb73d635502d85ed48ff4538
diff --git a/media-plugins/kodi-pvr-demo/kodi-pvr-demo-2.4.6.ebuild b/media-plugins/kodi-pvr-demo/kodi-pvr-demo-2.4.6.ebuild
deleted file mode 100644
index 29a0024da0f5..000000000000
--- a/media-plugins/kodi-pvr-demo/kodi-pvr-demo-2.4.6.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Demo PVR for Kodi"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.demo"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.demo.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Krypton"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.demo/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.demo-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-17*
-	=media-libs/kodi-platform-17*
-	dev-libs/tinyxml
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-demo/kodi-pvr-demo-2.4.3.ebuild b/media-plugins/kodi-pvr-demo/kodi-pvr-demo-3.6.1.ebuild
index 29a0024da0f5..5a8fd9899663 100644
--- a/media-plugins/kodi-pvr-demo/kodi-pvr-demo-2.4.3.ebuild
+++ b/media-plugins/kodi-pvr-demo/kodi-pvr-demo-3.6.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
@@ -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.demo/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/pvr.demo-${PV}-${CODENAME}"
@@ -28,8 +28,8 @@ SLOT="0"
 IUSE=""
 
 DEPEND="
-	=media-tv/kodi-17*
-	=media-libs/kodi-platform-17*
+	=media-tv/kodi-18*
+	=media-libs/kodi-platform-18*
 	dev-libs/tinyxml
 	"
 
diff --git a/media-plugins/kodi-pvr-demo/kodi-pvr-demo-9999.ebuild b/media-plugins/kodi-pvr-demo/kodi-pvr-demo-9999.ebuild
index 268cfaa74f37..6d694e9aa2d2 100644
--- a/media-plugins/kodi-pvr-demo/kodi-pvr-demo-9999.ebuild
+++ b/media-plugins/kodi-pvr-demo/kodi-pvr-demo-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
@@ -16,8 +16,8 @@ case ${PV} in
 	inherit git-r3
 	;;
 *)
-	CODENAME="Krypton"
-	KEYWORDS="~x86 ~amd64"
+	CODENAME="Leia"
+	KEYWORDS="~amd64 ~x86"
 	SRC_URI="https://github.com/kodi-pvr/pvr.demo/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/pvr.demo-${PV}-${CODENAME}"
 	;;
@@ -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-dvblink/Manifest b/media-plugins/kodi-pvr-dvblink/Manifest
index 621e6bc36db1..85bccbc8aefe 100644
--- a/media-plugins/kodi-pvr-dvblink/Manifest
+++ b/media-plugins/kodi-pvr-dvblink/Manifest
@@ -1,10 +1,6 @@
-DIST kodi-pvr-dvblink-3.3.11.tar.gz 150155 BLAKE2B a3c3a224885324f82d19d6b4fb467699cccacefa21729ee736c57f8823228a8b701335aba06c393542c5f4080a445b9a244c6c420e7134c5ef74284f70e8035f SHA512 4bc6b6c468c4578528e105003d37bf1b18d6decfd61144ec6e92cb9cc4c05e03d5fb0e475d48674f43b7feb5957f1d891cda6afe72e9f50c0834bdf4519074bb
-DIST kodi-pvr-dvblink-3.4.5.tar.gz 152982 BLAKE2B d74d7c33aeddbbbe588cb61e84ee06590a324ceace3c6cf1cd83d8f14ed7888376a237a9b5d6fc795e980da5f9f63fe9a4ed096dcccb8aed3fe549f07acedd1f SHA512 094781e1c944c7a64797f092404aa5eaa267fe31dcbf266441bcbe003362ca78e1732bf80ee26f703f3cdbe8f375f82131a0e6e2865b678e3c99c67220bb38e9
 DIST kodi-pvr-dvblink-4.7.1.tar.gz 181247 BLAKE2B a9368ed515f942a7144a50e02c5ada8029d3b87a61230ad9021065c90587afd449ef56e402e36e0cb0c9aefa226486ac793b11c2d509c9559a91c81b50753cab SHA512 66e132274632c10034c8dff78e1b72cf273b6e9e3dffff4ab2efb877ed509a88c8afda600734c93cb228ad7879a5e6815e89ae83d8b5e8d9d88c0c8b8dd3e25e
 DIST kodi-pvr-dvblink-4.7.2.tar.gz 180347 BLAKE2B 83ca3cf04de7cfda420da8f068022062ee08920d5313cf2e740c1512bc5c1ec3dc8cd1613f5aa1f30049193d777773d5e73ae66e616dc3e5ea4064cac72b4f01 SHA512 9057a066fa228a271e4b21935bf1b823bd7184d3cea62bdb358932d3a8018c86a1129548c5e54414bf068bcdaad7726a8355d5bc5c61f64130396fef8e089be5
-EBUILD kodi-pvr-dvblink-3.3.11-r1.ebuild 709 BLAKE2B 333110dd5935caf528768476dde4c629c196df9ba727d579cb0359a9b1054c7a7a93a0cf266e863b7804eefd4f56975b88f0f5a0f2e0926d41610c7346774e01 SHA512 e2ab0390cc48c019fd3c6858f52f972855ff1a580ed58404ca2ad5dbfea92e841b3cc1e7cda56153f918ec11793d14c4719bb0ca3bbe1264bd75981ab6724f97
-EBUILD kodi-pvr-dvblink-3.4.5.ebuild 709 BLAKE2B 333110dd5935caf528768476dde4c629c196df9ba727d579cb0359a9b1054c7a7a93a0cf266e863b7804eefd4f56975b88f0f5a0f2e0926d41610c7346774e01 SHA512 e2ab0390cc48c019fd3c6858f52f972855ff1a580ed58404ca2ad5dbfea92e841b3cc1e7cda56153f918ec11793d14c4719bb0ca3bbe1264bd75981ab6724f97
 EBUILD kodi-pvr-dvblink-4.7.1.ebuild 703 BLAKE2B ce4cd6664c4c53521badd438ecd5c5ed74280957fd63ddc8de33bf6e32292d96061bf82cd10ec45727ddc93c00239ca64d67eb3209a0d6e85e7b0456111f3192 SHA512 36295772140306413f42eae3fe3f8984d5a5948704ac8aa14567783eb7688e4d132059a768ebbfadde615f7ddf8fef4acfbee072b04d23993329788796f2fa30
 EBUILD kodi-pvr-dvblink-4.7.2.ebuild 703 BLAKE2B ce4cd6664c4c53521badd438ecd5c5ed74280957fd63ddc8de33bf6e32292d96061bf82cd10ec45727ddc93c00239ca64d67eb3209a0d6e85e7b0456111f3192 SHA512 36295772140306413f42eae3fe3f8984d5a5948704ac8aa14567783eb7688e4d132059a768ebbfadde615f7ddf8fef4acfbee072b04d23993329788796f2fa30
-EBUILD kodi-pvr-dvblink-9999.ebuild 708 BLAKE2B d69dbaaf73ee284c01bf1d19a638d995c354ebf105cf37748ea6645119747a57b7e32d6f0b470c64c5b79783c83cbb4d6d4a545fc36daa2dd40cdf7b0e3cd671 SHA512 fd4a02e348ac4d7e06665f360444b425ea1f5b63040e2b924421a919991fdf43263bcf3a6f7b211c98fc41f6bb3967a66ddde08717b3f14ba85ea09bcdf83606
+EBUILD kodi-pvr-dvblink-9999.ebuild 708 BLAKE2B a04b56d6f3793730ef5d90237125f7548c358e920f1934123047a6658271975d7c5a53573281fa919fe5f99690afbffd69a5ce91988d08be1e79fa96756432a3 SHA512 c1ce8332e924dbad56db9e7d25b572ec61e36ff5d8306829db642fdfe039eda0f524676e31ac66925b898c7e9a7df1e1167cf022fd9d675c3080011eea94e639
 MISC metadata.xml 430 BLAKE2B 3e8e91274af301f44e000e54762c98b68a732dcb24bab5f8114df0bfa2b82485cace8c2dec1258efc202b227f946820aa0833dfd7c4647968756b84feea3311f SHA512 f5087df98e004c6319dbb7bf9b4428e5e52636e129cd34f3450d23b7b21b6dc36e7d935c3921e08796831082d4bd101d4c4b185a70236eb1a4b8c6b8522691b7
diff --git a/media-plugins/kodi-pvr-dvblink/kodi-pvr-dvblink-3.3.11-r1.ebuild b/media-plugins/kodi-pvr-dvblink/kodi-pvr-dvblink-3.3.11-r1.ebuild
deleted file mode 100644
index dd3eb8b311ea..000000000000
--- a/media-plugins/kodi-pvr-dvblink/kodi-pvr-dvblink-3.3.11-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Kodi's DVBLink client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.dvblink"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.dvblink.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Krypton"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.dvblink/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.dvblink-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-17*
-	=media-libs/kodi-platform-17*
-	dev-libs/tinyxml2
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-dvblink/kodi-pvr-dvblink-3.4.5.ebuild b/media-plugins/kodi-pvr-dvblink/kodi-pvr-dvblink-3.4.5.ebuild
deleted file mode 100644
index dd3eb8b311ea..000000000000
--- a/media-plugins/kodi-pvr-dvblink/kodi-pvr-dvblink-3.4.5.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Kodi's DVBLink client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.dvblink"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.dvblink.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Krypton"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.dvblink/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.dvblink-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-17*
-	=media-libs/kodi-platform-17*
-	dev-libs/tinyxml2
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-dvblink/kodi-pvr-dvblink-9999.ebuild b/media-plugins/kodi-pvr-dvblink/kodi-pvr-dvblink-9999.ebuild
index e3061438fd15..dc3768c88ed1 100644
--- a/media-plugins/kodi-pvr-dvblink/kodi-pvr-dvblink-9999.ebuild
+++ b/media-plugins/kodi-pvr-dvblink/kodi-pvr-dvblink-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
diff --git a/media-plugins/kodi-pvr-dvbviewer/Manifest b/media-plugins/kodi-pvr-dvbviewer/Manifest
index 39b17a86ee2f..34d54ce40be7 100644
--- a/media-plugins/kodi-pvr-dvbviewer/Manifest
+++ b/media-plugins/kodi-pvr-dvbviewer/Manifest
@@ -1,12 +1,8 @@
-DIST kodi-pvr-dvbviewer-2.4.11.tar.gz 97354 BLAKE2B 6f9c04c0a0a4dd2ce9cab06e1ed96cdc0c674bcb3665db7df6525a2c5ed8e46023e050a4ff9c378fd80a494b34015d37b995f0692c2c8ebfaa1c4e333fbc7468 SHA512 282e11e6ec3bb6a0fdb8b7001a18d335b2cf7c9c28dc1f965ecbcef50b38d2ae52e7aff54508765eeb107ceff67ba0c5b5aa620e792ef88ad86930432cb37a02
-DIST kodi-pvr-dvbviewer-2.4.7.tar.gz 94802 BLAKE2B a2d952b56cf3dcf06563c0a63741026bb77c1f91e0b854d1c3e8f4b06923d71487a835497342955ef2f77af883d94dcc0b5e1363430cf20874b7af29ffe8b964 SHA512 b88dcba491af5f4bb66c3e6f38f28446978fdc7046ff1cc5579957316310e55cf9f00b9162decc0b701a95dd7e76260175d9d66dacc5357930a3f144c48e1ad1
 DIST kodi-pvr-dvbviewer-3.7.11-Leia.tar.gz 128370 BLAKE2B baa4a6bdab5fc96b8e34c73beebf7959fa20575fec87e7ce8f4634462704ec7eb1dc354da55f8073f7393dbdfe422f9b3fd328ef986d40fd6b8aaf68dc838997 SHA512 f20eb91641df1c56782884622b0a60f9c65bb0384b72bf5e1d71d38fc092a954866935658edc36873272b060a8ce8e712b997666012608745b52d91a474d5f7b
 DIST kodi-pvr-dvbviewer-3.7.5-Leia.tar.gz 125918 BLAKE2B 413a752c092ff250e01db404dcd8c35f522546c42c33d93c66f2b5dd7ade1b62fc1686f5b4453260155fd4e1c6b624318a8aeebabccf9041d90952308cc04570 SHA512 03aa18b4946d2d3c345feb5fc26d999a0ca2a929f2ec0bf92450a170f4ceea085fbd16d5daec3782090ffa054bcec8ca02d997716854b493b4f9b8373f2321eb
 DIST kodi-pvr-dvbviewer-3.7.8-Leia.tar.gz 127666 BLAKE2B a1f73598ec8b3c6db067b6c991ea829ebfeae526e4575f9392c0fe36280b467ccee46eadc65f14309bf422e06f9ce9754ae3b2d3444f58fe0c938541be9130d3 SHA512 8d0c16c21b6b80f16801d0d253987f292aaa324f0eabd508c0023e87fce9502ebecbcc89f8fb00007dbd792ced83a8925e280f6cb1dbf0a5f319699a8b7d95d8
-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.11.ebuild 724 BLAKE2B a47e2cefca993930953e681d990454e3ed7523033a12eafa3d7b1666ccaa02ce4ec463a855ab6efcaf3a0b8aa11e21fceebd0e5479e2533a2e9779221746ea57 SHA512 cd00eb63545a5786958b0c88e0f7cc95d59b1356b1a9de780a81402aa69ac9f4b4a5691d3844c7b27fc832b54d68ba0d1e7a4b13f997a12aea53770d654e8cd1
 EBUILD kodi-pvr-dvbviewer-3.7.5.ebuild 724 BLAKE2B 06c88eeb74096b98f317afcc10aab898af34159be154be5dd99713f0d6e33be9d49c0a3e4a06c3f6e40b8a43cb3a2427c527fec6f53cf71e7e24b0c0439174bc SHA512 1a7b983a71f4f8702e65534c9fac156aef3f343914064ffa2326841798b5aff8d16a5c4dd6d2af8aba766aa87d134e526f94b2dc057db2eafb75b5d5d2d54dd3
 EBUILD kodi-pvr-dvbviewer-3.7.8.ebuild 724 BLAKE2B 06c88eeb74096b98f317afcc10aab898af34159be154be5dd99713f0d6e33be9d49c0a3e4a06c3f6e40b8a43cb3a2427c527fec6f53cf71e7e24b0c0439174bc SHA512 1a7b983a71f4f8702e65534c9fac156aef3f343914064ffa2326841798b5aff8d16a5c4dd6d2af8aba766aa87d134e526f94b2dc057db2eafb75b5d5d2d54dd3
-EBUILD kodi-pvr-dvbviewer-9999.ebuild 726 BLAKE2B faa78ff1a46d710284b2043c26f458fc279161d53f6632ec320e5583b9c6576156ea5f52b1409ada64c32a6a52f79c5245c7d2dbdd6b81cae8a5101a3a2d4405 SHA512 59c05d893f445fef677587cfe13fc5340ad571f9a3856e6eb23ec119da39bfd5b863ce0051977bc4a5d3a4684a639af2e82670d0cdd99d16b225f8ee22326698
+EBUILD kodi-pvr-dvbviewer-9999.ebuild 726 BLAKE2B 32ab0af08b1579412f50e22f2e4509693bd143bbc23308ee753a6c0817a7c7f3cc8e9ab1531cdeae4a4d82c05d9750a9ae0a48a3bd3d20a1286079b17511e6af SHA512 7faf4553275cf0576517a3f81da6b5cfa32c30ba8c3821b2b0e0d42dd00d0ab9842c7e300a3b4520f1a3f21a2ce9255f1f10deb65aa8e91c7e70166e4da7f073
 MISC metadata.xml 434 BLAKE2B 8c6842bc4a5a0dc248402680bb06f034883ec52717aff60b0d8a55a27619f288719caf002056bb6c36f09506e8ecf0b45a173f7cfe85699db9477b30fdd380cd SHA512 9e817d4a01a0c99faf30fcbee42cf386310ee8e2a74799d5384bca834ee88c534740bd304b5febae834536c6283e6570199d6692b7091e5c2b9ebe35c1d717c4
diff --git a/media-plugins/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer-2.4.11.ebuild b/media-plugins/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer-2.4.11.ebuild
deleted file mode 100644
index 7947b15e7ecf..000000000000
--- a/media-plugins/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer-2.4.11.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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="Krypton"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/pvr.dvbviewer-${PV}-${CODENAME}"
-	SRC_URI="https://github.com/kodi-pvr/pvr.dvbviewer/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-17*
-	=media-libs/kodi-platform-17*
-	dev-libs/tinyxml
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer-2.4.7.ebuild b/media-plugins/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer-2.4.7.ebuild
deleted file mode 100644
index 95fec515a619..000000000000
--- a/media-plugins/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer-2.4.7.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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
-	;;
-*)
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/pvr.dvbviewer-${PV}"
-	SRC_URI="https://github.com/kodi-pvr/pvr.dvbviewer/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-17*
-	=media-libs/kodi-platform-17*
-	dev-libs/tinyxml
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer-9999.ebuild b/media-plugins/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer-9999.ebuild
index 56e77f938fb0..0c4eb9081cdf 100644
--- a/media-plugins/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer-9999.ebuild
+++ b/media-plugins/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
diff --git a/media-plugins/kodi-pvr-filmon/Manifest b/media-plugins/kodi-pvr-filmon/Manifest
index 88a6e4a1b264..31dd41e5ccca 100644
--- a/media-plugins/kodi-pvr-filmon/Manifest
+++ b/media-plugins/kodi-pvr-filmon/Manifest
@@ -1,8 +1,4 @@
-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-2.4.4.ebuild 697 BLAKE2B 40d100012cb3c7583684aebf7741c4629291a227af15627c4d9dac9a2b47ae2bbbf322ab34b70f03dab4c026ebb70e7bbcf6688468d81df840e151dcb9700760 SHA512 162b3053e55f4ca20f5586592b96538a4640dc32c5ed682262899880699b2097b013533eda33c3cf74d35b7a8aa6ce595188c16dea1054811e0cd8cfd2c0614e
-EBUILD kodi-pvr-filmon-9999.ebuild 699 BLAKE2B 883ffc7d43f5f599a4385c81c5326a0aae077bf819849d406ef8482d34589e4f23006365daf6da2460fbf45ef6bd6cb0eb8048f29fd9f8b0ddf319d0772166ab SHA512 87e2fd1de9e07f613d8418f6d2b825a6ca200bc7f020952f5f3e57ae5381cf0e85a9f16f978f34247c93526612a568571390a1efee6a24b60ab7ac558e75e275
+EBUILD kodi-pvr-filmon-9999.ebuild 699 BLAKE2B 3e6a1930f857d4a9361f3438f81c94cf346972f077d734882a9b88d5bfcabb2b1baf5d1cafe852af0ba066b9609fc63a81b29520e57bfc41a6d2b9ac2babae43 SHA512 c07dace498aaa0412428b76e3b2af92f1cb62f9c8707687a1a66f5a915eb534bbff5b9c2b9baa0c59da91a427228593edc008082e1d074da77489db0d1867d63
 MISC metadata.xml 429 BLAKE2B 5432fd7942694c454c239f39e4835bb6430f8e5dbc14b4bb11d32f6aa618822be12b1fa6a6b39422f4fb5c0d7a1b8203ce7fc3f2090a7d2a7253ee65fca11439 SHA512 dea6258c8509740209e941e13d258d165e72fee1902dba1d5364ce3c453e53de4698df34cff64f591f192336a46e69278ae7409c187788df6ef1a0bb4cf10ee4
diff --git a/media-plugins/kodi-pvr-filmon/kodi-pvr-filmon-1.4.7.ebuild b/media-plugins/kodi-pvr-filmon/kodi-pvr-filmon-1.4.7.ebuild
deleted file mode 100644
index 4cb0060831e3..000000000000
--- a/media-plugins/kodi-pvr-filmon/kodi-pvr-filmon-1.4.7.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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="Krypton"
-	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-17*
-	=media-libs/kodi-platform-17*
-	dev-libs/jsoncpp
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-filmon/kodi-pvr-filmon-1.4.8.ebuild b/media-plugins/kodi-pvr-filmon/kodi-pvr-filmon-1.4.8.ebuild
deleted file mode 100644
index 4cb0060831e3..000000000000
--- a/media-plugins/kodi-pvr-filmon/kodi-pvr-filmon-1.4.8.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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="Krypton"
-	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-17*
-	=media-libs/kodi-platform-17*
-	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 d4bba9c02f3a..c8a6715f02e4 100644
--- a/media-plugins/kodi-pvr-filmon/kodi-pvr-filmon-9999.ebuild
+++ b/media-plugins/kodi-pvr-filmon/kodi-pvr-filmon-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
diff --git a/media-plugins/kodi-pvr-hts/Manifest b/media-plugins/kodi-pvr-hts/Manifest
index 7052ad605a4c..4d0765aa4c74 100644
--- a/media-plugins/kodi-pvr-hts/Manifest
+++ b/media-plugins/kodi-pvr-hts/Manifest
@@ -1,16 +1,14 @@
-DIST kodi-pvr-hts-3.4.24.tar.gz 201592 BLAKE2B ad4db20f002c006f9c5dbeec65b136287fe6f7b6d973794e90c1e7c2edb3d13717db077edc91172a94c709afc623ce5fc29ccfa88ff34e8c6694b164a9223497 SHA512 66d0c0f090a1c22f748a2cf70a9790dc1fa74c05bbb3ad478cce92b2a116c8f2c25dbc72a9d6f2269a19da94c0ea9f7123bfffeebb9d2d6f29dd17411410fe16
 DIST kodi-pvr-hts-4.4.12.tar.gz 160405 BLAKE2B 7d192bf7a19672595cc0a6ca042943f5a59cc530596df65c848e940eba516c0cf429f59418f8f50d5ec930b36e8d496f2ed444b0d0c254941f4fb2b10407c087 SHA512 c04d9e72de8d4bae5699b48c4aa8839a468b81f5ff21b4f2607fee1bb10fe47f1de4574d7ace945a894e46246b9ee5c6b4df6f290b98ff77937a7c6edca675bf
 DIST kodi-pvr-hts-4.4.13.tar.gz 160588 BLAKE2B 2042237ab0804ecf8684f3a20a6f0397e5a890636a2f82ebd04be28a06ad2b79aba53f69c22de9a92d64022354af6e879822b74af37c488adfaf5e3bb6bea81b SHA512 7fe4b5519400c36609de9704087d59f60e44a226fa4d8457b9ace084fed5bd58669091cb05b38c705033e6d5c99a525541b87267d4bbbfed690a4eed043e232c
 DIST kodi-pvr-hts-4.4.14.tar.gz 160561 BLAKE2B dda8728a411b95039a4132e2ca4c882e36011a0c510bbc8e7bed093b778c1c2ab55d8356b25e04bc378bd4036b6ad6f43a0f13ffd7587cfbbb16ff5a7eaae350 SHA512 ad42dce7ed715e99ab4541d993128ceda194a9fa9e0fffb1a8ba170b719c977e32804a5d94a07d1d00f29346189708847df69540decabf1fe8d95b616c4c34a5
 DIST kodi-pvr-hts-4.4.16.tar.gz 160594 BLAKE2B 5ae9bff9ec9460c860b6333f93748d70c18987f51adf248482c2125610ea5a034f2d00312722b4d86d6435f5679e110451f1b6fc9743ed4c4cf79cb079d8f287 SHA512 f2e7ebdfa18f0b191b32964c18782ce0ee76497b141057c29aedb555dac932b1099aff319f4de61166f3fe7e1ab58b723acd2e1f284745f42d6174e7f3e8a31e
 DIST kodi-pvr-hts-4.4.17.tar.gz 161495 BLAKE2B 494d63cd77d6ada7090418140e7aebdb678941236fe45fc46464b213090a2cb5e386d0a59b589afc36cc4cbe020bd3205341b6d893de61c106aee55747172e18 SHA512 0c9eeb8194e4c5b54d5d4df86dc794604d8df91ef172eff9207001ece9a485f7eea40ece449c28bb4cbb414a5a195e6fc50b9571744420c76da104f5fadff377
 DIST kodi-pvr-hts-4.4.18.tar.gz 161525 BLAKE2B 22d869989fc2151ca5ec39c7802d4612d2dcf5e29065bb27a45f528b939f94835585a6a5d427c29a79bea31f5cae811e450be6d80a30d0a18d6934eb63eff395 SHA512 1a0fd0fdec46178262c3f03544d02d13601858043d58ff71bae97c60514f3b11edf12fa53e4436a0de13dcb6877e937d37a5a02f7d6b9ebebbcec9c39e357ce9
-EBUILD kodi-pvr-hts-3.4.24.ebuild 727 BLAKE2B 3b4ffb79aa912e1ec28482085cfda46969140da62410bb2c6698aaa6176b76b980aada914920dc2dafd170d155ab6ab586ef43c7f16c2629763b90561809b787 SHA512 469accb72b3fbf8085cd1d0d823c20a837442ac44d748bf352cadf5706952a9c3af4948753a236ac78bfc0f430d340710ff657f39fe65bbcd8b3c7ab3a58ac13
 EBUILD kodi-pvr-hts-4.4.12.ebuild 721 BLAKE2B 6c0f27c40208e8d4734f9dc79a7cd59bbf7b38335957815ebbab26f322c669f0f29a6562206973d65c276ab8bfaa885f0770db96bccc3eeb32256fdc414fae8a SHA512 cb3f4940a9617fec746d3977022c347060ef2c038218d2f3520f2546b1d7c000fce3f3a776d7575884e02e09e8b1c8f2367a5c389c7971ad1cbb88633c990ec3
 EBUILD kodi-pvr-hts-4.4.13.ebuild 721 BLAKE2B 6c0f27c40208e8d4734f9dc79a7cd59bbf7b38335957815ebbab26f322c669f0f29a6562206973d65c276ab8bfaa885f0770db96bccc3eeb32256fdc414fae8a SHA512 cb3f4940a9617fec746d3977022c347060ef2c038218d2f3520f2546b1d7c000fce3f3a776d7575884e02e09e8b1c8f2367a5c389c7971ad1cbb88633c990ec3
 EBUILD kodi-pvr-hts-4.4.14.ebuild 721 BLAKE2B 6c0f27c40208e8d4734f9dc79a7cd59bbf7b38335957815ebbab26f322c669f0f29a6562206973d65c276ab8bfaa885f0770db96bccc3eeb32256fdc414fae8a SHA512 cb3f4940a9617fec746d3977022c347060ef2c038218d2f3520f2546b1d7c000fce3f3a776d7575884e02e09e8b1c8f2367a5c389c7971ad1cbb88633c990ec3
 EBUILD kodi-pvr-hts-4.4.16.ebuild 721 BLAKE2B 6c0f27c40208e8d4734f9dc79a7cd59bbf7b38335957815ebbab26f322c669f0f29a6562206973d65c276ab8bfaa885f0770db96bccc3eeb32256fdc414fae8a SHA512 cb3f4940a9617fec746d3977022c347060ef2c038218d2f3520f2546b1d7c000fce3f3a776d7575884e02e09e8b1c8f2367a5c389c7971ad1cbb88633c990ec3
 EBUILD kodi-pvr-hts-4.4.17.ebuild 721 BLAKE2B 6c0f27c40208e8d4734f9dc79a7cd59bbf7b38335957815ebbab26f322c669f0f29a6562206973d65c276ab8bfaa885f0770db96bccc3eeb32256fdc414fae8a SHA512 cb3f4940a9617fec746d3977022c347060ef2c038218d2f3520f2546b1d7c000fce3f3a776d7575884e02e09e8b1c8f2367a5c389c7971ad1cbb88633c990ec3
 EBUILD kodi-pvr-hts-4.4.18.ebuild 721 BLAKE2B 6c0f27c40208e8d4734f9dc79a7cd59bbf7b38335957815ebbab26f322c669f0f29a6562206973d65c276ab8bfaa885f0770db96bccc3eeb32256fdc414fae8a SHA512 cb3f4940a9617fec746d3977022c347060ef2c038218d2f3520f2546b1d7c000fce3f3a776d7575884e02e09e8b1c8f2367a5c389c7971ad1cbb88633c990ec3
-EBUILD kodi-pvr-hts-9999.ebuild 723 BLAKE2B c40ccaf825c6162a565463bfe008d827e96ee2663422904ad086eed69f239a240133e4d10ac889e2acaa640c800e4d37edf3e44763b89381e7ff80729a7642a5 SHA512 ca35fceee8d9d6a8f8d622dd6bc6b5e1fc06043522954f6e36656d420b3983b345865ebe3e417f6f0cba50850332356b03e5c16c84fab521ac2531ac4bc4f03b
+EBUILD kodi-pvr-hts-9999.ebuild 723 BLAKE2B f51359291a40dada764e447982851b60e6433f3a8ffbbdcc307e2dd4ae2d9c69e98819406a85bd2e4d1614a748c98e679a6b72364f2b1212ec86efadcb48961d SHA512 65d6b27730ee77d64919fb8885c175e2cd4ee2ee416b44e8d501f4d8d39e3d149a9774687538559e92c65cbfd53c3f8f79e62fa58ccfb206a6875d2752fc6ca4
 MISC metadata.xml 529 BLAKE2B 75957634fa1689db9429bec1f25738c6700813d2714a4c80a4381fa9dec88a126144ef661cbdf1ba7ceb94cddde73bcdc376714abd08f9c205fdc8156e3fed55 SHA512 e6eab8498b684a786e899769dca6949b3252e7534fed233cf7b59f9eef8de4180b676445f455d1736713738c4ebbbbc3e761e8b2af86e386b93e20cfd04f0439
diff --git a/media-plugins/kodi-pvr-hts/kodi-pvr-hts-3.4.24.ebuild b/media-plugins/kodi-pvr-hts/kodi-pvr-hts-3.4.24.ebuild
deleted file mode 100644
index 3de6600a8328..000000000000
--- a/media-plugins/kodi-pvr-hts/kodi-pvr-hts-3.4.24.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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="Krypton"
-	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-17*
-	=media-tv/kodi-17*
-	"
-
-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 0e79994348d2..2e9cd82c3232 100644
--- a/media-plugins/kodi-pvr-hts/kodi-pvr-hts-9999.ebuild
+++ b/media-plugins/kodi-pvr-hts/kodi-pvr-hts-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
diff --git a/media-plugins/kodi-pvr-iptvsimple/Manifest b/media-plugins/kodi-pvr-iptvsimple/Manifest
index 134b56265cc3..0f48befdf9b9 100644
--- a/media-plugins/kodi-pvr-iptvsimple/Manifest
+++ b/media-plugins/kodi-pvr-iptvsimple/Manifest
@@ -1,12 +1,4 @@
-DIST kodi-pvr-iptvsimple-2.4.11.tar.gz 159750 BLAKE2B 806766c4753e657a031a2e067cf9d245e75aab6009fce97b718a095b3dcd2e18121ee9dd2ebd86d864da0de8816d02bba9111826752c01a9b73f572180f1ff78 SHA512 019fac3454c3e5c76055c5ce4785cf6129c79cd8d6c9d8343bc24781e72ea8598039cffec7f19f0ad32ae86acf7fab222ea304a70dd1a13a125ac6e38ca7370d
-DIST kodi-pvr-iptvsimple-2.4.14.tar.gz 160222 BLAKE2B ced35cccbcd4a1652aa63c3a83932c6da218e9ff2f09016bdf36f0ec478b88d07e42db270aeee891b19c0b80351e61e5ba7b442e3d56ca22a68511926db1933b SHA512 bcdc1060a871891b46b113f00edb84e99049205042d655bb936b672d318b611da9ab1a3e729efc06feb2554f9359d2d1bfeec3e4713f44259534f4f6ce21791e
-DIST kodi-pvr-iptvsimple-2.4.8.tar.gz 159663 BLAKE2B 73d2bdcee79ea38714fa772045b1a593bc32e28711eef155750fa052655b509a563cdce27c1eb0047feb6ded0c17e3fb3f800815a1cd589dc860213411626d7a SHA512 da4e287f8c72b014b36fe2379f85568551e4d479a311479347de36aa7f4f497f344b0d8443c5646a0cfbe20db0ec25c90a653e6030c59faee7040f8c8341cbf7
-DIST kodi-pvr-iptvsimple-3.5.7.tar.gz 116264 BLAKE2B 557fce9cfc4ac55562d938e63afdff3347c51b452869f34e705ea5dd912576eb210ffaf213a176dc605fa98ca2ff6862adac69be1afb4379ac2f90639d692156 SHA512 eaa26d84193c67bcb97c65b46f89c29acaabc121e650cf517cc2ded2831106ec8c66d0b9e59e7d423c79bcec3be2863dda1dffa89a71b3ab4548302fbad6e023
-DIST kodi-pvr-iptvsimple-3.5.8.tar.gz 116658 BLAKE2B df871b9e2b3c464ce226308e3cccaa195f8db1a118ce5349ce5640e3b7cd5792c093f18a1f28d3dfe4d91e1dca9b54317aa7a0c36db111eab86f7e1fae7c38f7 SHA512 e9de8e693b2804ca1323ad4c5ed9b0a3f10679bc92193f149769a89ed3af5282002ab986b849da42db8f5962e07a066d363bd00bf05e41dfbd43f546ebee1e9f
-EBUILD kodi-pvr-iptvsimple-2.4.11.ebuild 746 BLAKE2B b7d48cb12940c02a1becd6f11ca5fd075c739fdc5045b759f7cbf1b137952219b5e4af9349a943d06d3aba6db6155fd3eff61479a6f2557126fad0d46d293eec SHA512 12583cb932a5d9a39533ce58ae0d89b2ad0d814256dcc2c0f49ca0fa9f6b8c3af93b9277b60f8fb41810fdb1694ed85fbf84452a4134e99a835ddfeaeacda3b4
-EBUILD kodi-pvr-iptvsimple-2.4.14.ebuild 746 BLAKE2B b7d48cb12940c02a1becd6f11ca5fd075c739fdc5045b759f7cbf1b137952219b5e4af9349a943d06d3aba6db6155fd3eff61479a6f2557126fad0d46d293eec SHA512 12583cb932a5d9a39533ce58ae0d89b2ad0d814256dcc2c0f49ca0fa9f6b8c3af93b9277b60f8fb41810fdb1694ed85fbf84452a4134e99a835ddfeaeacda3b4
-EBUILD kodi-pvr-iptvsimple-2.4.8.ebuild 746 BLAKE2B b7d48cb12940c02a1becd6f11ca5fd075c739fdc5045b759f7cbf1b137952219b5e4af9349a943d06d3aba6db6155fd3eff61479a6f2557126fad0d46d293eec SHA512 12583cb932a5d9a39533ce58ae0d89b2ad0d814256dcc2c0f49ca0fa9f6b8c3af93b9277b60f8fb41810fdb1694ed85fbf84452a4134e99a835ddfeaeacda3b4
-EBUILD kodi-pvr-iptvsimple-3.5.7.ebuild 759 BLAKE2B d093efa3739157820d9a53f361be71540be969b1ca00a5ef798c61b54d5573095710888c16f2b940e1168e684319fb84607bbb47af7ed703c1fed047960b376d SHA512 e2ff98d231306be33cefd09631d4f512452e62fb46be55e246ba671feeddba96e5b67375f8f7bfade6c12be189d6a50eff35ab0e065165c5130a42ee2f00be49
-EBUILD kodi-pvr-iptvsimple-3.5.8.ebuild 759 BLAKE2B d093efa3739157820d9a53f361be71540be969b1ca00a5ef798c61b54d5573095710888c16f2b940e1168e684319fb84607bbb47af7ed703c1fed047960b376d SHA512 e2ff98d231306be33cefd09631d4f512452e62fb46be55e246ba671feeddba96e5b67375f8f7bfade6c12be189d6a50eff35ab0e065165c5130a42ee2f00be49
-EBUILD kodi-pvr-iptvsimple-9999.ebuild 761 BLAKE2B a2db9b475185a9a4a838a369ff4b79842f1f085b1d254d9ece7a4460126777bf089fa764f0e7e37f17ba308c3d2b338cf331099105ef742bfc9444b01504b148 SHA512 488548d789fb5d2871026c33b278ce6aa8f2c6a7a525d9512d946f71e8a1d4ed7dd822dad1e45dfe52097c54c3108bb8cdf198b4918db4186934a6f787064ddd
+DIST kodi-pvr-iptvsimple-3.8.0.tar.gz 124269 BLAKE2B 290eba76c3aad4cd2a2b03bf1f5d153173e168b372e4f9dfb25a236aa01f644371fc5371bc109c0474e3604da53663b21401adf551011369148f706b28a5a340 SHA512 1d7995ff2bc8506c38effece68f1aadee4238e56de49cee7b09e86e6b197cadebac44a3a1cea0590593c76db66eeb59f3ef17fc91b19ef1cb0480eef003ebaf3
+EBUILD kodi-pvr-iptvsimple-3.8.0.ebuild 759 BLAKE2B d093efa3739157820d9a53f361be71540be969b1ca00a5ef798c61b54d5573095710888c16f2b940e1168e684319fb84607bbb47af7ed703c1fed047960b376d SHA512 e2ff98d231306be33cefd09631d4f512452e62fb46be55e246ba671feeddba96e5b67375f8f7bfade6c12be189d6a50eff35ab0e065165c5130a42ee2f00be49
+EBUILD kodi-pvr-iptvsimple-9999.ebuild 761 BLAKE2B 0241ed10e0ab41194a0607c09edc6a8784da8ca397931f7efabee75650a8bc4b22722c695cee0b0821778a61d6413b0c22ecf223cbaee03942b2a6b607ea1f86 SHA512 037f8811dbe2461543389428ba0608cd16fbd0a00f8163ecc041aa931ba168e3a5aed949439017c8d8986ebe6cd82f22da9d92fcbee72ba1ac22b29d3c0c63ae
 MISC metadata.xml 436 BLAKE2B 657769c7828eb3034e2d71aba8377aa2f7d9e4d314904e24e17f08659c2e58ade1c24d1903b9b30c5f96322c4c9ab85c92fceb41c468afda496d52bc9f4c5a7e SHA512 a60cfa34672d7940ea934fbc3dc6c2b0e11c0ff59cecd7d41dae08d040172c65e70117748ced3a74c5a772af9ebd00259e91db26cb73d635502d85ed48ff4538
diff --git a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-2.4.11.ebuild b/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-2.4.11.ebuild
deleted file mode 100644
index f46484a6eaec..000000000000
--- a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-2.4.11.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Kodi's IPTVSimple client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.iptvsimple"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.iptvsimple.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Krypton"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.iptvsimple/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.iptvsimple-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=dev-libs/libplatform-2*
-	=media-tv/kodi-17*
-	=media-libs/kodi-platform-17*
-	sys-libs/zlib
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-2.4.14.ebuild b/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-2.4.14.ebuild
deleted file mode 100644
index f46484a6eaec..000000000000
--- a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-2.4.14.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Kodi's IPTVSimple client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.iptvsimple"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.iptvsimple.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Krypton"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.iptvsimple/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.iptvsimple-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=dev-libs/libplatform-2*
-	=media-tv/kodi-17*
-	=media-libs/kodi-platform-17*
-	sys-libs/zlib
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-2.4.8.ebuild b/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-2.4.8.ebuild
deleted file mode 100644
index f46484a6eaec..000000000000
--- a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-2.4.8.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Kodi's IPTVSimple client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.iptvsimple"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.iptvsimple.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Krypton"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.iptvsimple/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.iptvsimple-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=dev-libs/libplatform-2*
-	=media-tv/kodi-17*
-	=media-libs/kodi-platform-17*
-	sys-libs/zlib
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-3.5.8.ebuild b/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-3.5.8.ebuild
deleted file mode 100644
index 8aaf1e253888..000000000000
--- a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-3.5.8.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Kodi's IPTVSimple client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.iptvsimple"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.iptvsimple.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Leia"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.iptvsimple/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.iptvsimple-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=dev-libs/libplatform-2*
-	=media-tv/kodi-18*
-	=media-libs/kodi-platform-18*
-	sys-libs/zlib
-	dev-libs/rapidxml
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-3.5.7.ebuild b/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-3.8.0.ebuild
index 8aaf1e253888..8aaf1e253888 100644
--- a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-3.5.7.ebuild
+++ b/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-3.8.0.ebuild
diff --git a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-9999.ebuild b/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-9999.ebuild
index 66b869c31f5c..5decc98ab21b 100644
--- a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-9999.ebuild
+++ b/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
diff --git a/media-plugins/kodi-pvr-mediaportal-tvserver/Manifest b/media-plugins/kodi-pvr-mediaportal-tvserver/Manifest
index aef7a7cf338a..7a057bda4e03 100644
--- a/media-plugins/kodi-pvr-mediaportal-tvserver/Manifest
+++ b/media-plugins/kodi-pvr-mediaportal-tvserver/Manifest
@@ -1,8 +1,6 @@
-DIST kodi-pvr-mediaportal-tvserver-2.4.19.tar.gz 385817 BLAKE2B 2cd89d3940ef6a52a78be8791152715db8a55683120405eea2c42c3c58df58ac905b4f3c7aa50a6c45f8b94fe32e6d2d05811242c741a8ba7b10d8801d5d959f SHA512 d017d3d4b01fc86aaf22a1f44612e35c55b07888d8d0548cfad644d94aadedc4c86a50dd3d9c681c5e01e744971d25869f8bfa1a106c780492e4f3ee1b017e0f
 DIST kodi-pvr-mediaportal-tvserver-3.5.16.tar.gz 398113 BLAKE2B e944a49bd5d996d2c62325ec7c8b8dd6f69ca2918331cca198afbc11a1badafd4ad7ffd15f562016d540c5777cef285fcd090be28662988f71187899a43609f8 SHA512 4784b97d1826a8846156910b658a32b6b133dda04a8b2366f0dd67445fb4247132da427f63ada4284cf9889b8c5e7ca5f66785998e23b8ee5845ffdb352a83ea
 DIST kodi-pvr-mediaportal-tvserver-3.5.17.tar.gz 398338 BLAKE2B 52ed303aa236fb77bb5f79709f322b980aa29ca4e5077efc20894b610eaf81bd0d6f2a23de72bd3bf768ca0d819d57b920573515e0b134465b4f5399db966f35 SHA512 916d3a2f5ef8802a49c70f62bfb94145c3aa8f140ff3674ed3fef21c4d644a85a0cfb1088f1fc893b677635263f47455c0ffbe6554ca484659a1b7c8ebd47207
-EBUILD kodi-pvr-mediaportal-tvserver-2.4.19.ebuild 777 BLAKE2B 72f39af2662728f76c97f989dda6ca17dc59f99449edbaaa582323d51fb029763e5e1d275ddfde37c58344d22107d572b03ea4fff6788f376b5190abb531b9bb SHA512 c8f6c6091704045c2431970dcd8c081d58a275d19ab9ebcf47ebe490516e1b230d494fdbdaa86f8f535d7372e3eb1aff1bdd8a5becf72e90d072d5465c755148
 EBUILD kodi-pvr-mediaportal-tvserver-3.5.16.ebuild 767 BLAKE2B f8939465576f2c6c1fe7e4af9ddfba7a7c3f44740067fd9553ac716b2594a3d2898397efef7bfcccc815eed426a337ff74e627a9d76f0b0ef31f8f5e70515192 SHA512 7dc343fd3968611ee08aaab6dd5ce70cec1bd5f0b36bbd5be354323fcf287a3e7004119ae7a3be48953505d7c2b8ad6bf196e360275e39b0c258eaa86696b23b
 EBUILD kodi-pvr-mediaportal-tvserver-3.5.17.ebuild 767 BLAKE2B f8939465576f2c6c1fe7e4af9ddfba7a7c3f44740067fd9553ac716b2594a3d2898397efef7bfcccc815eed426a337ff74e627a9d76f0b0ef31f8f5e70515192 SHA512 7dc343fd3968611ee08aaab6dd5ce70cec1bd5f0b36bbd5be354323fcf287a3e7004119ae7a3be48953505d7c2b8ad6bf196e360275e39b0c258eaa86696b23b
-EBUILD kodi-pvr-mediaportal-tvserver-9999.ebuild 769 BLAKE2B dded0d563c6ab53e0d31b350aac8608fc73752926220ff2064f7c73202af6f0f9b1e870980cb931c4ad8cda21c7af9a6547edca83f945f899bbd649ed71652b7 SHA512 d78b613e7d099d59ae9b26363eba804638879b7288bb41ad65228bff6c0158d2f9358978164657fdd837aa4ad844cdcf9ca5a5f651fb003222c843319a6d1f38
+EBUILD kodi-pvr-mediaportal-tvserver-9999.ebuild 769 BLAKE2B d509027a696d3a3073631217861bff99c08c088b1c734bb30b81c66573274239984399e1183f831bedf6ce5da9c36ff82be5fcc066aafd035dfab0a5f247a7f1 SHA512 3d84ad37d4eda7a45db8c8c6334dc09379f1684232ed4da488c5259796b51a6bae151cb964a9682db87a4d3246b0afe205cb6d153ae6cd73cfe6638ba185f1c8
 MISC metadata.xml 456 BLAKE2B 79a150e9808ea82b402897e6b22c8da560055cae8a82dd38f2564895f417edb195720ddf7c9823eb9a001a8b9fae1626cc9704032b571c4f2e60906767b501b5 SHA512 dc787d33279a0b9f0fb8290f722f25f7cee998781de3d4d7bc16bf24ed0165ba0f967eee97a6e03865b5b3822952b545debd8ebec9f7dc0c18e1bf06b2486121
diff --git a/media-plugins/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver-2.4.19.ebuild b/media-plugins/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver-2.4.19.ebuild
deleted file mode 100644
index a42283a39e96..000000000000
--- a/media-plugins/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver-2.4.19.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Kodi's MediaPortal TVServer client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.mediaportal.tvserver"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.mediaportal.tvserver.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Krypton"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.mediaportal.tvserver/archive/${PV}v2-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.mediaportal.tvserver-${PV}v2-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-17*
-	=media-libs/kodi-platform-17*
-	dev-libs/tinyxml
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver-9999.ebuild b/media-plugins/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver-9999.ebuild
index 277ea63d5233..7a797bda8176 100644
--- a/media-plugins/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver-9999.ebuild
+++ b/media-plugins/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
diff --git a/media-plugins/kodi-pvr-mythtv/Manifest b/media-plugins/kodi-pvr-mythtv/Manifest
index f87a501e1ed7..9168e5addda6 100644
--- a/media-plugins/kodi-pvr-mythtv/Manifest
+++ b/media-plugins/kodi-pvr-mythtv/Manifest
@@ -1,12 +1,4 @@
-DIST kodi-pvr-mythtv-4.15.3.tar.gz 650217 BLAKE2B ddc6b11039bd8e5e6b46331030909063e127f681f4059e604734644a3159c10f10c3dbed770ba8a58bb5ea3b7e543dfba042b28f347c842d963d7966e35cad32 SHA512 1171f4e6a05878660795b585185d35707ef713e310f3508e7fb3327caf79feb6a941e4b4f4d9f2331ef13492c141a4d36157547e350642eee900f3fad1d46b55
-DIST kodi-pvr-mythtv-5.10.4.tar.gz 700724 BLAKE2B 51b30945bc24c5b66be2543ca95f7f86663e238554051735ab84f70742d78b15beee434feb7620241f36a65b279967b7e99e3f6c94708dbbc68447aaf9908418 SHA512 d7267f71a65f9a25c10bd2b8ebe114f9e9ab0b8575f1d60c58be70a6a7fae3a6abd8777186e092555b89d4911b5ef4639cc48874f189f4839fdf70d6bf07eae4
-DIST kodi-pvr-mythtv-5.10.5.tar.gz 701110 BLAKE2B 7aa1148cdc5b0c187b0c4c077c5a882493bc081e27ea2210fc0b02fa7757007d3f7081ca35bc155e9d019601b1d51b89fd358c094a30202309e6cfa218636e9b SHA512 9c3b5fc208693bfbded7e6376131aa06bf94b2019c111d40c254a7505c0b4641d66f7a57ad55fe0c174756811983250ce68e4d074619413d04d1b46d66759d7e
-DIST kodi-pvr-mythtv-5.10.6.tar.gz 701798 BLAKE2B e99fe7e4959e44238184b85fb8a6b22ff7f375f1ef6f1035d119edbfd0df65909e4e656ad0c008e34c5bd841b6379760a81e194f2b66bfdc087914647f69ae99 SHA512 14577d686f18698bd7fc9fcaf74bf3eb6dbb01e630782054a6045060bcead6878654d5427c7e6b37632a75de92b9a4dffecbecbd7b60004fdaf2763415919401
-DIST kodi-pvr-mythtv-5.10.7.tar.gz 701835 BLAKE2B 148f3bea1b034376c848c10c434987ef9265d722c028f8af1a5307f989a344114137111affae617f9012a5efaa6b1e772cf630fdfedd9d033474dadfd5512ce5 SHA512 3329737dda3141fe8cb0bcdb19a9f817d2320128e0db36b0255e8f8eaad00c4ab1149cf2ec3d617464c645c5030fe96cb22ac94fdf29d6ecc9533f7c0295a9f5
-EBUILD kodi-pvr-mythtv-4.15.3.ebuild 642 BLAKE2B 6b294e422af541a0867bf05d2bbb49e97f343d441b528836deca12cd1f919ecd7504978e5378713ec7019675a50f973dec956d6d93ad2de1d5a3308f3c37f789 SHA512 a5538514f1395a1f736ab751d46cadf5472c3db443ed8ee61b6ed021c358b93b5262cf1cc123c032e4ce3883a73ee677f4e7872190ff971506f2130f4c859283
-EBUILD kodi-pvr-mythtv-5.10.4.ebuild 680 BLAKE2B c6fdc907d8303a6a656e22aeace84f66dbe235babda827c1b70e42c18120fd9ead176c38de20649076857f8e7f3be1c85887c3efb67c09196a31f51d195ab314 SHA512 d3c7cc92c8b5ac95c985b8cb1ada86d1ec11dd627f9c378578dffc6b3035aa63996912fcf0fdf53bd46d976e7d22fce0cd55dcd8490a1590eec265c6c74d87ca
-EBUILD kodi-pvr-mythtv-5.10.5.ebuild 680 BLAKE2B c6fdc907d8303a6a656e22aeace84f66dbe235babda827c1b70e42c18120fd9ead176c38de20649076857f8e7f3be1c85887c3efb67c09196a31f51d195ab314 SHA512 d3c7cc92c8b5ac95c985b8cb1ada86d1ec11dd627f9c378578dffc6b3035aa63996912fcf0fdf53bd46d976e7d22fce0cd55dcd8490a1590eec265c6c74d87ca
-EBUILD kodi-pvr-mythtv-5.10.6.ebuild 680 BLAKE2B c6fdc907d8303a6a656e22aeace84f66dbe235babda827c1b70e42c18120fd9ead176c38de20649076857f8e7f3be1c85887c3efb67c09196a31f51d195ab314 SHA512 d3c7cc92c8b5ac95c985b8cb1ada86d1ec11dd627f9c378578dffc6b3035aa63996912fcf0fdf53bd46d976e7d22fce0cd55dcd8490a1590eec265c6c74d87ca
-EBUILD kodi-pvr-mythtv-5.10.7.ebuild 680 BLAKE2B c6fdc907d8303a6a656e22aeace84f66dbe235babda827c1b70e42c18120fd9ead176c38de20649076857f8e7f3be1c85887c3efb67c09196a31f51d195ab314 SHA512 d3c7cc92c8b5ac95c985b8cb1ada86d1ec11dd627f9c378578dffc6b3035aa63996912fcf0fdf53bd46d976e7d22fce0cd55dcd8490a1590eec265c6c74d87ca
-EBUILD kodi-pvr-mythtv-9999.ebuild 682 BLAKE2B 4d6be5c4849cce45961fccb26fce2c62c207b2983766a874e49f66cb8fc8719da23cd5dff6d843ec0792bb044275631fc357fb5fa85872455913637fe07a8eb9 SHA512 b65d91251b7fd381ee76bed85df2843548c0f044528887ed52338f6d5933f0f6c1dbd52997f90d744eef314a17826efa8ea9d981553222c13cc0715f429b9106
+DIST kodi-pvr-mythtv-5.10.9.tar.gz 702493 BLAKE2B 457be0137a95d1abe0ad4a5634bcf21bad8d2f9261879468e2c5ba598a41b7eb71ed1bbf9992f45db8ad82d4da25bf87067199c57e71b64c9255608350874a2c SHA512 b497f79de6ca42638af0ac3c76c18343236db26af2901b60f49ddc71f9c0f4c68c293a50dc57a80e0ecf81df2629ad7695a842e63e1e8ebc2b22de082a5e39c6
+EBUILD kodi-pvr-mythtv-5.10.9.ebuild 680 BLAKE2B 66b37356d675cb42969d92ab77bf2f0583d671d7002ccc180c721556458cb3b325bc8ec4f4d23ed9089754d2c6e07b09ae98c6b0318479c954979bae1d6af64d SHA512 497511d5ebcaacfbe8e406de0e660f97014e411dba76c45b33c19725264c1b2a912c29aba0f8ec4403634f91b0769db96132dff8dd230b8b7a1ec4ffcdd4b22c
+EBUILD kodi-pvr-mythtv-9999.ebuild 682 BLAKE2B 47852fae69c4351fc4d5a25d34f7f4fb327bd1093b28476985b0b99d7e73de016a84cc76f48ee6912ed28002eef83c8855d8556d84f09ab3adb650a5429713f4 SHA512 4803880b777e613c728e542265078e41ea076bc101c4c5af3bfb78902ac4b0bae0a6aafcc0e744a4e2e1157828e961c03adc780c116d8811904c2c0fb1625039
 MISC metadata.xml 419 BLAKE2B 71f7f4424dbf1c992fab169ce530ce61ff39399842089905618bfc800011ed7960c92428cb9e6e89b084872fa61d08da8df0c4179c483ec6dc2ab745d684f15e SHA512 5b6c21c0e780ed90e92fb080f0a15cf62fee13e8b8597081f7b5480eb21f3f013495aafb389a302a227e6e22b757cc6b83d3dd56d7cd74ed16587edb09ef871e
diff --git a/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-4.15.3.ebuild b/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-4.15.3.ebuild
deleted file mode 100644
index 0b183188b03a..000000000000
--- a/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-4.15.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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
-	;;
-*)
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/janbar/pvr.mythtv/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.mythtv-${PV}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	sys-libs/zlib
-	=media-tv/kodi-17*
-	=media-libs/kodi-platform-17*
-	"
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.10.4.ebuild b/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.10.4.ebuild
deleted file mode 100644
index 8b96d7f0430d..000000000000
--- a/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.10.4.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="MythTV PVR for Kodi"
-HOMEPAGE="https://github.com/janbar/pvr.mythtv"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/janbar/pvr.mythtv.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Leia"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/janbar/pvr.mythtv/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.mythtv-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	sys-libs/zlib
-	=media-tv/kodi-18*
-	=media-libs/kodi-platform-18*
-	"
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.10.6.ebuild b/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.10.6.ebuild
deleted file mode 100644
index 8b96d7f0430d..000000000000
--- a/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.10.6.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="MythTV PVR for Kodi"
-HOMEPAGE="https://github.com/janbar/pvr.mythtv"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/janbar/pvr.mythtv.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Leia"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/janbar/pvr.mythtv/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.mythtv-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	sys-libs/zlib
-	=media-tv/kodi-18*
-	=media-libs/kodi-platform-18*
-	"
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.10.7.ebuild b/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.10.7.ebuild
deleted file mode 100644
index 8b96d7f0430d..000000000000
--- a/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.10.7.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="MythTV PVR for Kodi"
-HOMEPAGE="https://github.com/janbar/pvr.mythtv"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/janbar/pvr.mythtv.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Leia"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/janbar/pvr.mythtv/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.mythtv-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	sys-libs/zlib
-	=media-tv/kodi-18*
-	=media-libs/kodi-platform-18*
-	"
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.10.5.ebuild b/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.10.9.ebuild
index 8b96d7f0430d..4ff772b69275 100644
--- a/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.10.5.ebuild
+++ b/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.10.9.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
diff --git a/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-9999.ebuild b/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-9999.ebuild
index d0a95543a96a..f829825e052b 100644
--- a/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-9999.ebuild
+++ b/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
diff --git a/media-plugins/kodi-pvr-nextpvr/Manifest b/media-plugins/kodi-pvr-nextpvr/Manifest
index dbb4b91ca8b9..60f0a0776689 100644
--- a/media-plugins/kodi-pvr-nextpvr/Manifest
+++ b/media-plugins/kodi-pvr-nextpvr/Manifest
@@ -1,18 +1,14 @@
-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.11.tar.gz 119455 BLAKE2B 1a1eaedaada67267ac63776e0ff4c668a6f2484c73e37ce94cc825ac07507fec3a4d4970b556bff1ab8a0a74231b38525773492b91cd4ed4bba98b213a15b9ea SHA512 145c71c0eeb7b9cea03b1fa1c4c18f6b69e6d775519e1565160efd32a38642eb351b608fb54f285281a36ee4841e8242e1ff7c2aa384dbee17dabfe8ba13bd65
 DIST kodi-pvr-nextpvr-3.3.12.tar.gz 119592 BLAKE2B 6522790e6bb6dabecd010d34fdd1ee9590b541e8fd5a539f586cb81635f5f3729f813514355306042180e7482d0e1c350639d285ce591fc1c35d560e50f903e2 SHA512 bda38c256a9d49f72ec6c8ac9942670942edd8ac095c5f6eee120f52189a9d5466c28f2a7dcb525987da5df05d5ebc4e3b2d93778807370c8d16ac936c616293
 DIST kodi-pvr-nextpvr-3.3.13.tar.gz 127574 BLAKE2B c2460352ce24099553a2610002bfb499555bde180d557dd19fcfd905bd4a38ddf7c6f9cc4e53636287197690b778eaf74afafb78c44fab1cb24a20df709e6648 SHA512 b75bd7d127e3e3f4e103dc9dfd3f681706c298c1d216904c0c0088cf8a02301b3dcaee0d0dd976568c14be59c78e8d98a60d0806465b08f130452c52cdb836cc
 DIST kodi-pvr-nextpvr-3.3.14.tar.gz 127995 BLAKE2B bacf139b2d7338db08016cc81e66cad1716c686d3f45b71612a591a00653457a47964e6e08727da0fe39da09dcaf643f9da529288a9c6e42db3343842e9a7050 SHA512 6da83088f652710363d7bd37f38328ec364e5313168a6a2c624b34c3276eaf99223d28eb8a2bd90a4e68fa0669aa974fccf979e5bf7a6e61a8b8262c954896c4
 DIST kodi-pvr-nextpvr-3.3.15.tar.gz 128304 BLAKE2B 7df4b212afb4c8a16bba2a31787c88296990055d02a7e249003eaedf8c737d54bff2f5d2ce1b00f0357bfc8cf5ad28f060f22ace192d8e0d1eb9ff69a4cd415f SHA512 27a4e5198adbb4d4465d25086ebe76209b2f311dee422480271f85ae420dbdbaeff54b64330b1e71f1276f1b441d74598d5ee9b94d3652b9013bb855719aff77
 DIST kodi-pvr-nextpvr-3.3.8.tar.gz 118717 BLAKE2B ea72f205121b050355fcd194fc8c28a2bce62504187372128b7397841f03a411d9ae1419aa1cee36acf391e098fed04b58f3312a74cf3dadf48726cd72da59bb SHA512 3cf8de69091946c9678c73f0254be9d49b51ecffe8153f675e62198aa97fa952bc5c1b5a4ccabbf7de5c05e8ca9e0c01d1ee5fd5988504430acec37a5b2edf3e
-EBUILD kodi-pvr-nextpvr-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-3.3.11.ebuild 702 BLAKE2B 797a4cb29b87021004a4c4bdaf8fccaea26676981e8868f95fbdc73720c4bfebbd879c8dd53fabb8c59a1321bc87af2c2dba10d4c1143e89c3f51b277132c4de SHA512 d7172c5b1643404e6822cbc6ea8473a312b708a28d3a9ee8c3d1d50ec4555858f359b5c76ff796e243558514b51fb5eac7c396d7f703fe59ed903be0a1d4b4bc
 EBUILD kodi-pvr-nextpvr-3.3.12.ebuild 702 BLAKE2B 797a4cb29b87021004a4c4bdaf8fccaea26676981e8868f95fbdc73720c4bfebbd879c8dd53fabb8c59a1321bc87af2c2dba10d4c1143e89c3f51b277132c4de SHA512 d7172c5b1643404e6822cbc6ea8473a312b708a28d3a9ee8c3d1d50ec4555858f359b5c76ff796e243558514b51fb5eac7c396d7f703fe59ed903be0a1d4b4bc
 EBUILD kodi-pvr-nextpvr-3.3.13.ebuild 702 BLAKE2B 797a4cb29b87021004a4c4bdaf8fccaea26676981e8868f95fbdc73720c4bfebbd879c8dd53fabb8c59a1321bc87af2c2dba10d4c1143e89c3f51b277132c4de SHA512 d7172c5b1643404e6822cbc6ea8473a312b708a28d3a9ee8c3d1d50ec4555858f359b5c76ff796e243558514b51fb5eac7c396d7f703fe59ed903be0a1d4b4bc
 EBUILD kodi-pvr-nextpvr-3.3.14.ebuild 702 BLAKE2B 797a4cb29b87021004a4c4bdaf8fccaea26676981e8868f95fbdc73720c4bfebbd879c8dd53fabb8c59a1321bc87af2c2dba10d4c1143e89c3f51b277132c4de SHA512 d7172c5b1643404e6822cbc6ea8473a312b708a28d3a9ee8c3d1d50ec4555858f359b5c76ff796e243558514b51fb5eac7c396d7f703fe59ed903be0a1d4b4bc
 EBUILD kodi-pvr-nextpvr-3.3.15.ebuild 702 BLAKE2B 797a4cb29b87021004a4c4bdaf8fccaea26676981e8868f95fbdc73720c4bfebbd879c8dd53fabb8c59a1321bc87af2c2dba10d4c1143e89c3f51b277132c4de SHA512 d7172c5b1643404e6822cbc6ea8473a312b708a28d3a9ee8c3d1d50ec4555858f359b5c76ff796e243558514b51fb5eac7c396d7f703fe59ed903be0a1d4b4bc
 EBUILD kodi-pvr-nextpvr-3.3.8.ebuild 702 BLAKE2B 6d087756fb0b2e5bef01e78f2e986fddfb4f02c2dfbd8803410d3fb0d1b0e260a2370bc8034737d31ae1e2df2ffcd119fd5d02127b383e1518f674a8b9b87943 SHA512 d5d8320f1fa4f1e3baf3a7cda383d6453a44ca4e1816926212818469d01161f3348ca634ad5a7c95c148fc491fec9ce3e4f2b507b2cf4d07b4cf99960cda4e18
-EBUILD kodi-pvr-nextpvr-9999.ebuild 704 BLAKE2B 9bfe109a644ca55ceadedcbbb6cd8a48679afd67ffd9128eccbe9081bcf611aa5da06f1ec3b3d0d2bc59b279f2c8bbc90aa7e0b190868dcadb622625a60e4596 SHA512 dfe5613b50d14ab632d80dda8041ec11f7a7bf5996a8cd824b56f51490f9fc1678ef914f68f9e2f4f58def0af50f23d143069d622cc3b861e97d1c6cfba97294
+EBUILD kodi-pvr-nextpvr-9999.ebuild 704 BLAKE2B b5f583dc1c8d853cbf51e5dcb15866aed8d024464ca9417605d3b15936d0db40cda8bb278c940d1dd443e2d57f1e65030e34120653bd60f9c94c66cd73f26824 SHA512 d3b742d8f4f7cfccdce8cdb019dc9ce9711fb75a137ca93d1118b041df93f1c40fd89f165a4fdf4e818ff700b2590c5f44722daa1e4b06dba4f5084ebfcae3cd
 MISC metadata.xml 430 BLAKE2B 60ef7af47e0cd7d264fd19275a356b83cd9fd4e5ed4e237658c47152315d4abcf807377bd8c94d88ec3088530a5fd9ab2d9482336328eeb9ff380963364644a9 SHA512 b0bd41b39d6e1379e1b3c36124432716cb222205ed587246523a8a48c42e2d9922b1b24c87ef601bf5f7452cfb874710c1ec7b558b9224c95c921b80967e02e3
diff --git a/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-2.4.11.ebuild b/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-2.4.11.ebuild
deleted file mode 100644
index 2a2aee92451c..000000000000
--- a/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-2.4.11.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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="Krypton"
-	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-17*
-	=media-libs/kodi-platform-17*
-	dev-libs/tinyxml
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-2.4.13.ebuild b/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-2.4.13.ebuild
deleted file mode 100644
index 2a2aee92451c..000000000000
--- a/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-2.4.13.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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="Krypton"
-	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-17*
-	=media-libs/kodi-platform-17*
-	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 8d192c0897ff..3055e0e70599 100644
--- a/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-9999.ebuild
+++ b/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
diff --git a/media-plugins/kodi-pvr-njoy/Manifest b/media-plugins/kodi-pvr-njoy/Manifest
index 2ed0ce5d4a3c..f5d7636cf234 100644
--- a/media-plugins/kodi-pvr-njoy/Manifest
+++ b/media-plugins/kodi-pvr-njoy/Manifest
@@ -1,6 +1,4 @@
-DIST kodi-pvr-njoy-2.4.2.tar.gz 47118 BLAKE2B f14dfe99aa1866f6ec08616120ecf2252cdb5b6c8e358736c208203aa7d9ff8c4af1b2338bf34c7ab77860b80f7a718b1c3e10123efdf70a068ddcdac82d46bb SHA512 2f36aed57c51dbba853c7e57775b2374d072028b1d02978d44f519adb72c6605ea0f1b19721411dc6a6f7c4b4cd0e36517f646c9ae901cfe2dd6e64916f0ba8d
-DIST kodi-pvr-njoy-2.4.3.tar.gz 47126 BLAKE2B ba5a3fb7267822824d507b6865740b8646c167cebca64cd63d004368081af467dd9f7e6eca0eb62fa926bac1f99c463bc1cfed17b557630ae850dd61cd088274 SHA512 e08595942e6c7d51422730156e7d3d110657c5ed8db2c5563d3cc03f03f17719e325c5d31bf627af9b71373edcd86b05cfa2f5d8d3854b56d2ea7395733137df
-EBUILD kodi-pvr-njoy-2.4.2.ebuild 696 BLAKE2B 9896f399e4e4dbe382409cafacf5794cdbc2a91fe4923089445bf1a428934512b0713a570358500967b89f6637b51e519c634bbff8361568c2b6fcd75ab1f15e SHA512 350a90c27a53ea739cfd9e4fb2039f7c03da9b2b1c04821a18a4ca7efe884211be2df5ab0b824b9dfb7e95675a02636e5cbc68bc0028fdaffb42dd6aba37d839
-EBUILD kodi-pvr-njoy-2.4.3.ebuild 696 BLAKE2B 9896f399e4e4dbe382409cafacf5794cdbc2a91fe4923089445bf1a428934512b0713a570358500967b89f6637b51e519c634bbff8361568c2b6fcd75ab1f15e SHA512 350a90c27a53ea739cfd9e4fb2039f7c03da9b2b1c04821a18a4ca7efe884211be2df5ab0b824b9dfb7e95675a02636e5cbc68bc0028fdaffb42dd6aba37d839
-EBUILD kodi-pvr-njoy-9999.ebuild 698 BLAKE2B 48cfee609b0faebf26413a1c6e4b6d5fd22b1ce1559b5340fea3943cbbd7ad9b592114a7c43157361e5e155f763fd08f7f4a0e469b812a8406cdad27a3ed3c37 SHA512 65435065df46a266e91a197cad6c3acc7e81cff5e2c204c2f2f8168ef2c459ad2f18a401feedb10db24052100b24d857f04d267103c33a2e3922111c0c9e28e0
+DIST kodi-pvr-njoy-3.4.2.tar.gz 47637 BLAKE2B 258dc10c06b68b6812b320aab5236a2ddb3f565ce616efb9ec6cc7710f60b58c24b827b61109af89e41430d4ef33a1daf6cb526ad8d449b954589c82783f5035 SHA512 5f30afb07c8c683920cce9acc2aa182273943e1381304e4e17f396fb42f1c464884e9134f507d7e787d9f271d24193eeb20c72870d2c7012a07aef94e1a686c4
+EBUILD kodi-pvr-njoy-3.4.2.ebuild 690 BLAKE2B 6cef3885570f60230d5207fb4feae064f6eec1285c045d8592ceb46f85d8ff71f5421d74340af6d732279ceb8e0b5e96956f086711b574ca41c108913fb0de9b SHA512 ebf3c386ff7094c317fa221dd64f7a98b9335c0ad4d994885f3e04b5f9357091b163afc8705eb6f0405729a52896f05798d589fbf493eea2626ca9462b902dfe
+EBUILD kodi-pvr-njoy-9999.ebuild 695 BLAKE2B c769f1c1a51d29d507b56a6d9a930a9ee433d1852ef351c5418dc82d7f2c3687c0d91bd20037efb37339eee47faf37a86a777192dcae3fd28a2c5babd08d6d5b SHA512 98cd6dc241e0a6782b761975b7d0c718b96ce72022612d17a32a17da4e58e7a4cb76e33231481e5ba4b800ea245889bef39317ba5ee05d89f83238d56805d277
 MISC metadata.xml 427 BLAKE2B 8fbaad407c2e34375e6dcb350d39071fe3b022e4d2799fbe97746d2afb7f80fe70f4ec51161bd3751097c4de98da76b07a79dd1cefaf9bb5c449beb4faaa5817 SHA512 4e03412ca3ca3e739de135eafb479c6479f0260f2bab7a69cff6913556bf6d101f306388fbcfa0e61b3c8037ae39f08d246106fcad3d0f8281b3259f6d2a1c36
diff --git a/media-plugins/kodi-pvr-njoy/kodi-pvr-njoy-2.4.3.ebuild b/media-plugins/kodi-pvr-njoy/kodi-pvr-njoy-2.4.3.ebuild
deleted file mode 100644
index 2e5f3ab319e0..000000000000
--- a/media-plugins/kodi-pvr-njoy/kodi-pvr-njoy-2.4.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Kodi's Njoy N7 client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.njoy"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.njoy.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Krypton"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.njoy/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.njoy-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-17*
-	=media-libs/kodi-platform-17*
-	dev-libs/tinyxml
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-njoy/kodi-pvr-njoy-2.4.2.ebuild b/media-plugins/kodi-pvr-njoy/kodi-pvr-njoy-3.4.2.ebuild
index 2e5f3ab319e0..7554c5d1acae 100644
--- a/media-plugins/kodi-pvr-njoy/kodi-pvr-njoy-2.4.2.ebuild
+++ b/media-plugins/kodi-pvr-njoy/kodi-pvr-njoy-3.4.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
@@ -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.njoy/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/pvr.njoy-${PV}-${CODENAME}"
@@ -28,8 +28,8 @@ SLOT="0"
 IUSE=""
 
 DEPEND="
-	=media-tv/kodi-17*
-	=media-libs/kodi-platform-17*
+	=media-tv/kodi-18*
+	=media-libs/kodi-platform-18*
 	dev-libs/tinyxml
 	"
 
diff --git a/media-plugins/kodi-pvr-njoy/kodi-pvr-njoy-9999.ebuild b/media-plugins/kodi-pvr-njoy/kodi-pvr-njoy-9999.ebuild
index 0f882d4a419e..959e619083ec 100644
--- a/media-plugins/kodi-pvr-njoy/kodi-pvr-njoy-9999.ebuild
+++ b/media-plugins/kodi-pvr-njoy/kodi-pvr-njoy-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
@@ -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 86511a1873ad..3383069fb2a3 100644
--- a/media-plugins/kodi-pvr-pctv/Manifest
+++ b/media-plugins/kodi-pvr-pctv/Manifest
@@ -1,8 +1,4 @@
-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-2.4.5.ebuild 687 BLAKE2B f794a38cd128e6693c201becfc7c50743c47b28bac56724800490c8a707f72c39975ab26a16198d26a71a41c7a3e1860a9d3d95ebab1c28b255aa1e807d59e91 SHA512 2d853652a23ba3be606befad46257b9173c63b5ab1852f5df5fd4545eb41653ebb38fd48726c4e55bc4cdf01b98d8dbddc76b796bd3d775cddeb5b59a0c88ca6
-EBUILD kodi-pvr-pctv-9999.ebuild 689 BLAKE2B 98afe970dd3d70abe6ac80be709d4f6cbbce01dd4c4603ae23fa9cb49c00b917b23bbce806048e416ff9c6e7916b57cd480e8d14a350206fa250e9cde40d19f2 SHA512 2e9f0ca882abec3f2698c8fc023c3decfef8016713ca80589486b0a5a3a7972edaab68385f4440a29b1dc53965764a61d55f48afe04bd058c4bee323c6cdc876
+EBUILD kodi-pvr-pctv-9999.ebuild 689 BLAKE2B b3ea9f0a6c214cb886770a7b55df9c7f2cc73cd2a8c2794fadcec78ae58d2635ce6c954cd72251c383d018a3b706093e308fa27082a1612c38a59e6f3d4dadc1 SHA512 9c832096efb7287e2ec488f8aedcecd3082df32c65dcd52d3b854e48111dfb1bb66eaabc53288ae3b1bed3d4460059bf3becc1b4106068bddf5c7456c1ccdd8c
 MISC metadata.xml 424 BLAKE2B 0637f01f1175e2d607d0e590535ef8d262173f71d42c265b5225d396bfe9783d03b6a231de1f75a9f548487769db28f9b9988ed27aadb5838ad5b37734405959 SHA512 91f472cc7c5eb36bfd24c3565a0679af173643011140133c98f6782fc6a14aef3ac30f30e86429bbe0b361c696998fca96ea968f97963eb08a64d14655f1b344
diff --git a/media-plugins/kodi-pvr-pctv/kodi-pvr-pctv-1.4.5.ebuild b/media-plugins/kodi-pvr-pctv/kodi-pvr-pctv-1.4.5.ebuild
deleted file mode 100644
index 3c212c8dc3d0..000000000000
--- a/media-plugins/kodi-pvr-pctv/kodi-pvr-pctv-1.4.5.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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="Krypton"
-	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-17*
-	=media-libs/kodi-platform-17*
-	dev-libs/jsoncpp
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-pctv/kodi-pvr-pctv-1.4.7.ebuild b/media-plugins/kodi-pvr-pctv/kodi-pvr-pctv-1.4.7.ebuild
deleted file mode 100644
index 3c212c8dc3d0..000000000000
--- a/media-plugins/kodi-pvr-pctv/kodi-pvr-pctv-1.4.7.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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="Krypton"
-	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-17*
-	=media-libs/kodi-platform-17*
-	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 cdec4c9ca49f..c1d659d31e3b 100644
--- a/media-plugins/kodi-pvr-pctv/kodi-pvr-pctv-9999.ebuild
+++ b/media-plugins/kodi-pvr-pctv/kodi-pvr-pctv-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
diff --git a/media-plugins/kodi-pvr-stalker/Manifest b/media-plugins/kodi-pvr-stalker/Manifest
index 8771fe35b8dc..30fedb154cae 100644
--- a/media-plugins/kodi-pvr-stalker/Manifest
+++ b/media-plugins/kodi-pvr-stalker/Manifest
@@ -1,10 +1,6 @@
-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
 DIST kodi-pvr-stalker-3.4.9.tar.gz 115275 BLAKE2B bd9df715d3f5e630d4a47fe24f24515085f8a6a151545c27d5bc6b3bf4e4876672cddbd7c2d6fbd6a999b285afc6a48a29030ac72b4ed32cf10e8448235ef0b1 SHA512 16107f60529b4ef3730f7a3deb5a7cd9ee645678647248d2fff01dbc94dc7a53029a67a3709955a9be8483a13e13048dadf73a32489725b60b5c07c3a0b6a979
-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-3.4.8.ebuild 720 BLAKE2B b343088cf996082adfdf0fe0eabdaf2306a1574f47174896aad8da4a0ec8005315d3d764681ef8db07d12b31510c010123f915e9a55b1c4bff57fc6f28066f1a SHA512 d343af5481e62426bd4dac77c778296be9c09561c7ca0789145607b55f47333ad20a79c6dcc5ade746b925eafb9a55afca3c4f0e55dd92a586c35f67ddf8af0f
 EBUILD kodi-pvr-stalker-3.4.9.ebuild 720 BLAKE2B 43b023fbde024a5d62b884936eaff910983d90a3d391226b71a4f7f24903fb554fb7cea228ada1137292779c49a8a55699d96d956ab8c1bac05e9de10778d05d SHA512 327f30ae993028aa4c18c14525999ec9bb8da0bafe8567a6ad1a88b821989d84e8dffe59e8c43c239ab0e67167e3d4b0122e5cc5e033be4e4dfb1c8acca5ccbe
-EBUILD kodi-pvr-stalker-9999.ebuild 722 BLAKE2B 86605983551c7768c2e0df7bce7f8322bc345818bdc7a74df292633b61435035d93c69c70f0530f00354f9df4be8603527a9ef493e39ca52aa345f1a77fa2c4d SHA512 637d968a23bdfa1c84799c2a3e1eefcdc352d55908920af89cdcad1dfa41bb0b54d0957ab0474c3d046082a35c5287b24169648015a5ed0169c3c8844513afcf
+EBUILD kodi-pvr-stalker-9999.ebuild 722 BLAKE2B 9a355b73fd86c5d5aa9cba4014eb2fb4963ce730f3d3ec1f63bbda5a81bd648629884308c902dd5fea70171755749a871ce52039b08dccbf2d7d63dac63d94e8 SHA512 ac3c8d265e557f3bc853eeaf2e5c4194146015f05c77516f6a8c1fe16e29c1f5c2ad43e83b3f0826f2d6f4e41d95d3d59fc3a961110b9bb5984079c9d44d6e85
 MISC metadata.xml 430 BLAKE2B 65eb48c9c9d6e307c0ce5950a5e79b705cf5cdb3e1032f97805dd5dec7ed9c302acedac823b4cc9d263156936576257a3097f7535d017f3c4cfb9bfc08b200df SHA512 b461665fc6954e9377b3afd38861852becea318284dd6ff089153679b4fd93dd92523d633299942314e439624d7516c466f57029025a7d4618f1e51919b09263
diff --git a/media-plugins/kodi-pvr-stalker/kodi-pvr-stalker-2.8.3.ebuild b/media-plugins/kodi-pvr-stalker/kodi-pvr-stalker-2.8.3.ebuild
deleted file mode 100644
index 01b9331e3ff7..000000000000
--- a/media-plugins/kodi-pvr-stalker/kodi-pvr-stalker-2.8.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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="Krypton"
-	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-17*
-	=media-libs/kodi-platform-17*
-	dev-libs/jsoncpp
-	dev-libs/tinyxml
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-stalker/kodi-pvr-stalker-2.8.6.ebuild b/media-plugins/kodi-pvr-stalker/kodi-pvr-stalker-2.8.6.ebuild
deleted file mode 100644
index 01b9331e3ff7..000000000000
--- a/media-plugins/kodi-pvr-stalker/kodi-pvr-stalker-2.8.6.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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="Krypton"
-	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-17*
-	=media-libs/kodi-platform-17*
-	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 3b5070346d7e..98779948846f 100644
--- a/media-plugins/kodi-pvr-stalker/kodi-pvr-stalker-9999.ebuild
+++ b/media-plugins/kodi-pvr-stalker/kodi-pvr-stalker-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
diff --git a/media-plugins/kodi-pvr-vbox/Manifest b/media-plugins/kodi-pvr-vbox/Manifest
index 0f0f1cdb6b48..b57f5ccb5af0 100644
--- a/media-plugins/kodi-pvr-vbox/Manifest
+++ b/media-plugins/kodi-pvr-vbox/Manifest
@@ -1,10 +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
 DIST kodi-pvr-vbox-4.4.8.tar.gz 155911 BLAKE2B bcfd48ebfa0a6378367794df5789e8cc80768a12292f88c26eef52a99007edadbb7da016109e7d29566563176e87dc75ff19e78d8777b8f263d78a23a9d4a274 SHA512 27c0d7143d70cb42ec2c57e553622cbc785e1d01aef09600030b6cb3a23a4c974d51700e80da1f3480a7e0fbacef1db3ff955fe2beab79f6ee0613065a0e556a
-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-4.4.8.ebuild 708 BLAKE2B 82da36b12438ffe48516af25339aaca3ec0c6c83ff99abc1cfc167ae407c1d559009a2f0be7f348e6997c76caf98ca789b02dfa25b2a0fe4f56cd33b60e8d781 SHA512 59818b2236c903f2bec98ffd83dbf0c97d370f208adf40154440377f4dabf1286acbb3aacf968915e14c4dad53b6f38e88e8f8e034342366553ec03a93dcbc10
-EBUILD kodi-pvr-vbox-9999.ebuild 710 BLAKE2B 11fabe5a61dec61e501671c7ce7e3cca3562d558f7dd7fda6a8bea6266b878a44874e8fa856ccc8020fef253d27d63e466dedece18439a36a044e51eb86a51e5 SHA512 c1d3a417fd6384478332eacbb1e080c6b85581c2f257b14a07533c331424b6dc41e84e99127e77700cea1cf2a9c70a469ae5da5757436c181479e66f496f8a96
+EBUILD kodi-pvr-vbox-9999.ebuild 710 BLAKE2B a56773cc1ea387b4c8a305e0994790d43c40e36f47e16b41ab415112cc2a443ad744e6a6f1d7287ac253c9e59192c1c4b6c2139d298c27fc274f5c671d5ea31e SHA512 d6c7d9adcbbf071f8ee95210f0f18c9b2500d497fb67b59b1c5532eda77b800e68a023558a3233c223c42cdafee07e44463c0981010cd4893d4258d94cdbeb3d
 MISC metadata.xml 444 BLAKE2B c614b42e40b284fb6433935458137624ec0bdb22db86221922d82ad2fdde06eaaef60f430ad871998fc54792a03decb577167a3e1c9e9ea048e0c1fd7faf33ac SHA512 9c7992961c43a1e7bbc60018b282f41796dd8d0ba1127d6cafe0945127c2e65653fad5e47b2f283bf04ef9d3436d8693b6aee31513ae17fc98c245f97c9e3dbc
diff --git a/media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-4.0.2-r1.ebuild b/media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-4.0.2-r1.ebuild
deleted file mode 100644
index 5bc893a7257f..000000000000
--- a/media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-4.0.2-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Kodi's 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
-	;;
-*)
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.vbox/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.vbox-${PV}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-17*
-	=media-libs/kodi-platform-17*
-	dev-libs/tinyxml2
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-9999.ebuild b/media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-9999.ebuild
index 0836a8ab7ea2..f5b74f9b320d 100644
--- a/media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-9999.ebuild
+++ b/media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
diff --git a/media-plugins/kodi-pvr-vdr-vnsi/Manifest b/media-plugins/kodi-pvr-vdr-vnsi/Manifest
index c568633c37cc..7ccee1161f3f 100644
--- a/media-plugins/kodi-pvr-vdr-vnsi/Manifest
+++ b/media-plugins/kodi-pvr-vdr-vnsi/Manifest
@@ -1,8 +1,6 @@
-DIST kodi-pvr-vdr-vnsi-2.6.17.tar.gz 145541 BLAKE2B 3682369144e75de78728c2b4c04f0edc4af470c696a96ab2204817173c507900de26810fa02a25111efa86a57090bbf8cdb1466e8ec375e69fb86ccc120e398d SHA512 43b9196d9cc08dc115638145ed06359cb78616534535b266f96c320ce8f7c808820654ae313a735a0a41a0ec71d5bceb50ed53bb869829c6bc79e434bb1dd653
 DIST kodi-pvr-vdr-vnsi-3.6.2.tar.gz 145275 BLAKE2B 40f1f21b80411c772b093a4a117522b31d93d3bc87d876154f46cfa58781e56e10d92e0dc67ca40be07a8e3e2b7c1c0a9716bd7a9b81ff21601b921b5a21f343 SHA512 ed76ba60188f513a6c43b21985522cb5e8eb8da3ffdf35ee88e95cec94c078cfc322c2e267a8837626c60242082bd61214c9ec26bff844967ce9f28f1cf885f8
 DIST kodi-pvr-vdr-vnsi-3.6.3.tar.gz 146568 BLAKE2B 375cacf90a8a7fa430f7b06a12397293df3d5aff07ce5c5fc254440bbb2a2b6f3f4e0b49687dd81a069a76801fc6ede3adcca9de11a126bb6ddae9ed7c35f4f4 SHA512 8f060373c43493ccde0e3d199470fcbf9c6e33f0457f31eb64bab4dde06e6cdbce5de0cefc9018aa7d35d8608d74fdf0f2f6e5e2b8d0a741683fa2091b4fe954
-EBUILD kodi-pvr-vdr-vnsi-2.6.17.ebuild 659 BLAKE2B 1010fbd87812331d707e2a9ad43ee76317b1d6df79d0e7960cab0ce11e26087dbc5c285213a5aee68a87dfdd30192782ad6d5eac8f3bdedfc5b1efa836a21342 SHA512 5635dd1a75f25cba9059d03c6acb08723b99d70ad9c1cac6180bf947e9d6e60d9ef5632e768f0a0cfcc566b79c13e03c03f3ae30405d40c26d08c2f5c56071f3
 EBUILD kodi-pvr-vdr-vnsi-3.6.2.ebuild 665 BLAKE2B 549c00829a828235bac2455a2f62aada5733940bf13a5cbc02c373cc61c9a4998e13849744b81b1f880a627d528c0d04f5eaabce8b9946043fd560ed92c66df5 SHA512 fb1cb4333073c7b9fee9e7919e975f85f75206e80877c76e6793310283be36ab591cf1054c1f20ecb0d184ef99b860263c749e1e29aeaebe64a3e62ec1e74b5a
 EBUILD kodi-pvr-vdr-vnsi-3.6.3.ebuild 696 BLAKE2B 616070d579738d34d9f4349642e14792433904b0cf3ab7f826b6c5fda9e29b7007eb4dcbd1854973988afe84cf49dbccd77041600d6686889f1ccb0757c68ca6 SHA512 bdb1549c09488af7b71a8af6e116603eba7c6169ae010d6a505df8451be70cfb4876b0af41ec150084c612b6b200080622b7b923c86e8e22da3fe50cd2d3fa4b
-EBUILD kodi-pvr-vdr-vnsi-9999.ebuild 698 BLAKE2B 8df7e4781b2fa661955e4078d9948951d7b7a1ed81ef4614e9bc9afa67a09eb86e97cda8899da629490d25d0c3a01789792618c4d0c8fd455bf351920ea52358 SHA512 5ece01a123f9a402738bdf8c965b9157b145402760ef1610f6e844c3ec03ad40812a8189ccb304cf385b90c42a38362fcec1c0935bf968d9baca9f08ff17dedf
+EBUILD kodi-pvr-vdr-vnsi-9999.ebuild 698 BLAKE2B 8cfd7a0c01597c946c11a169a5c8ddda0284ab949a4ef83494b7e5e54d4f0df32ae1491d4e6284c40b502d02672da24ad1e0012c9248f454c2e1b3ebfae40634 SHA512 ebdd798ccfc8cffe021cca650a355de67b257cad563b32abc3aeda0cd256355c34b3c7892316707c02e529fda6f14efa3403b005e3608b72587d8a8816686d30
 MISC metadata.xml 423 BLAKE2B ff5a21d61f4516f52b4a139f695048b1483aca09426e249c3165ecfbdef8770a47bd98d4bbea582e06e21c8d508884f67389d69ad126a3c7d46de1bce2b48207 SHA512 e81e80ae101dbd4b405ff3b8056c8cc901d5fcf2ff2d1eb595e26f5f59954d6931c5acce9fadb94bfbb533865017f17fb579bf382ce6c226ca32a2dc10f1e0a8
diff --git a/media-plugins/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi-2.6.17.ebuild b/media-plugins/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi-2.6.17.ebuild
deleted file mode 100644
index 583023f5daab..000000000000
--- a/media-plugins/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi-2.6.17.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Kodi PVR addon VNSI"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.vdr.vnsi"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.vdr.vnsi.git"
-	inherit git-r3
-	;;
-*)
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.vdr.vnsi/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.vdr.vnsi-${PV}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-17*
-	=media-libs/kodi-platform-17*
-	virtual/opengl
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi-9999.ebuild b/media-plugins/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi-9999.ebuild
index 635a11dfdd45..565b26fff2a0 100644
--- a/media-plugins/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi-9999.ebuild
+++ b/media-plugins/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
diff --git a/media-plugins/kodi-pvr-vuplus/Manifest b/media-plugins/kodi-pvr-vuplus/Manifest
index 474e7d35fac6..097078dbe18e 100644
--- a/media-plugins/kodi-pvr-vuplus/Manifest
+++ b/media-plugins/kodi-pvr-vuplus/Manifest
@@ -1,4 +1,3 @@
-DIST kodi-pvr-vuplus-2.4.10.tar.gz 80514 BLAKE2B d84f0da7f8473456ce6258b2602fb2ddc7631080d951ac33f603d9b649369c6cfd1fc36421ac200de7aaacd09cd23797c70e9f187bb011353889144aa8014f70 SHA512 b9569a85a6cb2c02b72f9494148f55874acc7c4a826704abfd4bd1d29c96b6221dbc62510c3823947b6496bd3465d6d9cd2089009d984fa706efc5b8ea882fa1
 DIST kodi-pvr-vuplus-3.17.0.tar.gz 160410 BLAKE2B 0eae7616abf01713148f6ac5370ccc2de9ee47dcb4b024119c16b1417fe1c655a8f1e9d9af188ae5106399cd321303f2ceb232b037f220411b15990986a6cea9 SHA512 a9c7e46af9bc1cdc18aeacac6f219c3c4210854287e086870e64b1cf2350b69b32d8ec3e980805be00093020ff3423b1cf7eb47dabcca4b14eee1f1cbe49e9f1
 DIST kodi-pvr-vuplus-3.18.1.tar.gz 163398 BLAKE2B 30cab3bcd9e0750c116f2e95170fd5d9fdc5c1be0f8068ed58aafc265454105d70504c6bf661d0b4c2e21eb9ca9e1868ec8da8e32bd39a054feae5bf8804ab46 SHA512 eadfb01b5a9d478d03bf720133c5de163b5fc1b8789dd2f756724dd180bc00ae593c43a4e727d6f6c9646a99626cc8dd6ee72cb054db65c2a49acc08ebb00ccc
 DIST kodi-pvr-vuplus-3.19.0.tar.gz 168331 BLAKE2B 141de1df21ae4149be56be3d952edd15792567aae39b337671c8f53cf28b1208dd69993a3680deb25b006b1d92eaa1a5b151ebc394f84d041d7cf99e56c206a4 SHA512 3a59aa691b0982cfbae466a3fa148a9ab71c7daeaeff1b91fdb71da4fbb406a6fa0346551bf7da37a4ba4dd6c1f58a2a3e41b0533b69afa4e28ecdf52be0029c
@@ -10,7 +9,7 @@ DIST kodi-pvr-vuplus-3.24.0.tar.gz 189303 BLAKE2B e1d1276b460d54722f80144d0e186b
 DIST kodi-pvr-vuplus-3.25.0.tar.gz 190314 BLAKE2B fba8e3438bc7475f0c4e4cf1afe02fc356b7cdc78c756c30cd541f71215c741fe56e436b934cc22ac0157ccf919159526f41625421995198157a1f0d8802366c SHA512 b94d6f846eb04cc241ae1a954f5d4fd07edd70b3389d9068bb9dc23083e3476bc46a17fd66e7f5d7ce04e361b1d9165672d7ada515f6251af86a5f3f18fa28b1
 DIST kodi-pvr-vuplus-3.26.0.tar.gz 192488 BLAKE2B 71909a13cc640c2509405a2ca954536b3ecf767dd607223fe0555860da270d710896fbb0e62922465dc7d22e817c39e183813c8064498e21783548aa85369744 SHA512 c0cb5e0fab716d20d7a6bbc81a8caaca5325938190742e15fc86fe475f93b915623cd3589b4990ebbd1caeb3924365d2872a598fd8e9dbe1822c37e3b2e288f8
 DIST kodi-pvr-vuplus-3.27.0.tar.gz 192727 BLAKE2B 0060d29cfae4217dd718d02836373d5829ee327a2ad6826d77fce22621758d0c48774a6a39b2907f462d4d778e9b308de7ca42f0c11fdb57381f6a3f50ac4e15 SHA512 e94a27c497e6b35a102897cccf3376bbb1e2aee056c5cef498a5db9f1a6c5e1c4d7a8c8060bfca5d5d2856067564ccabcd2cbaae1248021a9379c311bc84cb26
-EBUILD kodi-pvr-vuplus-2.4.10.ebuild 703 BLAKE2B e0553ee884be358337c235140046d8268c38d2f1a3d324469e45999fc8e3376d48fdd22222ffc1655fe45a30738f828254a291fcbb1e0a3e9e36ab4e6362a21b SHA512 79b1c4362a9a0dd8e5d41f3e006bec07bf7799b5746804a0a9a47d9f343d76bd7fbd6a82ef4734d7ba596e402fcb5acf349c1de9787aa90286778a9524061667
+DIST kodi-pvr-vuplus-3.27.1.tar.gz 193036 BLAKE2B 5c1f1422eab403748f4668e10f5ef27214857817851f1e4f14028256961927af741b211e5548d79c9a1dcaee21f4f05449dcd1835fd3688e632b0252c8cb8d13 SHA512 8efa1c00d953656ea97d9e923e0b7d380071047d138252edf14982f151c33132d3c57a0826e2e2abae82ba6beea06a8404bb79ff608ce1969f127649a1b0acc3
 EBUILD kodi-pvr-vuplus-3.17.0.ebuild 720 BLAKE2B 4dbe8dcd163cf5a1c71500610e3a3d54698c6de17831eee997d8bbb195edd15c50adbb75797c28af626a7923f074cb330f84d6499f143943d1ec9c9a91f90944 SHA512 df9154ff386ef0e962f74bf06e0ff4702bab942c78a3f7408a2ca9dab104571395a41c3bb4227da6ef65b9cbf2ca9b967ac4f8ac9b077833375bf5dd9472adfb
 EBUILD kodi-pvr-vuplus-3.18.1.ebuild 720 BLAKE2B 4dbe8dcd163cf5a1c71500610e3a3d54698c6de17831eee997d8bbb195edd15c50adbb75797c28af626a7923f074cb330f84d6499f143943d1ec9c9a91f90944 SHA512 df9154ff386ef0e962f74bf06e0ff4702bab942c78a3f7408a2ca9dab104571395a41c3bb4227da6ef65b9cbf2ca9b967ac4f8ac9b077833375bf5dd9472adfb
 EBUILD kodi-pvr-vuplus-3.19.0.ebuild 720 BLAKE2B 4dbe8dcd163cf5a1c71500610e3a3d54698c6de17831eee997d8bbb195edd15c50adbb75797c28af626a7923f074cb330f84d6499f143943d1ec9c9a91f90944 SHA512 df9154ff386ef0e962f74bf06e0ff4702bab942c78a3f7408a2ca9dab104571395a41c3bb4227da6ef65b9cbf2ca9b967ac4f8ac9b077833375bf5dd9472adfb
@@ -22,5 +21,6 @@ EBUILD kodi-pvr-vuplus-3.24.0.ebuild 720 BLAKE2B 4dbe8dcd163cf5a1c71500610e3a3d5
 EBUILD kodi-pvr-vuplus-3.25.0.ebuild 720 BLAKE2B 4dbe8dcd163cf5a1c71500610e3a3d54698c6de17831eee997d8bbb195edd15c50adbb75797c28af626a7923f074cb330f84d6499f143943d1ec9c9a91f90944 SHA512 df9154ff386ef0e962f74bf06e0ff4702bab942c78a3f7408a2ca9dab104571395a41c3bb4227da6ef65b9cbf2ca9b967ac4f8ac9b077833375bf5dd9472adfb
 EBUILD kodi-pvr-vuplus-3.26.0.ebuild 720 BLAKE2B 4dbe8dcd163cf5a1c71500610e3a3d54698c6de17831eee997d8bbb195edd15c50adbb75797c28af626a7923f074cb330f84d6499f143943d1ec9c9a91f90944 SHA512 df9154ff386ef0e962f74bf06e0ff4702bab942c78a3f7408a2ca9dab104571395a41c3bb4227da6ef65b9cbf2ca9b967ac4f8ac9b077833375bf5dd9472adfb
 EBUILD kodi-pvr-vuplus-3.27.0.ebuild 720 BLAKE2B 4dbe8dcd163cf5a1c71500610e3a3d54698c6de17831eee997d8bbb195edd15c50adbb75797c28af626a7923f074cb330f84d6499f143943d1ec9c9a91f90944 SHA512 df9154ff386ef0e962f74bf06e0ff4702bab942c78a3f7408a2ca9dab104571395a41c3bb4227da6ef65b9cbf2ca9b967ac4f8ac9b077833375bf5dd9472adfb
-EBUILD kodi-pvr-vuplus-9999.ebuild 722 BLAKE2B 9f205d55328bb0a326bb099167a7a837104f853a978e6ea7c21c6863467bbc0f4053166c69a5a350a8faa26332e6be7711b6c54a1f06daf84cc201410b0b6c1d SHA512 a7868c1239630426628ca131c0dfd42a8d33e47709030489a56db0cdd8bfc241f83062d652a3578ebf3d081e8c95a84edc45ca2f00d9a272596343973696851a
+EBUILD kodi-pvr-vuplus-3.27.1.ebuild 720 BLAKE2B 4dbe8dcd163cf5a1c71500610e3a3d54698c6de17831eee997d8bbb195edd15c50adbb75797c28af626a7923f074cb330f84d6499f143943d1ec9c9a91f90944 SHA512 df9154ff386ef0e962f74bf06e0ff4702bab942c78a3f7408a2ca9dab104571395a41c3bb4227da6ef65b9cbf2ca9b967ac4f8ac9b077833375bf5dd9472adfb
+EBUILD kodi-pvr-vuplus-9999.ebuild 722 BLAKE2B 1723620626a0fb522a9014ebbadd1c111a789da35d744598b4cfa397ba7a6cd4391ba25210cfee1d80b4c1615384dfc7411d14cbcd81bf48d97de1fff0ec1cf9 SHA512 0feb5fea81f0bee24d99ce4333252cb068cbea17e9b77cea042ce140f1ce65063101b65f6d25b9bb199b419d8314a1421ea1ee31200499abf734c535beda3af4
 MISC metadata.xml 428 BLAKE2B ac264c6bbfc925ff772eda61b1b4069b52ed5bf12836af8d8e86a72fe42bd852be1d00f74056c1d6b925fa2a026ea7df57ee57e7434a797884741b70762ff173 SHA512 573f803447cb7a7d0095eb21caa9f55c41fa4fb68c0f40aabad63df2ee262ce168fc75f28f3a3ae6aa7bf41f258be771c6a6dd06d1f2e2486b3d557d89f28f4f
diff --git a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-2.4.10.ebuild b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.27.1.ebuild
index ebf04407c57c..f77cda466527 100644
--- a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-2.4.10.ebuild
+++ b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.27.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 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,9 +28,10 @@ SLOT="0"
 IUSE=""
 
 DEPEND="
-	=media-tv/kodi-17*
-	=media-libs/kodi-platform-17*
+	=media-tv/kodi-18*
+	=media-libs/kodi-platform-18*
 	dev-libs/tinyxml
+	dev-cpp/nlohmann_json
 	"
 
 RDEPEND="
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 c93c8dd503db..138bdd5a99d8 100644
--- a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-9999.ebuild
+++ b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
diff --git a/media-plugins/kodi-pvr-wmc/Manifest b/media-plugins/kodi-pvr-wmc/Manifest
index 90871e9e42ee..dd5bdc6ec691 100644
--- a/media-plugins/kodi-pvr-wmc/Manifest
+++ b/media-plugins/kodi-pvr-wmc/Manifest
@@ -1,6 +1,4 @@
-DIST kodi-pvr-wmc-1.4.9.tar.gz 177965 BLAKE2B 680896d2f519977a0dbaaffdb6fe92f815787615dc9014934e2415eb817ac1a1f5dd5669f3d8ba1a0d6a98f0518062b285cdddb5cdf54efac4ec79aa3795ab73 SHA512 51ddfb064df5861b3fa89decdf78a499f8251fee3f18ffcf09fcdfbe9c3c741536cafce460486b38bd8abb447e3494f819aef3a2d0764b8e1579d649f386503f
 DIST kodi-pvr-wmc-2.4.4.tar.gz 178508 BLAKE2B e1d80860ade2a639dd65a9dd541657ee29032facf95c427fd38038f5df28f5cc93622f00809228ae7968786b0d5499606c38eb79adc7ed9200b4e94e2de26206 SHA512 9932d3c44dd91ff371ef34cd9fbbbe1485629116b102c31dc7292e32f82869727423195ae9c78969d96e3a03dd22d481cc0708212921acba0524759a4acaad8d
-EBUILD kodi-pvr-wmc-1.4.9.ebuild 690 BLAKE2B e6037d104fa02dc06a3003cf36c7600c9d310024f5050629736d8e7c1089f6ad99e2508d422179b87310dec03a3feab39b81feddf7efb9ff46247609f593dd20 SHA512 e28b7fe4354f8b12ffd0d15add45459231f9c458489de444b4d817196df14c0ad9ece62a0cc0b49cb7ab951241030a789eab47b65c0df50dbafb0ee7ba65c145
 EBUILD kodi-pvr-wmc-2.4.4.ebuild 680 BLAKE2B 7e2ceda9bcb53bc2c284d9876226abf5f87455e3e69eb1fb8cd3dc151f2a09b7312adae0ea0272ae2945d3df85bb3bb2464f7cf3b80483836ff6419037928aab SHA512 50105fb1457f40160a5f08546baccc73042e842738ea81b96904a68a5d60e9a87ad056d4db292ff391ca7c6ad2326682fb3ca6a84186d96beaf86d0526c85dce
-EBUILD kodi-pvr-wmc-9999.ebuild 682 BLAKE2B 0929f6e052949fe8c50fe6ec872fdfdf30dce2424f067b5bc0004e7364a3506fb4f5a096a728718ff61b010d4072cf8a1a01d41762f7349f36f1629229f337f7 SHA512 8ba688262ae557058d090fd1e289223d396f697e0f67aeaa563745ae5fb952eb276efa42fb499996bb76dec88c16b17efe7816606231abfa2bd23528634b0bb7
+EBUILD kodi-pvr-wmc-9999.ebuild 682 BLAKE2B 11fac4b803c51bb1464601a5dbef9b21e5bb0f8d2069f049163ab9c86ab9085fb1a67b2c137aeba1d98c0d5a5bedccb709b88e38e8df686a68d87e1a643f7f10 SHA512 24d91a68e9597556600aad597248d320f00f70d12ce94bade439c22385fe2aea922c78049cc3fb57110e950b2eda38f1448c2bd19aa434a5c81f6b29aef33b22
 MISC metadata.xml 439 BLAKE2B e9d6404796d298720abff6d7afd2db18b95007cb65ee3ff471b83ee7e7e864eb648a37e3d9d8405842c6b8fe3c409096abad8c8b6c3b1eb2e7df15d4865bfcae SHA512 d85d185c415264b312fc1cccf1155b4f49d1091795989e617c68a4a910f0c85e19b8e34764b4a4a31bc825c927f5a939a7bd7b2f4d1412263aff6d0e50b3fdf6
diff --git a/media-plugins/kodi-pvr-wmc/kodi-pvr-wmc-1.4.9.ebuild b/media-plugins/kodi-pvr-wmc/kodi-pvr-wmc-1.4.9.ebuild
deleted file mode 100644
index 50c278f7f89c..000000000000
--- a/media-plugins/kodi-pvr-wmc/kodi-pvr-wmc-1.4.9.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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="Krypton"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.wmc/archive/${PV}v2-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.wmc-${PV}v2-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-17*
-	=media-libs/kodi-platform-17*
-	"
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-wmc/kodi-pvr-wmc-9999.ebuild b/media-plugins/kodi-pvr-wmc/kodi-pvr-wmc-9999.ebuild
index 416de5a5756a..60b21dc3a53d 100644
--- a/media-plugins/kodi-pvr-wmc/kodi-pvr-wmc-9999.ebuild
+++ b/media-plugins/kodi-pvr-wmc/kodi-pvr-wmc-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
diff --git a/media-plugins/kodi-screensaver-asteroids/Manifest b/media-plugins/kodi-screensaver-asteroids/Manifest
index 656cf1fb8add..6d894191b2fa 100644
--- a/media-plugins/kodi-screensaver-asteroids/Manifest
+++ b/media-plugins/kodi-screensaver-asteroids/Manifest
@@ -1,6 +1,4 @@
-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-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
+EBUILD kodi-screensaver-asteroids-9999.ebuild 660 BLAKE2B 6c7e0b2750ff98c43c9e8a4fa3812426d8788ab9669c0cd3e373a5f085b67f2a9b6a9a254adf5b8ab5208284552710e9582bae20b4c3d5e511b39aed6e362dad SHA512 dc6d6c7c8e6a335202aea8aa127cc03d485de3185f75f32f2cd276edf735e503deb9fbb93b0d59a15181958245d2f9dbad1fed13ef2d5bf0cbcd6ba034cc2f5b
 MISC metadata.xml 439 BLAKE2B 3c290b112eb05ae33fa636fae123220ea920409b8e0a99101e12450d0d3af1c3effbbbbd96ea92969f6534139851f5ec4ce19b930c00f326578296ed0d6747d7 SHA512 47e672fd702cdaddcfb42c3f792a74159756c945a9b86f26144a889d8b46fffad3c2f57305a0d7be9e7390f9dda975d4cb5663657e0640ccf80ca50cc9d51bb1
diff --git a/media-plugins/kodi-screensaver-asteroids/kodi-screensaver-asteroids-1.1.0-r1.ebuild b/media-plugins/kodi-screensaver-asteroids/kodi-screensaver-asteroids-1.1.0-r1.ebuild
deleted file mode 100644
index 89339cd2eef0..000000000000
--- a/media-plugins/kodi-screensaver-asteroids/kodi-screensaver-asteroids-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Asteroids screensaver for Kodi"
-HOMEPAGE="https://github.com/notspiff/screensaver.asteroids"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/notspiff/screensaver.asteroids.git"
-	inherit git-r3
-	;;
-*)
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/notspiff/screensaver.asteroids/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/screensaver.asteroids-${PV}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-17*
-	"
diff --git a/media-plugins/kodi-screensaver-asteroids/kodi-screensaver-asteroids-9999.ebuild b/media-plugins/kodi-screensaver-asteroids/kodi-screensaver-asteroids-9999.ebuild
index 58c3b5bf9593..e3614ec88ae0 100644
--- a/media-plugins/kodi-screensaver-asteroids/kodi-screensaver-asteroids-9999.ebuild
+++ b/media-plugins/kodi-screensaver-asteroids/kodi-screensaver-asteroids-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
diff --git a/media-plugins/kodi-screensaver-biogenesis/Manifest b/media-plugins/kodi-screensaver-biogenesis/Manifest
index 398e96e9f9ca..884e6c1d4bef 100644
--- a/media-plugins/kodi-screensaver-biogenesis/Manifest
+++ b/media-plugins/kodi-screensaver-biogenesis/Manifest
@@ -2,5 +2,5 @@ DIST kodi-screensaver-biogenesis-1.1.0.tar.gz 8792 BLAKE2B 7e6d64cd5e4e53fc3c53a
 DIST kodi-screensaver-biogenesis-2.0.0.tar.gz 10579 BLAKE2B f6dbd9f99b453f33b3cd2650d901c4fa39b98ce77382362fa93b1d2e31a54a23394677006b3be97b8bd1626c97564ae812f3452bd17f9cb165914d8793e2e00a SHA512 3aa4668f009561b3615d68d7a61d47a86970e32ff97012f1a9a7ad8dab367008267949d736c47a913f878aced1daae8768c2531d3af6239419470baa2e9f835c
 EBUILD kodi-screensaver-biogenesis-1.1.0.ebuild 634 BLAKE2B 4b4dcef78e103d861517ee394c647d7acec70d748e39fedc2fd1537d7e5f1d7195e62038646ccebd397af177a7c3b8b6e6ad1bc946eccb22637bfd3418f23b6f SHA512 75f7f8e6ac7560e2fce53cd347a7141ff0ad81ede49d84907b30378d60c1700968ba47478db3ac4a2aa453d3d112d43ee685db9b39aac9c0bbc2130b4022448f
 EBUILD kodi-screensaver-biogenesis-2.0.0.ebuild 664 BLAKE2B a8f0fb5e6a227876991f24f7f7fa24f7d24bbafa311aa2b3ee75d7a2ddd916c34162ec5e24f0b9a2b1dcbfa6c92c69a8d1075748e8053713f2a2d68c4b8ffa56 SHA512 9ff72d54ece2a4e4f224d6b641aa601f351358eee14908f15bd86cf9991ef1b3afb1f073b5b0bb87c88ee8bb5c04ccd9fa4e4f3d4dc4bb4233c31260459766df
-EBUILD kodi-screensaver-biogenesis-9999.ebuild 665 BLAKE2B e7812ab99f0cd8905c4d3304cbeedfb6406158cf23b0e6d897cc932c00df5cabb1096a588f66eafddb58be0fb600ba1d53308693ff0b1c57272e89a9c2fdadb5 SHA512 5a60343b906157af49ad248922e113afead82f363310a9364b1be175393e1cbef82f3912be15833c6f4bcdeb2835b46540e87cda24c2d2fce1afca194da4e365
+EBUILD kodi-screensaver-biogenesis-9999.ebuild 665 BLAKE2B f0f356fa771feb50e421c4a2407ad7b07846a2b8c4c068da76c811cd2c0b7d28ce7db6cf7b69ee567379534588e633365cc6f6002d371a5f25f8f68615592347 SHA512 a62b659b80d1385ceab66ba87546ce053b527349a5143046f762eda553d02df40b7f06a5bb9281f39c1865f87c3d512db0fd784ccf6620709013fba56fffd24d
 MISC metadata.xml 441 BLAKE2B f5c19cf70bcc5dddc98d5d1f01403fe32e05e859fd18cd972e8df08b76e4356bce05910535a336dff4f11554f9e8cd7a69addb00b0c5efc2bc021d68a8198624 SHA512 ed6d1fe10c992d7f28c115e86eb2565b6dd2a753d670dae7815ecaa717b208d762a62504aa67a2bc1853a203fdb49d1763ac03e00effddf4db81567f20100791
diff --git a/media-plugins/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis-9999.ebuild b/media-plugins/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis-9999.ebuild
index 75a3fbf914aa..01b0cdea74f6 100644
--- a/media-plugins/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis-9999.ebuild
+++ b/media-plugins/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
diff --git a/media-plugins/kodi-screensaver-crystalmorph/Manifest b/media-plugins/kodi-screensaver-crystalmorph/Manifest
index d9783935b457..0252a957aa48 100644
--- a/media-plugins/kodi-screensaver-crystalmorph/Manifest
+++ b/media-plugins/kodi-screensaver-crystalmorph/Manifest
@@ -1,2 +1,2 @@
-EBUILD kodi-screensaver-crystalmorph-9999.ebuild 647 BLAKE2B d78c7ecee8c07f04c03699999059f4fb2a7ddd3ea46f0b5992e120ded078d1673667999d6fa0e50687a13cc5192c4d798b5b76fb1b439fb3b89dfe254ead3a71 SHA512 a4be58663dc15f31629877af82ac0679e9587c1372220b42c0101a17b01b4932c896d8c8017c1340b32b9b5238e0946181c021d3fa5aa4d0f1e27a026c253715
+EBUILD kodi-screensaver-crystalmorph-9999.ebuild 647 BLAKE2B c605e3b72e3a46538fef6fc7e5e49a954f54d2ef89487f58ee5bbcb10e95bdf7ae1666b02a5f20a28021a8c557cef6792940489114cf765bde119c1339abc64a SHA512 92c667d811bba26b3cd051e6f78b8fe6cd7e80b43f6e82ecfc4e36617f088d6f1b964bea993c8284b57270db10c463690351fc370c0a76ad2017cc5ce1bcccf0
 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 607de5eaf26c..67b977f36cab 100644
--- a/media-plugins/kodi-screensaver-crystalmorph/kodi-screensaver-crystalmorph-9999.ebuild
+++ b/media-plugins/kodi-screensaver-crystalmorph/kodi-screensaver-crystalmorph-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
diff --git a/media-plugins/kodi-screensaver-greynetic/Manifest b/media-plugins/kodi-screensaver-greynetic/Manifest
index 504625677fd9..5542c00037f7 100644
--- a/media-plugins/kodi-screensaver-greynetic/Manifest
+++ b/media-plugins/kodi-screensaver-greynetic/Manifest
@@ -2,5 +2,5 @@ DIST kodi-screensaver-greynetic-1.1.0.tar.gz 5115 BLAKE2B 357a4d51b2271c4181a335
 DIST kodi-screensaver-greynetic-2.0.0.tar.gz 6608 BLAKE2B bb48adc922d3949670d3685ca4adba7d608a42e9f9c0c659ca91a26e9181568f4a6d1f1f9aa707eedb395a9eb54c4aa40a83b36b6594bef5f9159ead5585381a SHA512 15a577bb9e10f81d86582eb43c20b4e2dcf430f478c76b3c18c1800532e38d9dc87754b7e0df669ca8df4e1d4d589224c561688a4fd14528c70dc6728c7be16f
 EBUILD kodi-screensaver-greynetic-1.1.0.ebuild 629 BLAKE2B d903f527a0c14316a872b1741cd44ddf02339a73a58b888482b40135d2b46ab35c4d388905475d3ba6262fb68050a7d56adf0786fd99f9c51749b52ad3761c8d SHA512 0afdf7c85059546e955d443a9a3b54c805712c8882d1e61a3e93025b1108aceb335ac06a6f6ee322daa760a7196404881054024431d5d765dba5fcadc076837e
 EBUILD kodi-screensaver-greynetic-2.0.0.ebuild 659 BLAKE2B 8175e6f35ff1710cca777c1f3450404f1e91c722239090bae403964432c9c15abbcb7085dcc4283c4e3f6c9186d184e2d4b591dc102afb939dde526a56751a05 SHA512 3cd27f42ffda2a43db0362e01ce7ecab2c092702412cc3995f17baedb91a51b6eaa13c4a5da3363eaa8f24da4be735e083d8fe28b042a63b60c8e42b2bc85570
-EBUILD kodi-screensaver-greynetic-9999.ebuild 660 BLAKE2B f76147a93694f01d93f5d412ae7f65303297e398dedb00ab9a76788834fbf29fa90e7b397864225ac4142aecccd79de0e53c1201e7856a55f63f147c222e8ab8 SHA512 0abbfcb95de736591e1120dbde8327a4921c1cd8b91f611ad69ee859a9e93451abef93beba66cfb8d6c5098098af742b7aaff863354d1f33ddc1762ecbecfc5c
+EBUILD kodi-screensaver-greynetic-9999.ebuild 660 BLAKE2B 4c4587857bb9c8324449e0e54a0368c220b8b8b5f4ecefc4f114649e1ce42bf71fe8bdcdec00bf9bea7839674636e1bc1f26a91ae98ec5f025ae90ac9a7908bf SHA512 208060e2634c8bdfcd130b9b1aecbfa0ecdd791cb1f3a7af43b9483f3abbc92b884775dd1ae6e3c4a086c8b433f75d963c043b642cc1787a4cfc4a7748c31435
 MISC metadata.xml 439 BLAKE2B 61919ac2fc5a3efc8278e1dd40f196fcd000ac12cdbe633b4f53bd0653978f4030fd3dcaeecb6f17a86c4e8fbabdb8e9d6e11e7ec245693c54baf57ac1042445 SHA512 56833abb5a30439a7c4736e4f695f555e79bcdd0cad2d53a87897c35d4c3efedb65a4bc5818572c5fbb7768eedc635659299186339d3557d98d86de7a54885c4
diff --git a/media-plugins/kodi-screensaver-greynetic/kodi-screensaver-greynetic-9999.ebuild b/media-plugins/kodi-screensaver-greynetic/kodi-screensaver-greynetic-9999.ebuild
index fc568b0174aa..f312ca7ebc25 100644
--- a/media-plugins/kodi-screensaver-greynetic/kodi-screensaver-greynetic-9999.ebuild
+++ b/media-plugins/kodi-screensaver-greynetic/kodi-screensaver-greynetic-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
diff --git a/media-plugins/kodi-screensaver-pingpong/Manifest b/media-plugins/kodi-screensaver-pingpong/Manifest
index 4fb15b6068c6..84f3f1adb366 100644
--- a/media-plugins/kodi-screensaver-pingpong/Manifest
+++ b/media-plugins/kodi-screensaver-pingpong/Manifest
@@ -2,5 +2,5 @@ DIST kodi-screensaver-pingpong-1.1.0.tar.gz 14476 BLAKE2B ce9a13968394ff607beff2
 DIST kodi-screensaver-pingpong-2.0.0.tar.gz 16768 BLAKE2B 1b4864ae3b88245733dec758cd815ff7a9f4673e1ab249275239c4ac1cdf04fbd256001d5ee984bd509730094b91cfe1d2e683169624f87192dbebcd4dc98f74 SHA512 c754b38a549589488e524e6b61088b3d9afe8f2f76bd65aa72901c7004880087cc7cb614f4b1cde49b0200a11f2f57181be913523a8b339abb6c26589a6a3d39
 EBUILD kodi-screensaver-pingpong-1.1.0.ebuild 625 BLAKE2B 9de8a58bac01aaa057c80d232bd4f0546be2855c76608da93a52d15f054c8adb7f2dffb1a31708a3a88a7766dc439f47ef8118b061946787144bba8be6d3f4b3 SHA512 13986351400280f6b9224110789dca0b5ac6930ee7214bbcf80d8f25a961c0c1a57bce5fa43fefef333ae2bd4c6129410a7eb55245ed8a05d0b5816b817b3fcd
 EBUILD kodi-screensaver-pingpong-2.0.0.ebuild 655 BLAKE2B 609c646adb52ee425e66f4dcef2a3e1512e0631e2833c6331351b9db4e43fe1c51160a994287d5047e591919de71f552b1ac8cfd63792b5944a1ef227ec7c009 SHA512 c76cb1d6db4bb84d464735d6bbce7cac16e70329479a0a47d966d1ac78dad8850a28d6c7b45b553bfe7dfd0e999042837dd33c00b7a39715ea48d96be29baee8
-EBUILD kodi-screensaver-pingpong-9999.ebuild 656 BLAKE2B 70488f9d4a6a331dc9137b3ceba30132abbad5ea903a3be39b23164d8ee732148c8d8980bd5cfb6622500e09c4aebdd09aa397d61bbc29a3a58b6dc26c53895e SHA512 955d4924e6f88601d51416e8e82731d9748a676153625476aa7394cbf9f6c1bf748d251f9d8ecab1abc472100dfaa016fa530d6556040067a6c8e61494f1b887
+EBUILD kodi-screensaver-pingpong-9999.ebuild 656 BLAKE2B 84a55f0a2e3a8672da97490bee171b36b1899f9b9a18c0ad908158a0e43d1aa1e43e9a98d6778f887710d27ad495314028839a7ad1b2619c3f5e7c2d6b3a6bf3 SHA512 347b8bb8a92144778673970ef274fc3b17dbe6b703827c5cfd5777747e3b2406685cd1cc1a679f991afdece9ebbcff041f8ca8e5aabd684130bcb7ffbf88e700
 MISC metadata.xml 439 BLAKE2B 3c290b112eb05ae33fa636fae123220ea920409b8e0a99101e12450d0d3af1c3effbbbbd96ea92969f6534139851f5ec4ce19b930c00f326578296ed0d6747d7 SHA512 47e672fd702cdaddcfb42c3f792a74159756c945a9b86f26144a889d8b46fffad3c2f57305a0d7be9e7390f9dda975d4cb5663657e0640ccf80ca50cc9d51bb1
diff --git a/media-plugins/kodi-screensaver-pingpong/kodi-screensaver-pingpong-9999.ebuild b/media-plugins/kodi-screensaver-pingpong/kodi-screensaver-pingpong-9999.ebuild
index a28bd3f5f731..41a80f39ef05 100644
--- a/media-plugins/kodi-screensaver-pingpong/kodi-screensaver-pingpong-9999.ebuild
+++ b/media-plugins/kodi-screensaver-pingpong/kodi-screensaver-pingpong-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
diff --git a/media-plugins/kodi-screensaver-pyro/Manifest b/media-plugins/kodi-screensaver-pyro/Manifest
index 1eb0a42614e3..53a9b11cb4aa 100644
--- a/media-plugins/kodi-screensaver-pyro/Manifest
+++ b/media-plugins/kodi-screensaver-pyro/Manifest
@@ -1,8 +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
 DIST kodi-screensaver-pyro-3.0.0.tar.gz 81858 BLAKE2B 4d48cfeee5d51c45e0caa99e742226ed6f6b0704391d657be8863ffe76acfeb2e3f3740903cec89e0dcaa2dcbff6109fb91e582c5855598b9fd75549880ab87a SHA512 92335e156950f7da5800dc9c9fd57262a2d608d63cb2015e3f5711686b657930f05651a35e043480ed64f40cb34a3228c44b6c641b63a8d0438e0944abc09515
-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-3.0.0.ebuild 634 BLAKE2B 0803976a5267983685007edda398af6fa33ec76c5ce63cf48c724fbb2056298cb0bef6e76ae682c78716f5be2afee7742d2ce25ef54c677f093c07b79b948a0d SHA512 fc89e6b3af290ca3ae3a7b5bbf6f83e875cdd560ffc1f80dcd53b890b83cdddfa4a7e10a22de4a21ec332dff090a007d95d590e9ae07f8d048b4cbdea132cdfc
-EBUILD kodi-screensaver-pyro-9999.ebuild 635 BLAKE2B af92ccaa044443360519d3549bab476bcc2d39442a043a1eed6ce40a419653915e9c2143b12c31deebcf61e22677401b8bf867a983e59d8ab8c54953eedb6525 SHA512 b707ec722debfa1b9a3739a7ae25041fc4424d2329f748132656579d751ba9f4370c16b1d6117977d3ef633fb9acbfe9fa002e3fcaec7b07d811ec61c12dada8
+EBUILD kodi-screensaver-pyro-9999.ebuild 635 BLAKE2B 70cd088be5230883b967030d23a6a734c7323008803f91dc98153337ddd92273f5314263af525394bc3c862a8e4299da94522656417c0a19999f203e5bedb1aa SHA512 4c57f4ac7d956e8ea07f5dbd217d77c32b529b3f1f758cc66fffa7f774dc15d2c7d0357190406e9ccd4a4f052fce163cee6f7d9caedb86f5439dd4d7ac46a0bc
 MISC metadata.xml 429 BLAKE2B 75a3ac26d3c3383485d3aa0b9a674f6bc249d95f13b637d9d07fb64f7ab46226301f8abf8a4194b3a30ea8dd6815d6565382a0e1e342bccf880ea0ca6a3d11f1 SHA512 df4dd73cbdb3c1d9a32ee398273356b506391363fee7d5e799a1bfed2765a1cea5c40ddc60716aebd272c4ee91d4d72d148a0644d3e47a84d3b31d03fa739f3d
diff --git a/media-plugins/kodi-screensaver-pyro/kodi-screensaver-pyro-1.1.0-r1.ebuild b/media-plugins/kodi-screensaver-pyro/kodi-screensaver-pyro-1.1.0-r1.ebuild
deleted file mode 100644
index c1ca09124946..000000000000
--- a/media-plugins/kodi-screensaver-pyro/kodi-screensaver-pyro-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Pyro screensaver for Kodi"
-HOMEPAGE="https://github.com/notspiff/screensaver.pyro"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/notspiff/screensaver.pyro.git"
-	inherit git-r3
-	;;
-*)
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/notspiff/screensaver.pyro/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/screensaver.pyro-${PV}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-17*
-	"
diff --git a/media-plugins/kodi-screensaver-pyro/kodi-screensaver-pyro-9999.ebuild b/media-plugins/kodi-screensaver-pyro/kodi-screensaver-pyro-9999.ebuild
index 2587a2913dfd..7caf62b15621 100644
--- a/media-plugins/kodi-screensaver-pyro/kodi-screensaver-pyro-9999.ebuild
+++ b/media-plugins/kodi-screensaver-pyro/kodi-screensaver-pyro-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
diff --git a/media-plugins/kodi-screensaver-rsxs/Manifest b/media-plugins/kodi-screensaver-rsxs/Manifest
index 6adf52a32efb..36088c365264 100644
--- a/media-plugins/kodi-screensaver-rsxs/Manifest
+++ b/media-plugins/kodi-screensaver-rsxs/Manifest
@@ -1,4 +1,2 @@
-DIST kodi-screensaver-rsxs-1.4.0.tar.gz 6181175 BLAKE2B 4873027b5f3583129a243c90fd7b3770c43cbba22428301778835e9cd62123a4248a0bf9199c3727f30f61cb7df6b6b1268ff7a1211405c0b72be75462a6781b SHA512 95d553e54be91b914b40d4616d2a6a127404215ceb4fbdf40abc4b6c9d981b33681dbe88c6def34d0bf80a8c0188c59d3760a5804a5189dce1257e5242568497
-EBUILD kodi-screensaver-rsxs-1.4.0-r1.ebuild 760 BLAKE2B 0033a65dcb6a49befd3a5dde38e5f36f626fd068defe31761fec2f824d8a1b9b24432d08f14af0d13ce1ae8538b3d7b482aded2225bf23fc406df4306fd03866 SHA512 dfb2e37d5f259bfa5631263e51897edd5b5f9c0c6f6af4c150a370a93a43021d7ba82da842300df7861f5a4bee4b5262cf06dc8b76c25661d364d02dfc3333d6
-EBUILD kodi-screensaver-rsxs-9999.ebuild 761 BLAKE2B 42809d2b2e8eda32c4f703c5e2ec306974beac7541d2222b2296207c06fb502a7f0b99e00e6d9cda66eda800d402c5275a8e3463521c8be84fb11939ab7f80eb SHA512 567159422fed2e727331a858947984f41e533b6609f665f3fc1c230096dc78cc5509ee180ab91f21b29e9784157176a88e4df93b3843604fe6be07de4f405e26
+EBUILD kodi-screensaver-rsxs-9999.ebuild 761 BLAKE2B 2a81721cd5fdd48cce06b1b4d8db31648c79995e6763b13c185c67e5cd28ae76e951acce46cb502604e08ffa1f9bf6cf6209340c6ba77e5db96a05d4429b3174 SHA512 537bc0b40cac9661394414f6b59171130aee4b06e5c2cd922eb27a3b0c99ed30219ac0ff64e27e50bdb21063b2b30c16b52f1129cdcde6bd01a2ab0ca9cd2323
 MISC metadata.xml 433 BLAKE2B eb81b1aba0ed7b5e827682e7db8752b045c0db57c5323b676ac117020a3c7f4b5cfd26801f6a3b9b6ad9c43f525790c646b9cb8bff3a65c2cea23e7560192d5a SHA512 24139a96ed95abd60bea9b882f8aee0166953652a3f187045c9fb691e295b97bc55f00b7911b2bc60c41cf3926c3900654e1ab1e0cc59f0705cea5d75bb0b2c7
diff --git a/media-plugins/kodi-screensaver-rsxs/kodi-screensaver-rsxs-1.4.0-r1.ebuild b/media-plugins/kodi-screensaver-rsxs/kodi-screensaver-rsxs-1.4.0-r1.ebuild
deleted file mode 100644
index d4a92cb85d14..000000000000
--- a/media-plugins/kodi-screensaver-rsxs/kodi-screensaver-rsxs-1.4.0-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="RSXS screensaver for Kodi"
-HOMEPAGE="https://github.com/notspiff/screensavers.rsxs"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/notspiff/screensavers.rsxs.git"
-	inherit git-r3
-	;;
-*)
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/notspiff/screensavers.rsxs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/screensavers.rsxs-${PV}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-17*
-	media-libs/libpng:=
-	sys-libs/zlib
-	media-libs/glu
-	virtual/opengl
-	"
-
-RDEPEND="
-	media-libs/libpng:=
-	sys-libs/zlib
-	virtual/opengl
-	media-libs/glu
-	"
diff --git a/media-plugins/kodi-screensaver-rsxs/kodi-screensaver-rsxs-9999.ebuild b/media-plugins/kodi-screensaver-rsxs/kodi-screensaver-rsxs-9999.ebuild
index 2945bf22cc7d..4ffc1f4f3c89 100644
--- a/media-plugins/kodi-screensaver-rsxs/kodi-screensaver-rsxs-9999.ebuild
+++ b/media-plugins/kodi-screensaver-rsxs/kodi-screensaver-rsxs-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
diff --git a/media-plugins/kodi-vfs-libarchive/Manifest b/media-plugins/kodi-vfs-libarchive/Manifest
index 94a029fb5733..e74ae096d50e 100644
--- a/media-plugins/kodi-vfs-libarchive/Manifest
+++ b/media-plugins/kodi-vfs-libarchive/Manifest
@@ -2,5 +2,5 @@ DIST kodi-vfs-libarchive-1.0.2.tar.gz 21985 BLAKE2B 0d3b8d7405cc7ea1a766a138b432
 DIST kodi-vfs-libarchive-1.0.5.tar.gz 32808 BLAKE2B f822cfb188d5d6ff2f5237fc3d242b7e9095d967314d9701a1a1635ff7865b9fd4d836686af5dd6afc90fd52c097952937d0ed7c02eb56c4c51b335d8f9b328c SHA512 3d9c5d1b8cba0545ca2b30a3a72d2ed930324329968f17a1fe3c145b54632d8d60dee45efdc1d7e74f7872503ce893101c71b6d9063b372de912a60980c762c7
 EBUILD kodi-vfs-libarchive-1.0.2.ebuild 877 BLAKE2B ab0ef79088afd96837f796f1b9ac8bac696aab214fd234b370ad3bbfee4998441e3140622ae683370a1e0086d6db784272e5fb63a4f057d5218d07c73235728e SHA512 e349e72aec6646445782a6b49b8588eaca41d2f9683408835a49e89b17e7f0618126ccf650bdd7a935db2367025e569465f0243e8bf45a31f1040f7d2c076ce1
 EBUILD kodi-vfs-libarchive-1.0.5.ebuild 877 BLAKE2B 7c842ae4877d93da9551f87c3be125adbf91f3266f1da136dd5a96f7f3e58532a0d9599b2438857a6222a4c1d0ef0e5cba2f4c576682946d12a5dc334b454e3b SHA512 ac4dc317c7d5d1957cd1e9009d9c2bc1616f5c9c74ae51be371ad381c9569670373ecb46b705bde78c04b39b32a00e69e2b1d905a4d21bcfbee87e6fae8a0980
-EBUILD kodi-vfs-libarchive-9999.ebuild 878 BLAKE2B 37b51c472a676c5daabad879cf891cb4faea77fd5b63fc71e4ab4ebb2c4c70d285647d6d3dde18ccd21c22c061be8b382ee627efb4824746c2b303aacf38e5e7 SHA512 16e19b3f5a283940b11e387e5f17fc12cee32d4214b82de07635783c3b4afd5035e7057bf93c8da2010b03d1cb14595cc175c8139e5a93ca7a12e70e51086d7d
+EBUILD kodi-vfs-libarchive-9999.ebuild 878 BLAKE2B 94110ec751196bac8ad6c921862c5ee4301b0aa9c70cd110ab3225f6160e46903a261f33747aa5b69f5b14238dff5cb4f2e1ed3ee4542da544d24d69493ca4b0 SHA512 840bdab3320c54e0f8dda6197ea5be0385ba8a4c768a0a766ab0ef99772b466b7328fe5c39b4efde6f69efb8188866031cf6d0a72a388f9b2068165d2041f092
 MISC metadata.xml 432 BLAKE2B 3006fcd638bfffcaa3100d40c3b1ffad2afa58ac1141edc5baa79640a1835db8104753cb64161530396f1d9549726044653ecbef6d4096769751f00dcba8b6c1 SHA512 553da085bf4fcc70c1b4ab666004ce9d0e68ad95b185d78713381392e6c0590f5aa8a23cd8f022e3a12b77cc96ef06ccc54e262233326921ad45a921a32af135
diff --git a/media-plugins/kodi-vfs-libarchive/kodi-vfs-libarchive-9999.ebuild b/media-plugins/kodi-vfs-libarchive/kodi-vfs-libarchive-9999.ebuild
index 1c03b73032f0..d38dfe7343fc 100644
--- a/media-plugins/kodi-vfs-libarchive/kodi-vfs-libarchive-9999.ebuild
+++ b/media-plugins/kodi-vfs-libarchive/kodi-vfs-libarchive-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
diff --git a/media-plugins/kodi-vfs-rar/Manifest b/media-plugins/kodi-vfs-rar/Manifest
index 3257d4dff2da..43c522575087 100644
--- a/media-plugins/kodi-vfs-rar/Manifest
+++ b/media-plugins/kodi-vfs-rar/Manifest
@@ -4,5 +4,5 @@ DIST kodi-vfs-rar-2.0.7.tar.gz 132225 BLAKE2B 62f75acba3b06a7eb179eedf31fffa2397
 EBUILD kodi-vfs-rar-2.0.5.ebuild 652 BLAKE2B b36b05c304dd57e616c1f8d30024a34f6eacb9bbebf4f40ff9c8a92f7bffa8f9252e289a1e4d32536ed13c7836be14c14fcae036e469337393b0f6f02edc826c SHA512 923b6dcae197faa632bef703cce6959f10c5480a76bddd3e188667859b4ee265ad3f1fee57ca91b6caeacc08315cb5f1fcf53598d792de46e5d5539d1844c5fa
 EBUILD kodi-vfs-rar-2.0.6.ebuild 652 BLAKE2B a3c9536ae1c17c721ff0a69fb3c54e4f7626122dfae57a633ee10ac33de556578c3a53a614c0500a96050bae184bc07bc66cc853cdd6bc91adc6cee3b0847b4d SHA512 deafe614fc3c89790f3d3b5c52c888f4a41969ac98afacbb0f616aacd7bd3f8ceea573d7b59ef5d8ef7a268e8926f00e34046e007f98eb00e058393bd0454dd3
 EBUILD kodi-vfs-rar-2.0.7.ebuild 652 BLAKE2B a3c9536ae1c17c721ff0a69fb3c54e4f7626122dfae57a633ee10ac33de556578c3a53a614c0500a96050bae184bc07bc66cc853cdd6bc91adc6cee3b0847b4d SHA512 deafe614fc3c89790f3d3b5c52c888f4a41969ac98afacbb0f616aacd7bd3f8ceea573d7b59ef5d8ef7a268e8926f00e34046e007f98eb00e058393bd0454dd3
-EBUILD kodi-vfs-rar-9999.ebuild 654 BLAKE2B 8a5694ad5196e0fa332ad6dec7c3c4aa9566db66b78538ba4ee33ba1695f8e1737200d269368d8dcca1f55d1eecbdc50a3480c788a45472a24351a889157a423 SHA512 181f2742355e8c0c0532d8f6a9fe5a1a47e9305c48768bff2ebc2abf24d83a40e6833f4aa131a72bc847b434be9424435b0faf9191b3ece49b106b0c9093cfc0
+EBUILD kodi-vfs-rar-9999.ebuild 654 BLAKE2B 15ae6eb5ef52ddd3a99cbbf7f5b1c945914cb4e843c469fd03a7a93498399cd6c0d3792a66c3de7554c7bf4fbafbdf0833940d6f13fb00814669a603c0321989 SHA512 adffd338796c88e1bc09da234c2330eebb41e6667b0aeba49c041dc23b037dc4ab32b931246a4575ced70546e9c99c4f9f9abd459e92ac94e320ca9d60aca75f
 MISC metadata.xml 417 BLAKE2B 848739e38b8064c10732cc179fd55c24c49fa32bd9067706443b0efec47f697a66d330a52733033271638d3b0ba7ef1661f372052bb6dc1a25f5e0dd745f83ed SHA512 70d2ec7f4f00ef2c208db31180e4520f26bd059cd12084e7764297542f75798d2bbe55a3558971fde8709b403968da29011f271bc6f3c4b4a63ae2589c0ae76f
diff --git a/media-plugins/kodi-vfs-rar/kodi-vfs-rar-9999.ebuild b/media-plugins/kodi-vfs-rar/kodi-vfs-rar-9999.ebuild
index f64d451adecd..0e1a57116e68 100644
--- a/media-plugins/kodi-vfs-rar/kodi-vfs-rar-9999.ebuild
+++ b/media-plugins/kodi-vfs-rar/kodi-vfs-rar-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
diff --git a/media-plugins/kodi-vfs-sacd/Manifest b/media-plugins/kodi-vfs-sacd/Manifest
index d36ed41c0f8d..127d14aef6b6 100644
--- a/media-plugins/kodi-vfs-sacd/Manifest
+++ b/media-plugins/kodi-vfs-sacd/Manifest
@@ -1,2 +1,2 @@
-EBUILD kodi-vfs-sacd-9999.ebuild 619 BLAKE2B 21533067c84024081864be400b104ad63667110e52bf04c2d41edc3af4b850b75520d7ea5df1d95e7d5c269a50e02bf848f148623c6d581aa6d53d7ee67ef5fb SHA512 b542ff2148ffc439b8eb35e9e070598789a96959f1b3ed3e2868b2ca31bd360b0da7ff3aefcaa2ead1e1a94d348a5d255006b52b080c635bd50f76b06a8ae31a
+EBUILD kodi-vfs-sacd-9999.ebuild 619 BLAKE2B 67a2ff8f85e17c25cee8dc8100ae8348944c6322fac2a60a5c379a467932237e5473a00d724977eb7f4ea7b760f5830f9cac9f737442c2e8b4a2680d2ed86a1b SHA512 54061667f3371b3324cc378e6cf9909c6d9cab5a6bd149be251ff284c3b5c6c7dfe7995e08760295490870cde536c3ffda8111a8b8fa6388e9e80e30395a69d0
 MISC metadata.xml 419 BLAKE2B 18019581cc35ab24aed35e146674d26ab57c18ad0d0468954f8dff16c2bff757d9a7acf718e5655fa96e02be9fd1a05d8f87f3c46b83fe09692b6f71677d89d4 SHA512 931961ed7c4a909bd1f15c7e02a3a37e7815b9ff293708aab813eaecca25ab38b8fc98872295b8dc6d46029d570dd238d68259f57504cba67601099f3f30dd55
diff --git a/media-plugins/kodi-vfs-sacd/kodi-vfs-sacd-9999.ebuild b/media-plugins/kodi-vfs-sacd/kodi-vfs-sacd-9999.ebuild
index 5c8b40fee8b3..a5726083a310 100644
--- a/media-plugins/kodi-vfs-sacd/kodi-vfs-sacd-9999.ebuild
+++ b/media-plugins/kodi-vfs-sacd/kodi-vfs-sacd-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
diff --git a/media-plugins/kodi-vfs-sftp/Manifest b/media-plugins/kodi-vfs-sftp/Manifest
index 45c5fa3744bd..378c1310a0e3 100644
--- a/media-plugins/kodi-vfs-sftp/Manifest
+++ b/media-plugins/kodi-vfs-sftp/Manifest
@@ -1,4 +1,4 @@
 DIST kodi-vfs-sftp-1.0.1.tar.gz 20059 BLAKE2B 3ff2178738dbb85de731d5268d80cad079f684234ff39ca1141337c384377ca75dd5ad51026471af4e8a1229c6739fa9212b6fd6253cad9be6d9b19a7dc7081a SHA512 e51aeae2bf6e611e679b38401add778fc5605ededb8b8b9d2f6732eda4b87fdee5ea352d2c491cf1ff671c0299395de1cc689404e2924266ffef84c4e7cc71c3
 EBUILD kodi-vfs-sftp-1.0.1.ebuild 678 BLAKE2B 629a085af07b523d098035fc5344b6956e8876f271a2b33e58b7d7bb5e4bfafbcd94d8932cc4ae4a11440189dd92c52bad52e2a956e609fa3559721fd120e2c9 SHA512 c6d4b2b2d7226736e98b155a5c8e1875aa9bff8fe3daf3a1749d795d4a0cb4e404ddb5640aaf772ad84da745bfefd312464d42fc50a72679a5b86aee60e0774b
-EBUILD kodi-vfs-sftp-9999.ebuild 682 BLAKE2B 1a7ba9b858a0d09d940f17bc8d0b2c2df25efcbeea1fa27c31af0395510f058105574d8391cd6701fd8c53eda8ef34e135137785cefd9f7fcfa9b7c185c4219d SHA512 0699f0e74fc860d1f2868e86d2606acd829a0d136e7c9cdf88facb66cac229976ab27d8aeb66a4b8d196c48052f7bb48b922da476c94fd837f22659d535d26d9
+EBUILD kodi-vfs-sftp-9999.ebuild 682 BLAKE2B 978d74aada2807908ffcc09b141d326ad936c338bf40ee08c3da4fb19d322be8946e532ab47637a5aefb91d5478ad812d9c30463fbe1ef6624edec750f2c0fbf SHA512 435a5760e15703d692698e6712d13cb9e76e8c4e97bd91932cac4a97a57df309fc8ea263dc315934d5efb238838134f0f6de8128b4a7b9474ff5cde72ca221b3
 MISC metadata.xml 419 BLAKE2B 7167e481bfec9e94de9e9bdb25f4a5d3d77596a73e3cabeafa265322f0da3043de844f2db94c8767e3b5657c37ba1e77643acac9970f509fe956399ccadb1e36 SHA512 31d530be90d385a7d6756296909e5dd5454a2efc2a83d83c47cff14fc2260c1bc772bc23b95fd6bcb91511c0be21d9297074367aa445642ae477623f8f545a21
diff --git a/media-plugins/kodi-vfs-sftp/kodi-vfs-sftp-9999.ebuild b/media-plugins/kodi-vfs-sftp/kodi-vfs-sftp-9999.ebuild
index 4bb7e369a978..aa38c3ff2d60 100644
--- a/media-plugins/kodi-vfs-sftp/kodi-vfs-sftp-9999.ebuild
+++ b/media-plugins/kodi-vfs-sftp/kodi-vfs-sftp-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
diff --git a/media-plugins/kodi-visualization-fishbmc/Manifest b/media-plugins/kodi-visualization-fishbmc/Manifest
index 994df2980ad0..00ff67533860 100644
--- a/media-plugins/kodi-visualization-fishbmc/Manifest
+++ b/media-plugins/kodi-visualization-fishbmc/Manifest
@@ -1,4 +1,2 @@
-DIST kodi-visualization-fishbmc-4.1.0.tar.gz 58536 BLAKE2B e0e573d6fdf3b461606e9335e64e531a92497201918bf22a26b5f2e0220bc8fdef199383e63f31f5acadd5d5091ead7edfae62ad3c20fa5174638e9d07f5fda5 SHA512 6107228b8a3f92a047003ef3a34dc57d187d9c6b1f28e2f8d326fd71e7e7b586750c02a3bb9b11cdda322cbdc5d3fe0146c08364029da028fd65d0f3a13a3358
-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
+EBUILD kodi-visualization-fishbmc-9999.ebuild 669 BLAKE2B 626748f31be9c21f258698142acfdbb74cb9651116266ab0bf5c01ddebc212e412ac1a43c316bf8f376ce39b5a85f8b71e634cdafc22c83f5434baff07d0ac2a SHA512 999424cdbeea6260165f4c001d47e8d8e7e33e7a974fdcab281d41db77dd8c1df8dadb0c07a61f9ac1e863b4c9f623a9d59e3228c7e1d73ab138fafb79f65b07
 MISC metadata.xml 439 BLAKE2B 538bd3c4a9323c884584cefda4f84d01e1ac2d677ac8c0f4b57a8b81dae2ac3cf6632769ffb50d46a5e162cb3571034fee417ece1878102dcaa8838e839495ac SHA512 0bdb34edf345e638dc3bd557a77adf3745d9332bd0858c40bc003511df26d87597932d2d2987e2245345c44b95d0d03696b61443c1eafaf95b0e151ddcc921d5
diff --git a/media-plugins/kodi-visualization-fishbmc/kodi-visualization-fishbmc-4.1.0-r1.ebuild b/media-plugins/kodi-visualization-fishbmc/kodi-visualization-fishbmc-4.1.0-r1.ebuild
deleted file mode 100644
index 1646b899e334..000000000000
--- a/media-plugins/kodi-visualization-fishbmc/kodi-visualization-fishbmc-4.1.0-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Fische visualizer for Kodi"
-HOMEPAGE="https://github.com/notspiff/visualization.fishbmc"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/notspiff/visualization.fishbmc.git"
-	inherit git-r3
-	;;
-*)
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/notspiff/visualization.fishbmc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/visualization.fishbmc-${PV}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-17*
-	virtual/opengl
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
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 e0bb237b4e91..27ce97f09bd2 100644
--- a/media-plugins/kodi-visualization-fishbmc/kodi-visualization-fishbmc-9999.ebuild
+++ b/media-plugins/kodi-visualization-fishbmc/kodi-visualization-fishbmc-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
diff --git a/media-plugins/kodi-visualization-goom/Manifest b/media-plugins/kodi-visualization-goom/Manifest
index 0ae68d735b07..1a0170d95cf5 100644
--- a/media-plugins/kodi-visualization-goom/Manifest
+++ b/media-plugins/kodi-visualization-goom/Manifest
@@ -1,4 +1,2 @@
-DIST kodi-visualization-goom-1.1.0.tar.gz 493839 BLAKE2B 97e99f0f8bc657b5f92464bd80c591de48c48839982005e5996ea949e6e6a4db24de0c31ed010becad29da8f4eb5d9b579006b2a4c28ee567f094460cc4aa063 SHA512 d0e7ab3931ad32f16f4b97f3746e2e5ec9ed08ba23184ac880ab4da1c0da16511c6a9e1ea595ccbbac3c7c8f385fa5dced1e554d0a1a8122db4f35223eb66ace
-EBUILD kodi-visualization-goom-1.1.0-r1.ebuild 654 BLAKE2B c3ad3c7d1e9c3f62d92177401ebb1911fcc12ef0c61cc2275565c7da2167ead0a7c7f155db60ff285a83be910f01c4e6f072202bba9d03b59a29a693d8237cf8 SHA512 73fb6db3760dc2325f26425be499bf004402cd84a9e5e75b2e9083851f889f4b09af19d1a826df950326561abf34d630d2165c34979e67940afa841740faefe7
-EBUILD kodi-visualization-goom-9999.ebuild 655 BLAKE2B b5dde5a0b1eb8c109fb24347f7aeff0e42aff6a5b0e7af262826c6afe5a8a72b9891912f4468b9528584ca708c1fe67f5f0aaa0dc549c09b1a2ba45bb29b502b SHA512 f87123ec302d660acea6508a5e826139b8d95e089e34359542b4b4de3a0dcd2cc8f0196453365bb7232d68bd5ac769bf5f451fec70e97af931bc7b10a59fffba
+EBUILD kodi-visualization-goom-9999.ebuild 655 BLAKE2B 9d8c43fe1484c1b9e9240baa487fe78658cc18b6be3b1503b213170eb2cbf98d6c9adc3a0af5315086c7a74416a6adceb0ccebf0fdb6363cf3e907704e1fe2ff SHA512 25ab09204e6054e1f79fe92eedd0be138ee46ad26741d276ec0cf364d853506089761eb0ae78b95ba20e1edbaac25058d095ece1d3aed8e0e45471cd789f8f03
 MISC metadata.xml 434 BLAKE2B 14ffadbe7c568eb11922b64df1f82c0404092fc971b8e8181955fc21989c70d3c2198a4beb7ab426cf6cf2356d2bd89d71e3ed7155ba35fb647303b231d45a26 SHA512 614347e4b283abd727a963d2b276fc6e0e1477ba1e5571957b123670be073a50e14e4c0460aba90b5f01380fd40f8f1e334b2b6a9409e038b3c9dd79ee2fc15c
diff --git a/media-plugins/kodi-visualization-goom/kodi-visualization-goom-1.1.0-r1.ebuild b/media-plugins/kodi-visualization-goom/kodi-visualization-goom-1.1.0-r1.ebuild
deleted file mode 100644
index 15d76968e81f..000000000000
--- a/media-plugins/kodi-visualization-goom/kodi-visualization-goom-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Goom visualizer for Kodi"
-HOMEPAGE="https://github.com/notspiff/visualization.goom"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/notspiff/visualization.goom.git"
-	inherit git-r3
-	;;
-*)
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/notspiff/visualization.goom/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/visualization.goom-${PV}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-17*
-	virtual/opengl
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-visualization-goom/kodi-visualization-goom-9999.ebuild b/media-plugins/kodi-visualization-goom/kodi-visualization-goom-9999.ebuild
index 9e658ae6affc..fd87d5665eb3 100644
--- a/media-plugins/kodi-visualization-goom/kodi-visualization-goom-9999.ebuild
+++ b/media-plugins/kodi-visualization-goom/kodi-visualization-goom-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
diff --git a/media-plugins/kodi-visualization-nastyfft/Manifest b/media-plugins/kodi-visualization-nastyfft/Manifest
index 2906e617ce0a..4152580c77a8 100644
--- a/media-plugins/kodi-visualization-nastyfft/Manifest
+++ b/media-plugins/kodi-visualization-nastyfft/Manifest
@@ -1,4 +1,2 @@
-DIST kodi-visualization-nastyfft-1.1.0.tar.gz 22375 BLAKE2B 3cd1c7362479e218259631dcf8af38f4f3bd32ef02e56fb5df8f9b3c9648096ac0e341eb9b9bd1567fc0e7ab2f690775289d2a39a7d59fd7f7923c56840a690b SHA512 fd32db6e39558102d6d9959b51029ceda250c5e3174689718ec78b095294cabda3d1459db753507245f96d7798273df23a197e82a9dea5a050147c6133a4b2e3
-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
+EBUILD kodi-visualization-nastyfft-9999.ebuild 675 BLAKE2B 9619e0bb01fe6d9f8b36521adcd7a81eee2b9dfaa98756e06e4c102fed430ffe69cc9b96f7e5e96d8c69438e411ab3f8b070aa1cd893532b2ea1072cbc167544 SHA512 cde967e3d227cea4a41d50251a105a60745cdb89f1f925ef1eb8dd5d76c93aa4faa4d22c7a3bd45b9c7223c2e8442a777963a0717a1eb47385a9a153ebf6c6d5
 MISC metadata.xml 442 BLAKE2B 9574b720a624b850e3aad20a4b3c03108b5b208d8a823d023408b415091ce2120eb135ce3a5369d7d554a17e89b2bb57fe7d20c3354b1612aeef4dcb1750ab20 SHA512 16f85f34283637601a3d32d268ff21a97ebe697e3830f082d39f4c1a401f123ce449c4943e1f8942aa9922404a7a4b86f36561e65db43a4788b9bdb8d700851b
diff --git a/media-plugins/kodi-visualization-nastyfft/kodi-visualization-nastyfft-1.1.0-r1.ebuild b/media-plugins/kodi-visualization-nastyfft/kodi-visualization-nastyfft-1.1.0-r1.ebuild
deleted file mode 100644
index 09baa294d4dd..000000000000
--- a/media-plugins/kodi-visualization-nastyfft/kodi-visualization-nastyfft-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="NastyFFT visualizer for Kodi"
-HOMEPAGE="https://github.com/notspiff/visualization.nastyfft"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/notspiff/visualization.nastyfft.git"
-	inherit git-r3
-	;;
-*)
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/notspiff/visualization.nastyfft/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/visualization.nastyfft-${PV}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-17*
-	virtual/opengl
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
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 0aaa3f8336c6..23fd5802f066 100644
--- a/media-plugins/kodi-visualization-nastyfft/kodi-visualization-nastyfft-9999.ebuild
+++ b/media-plugins/kodi-visualization-nastyfft/kodi-visualization-nastyfft-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
diff --git a/media-plugins/kodi-visualization-projectm/Manifest b/media-plugins/kodi-visualization-projectm/Manifest
index d9d29fed18b4..95a8fb92e70b 100644
--- a/media-plugins/kodi-visualization-projectm/Manifest
+++ b/media-plugins/kodi-visualization-projectm/Manifest
@@ -1,10 +1,6 @@
-DIST kodi-visualization-projectm-1.2.0.tar.gz 450058 BLAKE2B cd612cf2680bd5d1ef13bba41e9bcd20245ed40b0fbf4396259ad850232a4fed739f99738b118e6603512b155e73d487e94ff4f0077bdb22d8604a151d221b7d SHA512 9ad106cb97ac9c626908988a5c9cf7a9b18b23585f7c905cb8298a93afaf1e735eb3b582152e30e4e5bdd83625608228a9abaf233c8bbb765b7031c4a2d5a44e
-DIST kodi-visualization-projectm-1.2.1.tar.gz 450055 BLAKE2B 36be46629f927f4e9555f4e76521c2d55a2603f438b0dc5b9f4e83ea95a5b6b27ad20c02f211fa38298f08cd789bd5c4edd14215066575dd5e41d5cab603c2c6 SHA512 37091b7656c791434c80572d57424bfc7161c0f2b752adffc2c4d837c93d733e104f7b68893544f3efc32c67e607882063c34ecae240754b1c71856d83ba4c2e
 DIST kodi-visualization-projectm-2.1.0.tar.gz 2479742 BLAKE2B e0fc2953ef1d242aa89d3e0afe7804b22460c70a2f98758bd252fa6aa1978001b60cc167878e725f09e2e38e0ebf2c013b3edad88ca015e54148da73a0fceb51 SHA512 74924f524d8e4d5c108cf23ae52d034404db9d1d5f63866cda920f552de93f524c6bd7eaff894295c2dae779be11dc17808540f22ad5f2536ec90166d2a95cec
 DIST kodi-visualization-projectm-2.2.0.tar.gz 2478953 BLAKE2B 89e4d75de74b920dcb4829303c20cbafa5bcf843279c98817c35aca547408b961e6df9d1fd8f0bbdd3113ab2f5836c6b5f353e6f363f896b79341742d4850bf2 SHA512 6b16f6d186d7ab3bcc84ef60a1227f61a6244c2328ba685d606a29dd6b8e08270e58de26498af274970c3e2ad0a41597cd091a30209ad05c88bb8313995ae3a7
-EBUILD kodi-visualization-projectm-1.2.0.ebuild 732 BLAKE2B 8fe53b114aa9adc38334c521e1592b50fff5473ed2b48a79cd9b06873fc59b5b4fd9322b35622d94c2ca057f1db0f4e2be62c8043fc9bdedbb822ab5d76dd253 SHA512 66ed3a37a1b0caeee1704afa91f075af8a7dc6536c56da12e38c9e4e3ca510848f9a235a97d4e10e7dc46a2838a6a578863fdf87cab1ae3bd2ac78bc56578b5c
-EBUILD kodi-visualization-projectm-1.2.1.ebuild 732 BLAKE2B 8fe53b114aa9adc38334c521e1592b50fff5473ed2b48a79cd9b06873fc59b5b4fd9322b35622d94c2ca057f1db0f4e2be62c8043fc9bdedbb822ab5d76dd253 SHA512 66ed3a37a1b0caeee1704afa91f075af8a7dc6536c56da12e38c9e4e3ca510848f9a235a97d4e10e7dc46a2838a6a578863fdf87cab1ae3bd2ac78bc56578b5c
 EBUILD kodi-visualization-projectm-2.1.0.ebuild 814 BLAKE2B fd77790e57dab6507fdcc83c2029a7e56e548349c5616927ea874eaf595aeeed965ca748828e23fc3a464a56ed46f500c0056c30316332f4623d3c8a0f1c6d78 SHA512 f10a72588fa5c93ededd7361a0648d83464eea10dcdcb4582360eac559716b510a2905b11626046bdbad38dd47975e4eb9c535ce80238b79526a7974925a913c
 EBUILD kodi-visualization-projectm-2.2.0.ebuild 814 BLAKE2B 76517973886c0518175ce20cd8e9f58ea338a0b9f4533e78313f0ac2dc3f1439ad93f0d342f8948ef27e69f80e328fc82dfb93156ba6b7ed69ec910503ff75af SHA512 61c90555f83f7d7440731c0de1d61a72b970a5c675a19f913d292bb8faded746231416cce63da822ee65f6ce1eeaae441b6819de13a6eb009cd841cf4e380720
-EBUILD kodi-visualization-projectm-9999.ebuild 816 BLAKE2B 44b79eb51e5c066cd454163d76f49b09c214c89b744d71e5401a6598414ecd6b21b04bd149953e8a9c707cac397975aac8cb86e04530b3e9b673226cc46196cf SHA512 1e69d9bfac921de937b912441681af7d31ef977702e340970859d274fd66a2cf3631023f8812d739983a65852f244c636adda7fa9c9e170085a2cc9109b5c40f
+EBUILD kodi-visualization-projectm-9999.ebuild 832 BLAKE2B 48782e3a0a435464c47ad97ce0c7d55496ab3daa73452567ea2bff6b2f498167d43c7270cc204b69a9b733347044a5561d5b2dc34d3a37f5355b73f9648341d2 SHA512 44f0ba8257913e56650acb707a4e6a6b6a2546368ce8848cc491c07e90557ffb08f4908435b25ddf8f96bddeb32b83ef55481f2e25905efecf40691278b72f81
 MISC metadata.xml 438 BLAKE2B 7869da7be1eac18bc4e35672134270f92ae7dc4178edc4b62399dac713fe14eb83fecbb14d8712677d802742eed9d34df1f0eda581117dc0649a929a903ba823 SHA512 2e7259aa9e981c4a6a72e3f055e1475bb140e07785976fa586d8ebef2fe6013fb373cacee9500320cdf0a4cae56486555612ed2d9109415cf9016359b9cdba0a
diff --git a/media-plugins/kodi-visualization-projectm/kodi-visualization-projectm-1.2.0.ebuild b/media-plugins/kodi-visualization-projectm/kodi-visualization-projectm-1.2.0.ebuild
deleted file mode 100644
index cc8110b82d20..000000000000
--- a/media-plugins/kodi-visualization-projectm/kodi-visualization-projectm-1.2.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="ProjectM visualizer for Kodi"
-HOMEPAGE="https://github.com/notspiff/visualization.projectm"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/notspiff/visualization.projectm.git"
-	inherit git-r3
-	;;
-*)
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/notspiff/visualization.projectm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/visualization.projectm-${PV}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-17*
-	=media-libs/kodi-platform-17*
-	media-libs/libprojectm
-	virtual/opengl
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-visualization-projectm/kodi-visualization-projectm-1.2.1.ebuild b/media-plugins/kodi-visualization-projectm/kodi-visualization-projectm-1.2.1.ebuild
deleted file mode 100644
index cc8110b82d20..000000000000
--- a/media-plugins/kodi-visualization-projectm/kodi-visualization-projectm-1.2.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="ProjectM visualizer for Kodi"
-HOMEPAGE="https://github.com/notspiff/visualization.projectm"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/notspiff/visualization.projectm.git"
-	inherit git-r3
-	;;
-*)
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/notspiff/visualization.projectm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/visualization.projectm-${PV}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-17*
-	=media-libs/kodi-platform-17*
-	media-libs/libprojectm
-	virtual/opengl
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-visualization-projectm/kodi-visualization-projectm-9999.ebuild b/media-plugins/kodi-visualization-projectm/kodi-visualization-projectm-9999.ebuild
index f19d564570c0..663819949187 100644
--- a/media-plugins/kodi-visualization-projectm/kodi-visualization-projectm-9999.ebuild
+++ b/media-plugins/kodi-visualization-projectm/kodi-visualization-projectm-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
@@ -40,5 +40,5 @@ RDEPEND="
 src_prepare() {
 	# Delete bundled libprojectM
 	rm src/libprojectM -rf || die
-	default
+	cmake-utils_src_prepare
 }
diff --git a/media-plugins/kodi-visualization-shadertoy/Manifest b/media-plugins/kodi-visualization-shadertoy/Manifest
index e5884c51b6af..52c497ddd2ff 100644
--- a/media-plugins/kodi-visualization-shadertoy/Manifest
+++ b/media-plugins/kodi-visualization-shadertoy/Manifest
@@ -6,5 +6,5 @@ EBUILD kodi-visualization-shadertoy-1.1.10.ebuild 733 BLAKE2B b70e59671f5d3a92be
 EBUILD kodi-visualization-shadertoy-1.1.5.ebuild 703 BLAKE2B 8db9e065d98d01ea38a745e032590053081479d13fe8f2031403ec2576326ecf6fe11dc182b157a8b87939ad2cf754a9d97132081f7e3ba3a61d663b02f05e78 SHA512 e6616a30af82973f51dbdaa0ef2897a8983a572d3a7456a2eb1da6f6f126a88579aa9bfe703c07e100515f5635b6ae1fc7de09fbd25057e128cd8a75280d7cce
 EBUILD kodi-visualization-shadertoy-1.1.8.ebuild 733 BLAKE2B c29892cccfc9bbbfb6169ec53187408ae0885a7ffa1236e784885098ff931987ef3aec40855831b69e657507bcdcc4b374b6af415482b33034318e2b6ba9cfca SHA512 4b1ea57c7a6fe31fbbb3e7da47d2469e3c8e9d521119d8eee4384d49fdd57dc242ce180a012a1d4ebdcac551c1bb6015b9fc41a6a71eebe07c712cc1ad5cfa9d
 EBUILD kodi-visualization-shadertoy-1.1.9.ebuild 733 BLAKE2B b70e59671f5d3a92bed86531b1053a4a2e19b9f02d6bf7bc90ae2d7d3686f03f04f03eed97e07c451fff12343ecb753a2146582055d3449567c8e36eee0eab3b SHA512 8050a8c641107b37b4940e3d09a783d2f2b8f911d3a9e6c5613bc22b992ed4173e385c3513cdcfe5ab24cb4a86d4ce86b02a7229f606b643b325b5bef61c51aa
-EBUILD kodi-visualization-shadertoy-9999.ebuild 734 BLAKE2B ee341b0ff6825f7f034d0c62eeaf4c8abf2305f269b5fabb19bc0882b8df8e6a99161b438923237177025c5c0c27c9b8209ac685ce7aea22af296825202cc366 SHA512 eacd80122b385da5b1744415128dc1b83e06886565a5f902464f381142bbdb8424465e70f1dcaa7a2979a322c22df2a298c154b57a0e1180887f6f12d1aa8a49
+EBUILD kodi-visualization-shadertoy-9999.ebuild 734 BLAKE2B df26130578666e09bf24a7cc76261569c3e79616a4d95bf54153bb8110ec3fad194b54cd264f1de0669273d0852253b11df64880ea7aea502e91817c6907eb2c SHA512 4eb6df4e12712a14d2e2866f4b7fc921f8de94b7416e88b2b015835e26d353219e486bdc8ecb3f9a4f347ce4b36b5fec4b1035055d46edeadc053191186f5807
 MISC metadata.xml 440 BLAKE2B 8ca7ad0546c9c0590eff12d403b863109b99964ac6d5a9f73d05253ed65719f53ff8a043f1ef1a2f3ce4fb7a06d0e2ad3a5586c49308f22ab7e9690979d88050 SHA512 76e524e7318f8137a70002b265388a1cd107c8e970688ad5616b8895d38108760a06fa3a4e00abe46463ce7d346ef19756237eadb677c4ace52b44bff8a81f17
diff --git a/media-plugins/kodi-visualization-shadertoy/kodi-visualization-shadertoy-9999.ebuild b/media-plugins/kodi-visualization-shadertoy/kodi-visualization-shadertoy-9999.ebuild
index a3666ad91cb2..6ba8e7afe389 100644
--- a/media-plugins/kodi-visualization-shadertoy/kodi-visualization-shadertoy-9999.ebuild
+++ b/media-plugins/kodi-visualization-shadertoy/kodi-visualization-shadertoy-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
diff --git a/media-plugins/kodi-visualization-spectrum/Manifest b/media-plugins/kodi-visualization-spectrum/Manifest
index 15c05d3f2fe9..6d183b825af5 100644
--- a/media-plugins/kodi-visualization-spectrum/Manifest
+++ b/media-plugins/kodi-visualization-spectrum/Manifest
@@ -4,5 +4,5 @@ DIST kodi-visualization-spectrum-2.0.4.tar.gz 3087543 BLAKE2B c8a40d8c4c71b308ef
 EBUILD kodi-visualization-spectrum-1.1.1.ebuild 672 BLAKE2B 81047ebd915b86eb518afa2459cc2f1203e94e4df524bae8adf1033698e14cc893db3b4d2bb3fa4aebec20268b128844ce475595a12b98c73a897fbfdeaacd8b SHA512 adc631d17f89638df6548fe27cbef9acbe1e1753bed353bc1cbcdbe2a376688260bfa9bdc80c9fab1e991304a2fc9e2ee54bb70f4c36fff122ec605822f83562
 EBUILD kodi-visualization-spectrum-2.0.3.ebuild 662 BLAKE2B 87d284e6e59f235cda37e1b339dc8d1332f32d4e597ef4c9a540bf27e2b65110c6224660fe5e3908d3c9852932544ddcf661fe4c23d668ad6fd28a1eead91a1e SHA512 6b4eed836e15512d719153450f5b4fd73c31b2cedcba9e4d1377ee122abb7d5d273d289dc4565c28eb341610b6d49910e4ab20ac667f359cf8bd818ae3810211
 EBUILD kodi-visualization-spectrum-2.0.4.ebuild 703 BLAKE2B e187602ba9703a33d69a076489a5b7bb00d98615b0c08d63229242593e0dff58e443b8676dda3658cfeb6af8b18a86c6d0bb304b88b7b1b6f554daf9e4754a28 SHA512 99e3037b0591dcf123f2f43ea543f4f996ffafc24ba210f6c781dc81bb56055bc155b16fec94f4a644f34d63c069d9a77c2966063b21cd7a963dbe59c929f386
-EBUILD kodi-visualization-spectrum-9999.ebuild 704 BLAKE2B c7333638eb750c0ffea1adaf9689a6eacb912ab8964547657fd5fd4c61ce2882b5d483981814dfa2d349f663c967612fa9f870ab98025730ddada91c784a6986 SHA512 03885aebce6cde0afd0ef447f0683cadbba12993c5b6c36acf4b87cee2adbc4a4b6a6387188e4b604f37e2b6d98a36be578764b6e35fd736ef575cf011c4fa30
+EBUILD kodi-visualization-spectrum-9999.ebuild 704 BLAKE2B c6bd0cd3252850041fb6d5b420d4aea70077158c45d6df2dce91a58a24c7c6a7ee594aa2b75ada41a35799e743e6c7e0b7aa59fa86d99a20db28a34afd49fdbb SHA512 7f3760863995d09ab82d4f1bd060b00ba7646a47ae8096b0cf24bcd48dae89307d6eb875fbcd5450c19e6c3424b11822feaeb4362873652b840c2021eec6cefb
 MISC metadata.xml 438 BLAKE2B 8662b3f30cdc08223e10e8fc8515a3afb59e199f33e645f1dd011465f2d0b02201f2b64e5aa0c269cde77f20e3ca091d4e72afd817985198da5e3bd8c0f054da SHA512 8d683f5aa11f95edbf8a91e43c85c1882e19400dc55a79116ce9527f9f89ea552da28ccf65ea9aec8a5b166d18638c01def152dcee57fb054575cc636c0f0a0a
diff --git a/media-plugins/kodi-visualization-spectrum/kodi-visualization-spectrum-9999.ebuild b/media-plugins/kodi-visualization-spectrum/kodi-visualization-spectrum-9999.ebuild
index 3ec3bd96f69e..71fdf47e5d4f 100644
--- a/media-plugins/kodi-visualization-spectrum/kodi-visualization-spectrum-9999.ebuild
+++ b/media-plugins/kodi-visualization-spectrum/kodi-visualization-spectrum-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
diff --git a/media-plugins/kodi-visualization-starburst/Manifest b/media-plugins/kodi-visualization-starburst/Manifest
index 36ecea229d92..a6c7375adc08 100644
--- a/media-plugins/kodi-visualization-starburst/Manifest
+++ b/media-plugins/kodi-visualization-starburst/Manifest
@@ -1,2 +1,2 @@
-EBUILD kodi-visualization-starburst-9999.ebuild 677 BLAKE2B 478c522772ff1aa0022ec7e34bc2f3c4457b3884b3d33192af903308b6face918368c1dd8dbc7d18298fbf4173178510e510826655165e0108b40781b3977aba SHA512 21e0801e0b4f3777ac83470333c394227f71cc769fb6c1e8a66260270b8c6742a692eec226a451a87a2feda390334efe504c40949e8fe3940aefc06e1a44318e
+EBUILD kodi-visualization-starburst-9999.ebuild 674 BLAKE2B 6ee26bc4da5867293ec27d0b0f6121ca22674caab969179234d6d6bb5c3f59fc5748065854ed551690dd99b6b211c32b8124a17341ea436a614175930877f138 SHA512 5b2c302238a826ac81504d0702a30a7249927ecd3d1f9bfa7b5928d6a6d96d96605016b8107824e259fc65f1b64ebfb085e8c6e7281a9caec3b08daab6071216
 MISC metadata.xml 444 BLAKE2B 5f3221e98532824daa5b94268b4b1891206428444a4d0a82f6d388d05ed28d264171b34b0d13d58099dd0075879f9d0e85f52c80a1311adf75c879358722898a SHA512 c263072074bffb4a1665ebc90aba169c61f836e51d7778c3192b7ba6a370d4eb17691aaa1e3efbc869a4f64e367aea8795e93439e9d82515be443c1f66a77464
diff --git a/media-plugins/kodi-visualization-starburst/kodi-visualization-starburst-9999.ebuild b/media-plugins/kodi-visualization-starburst/kodi-visualization-starburst-9999.ebuild
index 4b1bf1f00f4d..044417ae7cd6 100644
--- a/media-plugins/kodi-visualization-starburst/kodi-visualization-starburst-9999.ebuild
+++ b/media-plugins/kodi-visualization-starburst/kodi-visualization-starburst-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
diff --git a/media-plugins/kodi-visualization-waveform/Manifest b/media-plugins/kodi-visualization-waveform/Manifest
index 4d6ae6be9a86..9def41a4f38f 100644
--- a/media-plugins/kodi-visualization-waveform/Manifest
+++ b/media-plugins/kodi-visualization-waveform/Manifest
@@ -1,6 +1,4 @@
-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-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
+EBUILD kodi-visualization-waveform-9999.ebuild 703 BLAKE2B 027bc9bbd5ca08c3faadece3198ffa66336f4823b8b3e85cb9131b731a99d93ddea72a74f93734fece2c39635333795084cdf6066fb7f0bff573347ac2780ac4 SHA512 6c526e04290b2ba17e508f20813f52f1bbc2349942ab62395cd9681d077aa56ec8f6a3bf26159d8150b5327baec34542c1fafb2f7026bedc5d1c07f7bc5f86c3
 MISC metadata.xml 438 BLAKE2B 223c9bc0d06814774f32141ee66b19a512091bbcd1658eacb1a1ecdeaeb2c450ddaaa301f2e6914abaa98d34dfbb456c5bf5a94ac9fadfbf84e75421d6233b45 SHA512 7bb4e6ec9690bfe2742cfe205f1e88db4f51f67bc05ee918ca9e181fb707fae8e75887bea9128a3b2d1e8c6cdf5613599b912816bd9b5093877d311bfec8f851
diff --git a/media-plugins/kodi-visualization-waveform/kodi-visualization-waveform-1.1.0-r1.ebuild b/media-plugins/kodi-visualization-waveform/kodi-visualization-waveform-1.1.0-r1.ebuild
deleted file mode 100644
index c3e77106f082..000000000000
--- a/media-plugins/kodi-visualization-waveform/kodi-visualization-waveform-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Waveform visualizer for Kodi"
-HOMEPAGE="https://github.com/notspiff/visualization.waveform"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/notspiff/visualization.waveform.git"
-	inherit git-r3
-	;;
-*)
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/notspiff/visualization.waveform/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/visualization.waveform-${PV}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-17*
-	virtual/opengl
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-visualization-waveform/kodi-visualization-waveform-9999.ebuild b/media-plugins/kodi-visualization-waveform/kodi-visualization-waveform-9999.ebuild
index 745379d28395..7b72c55cc1fc 100644
--- a/media-plugins/kodi-visualization-waveform/kodi-visualization-waveform-9999.ebuild
+++ b/media-plugins/kodi-visualization-waveform/kodi-visualization-waveform-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
diff --git a/media-plugins/mda-lv2/Manifest b/media-plugins/mda-lv2/Manifest
index a06e09da0d3e..f0f3a0ce713b 100644
--- a/media-plugins/mda-lv2/Manifest
+++ b/media-plugins/mda-lv2/Manifest
@@ -1,5 +1,5 @@
 DIST mda-lv2-1.0.0.tar.bz2 2154530 BLAKE2B 4053f7e8c861487ce32fb5e4b94e643084f9a6aa91423011c52c0b8938308abff12a3804b194d7ac2a30a1e5d13e1b69add1b5c18927b4dff687a79b250d42e2 SHA512 3ee521d916eeaec14c64d3cc84d036e3c2152441cb1c266d8971e823a7e498039a210e49af5f1a9a773ac85cb49c620acf64e46a0625c6969f559b4c99786575
 DIST mda-lv2-1.2.2.tar.bz2 2160906 BLAKE2B 2b0660395b3508247558305a1ec80c27c8e23ae4db3fb6eb30a06df54bca822256f712961dbaf9e318966be8f4c90824ea4246499fa2343a59376ef80f862eb5 SHA512 da9960462a896f8412cc1918e3a7c0bf9d33d5431a1264035705ca21295d52de1e6b5360369b9da519376a78f72b0c750d133d89b04240f3e35a210e4551854a
 EBUILD mda-lv2-1.0.0.ebuild 517 BLAKE2B 81cb2ee49daa43b22a5c3e8f38eeffac71b4b633ae20a860f0a146028ba5368850a5323bd4ae549f717c6484ac9407c6cf1e9a62e1065434086a75b1e1a0f3d8 SHA512 345b3c159873e56e2a919082dbff9fdf78295eb05e4b197fabcf68fe0cf2c3ff0c8b9d0d3ff3dd734eb66fc3a7b26e45684ccc75f94219eaa286aa1e731b3ace
-EBUILD mda-lv2-1.2.2.ebuild 528 BLAKE2B 0dc5dc15604f9ef81e89c3f97afdedbb01ef8f2b606ada540bdf9efff6e6ed7a52cc3d9235ec2dafa74fd39e5007596d05746b9f6e4e0c6da70a857ed5c95480 SHA512 a1822ad07c8348bf4c1f1658df908616915052969e14b87eddd44ed4ea0249a77cc87ce3bedced824cf078769e7c345cdc3069bbe494633af6bc25b32334109a
+EBUILD mda-lv2-1.2.2.ebuild 527 BLAKE2B bfd459b9758fb088dab6fa345d13eb19b04e8509dff503a9ddf1fcb2d68fd3171dab9f69a2fd802309b2b3b51d547cad0448689df475a4ebb546c22262a62078 SHA512 08e0869b5355ba2bc3f863db53f12d74e4cebde7a1cddcc331577bd5894cc81aa7ed9e4c8cbc79c663be21da947fbd2c7ba5410a2212a350e539a9a7905d5c47
 MISC metadata.xml 1639 BLAKE2B a4ef48117da13a3372fc3edd7a2f5c5a720e710f192193647842d5f1435d1a6976e6d229845c22e372f30313d6fb47cb1915855c529241e1b7a9bcfbc448d600 SHA512 aab04b98a5b005f186f2f81444f24899a2204a79971deb638b7fb8f4907a622c538fc01d5a606d4471a7650539993ee2b668324834f11dde9479d140d7edee19
diff --git a/media-plugins/mda-lv2/mda-lv2-1.2.2.ebuild b/media-plugins/mda-lv2/mda-lv2-1.2.2.ebuild
index e144613bd492..2b587a9d9efb 100644
--- a/media-plugins/mda-lv2/mda-lv2-1.2.2.ebuild
+++ b/media-plugins/mda-lv2/mda-lv2-1.2.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="media-libs/lv2"
diff --git a/media-plugins/vdr-dvbhddevice/Manifest b/media-plugins/vdr-dvbhddevice/Manifest
index dd1546cc5afe..acfefa3df494 100644
--- a/media-plugins/vdr-dvbhddevice/Manifest
+++ b/media-plugins/vdr-dvbhddevice/Manifest
@@ -1,6 +1,9 @@
+AUX define_AUDIO_GET_PTS.patch 360 BLAKE2B 59b15a5667e71df36ffca863dbcc5952ee9cc813c715fa4affd93de1a1988a5ce0e7d323739013e47567f96576c05292ba82ed2a44a4328139320467dbe201ad SHA512 16b020c92b33c481ea7b41205f048870df2bd3ae38cd5ba388a505e43d9893c20de7baa5aa298de42d83276d01630eb6a1ac949b18aee5226869b2b57264b5cc
 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
+DIST vdr-dvbhddevice-2.2.0_p20180420.tar.gz 42772 BLAKE2B c70842be34181b15aab69f5a62ba98f4cc72ad5148db684a45ae5c6b74431517b70cda72dbfb6abc371675fd2742f86000b02c645bfba5b6a6b64817f5c59b35 SHA512 bc6ede24897a7704ecefcfdca92eeaf1bf9f8ed2410a478a21cc712730bfe94616c01379a172214f664481fba636ee3aea33540a6cf258597015dfb73720c408
 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
+EBUILD vdr-dvbhddevice-2.2.0_p20180420.ebuild 864 BLAKE2B caee5aed7525c2ca82f14567c3171fe3c1e4fbe75c1354a5188c334ef24e19204689efa788d001627e39842a8d0245843112ecaea5e306490b20fc4cfae71659 SHA512 e77fbd39d863137ca39d36e0a859c002e2a10cf8a0a06d45432c481aba7a1af19b2c599180f81c962204084e4e506206261621031effc271974eef2e79808e0c
+MISC metadata.xml 565 BLAKE2B a629f35ce42591e8d978f8a6d5876f709fecbbef016776b2f7dbbac1c35dd4b22507398532db75be26b84cf4d0bc611bdcfe7e8219c11918be6bfb2e5580e96c SHA512 1d507d140eab426dc90ef53fe5f842f97128052a6c6ec27eb09fc5ccf23378e76567a59ee7830d8f195b0557308e67286144855ec22e28f8a113c700d8e53d59
diff --git a/media-plugins/vdr-dvbhddevice/files/define_AUDIO_GET_PTS.patch b/media-plugins/vdr-dvbhddevice/files/define_AUDIO_GET_PTS.patch
new file mode 100644
index 000000000000..4107608797f5
--- /dev/null
+++ b/media-plugins/vdr-dvbhddevice/files/define_AUDIO_GET_PTS.patch
@@ -0,0 +1,11 @@
+--- a/dvbhdffdevice.h	2018-10-10 09:03:47.464147905 +0200
++++ b/dvbhdffdevice.h	2018-10-10 09:04:59.353350738 +0200
+@@ -4,6 +4,9 @@
+  * See the README file for copyright information and how to reach the author.
+  */
+ 
++#ifndef AUDIO_GET_PTS
++#define AUDIO_GET_PTS              _IOR('o', 19, __u64)
++#endif
+ #ifndef __DVBHDFFDEVICE_H
+ #define __DVBHDFFDEVICE_H
diff --git a/media-plugins/vdr-dvbhddevice/metadata.xml b/media-plugins/vdr-dvbhddevice/metadata.xml
index 2223ff4c5ead..25143612c470 100644
--- a/media-plugins/vdr-dvbhddevice/metadata.xml
+++ b/media-plugins/vdr-dvbhddevice/metadata.xml
@@ -1,11 +1,19 @@
 <?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>
-  <upstream>
-    <remote-id type="bitbucket">powARman/dvbhddevice</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>martin.dummer@gmx.net</email>
+		<name>Martin Dummer</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>vdr@gentoo.org</email>
+		<name>Gentoo VDR Project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="bitbucket">powARman/dvbhddevice</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-plugins/vdr-dvbhddevice/vdr-dvbhddevice-2.2.0_p20180420.ebuild b/media-plugins/vdr-dvbhddevice/vdr-dvbhddevice-2.2.0_p20180420.ebuild
new file mode 100644
index 000000000000..9f21531f038a
--- /dev/null
+++ b/media-plugins/vdr-dvbhddevice/vdr-dvbhddevice-2.2.0_p20180420.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit vdr-plugin-2
+
+HG_REVISION="2ea854ae8c7a"
+HG_REVISION_DATE="20180420"
+
+DESCRIPTION="VDR Plugin: output device for the 'Full Featured' TechnoTrend
+S2-6400 DVB Card"
+HOMEPAGE="https://bitbucket.org/powARman/dvbhddevice"
+SRC_URI="https://bitbucket.org/powARman/dvbhddevice/get/${HG_REVISION}.tar.gz ->
+		${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=media-video/vdr-2.0.0"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/powARman-${VDRPLUGIN}-${HG_REVISION}"
+
+src_prepare() {
+	vdr-plugin-2_src_prepare
+
+	eapply "${FILESDIR}/define_AUDIO_GET_PTS.patch"
+	fix_vdr_libsi_include dvbhdffdevice.c
+}
+
+src_install() {
+	vdr-plugin-2_src_install
+
+	doheader dvbhdffdevice.h hdffcmd.h
+	insinto /usr/include/libhdffcmd
+	doins libhdffcmd/*.h
+}