gentoo resync : 05.04.2019

22 files changed, 280 insertions, 237 deletions

diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index 324634c5529f..a684a06d0161 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 664133ad2f61..194fe18e0469 100644
--- a/media-plugins/alsa-plugins/Manifest
+++ b/media-plugins/alsa-plugins/Manifest
@@ -11,5 +11,5 @@ DIST alsa-plugins-1.1.8.tar.bz2 375346 BLAKE2B 65c161ee375e7aed85dbe918a39bc2aa4
 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.7-r1.ebuild 2875 BLAKE2B 69390fa6e62ddfb8a415ab06e3ec2fa37851fa0b7a6e02ed3e9ee96291e8d82a09902c8e78068f36ebea1521af07429e603ec0c6e62acd97f9538f97bf148153 SHA512 bd2e1ca77192e0f551a41bbc0cff271284e8be137833a3056b47692dabbbc50ce317217eb6bd66b68cd33df675d86edec8480ccb72cc05e0545decf415037335
-EBUILD alsa-plugins-1.1.8.ebuild 2820 BLAKE2B 3c92ee1ea5de3c66cb58cd94a3b65bbcf1889503b0cb4e040f4d0022c2d173a8d0e138ad8d274110ba73feb4381c3dd5d3ab1baca0cd27822491866266c9ec9d SHA512 ad4be26e27881675e4381b7d5b0f34c54704a96c3b5e00e6e7d31d8004199d34210d4f74b3e5b1d2c577022edc09a7cf9060bad0597ea95790b69aa7e1e416ca
+EBUILD alsa-plugins-1.1.8.ebuild 2818 BLAKE2B b4e2358fcaa86f0f55533f6e56a2f1a948c9262aebea25964f6998374abd4af7ef34903b35e9656117963dd7ff1ffd891fc3d0f8d13f8de8db8b8032438cc905 SHA512 98b42455cb27ed34723162d481b9d762fbc40d3b9f474d9452213db4a7ab252f394ab286d2281ad018e06368d20326d758acd48138f869cb93f6af42d7f2ad9c
 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 0e6f55c85fa1..58c2bfd65ce2 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/calf/Manifest b/media-plugins/calf/Manifest
index b93231cbfcd0..110eac83fa65 100644
--- a/media-plugins/calf/Manifest
+++ b/media-plugins/calf/Manifest
@@ -1,9 +1,7 @@
 AUX calf-0.90.1-desktop.patch 1207 BLAKE2B f4af4c5a7a366bb204d0317fb7b6cf47b1cc31859392d360cd4acb46e89e98044bef6bd61d017dcb11ea8c6b264b908ffc0039ddc32c01c4a2ab12f7dc70a981 SHA512 e48183918f1ea2f12d59236a2b62ae68a6e66946e67d7ea8a84b8b1232b93556af222a8536a5fa0347e13af46566582a796b8f357799d53fc4ee987a1ed147ba
 AUX calf-0.90.1-htmldir.patch 3997 BLAKE2B 657248c76dfb82f39e8f6589c485e2993122b4d26c7b4c223191e3e97c8b36e723efcbbfbf324dc0bc72eee2da4a1cb23e1095ce9b638bf2485e3dade00b65be SHA512 ecace91bfdb2599ac98d7bc5e6b441c6bcedaab20c928177c74f5bb8810416ab6035f6b0efa6962bfd2d85969c902eaf2a640bc77efd97501f0b08e878b14c48
 AUX calf-0.90.1-no-automagic.patch 1268 BLAKE2B 1a6a7038a9beb9bdbe370c37c1283dfbbec21e378e063fb87aeb49b993a75b6ff16f9b7f0f94e8bb5e0ccdb524f786ae3679b9dc497e73ec3fd4f84d196f6e98 SHA512 ed96d843b6733bbe89c3fda2d21e1cb6b7e812471df73bf2ccbc96af8153cd7fd20d52047ab53693382894ac77c7ab70017d923e4f148c3079766536ae5dab6f
-DIST calf-0.90.0.tar.gz 15876661 BLAKE2B 48f9ba5386b1253771947e16a3d88912f83f75873e50340ac8f68c7c9a79595ef4a549c3a7616a16949b3bbbca7a6892b6ed9276a891c7b47ae0a4f0541776ae SHA512 65dc1f7e6d83ca52ace25578d310b1806166a78a022d6509412ded44d3ac138a7e7909ebc91b93a3761a5ed3dff956809d6552bc70db6f25522132aa71f0b951
 DIST calf-0.90.1.tar.gz 15872959 BLAKE2B 5d2d9e77ea600690814e503a0af0fcbc413b7a21496271add0ea3b1e83f3dc2d56b0df249447a861884422ac5b159befe2632c232fed4721cc7e0e7ac45f12b1 SHA512 48e5489fd3e1dd43ff520b3653597dea6903c60adcdd0462ac2ce4db6f35e2355a0386f8a29066b301dd9c3190f8f836a61d12f37cfc3a4fea3170947cec03ff
