gentoo resync : 18.11.2018

4 files changed, 48 insertions, 9 deletions

diff --git a/media-plugins/kodi-inputstream-rtmp/Manifest b/media-plugins/kodi-inputstream-rtmp/Manifest
index 88a13fe31052..e20627b43e29 100644
--- a/media-plugins/kodi-inputstream-rtmp/Manifest
+++ b/media-plugins/kodi-inputstream-rtmp/Manifest
@@ -1,6 +1,8 @@
 DIST kodi-inputstream-rtmp-1.0.4.tar.gz 7271 BLAKE2B c76b46fc1ba1bbe45084071ee0521b8f421a87886723abce3103867f8c542dbee364c9cb64a3e7237c59cfcc9afd910bb4ba5b749d5e1f6efa4ac215b1ced26d SHA512 659990b2cbe6e9119c650e151aaae0ccd33f8b9f5d6efd1436f4cb6c78beb51c8fae528b844278348066e1b10fe2a7fa6c05e32b54be82f5a750a5a14c8bd9d2
 DIST kodi-inputstream-rtmp-1.0.5.tar.gz 7271 BLAKE2B dfc7a80684d0c872761baf4e8603b491b6530cb0e8a5aad782f18165cb15ec54aaf7557b877eab74c87a46d68481aefecde2f0b15fc748c5a7800593f9033a45 SHA512 7a58ec265586fc0ffc8b1021aa1529d171c8ea14202f80b443d51dbfbfd8f0424a2b5f94687d302a3681e2931ac268e89e8d2e82635ac5b792cc8c9bd8f020af
+DIST kodi-inputstream-rtmp-2.0.4.tar.gz 18259 BLAKE2B 714090d52b1e46e79b88b34b3a400edb444668be2856eb92b61769ecec802be4a7fc1ab73380febbf0cb277b6a1758f2f4f81efb6d1c6c1d266691de6071f7cb SHA512 ac7a7f3f40f4c7d4ec176299ae0d8dd389f1e041d6633a65190e7e8a0a87e87142ebf4f80a36b7429524f7d1571ce5d1708ac753edae695b1d1d84de73e5d88f
 EBUILD kodi-inputstream-rtmp-1.0.4.ebuild 659 BLAKE2B a2b0e2a99fa914ae03ab14db0f6d0aea5ef561c1bcf4d8885751096d0df4f99250388168066c391c24df2b56c60275c55045e1fb0a35d9484201c21c8079ef01 SHA512 4877df994ca70060b38976fa956ce5e8bfc196dc17c08c79e8c437468a7885fdab7752e9c6a550b861a84322b82d25d186d462f5ef7c613bc5f7fc931bac935b
 EBUILD kodi-inputstream-rtmp-1.0.5.ebuild 659 BLAKE2B a24a3762a845bfcf1f4096962c2fdd4d69101cda354ae3ff8436ccaa965cf203b6d5b102771112468cd86bca6b722ac909c73e2571a3d2d496d2e95ffa9109cc SHA512 956a5fefa57ad78b53e7ff85ee65e581e8abaa37c3e15ea3dcfd67c23fe0d5d2bda887e9e1c0a17d42e0a6e71e5117ae19689c7d1ec3ba1a5812d01f118c14d6
