gentoo resync : 25.08.2020

3 files changed, 48 insertions, 3 deletions

diff --git a/media-plugins/kodi-pvr-vuplus/Manifest b/media-plugins/kodi-pvr-vuplus/Manifest
index f26fcaec3679..53dcbe9f5f58 100644
--- a/media-plugins/kodi-pvr-vuplus/Manifest
+++ b/media-plugins/kodi-pvr-vuplus/Manifest
@@ -7,6 +7,7 @@ DIST kodi-pvr-vuplus-3.28.6.tar.gz 191715 BLAKE2B cfcb0c47fc0960d2383ab11f1e6a5b
 DIST kodi-pvr-vuplus-3.28.7.tar.gz 191502 BLAKE2B 9f24e8ff3e15b7acfe7c395ca048bdde6f9406b382fabe047f8959407a3be0ad46d7f0755fbd19ddcd45e3220d1c7a502c415604671c63b86393272f177d7c86 SHA512 e8b5de5d23691c44b85167b2817b8fba450063b780b26969b9465bf41875a6debff2945d47e84be4adf7b76dc6d0f16a5995a77164ed7ee34bdb7db2466421bd
 DIST kodi-pvr-vuplus-3.28.8.tar.gz 191564 BLAKE2B 101fcad2195127674ac04a24191b13b39c448e8a10277ffb8de92b9d9bb9c571957eb14b8af273f228972061c677f21afbf1fb73da6e405d0596bfc15f98e517 SHA512 53e3d0fcebb8227e0d436011eddb326a3ab80a3a913c3841423cf835cab4d2e7f155d61547d1ec4e6913715a986bee6883b7443e6a3a1a56dd750a08f4b317d8
 DIST kodi-pvr-vuplus-3.28.9.tar.gz 191836 BLAKE2B 1b35fd8e639bc28b0e8be6863bd7ef79ce7c058e7cf531a00b4373ce43cbbc2d66e9e23048514055eb2bc08838ce4d3c919111eb5872dc4a4c9b253c2b301862 SHA512 de5a6cdb4552ef7c86cc250a14ec24ec4729c6a41a99bf72d43ed7762a66b87d061b6c94875bf7dde51ea50213c99313fecd4b42327fdce94d3549214d9dcb9e
+DIST kodi-pvr-vuplus-6.1.1.tar.gz 278369 BLAKE2B e8c9ba3a00fbe467eb4779d22ff189e24189d546050a6d69c1a982c4c797adab31eb760a68eee19ddf22f6fa94ca5a9405f4ad7cd9706246b8c899679b05c615 SHA512 87de5784610275051f68fc732d4a53b218443d0e93b2b1a7e2f4b07cb285e888cf66dc26de0b947080763f5cfa3a58a7ac3363ca00254b4956cba8edba7f7a69
 EBUILD kodi-pvr-vuplus-3.28.0.ebuild 714 BLAKE2B ddc7ca2601a67b0e9d6caea02534bb560f98289893d4d42f354962a7997e3103484bd47842b7d10db546064176dd470c7b14cdc5831334464361a97e41fba1c7 SHA512 1aeb62f2471889fd95448abf155566ce450dc043f27a69c7318e6c5cd874c382a12f9787b86ed4a3f72f867862dc793680660c0bbfd80377481115a6ad9664f6
 EBUILD kodi-pvr-vuplus-3.28.1.ebuild 793 BLAKE2B 481cf99f95fe3b9e01d2f4e30f9d9704ea5220cfe91b21625b1c3d1df0abdce1e9d83910971cae71ed01be8b9c9f10efa832517d8bf169d88765b30dc9a03e7b SHA512 9b5763dbc1b0c9eda706a18e6f669f32e4f5aa9f8f11e9221e81ab6c51ae3cf844ae129a9f3c9a1eec94fa2a280b32a8cbf07af268da75ae08926d112832a4d2
 EBUILD kodi-pvr-vuplus-3.28.2.ebuild 793 BLAKE2B 481cf99f95fe3b9e01d2f4e30f9d9704ea5220cfe91b21625b1c3d1df0abdce1e9d83910971cae71ed01be8b9c9f10efa832517d8bf169d88765b30dc9a03e7b SHA512 9b5763dbc1b0c9eda706a18e6f669f32e4f5aa9f8f11e9221e81ab6c51ae3cf844ae129a9f3c9a1eec94fa2a280b32a8cbf07af268da75ae08926d112832a4d2
