gentoo resync : 25.11.2020

4 files changed, 52 insertions, 46 deletions

diff --git a/media-plugins/kodi-inputstream-rtmp/Manifest b/media-plugins/kodi-inputstream-rtmp/Manifest
index e0cfa8fd9f4c..acb3043a7a5d 100644
--- a/media-plugins/kodi-inputstream-rtmp/Manifest
+++ b/media-plugins/kodi-inputstream-rtmp/Manifest
@@ -1,7 +1,8 @@
-DIST kodi-inputstream-rtmp-2.0.9.tar.gz 66408 BLAKE2B 466419ef7182c53ddbe358ffb9480f756b8ab7f1f8fe790bb7942ac1cbd14731e4ef2faa0c15d31652733fe49881cf7588a6e560e6f132b61da47d7a8e0e0367 SHA512 b38b45f6313bcf2827eabf80875840b8b24cf010e0f44c20241f8a20f438273020ebd34078562581c34c83f3c9109ec953ef1de819c85de2260f0377903fbd23
 DIST kodi-inputstream-rtmp-3.1.1.tar.gz 75658 BLAKE2B 4a776d3e44326cfa8195ad75b49eecba08d4a6de6a43ea51ee31791556ed2a28536e77033d0c9833838be9a27b2a32dc5ac34c4e9ee92e7a9084b021afbd1100 SHA512 9509fe681c3e2699ebe18a3090bd31c32ccc2634ee0c3c5a686b380ce1d104ff7ec1620f6615495d26fb271164592c0cb4f287ef1852468edddfec9440773a53
-EBUILD kodi-inputstream-rtmp-2.0.9-r1.ebuild 870 BLAKE2B 6229a48d0be846dda6b5c8a9d674667082ec2fe99e51e167255769eb95f89fa8d7979a4085f692559123da5a60d8eebb2222f9f4c8c4eb8c7cdf598b684f6922 SHA512 ea126c01a4c3fd910c52ea1bad96a57f46775ae73a744c752176705d58e76b4ae339ee0065e5a31807c0dd96b61c28ea9192d4bc886d0a6d87571af2ceea553e
-EBUILD kodi-inputstream-rtmp-2.0.9.ebuild 757 BLAKE2B 5b46c0b9291a24577d5895b53295fa44ff0e8d75f0917daac4915a039e445f3fd285d7084eb5e30d873a511533d65949bab87f70169311706613a49fc685aeb3 SHA512 7bb521e1bf183c4d8cdab8ce936febf6181b727160346c3d0716d6cc037666ebce2caa5a7e32e32872d9dc5dccdbb842c36f505885a8b4918b8f0068ec3b58b9
+DIST kodi-inputstream-rtmp-3.3.0.tar.gz 76074 BLAKE2B d920235be127d67a73d3fe8b713459f1bc04491577d886352e0932fd13c638e694b322400c5d9512c0716aca7ef4ed5c3535a05472ea6fff5d0d5aeeebe34aeb SHA512 a981ecd904932ba372e7972137c78308f1fe6928286fead13ad692b41aed0303c7e95a1788984e69cad4984d4f36c1d875f98eeb4a0ed3608ca1c4f8335133cd
+DIST kodi-inputstream-rtmp-3.4.0.tar.gz 76100 BLAKE2B 0f087ecdbb13797f094925f37f5ca4c9426cf6c90b803a99bf6b6e05aeb792558e1bdd3bbbc3d3926d8ccc886f3c9ffff7da24f1fb326f7cddaf7d5aa5601cc8 SHA512 5016d5454761bc854e3ccaec375123ae5f96777a1639c68c21b94073aa7b1e7a615204739017704ae03f4119a92afb225152a833f3891e302b95da60904bf39c
 EBUILD kodi-inputstream-rtmp-3.1.1-r1.ebuild 894 BLAKE2B 2a748a9a0a17bf7b8047256b846064b6ed40cd6d181bd555db50f78f942a4dd605cd1188f1ada43749f9801b851c6d31ac7a0b43a5ebc976e93a8f9ddf5e5187 SHA512 163e2b1e334d40fd67043bd92ddceb5aa9e0520a054672f20c45b9bff0043302cd31e961f1ccdd97aabc4b06c0056552246e3494c7af282a0a1af7d8de6fdbf7