-EBUILD kodi-inputstream-rtmp-9999.ebuild 660 BLAKE2B c9d2990e123ae0b476a4d833bd3829f6d2f6f19e9fb5f2b039cf4ab48cbf4a329d211ee0f2e87cb1469fd982fa404ed4097ff90af6da9deec644761e255ec9d1 SHA512 2c7ae4993e870fe31b414e5015b501dfb242bb7f57dbfd8f107dab88511be575e9fd5f5e3134066d023c61a87dc10d31002bfd28976cd38c7efb114c235240f4
-MISC metadata.xml 437 BLAKE2B ee8cee756e2afa1a07e2bba7bf68d6b22fa8fce79860b79a215db68a2f39f84e8d42dd49146941c4ea4c419f6928b30e097963e825253523b969c159a87f645b SHA512 fc9a96c9a2889e0f4edd80638ba0dd50c4272660f3724ff170c4b34ac71824e8e2b32829826bef8efc2327f6aaa1b694a73049103cd2e772f17324eb05b565ff
+EBUILD kodi-inputstream-rtmp-2.0.4.ebuild 684 BLAKE2B f8f25f5846d5576b656555155f213c817a18de0c20cb0a4c55952d694dc2e21420c5b8e21813c2744dfe23877ea408c3876efe66fbbc2e54642d6eefd5686c5a SHA512 39147f7f41ab05b76de6c4aa800b3ea292a6b4dfa6fde6d322f30822ba8319f0f08e9a090c4b45cc5d3bf59ab0fb0b5c9a621fc831f12d972e61d8057f73e2d6
+EBUILD kodi-inputstream-rtmp-9999.ebuild 685 BLAKE2B 374e8719bcda88ec5c7f36aac819825302775dc1eca54d4c2027eddc3fbafc2096ec756103f51bd1e84f0a7523368813a66354edd980c2feef81a5a7a7b5cc65 SHA512 5440ea6b458366246f9d035854e7b990047eb10f347289ef0855375c9dde4f565104039aa516c79ea2ed8df92a56373f6328ac1189d21ed9c72db3607044d5c9
+MISC metadata.xml 433 BLAKE2B 5b159068b2431fb4b669662f4e36d8768afbda1e076e866678c193590945ff0ba4d6c03228475dda7bb7ca5d204d09e0e5d5804baacbfa653563f199045a1c80 SHA512 0cb47e468304977fd3624c4ec07d254271406897eb4601eac57a68167463a8379e3d8cf4d4e0e4988ae78d832ae39da9a457ba30a7c0fbbe8a32fab4e5e94f53
diff --git a/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-2.0.4.ebuild b/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-2.0.4.ebuild
new file mode 100644
index 000000000000..b9b53d260348
--- /dev/null
+++ b/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-2.0.4.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils kodi-addon
+
+DESCRIPTION="Kodi's RTMP inputstream addon"
+HOMEPAGE="https://github.com/xbmc/inputstream.rtmp"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/inputstream.rtmp.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Leia"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/xbmc/inputstream.rtmp/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/inputstream.rtmp-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-18*
+	media-video/rtmpdump
+	"
+RDEPEND="
+	${DEPEND}
+	"
diff --git a/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-9999.ebuild b/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-9999.ebuild
index 28be9b91015b..c866d60112af 100644
--- a/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-9999.ebuild
+++ b/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,19 +6,20 @@ EAPI=6
 inherit cmake-utils kodi-addon
 
 DESCRIPTION="Kodi's RTMP inputstream addon"
-HOMEPAGE="https://github.com/notspiff/inputstream.rtmp"
+HOMEPAGE="https://github.com/xbmc/inputstream.rtmp"
 SRC_URI=""
 
 case ${PV} in
 9999)
 	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/notspiff/inputstream.rtmp.git"
+	EGIT_REPO_URI="https://github.com/xbmc/inputstream.rtmp.git"
 	inherit git-r3
 	;;
 *)
+	CODENAME="Leia"
 	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/notspiff/inputstream.rtmp/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/inputstream.rtmp-${PV}"
+	SRC_URI="https://github.com/xbmc/inputstream.rtmp/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/inputstream.rtmp-${PV}-${CODENAME}"
 	;;
 esac
 
@@ -27,7 +28,7 @@ SLOT="0"
 IUSE=""
 
 DEPEND="
-	=media-tv/kodi-9999
+	~media-tv/kodi-9999
 	media-video/rtmpdump
 	"
 RDEPEND="
diff --git a/media-plugins/kodi-inputstream-rtmp/metadata.xml b/media-plugins/kodi-inputstream-rtmp/metadata.xml
index a9d8bb311bc5..1ebb385c856d 100644
--- a/media-plugins/kodi-inputstream-rtmp/metadata.xml
+++ b/media-plugins/kodi-inputstream-rtmp/metadata.xml
@@ -7,6 +7,6 @@
     </maintainer>
     <longdescription>Kodi's RTMP inputstream addon</longdescription>
     <upstream>
-        <remote-id type="github">notspiff/inputstream.rtmp</remote-id>
+        <remote-id type="github">xbmc/inputstream.rtmp</remote-id>
     </upstream>
 </pkgmetadata>