@@ -16,5 +17,6 @@ EBUILD kodi-pvr-vuplus-3.28.6.ebuild 793 BLAKE2B 481cf99f95fe3b9e01d2f4e30f9d970
 EBUILD kodi-pvr-vuplus-3.28.7.ebuild 793 BLAKE2B 481cf99f95fe3b9e01d2f4e30f9d9704ea5220cfe91b21625b1c3d1df0abdce1e9d83910971cae71ed01be8b9c9f10efa832517d8bf169d88765b30dc9a03e7b SHA512 9b5763dbc1b0c9eda706a18e6f669f32e4f5aa9f8f11e9221e81ab6c51ae3cf844ae129a9f3c9a1eec94fa2a280b32a8cbf07af268da75ae08926d112832a4d2
 EBUILD kodi-pvr-vuplus-3.28.8.ebuild 793 BLAKE2B 481cf99f95fe3b9e01d2f4e30f9d9704ea5220cfe91b21625b1c3d1df0abdce1e9d83910971cae71ed01be8b9c9f10efa832517d8bf169d88765b30dc9a03e7b SHA512 9b5763dbc1b0c9eda706a18e6f669f32e4f5aa9f8f11e9221e81ab6c51ae3cf844ae129a9f3c9a1eec94fa2a280b32a8cbf07af268da75ae08926d112832a4d2
 EBUILD kodi-pvr-vuplus-3.28.9.ebuild 793 BLAKE2B 481cf99f95fe3b9e01d2f4e30f9d9704ea5220cfe91b21625b1c3d1df0abdce1e9d83910971cae71ed01be8b9c9f10efa832517d8bf169d88765b30dc9a03e7b SHA512 9b5763dbc1b0c9eda706a18e6f669f32e4f5aa9f8f11e9221e81ab6c51ae3cf844ae129a9f3c9a1eec94fa2a280b32a8cbf07af268da75ae08926d112832a4d2
-EBUILD kodi-pvr-vuplus-9999.ebuild 821 BLAKE2B 11827a84db5745ae036536bec483694e8450b2619c800081a203f4eba3efc91e0d6cdef280e0678700662f7e8b305b6ac642ae15d18a463e86ed57e62b30682c SHA512 9f780ab4715d8733097184c0ce99de9856fb3d7010354b5a6eb1df7ef62900bdd7496dad83cb2f698a129ef31a199ce75c1e88cb9e07c978439fad4fe8c3064b
+EBUILD kodi-pvr-vuplus-6.1.1.ebuild 790 BLAKE2B 318c0bb6d01af96d85197cb7a09f5c7a409321e4fc08736bc726efd3000084cfca631eba3aba714ac0d90e692a9ffc4286969e17bf7e4e0371a6225b70cb2333 SHA512 0cc0c5cd415ef5ce9a42cafe109fd7d397b4702de87779278390422c549d27e564b1d0f606d4074ae5e11261e4664ef2308ae0306ce93d94e24c7862a8ba28f3
+EBUILD kodi-pvr-vuplus-9999.ebuild 791 BLAKE2B 9f92260c4ea414dc0e8bee61d366b1c6a48c1055d2c55f7ef2209a17fef92d360c56167726c4f3fc5ea034542c90e5ef6a320a92d0932d3a31436dac5cb62daf SHA512 a98f18e3e191e4964f1fb0cc262489951aca47c7f7bff7dade9976ac0d6c2bedde1430d177a3f4512d62272a91e73cbe27b87b8754418ab48331ab321d3f8610
 MISC metadata.xml 428 BLAKE2B ac264c6bbfc925ff772eda61b1b4069b52ed5bf12836af8d8e86a72fe42bd852be1d00f74056c1d6b925fa2a026ea7df57ee57e7434a797884741b70762ff173 SHA512 573f803447cb7a7d0095eb21caa9f55c41fa4fb68c0f40aabad63df2ee262ce168fc75f28f3a3ae6aa7bf41f258be771c6a6dd06d1f2e2486b3d557d89f28f4f
diff --git a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-6.1.1.ebuild b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-6.1.1.ebuild
new file mode 100644
index 000000000000..514a694a91e0
--- /dev/null
+++ b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-6.1.1.ebuild
@@ -0,0 +1,44 @@
+# 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 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="Matrix"
+	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-19*
+	=dev-libs/libplatform-2*
+	dev-libs/tinyxml
+	dev-cpp/nlohmann_json
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
+
+src_prepare() {
+	[ -d depends ] && rm -rf depends || die
+	cmake_src_prepare
+}
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 e3d879c290d5..2340779b0704 100644
--- a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-9999.ebuild
+++ b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-9999.ebuild
@@ -16,7 +16,7 @@ case ${PV} in
 	inherit git-r3
 	;;
 *)
-	CODENAME="Leia"
+	CODENAME="Matrix"
 	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}"
@@ -29,7 +29,6 @@ IUSE=""
 
 DEPEND="
 	~media-tv/kodi-9999
-	~media-libs/kodi-platform-9999
 	=dev-libs/libplatform-2*
 	dev-libs/tinyxml
 	dev-cpp/nlohmann_json