gentoo resync : 25.11.2020

3 files changed, 6 insertions, 47 deletions

diff --git a/media-plugins/kodi-pvr-filmon/Manifest b/media-plugins/kodi-pvr-filmon/Manifest
index a232592de7b2..d0742be13de5 100644
--- a/media-plugins/kodi-pvr-filmon/Manifest
+++ b/media-plugins/kodi-pvr-filmon/Manifest
@@ -1,8 +1,6 @@
-DIST kodi-pvr-filmon-2.4.4.tar.gz 104862 BLAKE2B 8333be55812ec5cb18535aa696c07e16cc02712522b540bef346bd030fdbd572daae47d81bed78be243014fb920911309d5f924079d323104c60090d0ca2c72b SHA512 f6d7c90842ca59ebb3b254860b47d7c1b7e6e5bd70f06744341eaf30a4bc2847027818a2bb097e56398354315753cfea7878cf2b82c3fc69b0aeed106b8d8e80
-DIST kodi-pvr-filmon-2.4.6.tar.gz 105423 BLAKE2B 75c64e863da1609ed7f8176635c90062de9008d1f814fd4cfbb7110d6e46fc1a9bb79dbddfce2e3edbb341048c11f80a126666701209afc5152ccd2035d7b4d1 SHA512 832840319bfb8d9d89883ecc58a4cbc1e32807bed5296dd1bcf033199109b47c5a48be4609e6879ba49a69da61958b2dec033729bb9536a0d26990102472f400
 DIST kodi-pvr-filmon-5.1.0.tar.gz 111224 BLAKE2B 8c65a7ed7bcd1846c0bf64ccf99111d8fdbd882a06a6045577d031fa68730ade691362f8b60105714e5ebe7f57e31d1e76927b1b505926b4fd7f3e99efc24983 SHA512 02ba24e23c44ae3000c4f41e90169ea1455678927c6de1fda1927c705bbb236ed06bd5ecd0da59f547f02afe7b695306f7282cdc5014816fd9e0f1922243b2fd
-EBUILD kodi-pvr-filmon-2.4.4.ebuild 697 BLAKE2B 40d100012cb3c7583684aebf7741c4629291a227af15627c4d9dac9a2b47ae2bbbf322ab34b70f03dab4c026ebb70e7bbcf6688468d81df840e151dcb9700760 SHA512 162b3053e55f4ca20f5586592b96538a4640dc32c5ed682262899880699b2097b013533eda33c3cf74d35b7a8aa6ce595188c16dea1054811e0cd8cfd2c0614e
-EBUILD kodi-pvr-filmon-2.4.6.ebuild 697 BLAKE2B e191080842e83d16027afe50f4fb0879683684e06f9f63057ead9c22fa4db97f057ca84e592e9f25a68312dbf8ecead1f52f60290d5e4c5e798d31aa31451c5f SHA512 259df98dadf703e067d10534ac68eb0fe0c382b986435f19ee677d6f6dcebbb6735cf4a10f79eace7cc6494ee92746aa190523ca03ad9f7515eb48189e661442
+DIST kodi-pvr-filmon-6.0.0.tar.gz 108084 BLAKE2B a30f73569fdea28d9c4beca1e605099e9ee4bdfc61c9c56e7c5089d26857cd67785bff0b7ac81916379d8ec825e2f1c1f870a9351bd49d24f35e7274777596ec SHA512 c86f649a12fca13ba5aabcd3c4c37a75279646fd093f48aa20ed3d6a75ad1de0980daffd3aac4771581628974515351c8f9618f60b4b5ea6b66ad91ea6ba0f6d
 EBUILD kodi-pvr-filmon-5.1.0.ebuild 662 BLAKE2B 7866d82a74f4c3636f63ef889ccc87abb2ef325002b5313fa2c5f28ab3ef80e544747c0ce9add7386ac39bee3ed34cad22d68da2ba28464a5bddf7488f945ded SHA512 32a94940509cdb8523bbf0ab6013b37dcb9ef18b865ab3b82b005f7eea88a64804f457092d8a69f0c94fc7e4caf64f0f626c518bce690ee01f4369d7a598f7d3
+EBUILD kodi-pvr-filmon-6.0.0.ebuild 662 BLAKE2B 7866d82a74f4c3636f63ef889ccc87abb2ef325002b5313fa2c5f28ab3ef80e544747c0ce9add7386ac39bee3ed34cad22d68da2ba28464a5bddf7488f945ded SHA512 32a94940509cdb8523bbf0ab6013b37dcb9ef18b865ab3b82b005f7eea88a64804f457092d8a69f0c94fc7e4caf64f0f626c518bce690ee01f4369d7a598f7d3
 EBUILD kodi-pvr-filmon-9999.ebuild 663 BLAKE2B 4b2f64e7ad0b13994ae98e611346d88b3b24255e8d4ffe3dd9eda35b553b9de85c78538855df31ad6d7bea05660251a1f53eb603d87a5e3039a0a3b24230cd5b SHA512 8aa1ccd46a6af7fcb08e54e833652f5e6747a0c223f450fd8a6ecad4918a84082d7d32fe4686a2d1829ff1ea75757928898fc61e653b3d434a18f47cf663462a
 MISC metadata.xml 362 BLAKE2B 994323335a8588c4281b8a54c7d3129ec08bfb8430b3f56b31c62a20bab0683ea0397d6ce7af1ee4e77e97c6ad880aadc8cbf5c8b3fe3544b41f786fe42bb3de SHA512 c53ff24095bb3246146ad503596d61833a610ce82c670c8250fe6be159f4fff9303e43601b492f86ce99a47c37aa55aee938dc4060530eed67b525e7fe6a49f7
diff --git a/media-plugins/kodi-pvr-filmon/kodi-pvr-filmon-2.4.4.ebuild b/media-plugins/kodi-pvr-filmon/kodi-pvr-filmon-2.4.4.ebuild
deleted file mode 100644
index a785a13ade13..000000000000
--- a/media-plugins/kodi-pvr-filmon/kodi-pvr-filmon-2.4.4.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# 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 Filmon client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.filmon"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.filmon.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Leia"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.filmon/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.filmon-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-18*
-	=media-libs/kodi-platform-18*
-	dev-libs/jsoncpp
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-filmon/kodi-pvr-filmon-2.4.6.ebuild b/media-plugins/kodi-pvr-filmon/kodi-pvr-filmon-6.0.0.ebuild
index 241eb1f9aea9..6c7b60670368 100644
--- a/media-plugins/kodi-pvr-filmon/kodi-pvr-filmon-2.4.6.ebuild
+++ b/media-plugins/kodi-pvr-filmon/kodi-pvr-filmon-6.0.0.ebuild
@@ -1,9 +1,9 @@
 # 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 Filmon client addon"
 HOMEPAGE="https://github.com/kodi-pvr/pvr.filmon"
@@ -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.filmon/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/pvr.filmon-${PV}-${CODENAME}"
@@ -28,8 +28,7 @@ SLOT="0"
 IUSE=""
 
 DEPEND="
-	=media-tv/kodi-18*
-	=media-libs/kodi-platform-18*
+	=media-tv/kodi-19*
 	dev-libs/jsoncpp
 	"