-EBUILD calf-0.90.0.ebuild 1240 BLAKE2B d25d5384de1227348e8df740323e0ea462b7ea6af9fc4810b82f3ddad1f4244f1d60719290155aa97e694d903cfcdd112766cd0d340161f74578580fa40b0004 SHA512 bfc4c1580ed472d483e42804f2404f02d56f6cc9159c36e10b69570670d1bcb3a525dd348fb4e4aa08f9d6dba1a50ab93d6668fe2c7159ff481b6cbced81cf68
-EBUILD calf-0.90.1.ebuild 1611 BLAKE2B b7f3c7446b226acb9340b8ec187e9d55af2ef9aa05b900954acd9fd25ceef416a4b21c8ca8429c8d22e9c7c0169a71f57cb5c8b1bb092515bd307581202ba721 SHA512 cbafd242e10a3641c9790827e293642714011b1a758a7eb2aefc597e6eca655def4ecfd6c38c719b94e07f75bf2b4fc29cb6b7d64c1c67d230d7dccf4f28a750
+EBUILD calf-0.90.1.ebuild 1610 BLAKE2B 889c39c2cfa4cb3635437bae07cb7c2dd72cb787315f2b5c44d2935bbbe3ce1f90e6b95295b6b69d388bd68453eb47496b25a9da274ba80c5092dcadf8aa2d8c SHA512 df3e63fe7b47120808c76fb2b3774d15c23909df2cb0895e000c3a4342ea38cb785844fcf0e96cf57bc215d7d3e1a8ef5085fd0bb8c05b8a89dd432029da919b
 EBUILD calf-9999.ebuild 1636 BLAKE2B 26944eed996b1f7c0c2db5871c858f33268f95a3a82dce479462b1866af682d4e241c526eb5dd948f2141d131c3051721dc1a22c6403aefe13cc32bfa63e2edc SHA512 867ed42443ba883ccde95fca8e1b6b72b6a4dbd45e9984dd488d43325d66f93eeb0e8f13733f25533cb34f675fc315791a41b6dbf4fae17fd821d50729a558d5
 MISC metadata.xml 500 BLAKE2B 79be90120221b85a9bd6960b4245d17085b158e3653d1560998e0f5bcf154f9955af7fd1a5b04e54769189753c3b1ac176df45d838bf6c6a3b1dac5cbabb422f SHA512 a88cde96e4ca78145f3214ce16552d43ef974b5235829e51e98a5c7c8f60bcaa259ba7da166e5e4c59aade062fe16de915355c67ea7ded9ba9d83a04a98bb37b
