gentoo resync : 05.02.2020

5 files changed, 16 insertions, 48 deletions

diff --git a/media-plugins/kodi-inputstream-rtmp/Manifest b/media-plugins/kodi-inputstream-rtmp/Manifest
index 7edb2c320a72..2d7811659742 100644
--- a/media-plugins/kodi-inputstream-rtmp/Manifest
+++ b/media-plugins/kodi-inputstream-rtmp/Manifest
@@ -1,8 +1,6 @@
-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
-DIST kodi-inputstream-rtmp-2.0.6.tar.gz 18489 BLAKE2B 36a760ee57109d38c55b375531392e10040dbe89a6797299eae69c02c0b9fe828f9b1745488e61ea256d1b0216acea03906e7d4676f93126577be25a7c81ca9f SHA512 38bc0813427d6ae201b305a208b91eee5087ee8226c8f26e7df4e82d5dc87ac3c0a0809abee3ff99fa995659bb8eba1d1ba2aeb7ee1059ef85aa45d9a0abfd3b
-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-2.0.6.ebuild 756 BLAKE2B 6d819f2e59273f8430dcfec75cf3938317286aa4bd141509d1250834e7a35792accf971d6967be8ecb66e4fc7390b62a29210d74eeefc0e21f892cbdaad13ff0 SHA512 b2fd1319deefcc825d7f8dd6a232cc08779e9ed982d959452d247b4e897cfb2fc5e1a3e64aa809e8c1b29603b918afc4936463bb142816dd346229fed005e648
-EBUILD kodi-inputstream-rtmp-9999.ebuild 757 BLAKE2B f8a947d8f7fc8568729b6941b843f240d7371310e85ce7b6e2bd77dc34e963b4d58dde3904d1ed914ebbd55ea7e89ba3e3cbc6a656bbdd405eeef9d6ac24d6ad SHA512 940909eec14c71127c349bd9359d1100d188aa10bc521872af00b6b51c39939f73e4e2753ce48838bb82c182977bb30ea6a5ea1a20bc608ae6927faceaa8c5c7
+DIST kodi-inputstream-rtmp-2.0.7.tar.gz 18511 BLAKE2B d7e67883ac0ea59005238d28e8b16e6d53df3b8283b225b2c0523fa7eaf5fbdae44482209c510a2983c0edfa483e195311ce3f1298add1372ce13450832ebbcd SHA512 a67be952bae24083403e5a8783c86af51b24d9f2759fdeb1e4bdc42912c55381189c5925b52743ce79dd03a3e510c65d4972728e2355082b91d73857b1657cd9
+DIST kodi-inputstream-rtmp-2.0.8.tar.gz 68254 BLAKE2B f094cd81f6bbf1854578d12b9b98668ae921ebd89ed6289da5a7d48c3d60b2a40e9ba293422c5c08c969f768d85e0d59ce900c45b57a965f59d6d5bef4abbf64 SHA512 fca7de7cf5ad65081bd25ea1a6cb5c1cdf41f72ba4460256918178060b62e04d389c293add1a10faf899750745ba77244cfb7af97ba613b2abcf6862839c751b
+EBUILD kodi-inputstream-rtmp-2.0.7.ebuild 756 BLAKE2B 728c4a76e037fe5214af42c602a03cb7fb40d3f5617ed02a1f61bea9b96a7557aa081c462df6ce662bfdfcc0684cf7834c87db3262cc709f6f604e7bb8218186 SHA512 bab4fa9793bb52d514d67d57454204a304973bcb983075a837e4df3e7472588ea9c76644e9b30d8a3b6e357edfb6bb6d5d785f49fdf9cb2b7de016df4c2defbb
+EBUILD kodi-inputstream-rtmp-2.0.8.ebuild 756 BLAKE2B 728c4a76e037fe5214af42c602a03cb7fb40d3f5617ed02a1f61bea9b96a7557aa081c462df6ce662bfdfcc0684cf7834c87db3262cc709f6f604e7bb8218186 SHA512 bab4fa9793bb52d514d67d57454204a304973bcb983075a837e4df3e7472588ea9c76644e9b30d8a3b6e357edfb6bb6d5d785f49fdf9cb2b7de016df4c2defbb
+EBUILD kodi-inputstream-rtmp-9999.ebuild 779 BLAKE2B 505a4dd71987cb90c54a5499518594fcb039ec94c2b23fc2c9a37331880c20d8fd8c2670fc580850ac3890328d03a48076b57be68c6d4e6d9f1287fc8784aa4f SHA512 bc655d435a8f126dfd9791ebc9153264f1500716fd4e2caf9da77f94686bb53eea595763a5e61cee440efc5072fedbcc691d9c054a17839f3bf9b562059ca5cc
 MISC metadata.xml 433 BLAKE2B 5b159068b2431fb4b669662f4e36d8768afbda1e076e866678c193590945ff0ba4d6c03228475dda7bb7ca5d204d09e0e5d5804baacbfa653563f199045a1c80 SHA512 0cb47e468304977fd3624c4ec07d254271406897eb4601eac57a68167463a8379e3d8cf4d4e0e4988ae78d832ae39da9a457ba30a7c0fbbe8a32fab4e5e94f53
diff --git a/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-2.0.5.ebuild b/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-2.0.5.ebuild
deleted file mode 100644
index 28f7ef29d680..000000000000
--- a/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-2.0.5.ebuild
+++ /dev/null
@@ -1,36 +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 RTMP inputstream addon"
-HOMEPAGE="https://github.com/xbmc/inputstream.rtmp"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/xbmc/inputstream.rtmp.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Leia"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/xbmc/inputstream.rtmp/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/inputstream.rtmp-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-18*
-	media-video/rtmpdump
-	"
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-2.0.6.ebuild b/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-2.0.7.ebuild
index 4766db65de42..c7798ff8774b 100644
--- a/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-2.0.6.ebuild
+++ b/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-2.0.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-2.0.4.ebuild b/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-2.0.8.ebuild
index b9b53d260348..c7798ff8774b 100644
--- a/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-2.0.4.ebuild
+++ b/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-2.0.8.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils kodi-addon
+inherit cmake kodi-addon
 
 DESCRIPTION="Kodi's RTMP inputstream addon"
 HOMEPAGE="https://github.com/xbmc/inputstream.rtmp"
@@ -34,3 +34,8 @@ DEPEND="
 RDEPEND="
 	${DEPEND}
 	"
+
+src_prepare(){
+	[ -d depends ] && rm -rf depends || die
+	cmake_src_prepare
+}
diff --git a/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-9999.ebuild b/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-9999.ebuild
index e38c1e39aac8..9aabb1756ab0 100644
--- a/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-9999.ebuild
+++ b/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,6 +12,7 @@ SRC_URI=""
 case ${PV} in
 9999)
 	SRC_URI=""
+	EGIT_BRANCH="Matrix"
 	EGIT_REPO_URI="https://github.com/xbmc/inputstream.rtmp.git"
 	inherit git-r3
 	;;