+EBUILD kodi-inputstream-rtmp-3.3.0.ebuild 894 BLAKE2B 2a748a9a0a17bf7b8047256b846064b6ed40cd6d181bd555db50f78f942a4dd605cd1188f1ada43749f9801b851c6d31ac7a0b43a5ebc976e93a8f9ddf5e5187 SHA512 163e2b1e334d40fd67043bd92ddceb5aa9e0520a054672f20c45b9bff0043302cd31e961f1ccdd97aabc4b06c0056552246e3494c7af282a0a1af7d8de6fdbf7
+EBUILD kodi-inputstream-rtmp-3.4.0.ebuild 894 BLAKE2B 2a748a9a0a17bf7b8047256b846064b6ed40cd6d181bd555db50f78f942a4dd605cd1188f1ada43749f9801b851c6d31ac7a0b43a5ebc976e93a8f9ddf5e5187 SHA512 163e2b1e334d40fd67043bd92ddceb5aa9e0520a054672f20c45b9bff0043302cd31e961f1ccdd97aabc4b06c0056552246e3494c7af282a0a1af7d8de6fdbf7
 EBUILD kodi-inputstream-rtmp-9999.ebuild 894 BLAKE2B 2a748a9a0a17bf7b8047256b846064b6ed40cd6d181bd555db50f78f942a4dd605cd1188f1ada43749f9801b851c6d31ac7a0b43a5ebc976e93a8f9ddf5e5187 SHA512 163e2b1e334d40fd67043bd92ddceb5aa9e0520a054672f20c45b9bff0043302cd31e961f1ccdd97aabc4b06c0056552246e3494c7af282a0a1af7d8de6fdbf7
 MISC metadata.xml 364 BLAKE2B 0b1adf56169d01816334fa11c7b1a6f978d51a262b4324248e4381e158e8e9e9f0488154bfbcf4067edd93dec8f219676115ca1c23b7e6ecae0b95b896383c02 SHA512 ca3f4281e478607a86570a19c4fd345af115184527b623711943a96c222e2f7e08fa593b86c4cda89e109f32bb02eccbe94d1a78281aa9bc2a899fb2bfc6f976
diff --git a/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-2.0.9.ebuild b/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-2.0.9.ebuild
deleted file mode 100644
index 3505fb806a07..000000000000
--- a/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-2.0.9.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake 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}
-	"
-
-src_prepare() {
-	[ -d depends ] && rm -rf depends || die
-	cmake_src_prepare
-}
diff --git a/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-2.0.9-r1.ebuild b/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-3.3.0.ebuild
index 420dcee6d343..a0b89342cd1c 100644
--- a/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-2.0.9-r1.ebuild
+++ b/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-3.3.0.ebuild
@@ -13,15 +13,16 @@ case ${PV} in
 9999)
 	SRC_URI=""
 	EGIT_REPO_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}.git"
+	EGIT_BRANCH="Matrix"
 	inherit git-r3
 	DEPEND="~media-tv/kodi-9999"
 	;;
 *)
-	CODENAME="Leia"
+	CODENAME="Matrix"
 	KEYWORDS="~amd64 ~x86"
 	SRC_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}"
-	DEPEND="=media-tv/kodi-18*:="
+	DEPEND="=media-tv/kodi-19*:="
 	;;
 esac
 
diff --git a/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-3.4.0.ebuild b/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-3.4.0.ebuild
new file mode 100644
index 000000000000..a0b89342cd1c
--- /dev/null
+++ b/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-3.4.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kodi-addon
+
+DESCRIPTION="Kodi's RTMP inputstream addon"
+HOMEPAGE="https://github.com/xbmc/inputstream.rtmp"
+KODI_PLUGIN_NAME="inputstream.rtmp"
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}.git"
+	EGIT_BRANCH="Matrix"
+	inherit git-r3
+	DEPEND="~media-tv/kodi-9999"
+	;;
+*)
+	CODENAME="Matrix"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}"
+	DEPEND="=media-tv/kodi-19*:="
+	;;
+esac
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+
+DEPEND+="
+	media-video/rtmpdump[ssl]
+	"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	if [ -d depends ]; then rm -rf depends || die; fi
+
+	cmake_src_prepare
+}