diff --git a/media-plugins/calf/calf-0.90.0.ebuild b/media-plugins/calf/calf-0.90.0.ebuild
deleted file mode 100644
index 820905fdc57e..000000000000
--- a/media-plugins/calf/calf-0.90.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools
-
-DESCRIPTION="A set of open source instruments and effects for digital audio workstations"
-HOMEPAGE="http://calf-studio-gear.org/"
-
-if [[ "${PV}" = "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/calf-studio-gear/calf.git"
-else
-	SRC_URI="https://github.com/calf-studio-gear/calf/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="cpu_flags_x86_sse gtk jack lash lv2 static-libs experimental"
-
-RDEPEND="dev-libs/atk
-	dev-libs/expat
-	dev-libs/glib:2
-	media-sound/fluidsynth
-	jack? ( virtual/jack )
-	gtk? (
-		x11-libs/cairo
-		x11-libs/gtk+:2
-		x11-libs/gdk-pixbuf
-		x11-libs/pango
-	)
-	lash? ( media-sound/lash )
-	lv2? ( media-libs/lv2 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# automagic...
-	#$(use_with gtk gui)
-	#$(use_with jack)
-	econf \
-		--without-obsolete-check \
-		$(use_with lash) \
-		$(use_with lv2 lv2) \
-		$(usex lv2 "--with-lv2-dir=/usr/$(get_libdir)/lv2" "") \
-		$(use_enable static-libs static) \
-		$(use_enable cpu_flags_x86_sse sse) \
-		$(use_enable experimental)
-}
diff --git a/media-plugins/calf/calf-0.90.1.ebuild b/media-plugins/calf/calf-0.90.1.ebuild
index 7d6a75335773..37fb836f5eef 100644
--- a/media-plugins/calf/calf-0.90.1.ebuild
+++ b/media-plugins/calf/calf-0.90.1.ebuild
@@ -13,7 +13,7 @@ if [[ "${PV}" = "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/calf-studio-gear/calf.git"
 else
 	SRC_URI="https://github.com/calf-studio-gear/calf/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="LGPL-2.1"
diff --git a/media-plugins/gst-plugins-libav/Manifest b/media-plugins/gst-plugins-libav/Manifest
index e0bd18d79e0e..8f5d7d87105d 100644
--- a/media-plugins/gst-plugins-libav/Manifest
+++ b/media-plugins/gst-plugins-libav/Manifest
@@ -1,11 +1,10 @@
 AUX AVOptionsRanges-leak-fix.patch 1181 BLAKE2B 112c55b0b96d2223fef39380f0e53e21be5adaf5c24acb33ef4bcef6f62a8ffdf981ab4166cfc4b777220f828d675801608ffed958de6c44190913085f95d476 SHA512 caea8b2ba2fcadeebd30689ac380a97ba0047c25a98fdde0a8c2591cf85eac52ba2327fb30a14c152bb100c7f764e7034969b2978eebeee67e2783f257132f98
 AUX external-ffmpeg4-dep.patch 672 BLAKE2B f6abd0913ce1dbd26d3c75fab15537f582605d21b6eb7e49cfffe6390a870bac13dc440f1ed319940c216e5a789a87309e20016649388d3b689dc0e602641c55 SHA512 11f9e7e4c96ffebaeb8b3e29934f1dd01ae8794bc6401a8fe3e999110a64949d282c41da1c2145f72a394b45f5c6d62cf1d9af7634e1dc9c4a67a507a9a575ee
+AUX fix-negative-pts.patch 1462 BLAKE2B 1f661913eef1d7d2827c95107473556213152e7a4e2c25ff0c9368cfb8933da2cb3c60f9132129e882238c0351179d11ce0ee5273d4a1bf6eee2f7971a52b53e SHA512 dbe9ce45154ab9d6d88faa4507b03e76026dc82236ad1075cf21b3b9d867c273be7aaab8d8c3eb103ac1cd2fbbc5ddcfd6a18ed6d4538c8c087e8755ca875cf7
 DIST ffmpeg-3.4.5.tar.bz2 10183082 BLAKE2B f72157baefcd6a0ca8f389309bbe947ad21996e0f2eb3c46c6bfc90f1ebbb14bfd007d001e46ea51efef5db5f9fcee24b1a90b6862136aeebecdc95bb61b23a5 SHA512 e12707d47404a9ce02790b77d2852fc1a1573c8108e980c7355fa48ba891d1649464d4fe4d08394ecd6d871f651ac4388486b7654cb54a7aaeedaf05c55513ec
-DIST ffmpeg-4.1.1.tar.bz2 10686360 BLAKE2B 47f4716d7e184d7318eb1a99ab1cdc188009464e973162e583f7ca4ae79fa3b103f9d5329c8993b72d20667e42e5a749123709a4640f07762568300b5c3c897f SHA512 0241c44e1dffd0d890a3d30a1b2387ea167d578bb39ba0c804fb417e132d343a9e43da9247b205e18b893d8cf75d8528e9971569be67ac380b88618ef0a75ed4
-DIST ffmpeg-4.1.tar.bz2 10687291 BLAKE2B 07293af1b13c6c6cad72e368207db21bdbc4b991931166c24ff40b00c3b3c8e1242be1876af8e3f154cc840fcd90d87b762fe77faccf06936dd096478d5d074b SHA512 ccf6d07268dc47e08ca619eb182a003face2a8ee73ec1a28157330dd7de1df88939def1fc1c7e6b6ac7b59752cdad84657d589b2fafb73e14e5ef03fb6e33417
+DIST ffmpeg-4.1.3.tar.bz2 10689073 BLAKE2B 8486e21c8df116af802bb7f9208e702ec1feaa4f292f14021e0b6bfb3957b13ddacfa87db361e677ae0583cc2bd1d402a66b0c8507cbed79a001c9b8462100bf SHA512 d0f8b3ee7b55e67b1c7ad9610a7b19a15acfc35dc843683502e536ebcc2e8678b55325532c0039b764cc978e95f83afb48bd24304abaee26f26d3247a8310bfe
 DIST gst-libav-1.14.4-ffmpeg4-patchset.tar.xz 49428 BLAKE2B 74c3e0b25643bcfdf01d1d16514401fef4bb988ba3d1f306b647ba0cd6e89f0205cc33e6d144889d6b2f7fab9e4fae946e03821a85009fa95c68f3cedf25068a SHA512 1347424ed342f00c25ac4780670611a24eeaf708426b6efc6d9f6c6fa7bf91ef292302a5363afe9523c497265b8c0d7ad81374364cbecb2924b749e716819745
 DIST gst-libav-1.14.4.tar.xz 9036732 BLAKE2B 1c2e257912f61dac71e1d890f4cb650e0cdbbf4472cbd8dc6b73e471d1914409b71699bd198c154069e15e68364530e91f76619afb52b91e373e58c9237ab7cb SHA512 4a0e9a91c23cba82e6a6b8eb65ff42b9d80389dd232b08c22b3431d3942fb93a6a7e64be97083d11cbceb2abe5d45dc5b37d230f7552e1a7fb193610d0530717
 EBUILD gst-plugins-libav-1.14.4.3.4.5.ebuild 2440 BLAKE2B 61c9b14b905aefdac17cffc297fd6e2e6ef850ea7f0b980c468dbdb3f12b52d192134a51c623ed3294872fe74153d66d766dd0cdf8e8fa6eb2275ac4341c14d3 SHA512 b26cca92978671ac18d713c751a2087e0e86d6a05169626ce36b668920a58d98f354a3c151e00af408bf2cd09a02d46fec85ac7d01597b47ecd30eb6e3a3e328
-EBUILD gst-plugins-libav-1.14.4.4.1.1_p20190113.ebuild 3047 BLAKE2B f81b29eaa48d938337497f1b17124f5677cfb682cfdc0a765f1ec61d1ee2820ff364d60d9bf99aedd9faef35aa39fa87356a08391357f8088ce880c772bb68f1 SHA512 f7b103d2c81a8201a102b88066d3a1771897f4cb0302989eaa4369b7276bcb135f849f3235ed28e5f8ce91695a7e388f1d836c00b0fc2fddb13909c764d87f87
-EBUILD gst-plugins-libav-1.14.4.4.1_p20181115.ebuild 2951 BLAKE2B c103597c9ead48bf9335486f109da27cc0401ed8471dfebf06d47815568948393404a5ef4948d00183120c26b03e285fc04d02b37350237f618349a3d78c8ad7 SHA512 a1c3e103488a67e5293aa3a06198f28bea6fd0b2ee84b3f55914210fe7b94eb9544fd930b9f8c67e42c03f86f9e916ed36e01cf2dc5ac4a272d9e3635ebea008
+EBUILD gst-plugins-libav-1.14.4.4.1.3_p20190329.ebuild 3169 BLAKE2B 48d4165e5f751789093ea17bc754331b525263141718f633340a232a93c7b12f309c3d720fd129f5b2fda4879f9eb7e2904f7d58a19e229072562bfbf934a37a SHA512 b586a1360e7baecf931896ff59b8bc94c949d10b2530e26c52528a217d9b2567253fa9fd30874ee417ca35c22b8b867165bd8f79e66411a7f1be434bb59570c4
 MISC metadata.xml 435 BLAKE2B 8ee96f01d191e918656c2a80e8cacee47237740f7639d34f0205417815a06ae8dd5b0a27bd7bffac668f3a74ce8fc377112e3cbc369ad4fb34089b2975f3c733 SHA512 5c65497b650587ba929108974a18116b9fdea3ae175fc637c470725a39375defbaf962323f7062ce4287655fc47e8fd28ce4a1d8608fe7ea243bc6999a1bf753
diff --git a/media-plugins/gst-plugins-libav/files/fix-negative-pts.patch b/media-plugins/gst-plugins-libav/files/fix-negative-pts.patch
new file mode 100644
index 000000000000..d5be422e781d
--- /dev/null
+++ b/media-plugins/gst-plugins-libav/files/fix-negative-pts.patch
@@ -0,0 +1,40 @@
+From 1d293764e55fb9c3901c9dfa903fa5ae0021ab10 Mon Sep 17 00:00:00 2001
+From: Guillaume Desmottes <guillaume.desmottes@collabora.com>
+Date: Thu, 21 Feb 2019 08:48:31 +0100
+Subject: [PATCH] avdemux: fix negative pts if start_time is bigger than the ts
+
+The start time is supposed to be the ts of the first frame.
+FFmpeg uses fractions to represent timestamps and the start time may use a
+different base than the frame pts. So we may end up having the start
+time bigger than the pts because of rounding when converting to gst ts.
+
+See https://gitlab.freedesktop.org/gstreamer/gst-libav/issues/51
+for details.
+---
+ ext/libav/gstavdemux.c | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/ext/libav/gstavdemux.c b/ext/libav/gstavdemux.c
+index 30e0360..3b74f92 100644
+--- a/ext/libav/gstavdemux.c
++++ b/ext/libav/gstavdemux.c
+@@ -1473,8 +1473,14 @@ gst_ffmpegdemux_loop (GstFFMpegDemux * demux)
+     goto drop;
+ #endif
+ 
+-  if (GST_CLOCK_TIME_IS_VALID (timestamp))
+-    timestamp -= demux->start_time;
++  if (GST_CLOCK_TIME_IS_VALID (timestamp)) {
++    /* start_time should be the ts of the first frame but it may actually be
++     * higher because of rounding when converting to gst ts. */
++    if (demux->start_time >= timestamp)
++      timestamp = 0;
++    else
++      timestamp -= demux->start_time;
++  }
+ 
+   /* check if we ran outside of the segment */
+   if (demux->segment.stop != -1 && timestamp > demux->segment.stop)
+-- 
+2.17.0
+
diff --git a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.14.4.4.1.1_p20190113.ebuild b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.14.4.4.1.3_p20190329.ebuild
index 22bb5b192043..e9c44dd1b7b1 100644
--- a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.14.4.4.1.1_p20190113.ebuild
+++ b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.14.4.4.1.3_p20190329.ebuild
@@ -42,6 +42,7 @@ S="${WORKDIR}/${MY_P}"
 PATCHES=(
 	"${WORKDIR}"/patches # ffmpeg-4 compat and more from git up to 20181115; requires eautoreconf
 	"${FILESDIR}"/AVOptionsRanges-leak-fix.patch # extra patch from Jan 2019 for a leak fix
+	"${FILESDIR}"/fix-negative-pts.patch # extra patch from Feb 2019 to fix negative pts if start_time is bigger than the ts
 	"${FILESDIR}"/external-ffmpeg4-dep.patch # Automatically rescan available elements for registry when system ffmpeg changes
 )
 
diff --git a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.14.4.4.1_p20181115.ebuild b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.14.4.4.1_p20181115.ebuild
deleted file mode 100644
index 2df068ec20c0..000000000000
--- a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.14.4.4.1_p20181115.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eapi7-ver multilib-minimal
-
-MY_PN="gst-libav"
-MY_PV="$(ver_cut 1-3)"
-MY_P="${MY_PN}-${MY_PV}"
-FFMPEG_PV="$(ver_cut 4- ${PV%_*})"
-
-DESCRIPTION="FFmpeg based gstreamer plugin"
-HOMEPAGE="https://gstreamer.freedesktop.org/modules/gst-libav.html"
-SRC_URI="https://gstreamer.freedesktop.org/src/${MY_PN}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~leio/distfiles/${MY_P}-ffmpeg4-patchset.tar.xz
-	libav? ( https://ffmpeg.org/releases/ffmpeg-${FFMPEG_PV}.tar.bz2 )"
-
-LICENSE="LGPL-2+"
-SLOT="1.0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="libav +orc"
-
-RDEPEND="
-	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
-	>=media-libs/gstreamer-${MY_PV}:1.0[${MULTILIB_USEDEP}]
-	>=media-libs/gst-plugins-base-${MY_PV}:1.0[${MULTILIB_USEDEP}]
-	!libav? ( >=media-video/ffmpeg-4:0=[${MULTILIB_USEDEP}] )
-	libav? (
-		app-arch/bzip2[${MULTILIB_USEDEP}]
-		app-arch/xz-utils[${MULTILIB_USEDEP}]
-	)
-	orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.12
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${WORKDIR}"/patches # ffmpeg-4 compat and more from git up to 20181115; requires eautoreconf
-	"${FILESDIR}"/external-ffmpeg4-dep.patch # Automatically rescan available elements for registry when system ffmpeg changes
-)
-
-RESTRICT="test" # FIXME: tests seem to get stuck at one point; investigate properly
-
-src_unpack() {
-	default
-
-	if use libav; then
-		# Use newer version of bundled FFmpeg.
-		rm -r "${S}/gst-libs/ext/libav" || die
-		ln -s ../../../ffmpeg-${FFMPEG_PV} "${S}/gst-libs/ext/libav" || die
-	fi
-}
-
-src_prepare() {
-	default
-	eautoreconf # remove with a proper release without build system touching patchset
-}
-
-multilib_src_configure() {
-	GST_PLUGINS_BUILD=""
-	# Upstream dropped support for system libav and won't work
-	# for preserving its compat anymore, forcing us to rely on internal
-	# ffmpeg copy if we don't want to cause unresolvable blockers for
-	# libav setups.
-	# https://bugzilla.gnome.org/show_bug.cgi?id=758183
-	# Prefer system ffmpeg for -libav
-	local myconf=()
-
-	if use libav; then
-		ewarn "Using bundled ffmpeg copy as upstream dropped"
-		ewarn "the support for compiling against system libav"
-		ewarn "https://bugzilla.gnome.org/show_bug.cgi?id=758183"
-
-		myconf+=(--with-libav-extra-configure="--disable-debug --optflags=\\\"${CFLAGS}\\\"")
-	else
-		myconf+=("--with-system-libav")
-	fi
-
-	ECONF_SOURCE=${S} \
-	econf \
-		--disable-maintainer-mode \
-		--with-package-name="Gentoo GStreamer ebuild" \
-		--with-package-origin="https://www.gentoo.org" \
-		--disable-fatal-warnings \
-		$(use_enable orc) \
-		"${myconf[@]}"
-}
-
-multilib_src_compile() {
-	# Don't build with -Werror; verbose build
-	emake ERROR_CFLAGS= V=1
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-plugins/gst-plugins-meta/Manifest b/media-plugins/gst-plugins-meta/Manifest
index d6f535d39c9c..533d3640eb95 100644
--- a/media-plugins/gst-plugins-meta/Manifest
+++ b/media-plugins/gst-plugins-meta/Manifest
@@ -1,4 +1,3 @@
 EBUILD gst-plugins-meta-0.10-r11.ebuild 4389 BLAKE2B de5b074ead1f2945933922055274e1865bb67458df6d3b6a9071889f5688fa39c34590112d2ae4400d05698538a1468dcb061cd3301378e2a90a10f7f2690a42 SHA512 e9332638416456961a4baa40356074b1246f0138097ec41d986df2219cc0c14fa8e1247986ef47512f1377c801ac3c18bc930cd8da6d19d19b135a59ca8dc384
-EBUILD gst-plugins-meta-1.14.1.ebuild 3767 BLAKE2B 09bf914203440b8b6c183ba42681271ffc728621a05c1dfb26983b744dc8d7413d9c33136d655f7b22e3554e0fdf1c27475b8ab1558286b2647dd13c60a0313d SHA512 d19a376267a338a19b08bdf0a6e248febe5c31d7b0908cab0795efaf4daadba07fffd5f0d41d39721f096c1e87df7118c2d4e5af1a366a0458f68b8c160d8384
 EBUILD gst-plugins-meta-1.14.3.ebuild 3768 BLAKE2B 68e11ff034c2fa1dfd992511e3c5df36befc2d5f4e19fd8aec1318cd4bdec803b2807d72d7235b2a694e6cc728f6fd88de6e0e196d59dae49ee54d5dd919f3e3 SHA512 1331bd54dd465e3974558282b06914e8e2dcc784a975640d8a758c74b9dc72e9037b7d20fba90d5704a86d86940d00b56a7a2f8aaf9aebd4bddc9d4254af21b4
 MISC metadata.xml 996 BLAKE2B 1bc83f42a32de2aafdf03808fffb16d603986c19160d2802426ecea7f279e529ff7ad0e2c321671681f80c3575dceaea0064db559dba1212b0a30b826ae8e2a2 SHA512 4d905ac8fb0f07b2ba3c6791d7a84daef638ed552d2fac834a71febb274d1c667abe66735e7cfe77f5ed83c269c01ca7c2761b13d176164cd956e8fadf31fbd0
diff --git a/media-plugins/gst-plugins-meta/gst-plugins-meta-1.14.1.ebuild b/media-plugins/gst-plugins-meta/gst-plugins-meta-1.14.1.ebuild
deleted file mode 100644
index 22a8f074d605..000000000000
--- a/media-plugins/gst-plugins-meta/gst-plugins-meta-1.14.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib-build
-
-DESCRIPTION="Meta ebuild to pull in gst plugins for apps"
-HOMEPAGE="https://gstreamer.freedesktop.org/"
-
-LICENSE="metapackage"
-SLOT="1.0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd"
-IUSE="aac a52 alsa cdda dts dv dvb dvd ffmpeg flac http jack lame libass libvisual mms mp3 modplug mpeg ogg opus oss pulseaudio taglib theora v4l vaapi vcd vorbis vpx wavpack X x264"
-REQUIRED_USE="opus? ( ogg ) theora? ( ogg ) vorbis? ( ogg )"
-
-RDEPEND="
-	>=media-libs/gstreamer-${PV}:1.0[${MULTILIB_USEDEP}]
-	>=media-libs/gst-plugins-base-${PV}:1.0[alsa?,ogg?,theora?,vorbis?,X?,${MULTILIB_USEDEP}]
-	>=media-libs/gst-plugins-good-${PV}:1.0[${MULTILIB_USEDEP}]
-	a52? ( >=media-plugins/gst-plugins-a52dec-${PV}:1.0[${MULTILIB_USEDEP}] )
-	aac? ( >=media-plugins/gst-plugins-faad-${PV}:1.0[${MULTILIB_USEDEP}] )
-	cdda? ( || (
-		>=media-plugins/gst-plugins-cdparanoia-${PV}:1.0[${MULTILIB_USEDEP}]
-		>=media-plugins/gst-plugins-cdio-${PV}:1.0[${MULTILIB_USEDEP}] ) )
-	dts? ( >=media-plugins/gst-plugins-dts-${PV}:1.0[${MULTILIB_USEDEP}] )
-	dv? ( >=media-plugins/gst-plugins-dv-${PV}:1.0[${MULTILIB_USEDEP}] )
-	dvb? (
-		>=media-plugins/gst-plugins-dvb-${PV}:1.0[${MULTILIB_USEDEP}]
-		>=media-libs/gst-plugins-bad-${PV}:1.0[${MULTILIB_USEDEP}] )
-	dvd? (
-		>=media-libs/gst-plugins-ugly-${PV}:1.0[${MULTILIB_USEDEP}]
-		>=media-plugins/gst-plugins-a52dec-${PV}:1.0[${MULTILIB_USEDEP}]
-		>=media-plugins/gst-plugins-dvdread-${PV}:1.0[${MULTILIB_USEDEP}]
-		>=media-plugins/gst-plugins-mpeg2dec-${PV}:1.0[${MULTILIB_USEDEP}]
-		>=media-plugins/gst-plugins-resindvd-${PV}:1.0[${MULTILIB_USEDEP}] )
-	ffmpeg? ( >=media-plugins/gst-plugins-libav-${PV}:1.0[${MULTILIB_USEDEP}] )
-	flac? ( >=media-plugins/gst-plugins-flac-${PV}:1.0[${MULTILIB_USEDEP}] )
-	http? ( >=media-plugins/gst-plugins-soup-${PV}:1.0[${MULTILIB_USEDEP}] )
-	jack? ( >=media-plugins/gst-plugins-jack-${PV}:1.0[${MULTILIB_USEDEP}] )
-	lame? ( >=media-plugins/gst-plugins-lame-${PV}:1.0[${MULTILIB_USEDEP}] )
-	libass? ( >=media-plugins/gst-plugins-assrender-${PV}:1.0[${MULTILIB_USEDEP}] )
-	libvisual? ( >=media-plugins/gst-plugins-libvisual-${PV}:1.0[${MULTILIB_USEDEP}] )
-	mms? ( >=media-plugins/gst-plugins-libmms-${PV}:1.0[${MULTILIB_USEDEP}] )
-	modplug? ( >=media-plugins/gst-plugins-modplug-${PV}:1.0[${MULTILIB_USEDEP}] )
-	mp3? (
-		>=media-libs/gst-plugins-ugly-${PV}:1.0[${MULTILIB_USEDEP}]
-		>=media-plugins/gst-plugins-mpg123-${PV}:1.0[${MULTILIB_USEDEP}] )
-	mpeg? ( >=media-plugins/gst-plugins-mpeg2dec-${PV}:1.0[${MULTILIB_USEDEP}] )
-	opus? ( >=media-plugins/gst-plugins-opus-${PV}:1.0[${MULTILIB_USEDEP}] )
-	oss? ( >=media-plugins/gst-plugins-oss-${PV}:1.0[${MULTILIB_USEDEP}] )
-	pulseaudio? ( >=media-plugins/gst-plugins-pulse-${PV}:1.0[${MULTILIB_USEDEP}] )
-	taglib? ( >=media-plugins/gst-plugins-taglib-${PV}:1.0[${MULTILIB_USEDEP}] )
-	v4l? ( >=media-plugins/gst-plugins-v4l2-${PV}:1.0[${MULTILIB_USEDEP}] )
-	vaapi? ( >=media-plugins/gst-plugins-vaapi-${PV}:1.0[${MULTILIB_USEDEP}] )
-	vcd? (
-		>=media-plugins/gst-plugins-mplex-${PV}:1.0[${MULTILIB_USEDEP}]
-		>=media-plugins/gst-plugins-mpeg2dec-${PV}:1.0[${MULTILIB_USEDEP}] )
-	vpx? ( >=media-plugins/gst-plugins-vpx-${PV}:1.0[${MULTILIB_USEDEP}] )
-	wavpack? ( >=media-plugins/gst-plugins-wavpack-${PV}:1.0[${MULTILIB_USEDEP}] )
-	x264? ( >=media-plugins/gst-plugins-x264-${PV}:1.0[${MULTILIB_USEDEP}] )
-"
-
-# Usage note:
-# The idea is that apps depend on this for optional gstreamer plugins.  Then,
-# when USE flags change, no app gets rebuilt, and all apps that can make use of
-# the new plugin automatically do.
-
-# When adding deps here, make sure the keywords on the gst-plugin are valid.
diff --git a/media-plugins/kodi-inputstream-adaptive/Manifest b/media-plugins/kodi-inputstream-adaptive/Manifest
index e934faeaf991..616b10b9fb5f 100644
--- a/media-plugins/kodi-inputstream-adaptive/Manifest
+++ b/media-plugins/kodi-inputstream-adaptive/Manifest
@@ -2,9 +2,11 @@ DIST kodi-inputstream-adaptive-2.0.25.tar.gz 881743 BLAKE2B 210b23fe42a262696b2d
 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
 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-9999.ebuild 726 BLAKE2B cd3693fd8b4832ee1a9d7aa2841151cdf799b09798566e7ada2bccc558cc4577db076f2fcaa7adea8f273148bda81d55a78e5e7a8f9164704797f5efce05e5da SHA512 0ca52c003def92bafee5c0865aa6c413ff94531c2a804ccd9b4691418265a101929f3b25d2bd1ca94de16c030ac5d8b5a1985009bc1af2174181781b05786399
 MISC metadata.xml 459 BLAKE2B eeb0ec3e241775f1953b2846edd160fcbe72d5990a256f5374e9aae5e45eef5f4c50225c72d371c0ca3d11a3b81eabd87a5de35952aa5f7676b4d7b79854ba71 SHA512 748df555db70e268d7f67b408428d949ecc04c49fcd143d984b47597c3c4ee86fd8066bf294598df926889525213f34182a790d442aced5fc2f39346f13e4d5c
diff --git a/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.3.16.ebuild b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.3.16.ebuild
new file mode 100644
index 000000000000..85e10272539d
--- /dev/null
+++ b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.3.16.ebuild
@@ -0,0 +1,37 @@
+# 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-pvr-vuplus/Manifest b/media-plugins/kodi-pvr-vuplus/Manifest
index db7890e31c8a..6754f81bca4e 100644
--- a/media-plugins/kodi-pvr-vuplus/Manifest
+++ b/media-plugins/kodi-pvr-vuplus/Manifest
@@ -2,9 +2,15 @@ DIST kodi-pvr-vuplus-2.4.10.tar.gz 80514 BLAKE2B d84f0da7f8473456ce6258b2602fb2d
 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
+DIST kodi-pvr-vuplus-3.20.0.tar.gz 172198 BLAKE2B bb68f6de811e14e38b0a804ed1db01e64df7d9c8e2c5ad6b31e07188f571418ec1ab8289056a0480b7aeffdd39bb8668c5ea0493ac0688e665c02994da9e53d1 SHA512 e30edab00ff0396ddd4021dc5a9ac8a0199d2535449385ff130572387fc1f01e128fd1f1a9b5cacea22de4789b1220b9ad0202a9c8086618fc2e35ef053dae19
+DIST kodi-pvr-vuplus-3.21.0.tar.gz 176202 BLAKE2B c51ff08e110748757aa56204af837982744fc49189a9fab762c49722fe760e05bd77d23e876dda831a63196c27994737a0f1df97d1e00f58a9824b3c8bd54a74 SHA512 480ce345619f68bdce6402b7f0f1291c41d3b2cd1cb868fba4540f60e45cfc5e80945e2394b5fac65bddc4ee9cb6c56f95f1563bc7230efa38521aa0c35f1946
+DIST kodi-pvr-vuplus-3.22.0.tar.gz 184305 BLAKE2B 58d865950a7f24bf44293ff156a3cb481fa16946a2c9489b46969dfaaabb26fe2af4fa3eb1462bc3f34000944a0aee0ac8bd274c7da2f4b00349db31cb78695b SHA512 bc75644e0a64e68564c29b15924d6f7dd5f45eef6f72b7c6a72609e0c18d4b2773452882af39674861ac515317511b281b832522c4657537675afc6ae5531644
 EBUILD kodi-pvr-vuplus-2.4.10.ebuild 703 BLAKE2B e0553ee884be358337c235140046d8268c38d2f1a3d324469e45999fc8e3376d48fdd22222ffc1655fe45a30738f828254a291fcbb1e0a3e9e36ab4e6362a21b SHA512 79b1c4362a9a0dd8e5d41f3e006bec07bf7799b5746804a0a9a47d9f343d76bd7fbd6a82ef4734d7ba596e402fcb5acf349c1de9787aa90286778a9524061667
 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
+EBUILD kodi-pvr-vuplus-3.20.0.ebuild 720 BLAKE2B 4dbe8dcd163cf5a1c71500610e3a3d54698c6de17831eee997d8bbb195edd15c50adbb75797c28af626a7923f074cb330f84d6499f143943d1ec9c9a91f90944 SHA512 df9154ff386ef0e962f74bf06e0ff4702bab942c78a3f7408a2ca9dab104571395a41c3bb4227da6ef65b9cbf2ca9b967ac4f8ac9b077833375bf5dd9472adfb
+EBUILD kodi-pvr-vuplus-3.21.0.ebuild 720 BLAKE2B 4dbe8dcd163cf5a1c71500610e3a3d54698c6de17831eee997d8bbb195edd15c50adbb75797c28af626a7923f074cb330f84d6499f143943d1ec9c9a91f90944 SHA512 df9154ff386ef0e962f74bf06e0ff4702bab942c78a3f7408a2ca9dab104571395a41c3bb4227da6ef65b9cbf2ca9b967ac4f8ac9b077833375bf5dd9472adfb
+EBUILD kodi-pvr-vuplus-3.22.0.ebuild 720 BLAKE2B 4dbe8dcd163cf5a1c71500610e3a3d54698c6de17831eee997d8bbb195edd15c50adbb75797c28af626a7923f074cb330f84d6499f143943d1ec9c9a91f90944 SHA512 df9154ff386ef0e962f74bf06e0ff4702bab942c78a3f7408a2ca9dab104571395a41c3bb4227da6ef65b9cbf2ca9b967ac4f8ac9b077833375bf5dd9472adfb
 EBUILD kodi-pvr-vuplus-9999.ebuild 722 BLAKE2B 9f205d55328bb0a326bb099167a7a837104f853a978e6ea7c21c6863467bbc0f4053166c69a5a350a8faa26332e6be7711b6c54a1f06daf84cc201410b0b6c1d SHA512 a7868c1239630426628ca131c0dfd42a8d33e47709030489a56db0cdd8bfc241f83062d652a3578ebf3d081e8c95a84edc45ca2f00d9a272596343973696851a
 MISC metadata.xml 428 BLAKE2B ac264c6bbfc925ff772eda61b1b4069b52ed5bf12836af8d8e86a72fe42bd852be1d00f74056c1d6b925fa2a026ea7df57ee57e7434a797884741b70762ff173 SHA512 573f803447cb7a7d0095eb21caa9f55c41fa4fb68c0f40aabad63df2ee262ce168fc75f28f3a3ae6aa7bf41f258be771c6a6dd06d1f2e2486b3d557d89f28f4f
diff --git a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.20.0.ebuild b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.20.0.ebuild
new file mode 100644
index 000000000000..f77cda466527
--- /dev/null
+++ b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.20.0.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="Kodi's VuPlus client addon"
+HOMEPAGE="https://github.com/kodi-pvr/pvr.vuplus"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.vuplus.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Leia"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/kodi-pvr/pvr.vuplus/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/pvr.vuplus-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-18*
+	=media-libs/kodi-platform-18*
+	dev-libs/tinyxml
+	dev-cpp/nlohmann_json
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
diff --git a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.21.0.ebuild b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.21.0.ebuild
new file mode 100644
index 000000000000..f77cda466527
--- /dev/null
+++ b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.21.0.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="Kodi's VuPlus client addon"
+HOMEPAGE="https://github.com/kodi-pvr/pvr.vuplus"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.vuplus.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Leia"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/kodi-pvr/pvr.vuplus/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/pvr.vuplus-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-18*
+	=media-libs/kodi-platform-18*
+	dev-libs/tinyxml
+	dev-cpp/nlohmann_json
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
diff --git a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.22.0.ebuild b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.22.0.ebuild
new file mode 100644
index 000000000000..f77cda466527
--- /dev/null
+++ b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.22.0.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="Kodi's VuPlus client addon"
+HOMEPAGE="https://github.com/kodi-pvr/pvr.vuplus"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.vuplus.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Leia"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/kodi-pvr/pvr.vuplus/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/pvr.vuplus-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-18*
+	=media-libs/kodi-platform-18*
+	dev-libs/tinyxml
+	dev-cpp/nlohmann_json
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
diff --git a/media-plugins/kodi-screensaver-pyro/Manifest b/media-plugins/kodi-screensaver-pyro/Manifest
index 8d40ba699436..1eb0a42614e3 100644
--- a/media-plugins/kodi-screensaver-pyro/Manifest
+++ b/media-plugins/kodi-screensaver-pyro/Manifest
@@ -1,6 +1,8 @@
 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
 MISC metadata.xml 429 BLAKE2B 75a3ac26d3c3383485d3aa0b9a674f6bc249d95f13b637d9d07fb64f7ab46226301f8abf8a4194b3a30ea8dd6815d6565382a0e1e342bccf880ea0ca6a3d11f1 SHA512 df4dd73cbdb3c1d9a32ee398273356b506391363fee7d5e799a1bfed2765a1cea5c40ddc60716aebd272c4ee91d4d72d148a0644d3e47a84d3b31d03fa739f3d
diff --git a/media-plugins/kodi-screensaver-pyro/kodi-screensaver-pyro-3.0.0.ebuild b/media-plugins/kodi-screensaver-pyro/kodi-screensaver-pyro-3.0.0.ebuild
new file mode 100644
index 000000000000..a51a4c182589
--- /dev/null
+++ b/media-plugins/kodi-screensaver-pyro/kodi-screensaver-pyro-3.0.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils kodi-addon
+
+DESCRIPTION="Pyro screensaver for Kodi"
+HOMEPAGE="https://github.com/xbmc/screensaver.pyro"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/screensaver.pyro.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Leia"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/xbmc/screensaver.pyro/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/screensaver.pyro-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-18*
+	"
diff --git a/media-plugins/kodi-vfs-rar/Manifest b/media-plugins/kodi-vfs-rar/Manifest
index 24070f93d6cc..3257d4dff2da 100644
--- a/media-plugins/kodi-vfs-rar/Manifest
+++ b/media-plugins/kodi-vfs-rar/Manifest
@@ -1,6 +1,8 @@
 DIST kodi-vfs-rar-2.0.5.tar.gz 132264 BLAKE2B 1c092fcc45a9b540ab43da9d93028bf3ecca5342fbe99e0380ccf1945be2bbe931e0c93454b69c8091c5919ea52347ab24ee27a72e96e202e6c38775640c016b SHA512 46c17952b1933a5958082ecc6d904b3300acfc6982ef42fd63a15c68ce60c79528a52369fb7e5d0a912cd4346c7701b1aa07dedd882bec618d9e7343ffcbef73
 DIST kodi-vfs-rar-2.0.6.tar.gz 132265 BLAKE2B 686e9e47680f701f68c44c597035ddc1051b16b2048f81060b656217497ebc368428462f7edbcebdcccf7275e6bde57ab8889644e265ebcd5aabba4f2cf364b9 SHA512 73112865d4c66653b565f7f52d557b68548b2077264088a03d8b2a49c9b84b366f5424bcc88bfc91d484f77424944a7191d4275f00255511b0c91ebdb3a30350
+DIST kodi-vfs-rar-2.0.7.tar.gz 132225 BLAKE2B 62f75acba3b06a7eb179eedf31fffa2397f614dab64c0004058db4908e51a2e70cd0dd177e64eff12e54ad1eb57d315abde646604305dbd83e7f4fd897ad6b6a SHA512 40245b9869bb37b1df0822337b7028c4583d0de08338c8bbca2732d71413fa76490250eae50aa805ebbe654798cf8c232794e561e9650f16e9866714d6bce5b3
 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
 MISC metadata.xml 417 BLAKE2B 848739e38b8064c10732cc179fd55c24c49fa32bd9067706443b0efec47f697a66d330a52733033271638d3b0ba7ef1661f372052bb6dc1a25f5e0dd745f83ed SHA512 70d2ec7f4f00ef2c208db31180e4520f26bd059cd12084e7764297542f75798d2bbe55a3558971fde8709b403968da29011f271bc6f3c4b4a63ae2589c0ae76f
diff --git a/media-plugins/kodi-vfs-rar/kodi-vfs-rar-2.0.7.ebuild b/media-plugins/kodi-vfs-rar/kodi-vfs-rar-2.0.7.ebuild
new file mode 100644
index 000000000000..26575d64ab3c
--- /dev/null
+++ b/media-plugins/kodi-vfs-rar/kodi-vfs-rar-2.0.7.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils kodi-addon
+
+DESCRIPTION="RAR VFS addon for Kodi"
+HOMEPAGE="https://github.com/xbmc/vfs.rar"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/vfs.rar.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Leia"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/xbmc/vfs.rar/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/vfs.rar-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=dev-libs/libplatform-2*
+	=media-libs/kodi-platform-18*
+	=media-tv/kodi-18*
+	"