gentoo resync : 14.12.2020

25 files changed, 15 insertions, 575 deletions

diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index 36a2196af427..78ae4759f2d0 100644
--- a/media-plugins/Manifest.gz
+++ b/media-plugins/Manifest.gz
diff --git a/media-plugins/kodi-pvr-hts/Manifest b/media-plugins/kodi-pvr-hts/Manifest
index 04804b3c9515..1b1e80c67ef4 100644
--- a/media-plugins/kodi-pvr-hts/Manifest
+++ b/media-plugins/kodi-pvr-hts/Manifest
@@ -1,14 +1,4 @@
-DIST kodi-pvr-hts-7.1.4.tar.gz 167634 BLAKE2B 34c19b9be6f8e66c22b93e74703d55ccf66970fb39b4c2ac52146aa9d94175280406339fbe6651a53be4b9216713dbeb25fc004f9959a1ce1db42e13b0aec2f7 SHA512 91f9420ad88ec806d2d16e618827583039b90e488014d0f998108c9d94906aa247755f5d53dc4b59badc9fdfad96c975b0d7c98ef0ffd7116171e8abd247c94b
-DIST kodi-pvr-hts-7.2.0.tar.gz 167998 BLAKE2B 4da53589b58849259d66a03d2f719067cc1749ea181ad6037f03ca178879a34e209422039a1b2d0b3900ee2a2ef65d32a09cae0f177dc17dd8aa97e06dea4f2b SHA512 736188c4464c9110e4916223cd0aa79195547d4ff568aea711aa42c1145d5aa981d1d5f62d4ed79b37575592bda9f2bbc532eff7b09e48785e644e8fdea668c0
-DIST kodi-pvr-hts-7.2.1.tar.gz 180461 BLAKE2B c0beed28549d80f71e5bb7197a396c5abf6c26e119caee5624e37c250d718425519d93317e26e1fa831f13d83903807e2fa3917831645ed83e465f8177cc77d3 SHA512 6f971a14e04c4ebb7b300286f7b10f64092eac91a63cbb1ea7ce0d47431231743080b73eb9939273e775f69c1659c2daa669ee53b22be3dafa4c732b095c43f8
-DIST kodi-pvr-hts-7.2.2.tar.gz 180484 BLAKE2B 051fec04c54ef0e6d6bb756e118827b399881d34eb4657efad0a8f390d96d3b7117a7b48172674d6e5fa6179bf96716665f97d8bacd3f3097d7087eaa1cfa902 SHA512 1dd1a097f08e329afdcbcf749417da57001b0191b3a00851607851ba982a268d122dbb9bccf779a8d95f96227a1cf7dd557fcc7761fa32ed263510c2e7941f33
-DIST kodi-pvr-hts-8.0.0.tar.gz 180516 BLAKE2B 3c76654515e3c40fb900c3765ecbb7648cead5d75cc6e43f440378f3041fa9acedc12bb996197384dd0a1a19be0e7771d67f8f5b496e3b421eeee8dfa58b79af SHA512 18f707bbaa5068aa2d2c2c71b4c8730e3edc1d9f24cdc99ebff0c665f47cab91c88111a444648cb733595e05d1275032cd824edcbb008e9c7609c2372eb03b9a
-DIST kodi-pvr-hts-8.1.0.tar.gz 180549 BLAKE2B 01cce4af7e4859e6b9cbf21db80869dede60410f4b8a90e2ca7341cf36e3ffe97af356cb67ba4b604dbcd2bd8ee5374b91a4e5edf533414cef74abad2c4835e4 SHA512 dd3cdd183a1bfcb281ca72dac852e8ff8751747b5d2bc6a50234bf30954925e101235760052742ba7b82ba35177a80f0ea3833974912ac010ec666e718177676
-EBUILD kodi-pvr-hts-7.1.4.ebuild 686 BLAKE2B 71475aa7b92deb77359b521d10487da4a340fd4d6b5282d144c984a34afe2515059f21205e12ebb95f182a1b27cae107daa9900c9c1876691da9dc121b74b08d SHA512 34df4626bd706780cafda9f15e8d308573b0155a2cca4bb4d556bf95e8c64d34ed07868fd77085f06043fde19848ba4ae27632340d3dac925342453469b4031f
-EBUILD kodi-pvr-hts-7.2.0.ebuild 686 BLAKE2B 71475aa7b92deb77359b521d10487da4a340fd4d6b5282d144c984a34afe2515059f21205e12ebb95f182a1b27cae107daa9900c9c1876691da9dc121b74b08d SHA512 34df4626bd706780cafda9f15e8d308573b0155a2cca4bb4d556bf95e8c64d34ed07868fd77085f06043fde19848ba4ae27632340d3dac925342453469b4031f
-EBUILD kodi-pvr-hts-7.2.1.ebuild 660 BLAKE2B a079cd60833f98854c3b7a53cefe70b53feed00599dcb5963074911479c20c7120541c809944138f91f317d6d521bb12985f7f16811999ca2eee8eeda19d730d SHA512 55d0745e9dea4804e81f6f49c4578c8ec306937c29059314365789e33a5022aaa8810f4d9660ce6d23b842c6328198a155584d8c4716bc2a5daec9f20feca19b
-EBUILD kodi-pvr-hts-7.2.2.ebuild 660 BLAKE2B a079cd60833f98854c3b7a53cefe70b53feed00599dcb5963074911479c20c7120541c809944138f91f317d6d521bb12985f7f16811999ca2eee8eeda19d730d SHA512 55d0745e9dea4804e81f6f49c4578c8ec306937c29059314365789e33a5022aaa8810f4d9660ce6d23b842c6328198a155584d8c4716bc2a5daec9f20feca19b
-EBUILD kodi-pvr-hts-8.0.0.ebuild 660 BLAKE2B a079cd60833f98854c3b7a53cefe70b53feed00599dcb5963074911479c20c7120541c809944138f91f317d6d521bb12985f7f16811999ca2eee8eeda19d730d SHA512 55d0745e9dea4804e81f6f49c4578c8ec306937c29059314365789e33a5022aaa8810f4d9660ce6d23b842c6328198a155584d8c4716bc2a5daec9f20feca19b
-EBUILD kodi-pvr-hts-8.1.0.ebuild 660 BLAKE2B a079cd60833f98854c3b7a53cefe70b53feed00599dcb5963074911479c20c7120541c809944138f91f317d6d521bb12985f7f16811999ca2eee8eeda19d730d SHA512 55d0745e9dea4804e81f6f49c4578c8ec306937c29059314365789e33a5022aaa8810f4d9660ce6d23b842c6328198a155584d8c4716bc2a5daec9f20feca19b
+DIST kodi-pvr-hts-8.1.2.tar.gz 180630 BLAKE2B d65843b7ede1c2543c0c2d2c408c47a0004632154e3a35a119384e90f9104b523f90776c1387fee33acc97fdc1d04a691eb45b064ed25c45a73913b5c0a32e74 SHA512 92a510336a7ca7563149909c6d155d0ee7adf633653860d32cc29e1c88b88577d9ed8eea75bb507707645e254e116aa3ffc4f8a4acb95b1fb15157f7c8e3a2dc
+EBUILD kodi-pvr-hts-8.1.2.ebuild 660 BLAKE2B a079cd60833f98854c3b7a53cefe70b53feed00599dcb5963074911479c20c7120541c809944138f91f317d6d521bb12985f7f16811999ca2eee8eeda19d730d SHA512 55d0745e9dea4804e81f6f49c4578c8ec306937c29059314365789e33a5022aaa8810f4d9660ce6d23b842c6328198a155584d8c4716bc2a5daec9f20feca19b
 EBUILD kodi-pvr-hts-9999.ebuild 661 BLAKE2B 2e17ace5bb95016788db8c07b1d0aef10f72c5bf82f7c0321d27525550a382a565df112d4a5125233ae029dc294962da333d1f384a46bedd643d81e1c1a65fa0 SHA512 f6122a34e52426853d476eedfa33209d9435e02c79ae75520e6c64ae36a5cb663ee9140c96d53f2e7437c20135776ab8071c1a2de6cf73841c0cf3adc8bd10da
 MISC metadata.xml 439 BLAKE2B bc951f0eaf43cf751137213ab717ca84d60964687c640b778459afcc461700148ade8cf59afa7d0d0805fc53285db28de84950f38a0b9c3c7bb6c5a2c553214c SHA512 92746f7dacc9316b473e2e62ffaecedf88d760f91970cfd794d306e117ba45cdb509fc0cc7d868d55f70d8c567ffc34517c27c37dc51e0756758ce2860739a5f
diff --git a/media-plugins/kodi-pvr-hts/kodi-pvr-hts-7.1.4.ebuild b/media-plugins/kodi-pvr-hts/kodi-pvr-hts-7.1.4.ebuild
deleted file mode 100644
index 764206faf8d3..000000000000
--- a/media-plugins/kodi-pvr-hts/kodi-pvr-hts-7.1.4.ebuild
+++ /dev/null
@@ -1,34 +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="Tvheadend Live TV and Radio PVR client addon for Kodi"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.hts"
-SRC_URI=""
-
-if [[ ${PV} == 9999 ]]; then
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.hts.git"
-	inherit git-r3
-else
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.hts/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.hts-${PV}-${CODENAME}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=dev-libs/libplatform-2*
-	=media-tv/kodi-19*
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-hts/kodi-pvr-hts-7.2.0.ebuild b/media-plugins/kodi-pvr-hts/kodi-pvr-hts-7.2.0.ebuild
deleted file mode 100644
index 764206faf8d3..000000000000
--- a/media-plugins/kodi-pvr-hts/kodi-pvr-hts-7.2.0.ebuild
+++ /dev/null
@@ -1,34 +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="Tvheadend Live TV and Radio PVR client addon for Kodi"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.hts"
-SRC_URI=""
-
-if [[ ${PV} == 9999 ]]; then
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.hts.git"
-	inherit git-r3
-else
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.hts/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.hts-${PV}-${CODENAME}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=dev-libs/libplatform-2*
-	=media-tv/kodi-19*
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-hts/kodi-pvr-hts-7.2.2.ebuild b/media-plugins/kodi-pvr-hts/kodi-pvr-hts-7.2.2.ebuild
deleted file mode 100644
index c5e930e99316..000000000000
--- a/media-plugins/kodi-pvr-hts/kodi-pvr-hts-7.2.2.ebuild
+++ /dev/null
@@ -1,33 +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="Tvheadend Live TV and Radio PVR client addon for Kodi"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.hts"
-SRC_URI=""
-
-if [[ ${PV} == 9999 ]]; then
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.hts.git"
-	inherit git-r3
-else
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.hts/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.hts-${PV}-${CODENAME}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-19*
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-hts/kodi-pvr-hts-8.0.0.ebuild b/media-plugins/kodi-pvr-hts/kodi-pvr-hts-8.0.0.ebuild
deleted file mode 100644
index c5e930e99316..000000000000
--- a/media-plugins/kodi-pvr-hts/kodi-pvr-hts-8.0.0.ebuild
+++ /dev/null
@@ -1,33 +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="Tvheadend Live TV and Radio PVR client addon for Kodi"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.hts"
-SRC_URI=""
-
-if [[ ${PV} == 9999 ]]; then
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.hts.git"
-	inherit git-r3
-else
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.hts/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.hts-${PV}-${CODENAME}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-19*
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-hts/kodi-pvr-hts-8.1.0.ebuild b/media-plugins/kodi-pvr-hts/kodi-pvr-hts-8.1.0.ebuild
deleted file mode 100644
index c5e930e99316..000000000000
--- a/media-plugins/kodi-pvr-hts/kodi-pvr-hts-8.1.0.ebuild
+++ /dev/null
@@ -1,33 +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="Tvheadend Live TV and Radio PVR client addon for Kodi"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.hts"
-SRC_URI=""
-
-if [[ ${PV} == 9999 ]]; then
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.hts.git"
-	inherit git-r3
-else
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.hts/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.hts-${PV}-${CODENAME}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-19*
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-hts/kodi-pvr-hts-7.2.1.ebuild b/media-plugins/kodi-pvr-hts/kodi-pvr-hts-8.1.2.ebuild
index c5e930e99316..c5e930e99316 100644
--- a/media-plugins/kodi-pvr-hts/kodi-pvr-hts-7.2.1.ebuild
+++ b/media-plugins/kodi-pvr-hts/kodi-pvr-hts-8.1.2.ebuild
diff --git a/media-plugins/kodi-pvr-iptvsimple/Manifest b/media-plugins/kodi-pvr-iptvsimple/Manifest
index ac35c9a8a927..2acf46d3f5a2 100644
--- a/media-plugins/kodi-pvr-iptvsimple/Manifest
+++ b/media-plugins/kodi-pvr-iptvsimple/Manifest
@@ -1,12 +1,4 @@
-DIST kodi-pvr-iptvsimple-6.3.1.tar.gz 178767 BLAKE2B 9ce62b099bb1b5bd8038b0b638a7673c8498a128d9901c17263edb17ee6482ad83eb4bd8acd4144eaf8b694e72bc2eecc4cefd3675de82177f185aca18403dfe SHA512 586f404c43e496ee7a12c84ed6f5ae9f373b1197be24b9d34df0c1c226961d0da5642b707f8f4bcf2ca9a5b38a3d5f6a8a17d31173af4e2c8ee6a0582707862d
-DIST kodi-pvr-iptvsimple-6.3.2.tar.gz 192436 BLAKE2B 8d793ed6802a93457f1d1f2c1f08604c1f7e0387f29358ce3f97adf70ae5c05835dfd43bf59787970b8087ee948099d46b2d32ef5a76a04b9e91cfd048f745ea SHA512 20a44e24403575493d3afeb76cf376dfcd31a9f6dbc2e64e43ccc4a007cef517af1287d5b6985d925d523b926642cb79586e296707dd6ada891edf29523bf61c
-DIST kodi-pvr-iptvsimple-6.4.0.tar.gz 179020 BLAKE2B b4dbabc152cdea4c3768a6d74e1d67e2e1686ccc161fef40f25872e58ee07b66f732db1df48a1947103075b9828f11484a0961ede766806f0a27d2271fbc6a66 SHA512 b9a52244ef502c62127658903dddd0c391c5acae34999dd57a4a42fc4ce4d138b96dcd6f485eb08ef346a6d7e173175e5d7954feb8928fb8df097fb1ecbce051
-DIST kodi-pvr-iptvsimple-6.4.1.tar.gz 179019 BLAKE2B eaaa2230d697d2f85b26b3949ecb36b95fc02f57bee740b33f2ad99239b32067a1f89188320dbd874d4e15a2fd6a906f252e52ef619a09b40a2eb348fb30b805 SHA512 048898135ccd08ed2d584c52bfc94bb22865931036173c642606695ed68ffc55478a255e183e347ee9c704225a2af855871f4aaed85b614a42e7dcad040408dc
-DIST kodi-pvr-iptvsimple-7.0.0.tar.gz 179504 BLAKE2B 11598b6313bcd0b0909df0191168e8e4d468c31be96290af881658656f92d5e97f031408fef6677e962f4203e6a02896977d49225f58f0fa5eb1d21bc28b5e22 SHA512 7c0d1f82f74c4c66e9276aa31444b76a816c6fa456ea53e25b897d7c24c352529dd158043391817502172d0c0c90ae6da22329ba334b6bbd38438e981036bce4
-EBUILD kodi-pvr-iptvsimple-6.3.1.ebuild 802 BLAKE2B c592515b2b56a24ea223a837e21c96b171bffe323703a8011c04741432ea0e474204701aa3ade26d0fc088dfcf6661cf775fc111d9c548200b47f9a17634b8bb SHA512 b348a54ff3daa6cc31d278a6d7cc9a44bfb8943f6d0507e5429ff9302b6864b3573457ad52ffcd41cd8015cb679dd888af520213b54c8bb7e23283dcf3bc8bc6
-EBUILD kodi-pvr-iptvsimple-6.3.2.ebuild 776 BLAKE2B e35d8f0e397792b7e14f166fe48eb4a9c7d37a55bf05bd3a002bf47aad9e3295cbf43c0e6c783e7846d9cf5f4334f38272052a4fcc434a98f1a5818d4c6cb55c SHA512 0977e1fe83192fc516ebf1fe68b2bb6a58255e80f4ff52fea22869d8beb4388b5bc802c9ef8ffa3840e05819d769666c14cb268ec8d94dfc3423db6b142f393c
-EBUILD kodi-pvr-iptvsimple-6.4.0.ebuild 776 BLAKE2B e35d8f0e397792b7e14f166fe48eb4a9c7d37a55bf05bd3a002bf47aad9e3295cbf43c0e6c783e7846d9cf5f4334f38272052a4fcc434a98f1a5818d4c6cb55c SHA512 0977e1fe83192fc516ebf1fe68b2bb6a58255e80f4ff52fea22869d8beb4388b5bc802c9ef8ffa3840e05819d769666c14cb268ec8d94dfc3423db6b142f393c
-EBUILD kodi-pvr-iptvsimple-6.4.1.ebuild 776 BLAKE2B e35d8f0e397792b7e14f166fe48eb4a9c7d37a55bf05bd3a002bf47aad9e3295cbf43c0e6c783e7846d9cf5f4334f38272052a4fcc434a98f1a5818d4c6cb55c SHA512 0977e1fe83192fc516ebf1fe68b2bb6a58255e80f4ff52fea22869d8beb4388b5bc802c9ef8ffa3840e05819d769666c14cb268ec8d94dfc3423db6b142f393c
-EBUILD kodi-pvr-iptvsimple-7.0.0.ebuild 776 BLAKE2B e35d8f0e397792b7e14f166fe48eb4a9c7d37a55bf05bd3a002bf47aad9e3295cbf43c0e6c783e7846d9cf5f4334f38272052a4fcc434a98f1a5818d4c6cb55c SHA512 0977e1fe83192fc516ebf1fe68b2bb6a58255e80f4ff52fea22869d8beb4388b5bc802c9ef8ffa3840e05819d769666c14cb268ec8d94dfc3423db6b142f393c
+DIST kodi-pvr-iptvsimple-7.1.0.tar.gz 180721 BLAKE2B 0ec7ac0ffd1eb480e3a3a956b3fbd79e5bc3607713839a72dff45dc2d22e66d006d354ec12a5606360703f3e6bb29457e17034a5644ba06fc5ef032b5f0690c4 SHA512 b4b97d94c216a195b3741dc816ab9441493550c4d9fa9c9b28ba58dfb31a4d94e3fd429384ca46bf3150a607c8c52feac402a6f18f664bc18353a7c40e54f85e
+EBUILD kodi-pvr-iptvsimple-7.1.0.ebuild 776 BLAKE2B e35d8f0e397792b7e14f166fe48eb4a9c7d37a55bf05bd3a002bf47aad9e3295cbf43c0e6c783e7846d9cf5f4334f38272052a4fcc434a98f1a5818d4c6cb55c SHA512 0977e1fe83192fc516ebf1fe68b2bb6a58255e80f4ff52fea22869d8beb4388b5bc802c9ef8ffa3840e05819d769666c14cb268ec8d94dfc3423db6b142f393c
 EBUILD kodi-pvr-iptvsimple-9999.ebuild 777 BLAKE2B 1f18d43d3ce74c2dffbba99b6ad31c572d5fc5235409ddfb864abc8b2dcb3e5c1b584d7c58fd34b6aee45503198361c5b0b1d90b3946be18ac7cc9429330c214 SHA512 98b61705920ca7daf65b16c5c38e10f7e0a832e2b91c8eee0a513f2f459591ddfdd59a4146eca101630a7ccf863218c8d5e593a4704ffa70eccb4c7133679328
 MISC metadata.xml 366 BLAKE2B 7e2c022e027a3c4d0c1f5d5aa889b390fa079d8c71b16ea773403b9bbce28c7dae01d370d741575255b20dd4b7cf1b9d3f58161ac271c8829ed26d65920f5876 SHA512 379194149299ccced43f0c2054ef9fd8c049e4d9397c062ece4dd2e517f1f10a670cf53626daf7f53261981ac346c38e7aed9ae0710527843051a2d861c7f655
diff --git a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-6.3.1.ebuild b/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-6.3.1.ebuild
deleted file mode 100644
index ca427448e66e..000000000000
--- a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-6.3.1.ebuild
+++ /dev/null
@@ -1,44 +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 IPTVSimple client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.iptvsimple"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.iptvsimple.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.iptvsimple/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.iptvsimple-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=dev-libs/libplatform-2*
-	dev-libs/pugixml
-	=media-tv/kodi-19*
-	sys-libs/zlib
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
-
-src_prepare() {
-	[ -d depends ] && rm -rf depends || die
-	cmake_src_prepare
-}
diff --git a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-6.4.0.ebuild b/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-6.4.0.ebuild
deleted file mode 100644
index d29c62c10d9a..000000000000
--- a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-6.4.0.ebuild
+++ /dev/null
@@ -1,43 +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 IPTVSimple client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.iptvsimple"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.iptvsimple.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.iptvsimple/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.iptvsimple-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	dev-libs/pugixml
-	=media-tv/kodi-19*
-	sys-libs/zlib
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
-
-src_prepare() {
-	[ -d depends ] && rm -rf depends || die
-	cmake_src_prepare
-}
diff --git a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-6.4.1.ebuild b/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-6.4.1.ebuild
deleted file mode 100644
index d29c62c10d9a..000000000000
--- a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-6.4.1.ebuild
+++ /dev/null
@@ -1,43 +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 IPTVSimple client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.iptvsimple"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.iptvsimple.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.iptvsimple/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.iptvsimple-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	dev-libs/pugixml
-	=media-tv/kodi-19*
-	sys-libs/zlib
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
-
-src_prepare() {
-	[ -d depends ] && rm -rf depends || die
-	cmake_src_prepare
-}
diff --git a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-6.3.2.ebuild b/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-7.1.0.ebuild
index d29c62c10d9a..d29c62c10d9a 100644
--- a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-6.3.2.ebuild
+++ b/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-7.1.0.ebuild
diff --git a/media-plugins/kodi-pvr-nextpvr/Manifest b/media-plugins/kodi-pvr-nextpvr/Manifest
index b0b066cad8d0..45e70ad0c42f 100644
--- a/media-plugins/kodi-pvr-nextpvr/Manifest
+++ b/media-plugins/kodi-pvr-nextpvr/Manifest
@@ -1,14 +1,4 @@
-DIST kodi-pvr-nextpvr-7.0.0.tar.gz 145031 BLAKE2B 01d8583d74111dfcb59a139987dc30cc900a41742ea28d4a0fcec11864cb6fc505dd200cf7b61c9dc3d7338ac500d014cc6a312ed8b26be6387604a7969aa9d1 SHA512 b7ede2d9f2a384816c48c19078583aa996f8d08671842444abc93a02e7d3cea9669deb67c26429aa68d3875b6644c29f467bc925768a336916b6b6a7d0894cc9
-DIST kodi-pvr-nextpvr-7.0.2.tar.gz 146987 BLAKE2B 751e08334f29f447b6abd665c782cee9ddc7a1b40a6600296a68d131827feecac3c71622aa1fc61c30d6aafa799b82f7197528c2fdd764a8a66f263493bca2a7 SHA512 8e3d0f127379263b55e565a5eafc062a265a354e23f3c184093e4f6a3ffbccddddf0acddb89321165f7c7242c6c55d22b2a033e4d52bb5cd9e48baef91d15a08
-DIST kodi-pvr-nextpvr-7.1.0.tar.gz 145632 BLAKE2B 048e006df0817390037d79c3c1f4286c8309630c21931842f52b152c389e356fb7297799fcb1eba04a11029ae55e2c88d637acfa933279f9b3b7488fc823256c SHA512 1d4fa70b1ad4988b9b7b6cf04b992c5bf5f6c7ea469dcb4c745e90b6b09d2de52ec1ec785c30dcb7cdf1703aef9fbedc2ad2b43d1bcc7c7480daef4b1fc50e26
-DIST kodi-pvr-nextpvr-7.1.1.tar.gz 147599 BLAKE2B 0091182e313d9ca052f08cf9615dfaca51e1354d54f58685e23a767cc8ada532c531ff67f198f74f84d5252b61f2bc1a2c06d8ffe92ff771730a2a54c7841c3d SHA512 7a387c9d42e3044c99125292da7d399bfd138d5126904daa5acb3612b46e54adb1ba890d8a90dc20af8cf9b9dbc152531fdbaa8f38d4f7faf208176379542752
-DIST kodi-pvr-nextpvr-8.0.0.tar.gz 147610 BLAKE2B 22928f16d9b9b2af7d5226137a0768e321ed2490b9f06046a232a9b906b98690b5f96aac32e5843e0163ac8836250fdbef535b06ee93792f6752719ece7d54ec SHA512 66f92a6b9239729017cc87dc75842e545b5bed711298231366238d0c56e4154944819a4607bd1e1bfc49721a41ca0644721304c9fb037a6cab034ae51dde3349
-DIST kodi-pvr-nextpvr-8.0.1.tar.gz 147804 BLAKE2B ae1489eb5b8c72a635dd59c94f9aa45626cd49fad1bc897fde0c8868009bc9f3b5d43eafef2ce378060a1061848b7d798ce015f4d156a11b10cb89e109ab5d85 SHA512 91d0a6d8f3c21d55e11e116b4bca4832f17e06a2ab7b45963739109575a33e037cf73258aae3ec26ab1b3746c0c5777800ef3d266c170859ea393423ad031a35
-EBUILD kodi-pvr-nextpvr-7.0.0.ebuild 694 BLAKE2B 9b426aec0094895fb33bc0dbb7a669c29f0fcc084a2c3c3eb611f17b2b44e4df6352d7693453ce6b09c0cdf32379b8b8c8aa07f6bd7744dba41ac2f50dbafe57 SHA512 d45bb0e67795ec68e7254a110790b51954795328c1dc92a723306c06bac1268bb6d3ddf4c6a5d89648240f8a4d542d27a0d2a5f5702a509255bab0bfc00f97d4
-EBUILD kodi-pvr-nextpvr-7.0.2.ebuild 694 BLAKE2B 9b426aec0094895fb33bc0dbb7a669c29f0fcc084a2c3c3eb611f17b2b44e4df6352d7693453ce6b09c0cdf32379b8b8c8aa07f6bd7744dba41ac2f50dbafe57 SHA512 d45bb0e67795ec68e7254a110790b51954795328c1dc92a723306c06bac1268bb6d3ddf4c6a5d89648240f8a4d542d27a0d2a5f5702a509255bab0bfc00f97d4
-EBUILD kodi-pvr-nextpvr-7.1.0.ebuild 668 BLAKE2B ab018cbba41dd1fe44af666c6b1d993ff02170e76fa5aa607c9b315b08be3072007b5a7151086fe3dcdb1680ae326d0a0322c3644a7a35585ee15334cfab8ed2 SHA512 9b1b43c034b75d252e0a3c3ee1e4cbd894e206cc47882d05be06dbb54b9e1e2547e1a2f984995843f3f4b6472112b0b9dca2b2055b40274dcd12dc640ad4ac23
-EBUILD kodi-pvr-nextpvr-7.1.1.ebuild 668 BLAKE2B ab018cbba41dd1fe44af666c6b1d993ff02170e76fa5aa607c9b315b08be3072007b5a7151086fe3dcdb1680ae326d0a0322c3644a7a35585ee15334cfab8ed2 SHA512 9b1b43c034b75d252e0a3c3ee1e4cbd894e206cc47882d05be06dbb54b9e1e2547e1a2f984995843f3f4b6472112b0b9dca2b2055b40274dcd12dc640ad4ac23
-EBUILD kodi-pvr-nextpvr-8.0.0.ebuild 668 BLAKE2B ab018cbba41dd1fe44af666c6b1d993ff02170e76fa5aa607c9b315b08be3072007b5a7151086fe3dcdb1680ae326d0a0322c3644a7a35585ee15334cfab8ed2 SHA512 9b1b43c034b75d252e0a3c3ee1e4cbd894e206cc47882d05be06dbb54b9e1e2547e1a2f984995843f3f4b6472112b0b9dca2b2055b40274dcd12dc640ad4ac23
-EBUILD kodi-pvr-nextpvr-8.0.1.ebuild 668 BLAKE2B ab018cbba41dd1fe44af666c6b1d993ff02170e76fa5aa607c9b315b08be3072007b5a7151086fe3dcdb1680ae326d0a0322c3644a7a35585ee15334cfab8ed2 SHA512 9b1b43c034b75d252e0a3c3ee1e4cbd894e206cc47882d05be06dbb54b9e1e2547e1a2f984995843f3f4b6472112b0b9dca2b2055b40274dcd12dc640ad4ac23
+DIST kodi-pvr-nextpvr-8.0.2.tar.gz 148511 BLAKE2B 058464e3144216dd0b36bdaf7f124933b5fed3e5cd4672b79b6226cf727bc9ec7434e63855484069d364e34e97da0c1a62cd234b3b15411dcac7fff43cc83617 SHA512 951cce79233a0606fb12669f52ba7fe24381cfc9d56213dcfed5a928ab41ec974d919713a530ef5d465a31f5d7da175594c28790a55cfc9e144473903d79c49b
+EBUILD kodi-pvr-nextpvr-8.0.2.ebuild 668 BLAKE2B ab018cbba41dd1fe44af666c6b1d993ff02170e76fa5aa607c9b315b08be3072007b5a7151086fe3dcdb1680ae326d0a0322c3644a7a35585ee15334cfab8ed2 SHA512 9b1b43c034b75d252e0a3c3ee1e4cbd894e206cc47882d05be06dbb54b9e1e2547e1a2f984995843f3f4b6472112b0b9dca2b2055b40274dcd12dc640ad4ac23
 EBUILD kodi-pvr-nextpvr-9999.ebuild 669 BLAKE2B 2df674d0426fa7f3195e7ec54e507955811e2dd2d0d0ed70d2d7d61b43e466b15fa0a5539905f88b07159a3eb220e205c95daca2f42b0ed386ca4e2899f083cb SHA512 e25dda696230ab5f661277943e9265c4efb37091beabce465460893765f4758b6f5a72f88e9697c9bdfe6014f0638599db1c59226b9672dc387d9da1734992e1
 MISC metadata.xml 363 BLAKE2B 360045b62c00991268efd908e4d47cd2468232ce63afb72b10528ffaf853f5d467d4930415a0fc56360d9a7290a4e2a17225ac40b19f3d92998cfee0f47fafa9 SHA512 db285760307fda62a5e608534a3a5e531ff9a1efb6893450144f5d295b1e66b494f4daaabe41ffaf53da803f5be8ca9dd55dec7a5aa5bd118c37bd93ec2c9b9a
diff --git a/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-7.0.0.ebuild b/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-7.0.0.ebuild
deleted file mode 100644
index 75598935558f..000000000000
--- a/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-7.0.0.ebuild
+++ /dev/null
@@ -1,38 +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 NextPVR client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.nextpvr"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.nextpvr.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.nextpvr/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.nextpvr-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-19*
-	=dev-libs/libplatform-2*
-	dev-libs/tinyxml2
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-7.0.2.ebuild b/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-7.0.2.ebuild
deleted file mode 100644
index 75598935558f..000000000000
--- a/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-7.0.2.ebuild
+++ /dev/null
@@ -1,38 +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 NextPVR client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.nextpvr"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.nextpvr.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.nextpvr/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.nextpvr-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-19*
-	=dev-libs/libplatform-2*
-	dev-libs/tinyxml2
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-7.1.1.ebuild b/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-7.1.1.ebuild
deleted file mode 100644
index 46d49f2ab86f..000000000000
--- a/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-7.1.1.ebuild
+++ /dev/null
@@ -1,37 +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 NextPVR client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.nextpvr"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.nextpvr.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.nextpvr/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.nextpvr-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-19*
-	dev-libs/tinyxml2
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-8.0.0.ebuild b/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-8.0.0.ebuild
deleted file mode 100644
index 46d49f2ab86f..000000000000
--- a/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-8.0.0.ebuild
+++ /dev/null
@@ -1,37 +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 NextPVR client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.nextpvr"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.nextpvr.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.nextpvr/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.nextpvr-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-19*
-	dev-libs/tinyxml2
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-8.0.1.ebuild b/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-8.0.1.ebuild
deleted file mode 100644
index 46d49f2ab86f..000000000000
--- a/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-8.0.1.ebuild
+++ /dev/null
@@ -1,37 +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 NextPVR client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.nextpvr"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.nextpvr.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.nextpvr/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.nextpvr-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-19*
-	dev-libs/tinyxml2
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-7.1.0.ebuild b/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-8.0.2.ebuild
index 46d49f2ab86f..46d49f2ab86f 100644
--- a/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-7.1.0.ebuild
+++ b/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-8.0.2.ebuild
diff --git a/media-plugins/kodi-pvr-vuplus/Manifest b/media-plugins/kodi-pvr-vuplus/Manifest
index 87fe6b07afaf..73743d9a9524 100644
--- a/media-plugins/kodi-pvr-vuplus/Manifest
+++ b/media-plugins/kodi-pvr-vuplus/Manifest
@@ -1,4 +1,6 @@
 DIST kodi-pvr-vuplus-7.1.3.tar.gz 270666 BLAKE2B 20a15a36f47665c0ef1259053a84e4d4487a9818dbf63604ae30ade01a92f875bfdf23a8bc8b935bcdb4cb28d3c7d138f65ad5e78f73957360fb60315daa3f17 SHA512 b89e9450dd8dfa17cb73e25b89fa3a55c8fd39303f31d08b1d9d5f343eea0ac47e66b5724dda8c237263ac59c0a52068cb659d08abf13a1f7c5cc9d650e8202e
+DIST kodi-pvr-vuplus-7.2.0.tar.gz 272592 BLAKE2B c0fe327165c990eb84a99d8e9810da35ca1fb2e4b3f645996969f83b942bb3ab6db059d668bfdc7aa95fa89c6c0256ba27318d6796f0ab048259d6ab6fbd9431 SHA512 8643d47e376a493a7e701b324734a5b3eda71ee772cf738505bb1d6c24d0e902626f89e9dd2f0b88deb188b89d09ea9d6eedb7a64ea6f4956143292d66150e8e
 EBUILD kodi-pvr-vuplus-7.1.3.ebuild 764 BLAKE2B e750f6bc6b70f71139ff3de3a4d53ff40be230ffa644cbbd96f2357d2f6e5668eedcfaeaec1807e49dd5922188849ed57f05d1066c29e095ed76eb57f899edc2 SHA512 e98c3657e70d28f2c9d0c64dcc46e19b07d4c56f7b7f65f72ab8bf5de034806570586be8198310a0e86f07ca3add31be051cebdbe58d8c43c6e0cdbbdd3a6a2f
+EBUILD kodi-pvr-vuplus-7.2.0.ebuild 764 BLAKE2B e750f6bc6b70f71139ff3de3a4d53ff40be230ffa644cbbd96f2357d2f6e5668eedcfaeaec1807e49dd5922188849ed57f05d1066c29e095ed76eb57f899edc2 SHA512 e98c3657e70d28f2c9d0c64dcc46e19b07d4c56f7b7f65f72ab8bf5de034806570586be8198310a0e86f07ca3add31be051cebdbe58d8c43c6e0cdbbdd3a6a2f
 EBUILD kodi-pvr-vuplus-9999.ebuild 765 BLAKE2B 65a7bb78532a89ffa205709e64b92a14f6088412e8456d8a836ab496f1a010150b602ce9f8841f38cdb585dcf1135662405f2ca200658a88ff0dd0944ad07852 SHA512 70534928d3d77fe610b75048d73443481ea0eaa0419a22a6376774aff60d04382f8e9305c5a8d42cd7425dbe5c4bde17dd81026ea8074323bfd3599c094d4b8f
 MISC metadata.xml 362 BLAKE2B b551dbe10d765427e74ffc88979ea464caa79988f4204b05ced79d38745ffb4dff3fefd0464a999af66de4d132dcc0439ceb1239ccea3f924bf2a2c9083fd3ee SHA512 c9053d27b0f39fcef4c226c9a6c5578ae9cb076288fdd8f6ee39fb12b12b445499005515e79e5de8e4ba9e96fa991fd0210b3621b682960b41143ded1d84ac14
diff --git a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-7.0.0.ebuild b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-7.2.0.ebuild
index d29c62c10d9a..0fb0a0a6a42d 100644
--- a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-7.0.0.ebuild
+++ b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-7.2.0.ebuild
@@ -5,21 +5,21 @@ EAPI=7
 
 inherit cmake kodi-addon
 
-DESCRIPTION="Kodi's IPTVSimple client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.iptvsimple"
+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.iptvsimple.git"
+	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.iptvsimple/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.iptvsimple-${PV}-${CODENAME}"
+	SRC_URI="https://github.com/kodi-pvr/pvr.vuplus/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/pvr.vuplus-${PV}-${CODENAME}"
 	;;
 esac
 
@@ -28,9 +28,9 @@ SLOT="0"
 IUSE=""
 
 DEPEND="
-	dev-libs/pugixml
 	=media-tv/kodi-19*
-	sys-libs/zlib
+	dev-libs/tinyxml
+	dev-cpp/nlohmann_json
 	"
 
 RDEPEND="
diff --git a/media-plugins/xbmc-addon-xvdr/Manifest b/media-plugins/xbmc-addon-xvdr/Manifest
deleted file mode 100644
index 5afd1d52ccbd..000000000000
--- a/media-plugins/xbmc-addon-xvdr/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD xbmc-addon-xvdr-9999.ebuild 872 BLAKE2B 069c601fdf0bd8aa7fc3fc31981402d2bd32f971bd4b14956dd2047978c9d2eb21f2c929fbf2a6fa3abbf4a699424008506e01db3e1ebc496ae3aa6da1a8444f SHA512 35a43bb8ecd88572b10d9f06d4ce3e6d3c1c61040da0bfffd1338bb66d6c2fb66317a6d70e636312e720b14883203b48280ce39f7530f3979ad7a5b12d51c9b9
-MISC metadata.xml 337 BLAKE2B e12fff14117304efdefa91579ffebf4ddbaf0436bb66780b888a05182accedb7b3062a1447ff0f4cafa3fa05872195f3a8976be247ba1ccfa083835828b4804e SHA512 ddc8dfe63fa6764d72452b40f409c86c89530bc5dc29051bfbdf97dd5aaa8a8747ccf435813a74707420459ee1288b5661eea980e7ea7fe9d63cff827b48de77
diff --git a/media-plugins/xbmc-addon-xvdr/metadata.xml b/media-plugins/xbmc-addon-xvdr/metadata.xml
deleted file mode 100644
index 6a454981266d..000000000000
--- a/media-plugins/xbmc-addon-xvdr/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>vdr@gentoo.org</email>
-		<name>Gentoo VDR Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">pipelka/xbmc-addon-xvdr</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-plugins/xbmc-addon-xvdr/xbmc-addon-xvdr-9999.ebuild b/media-plugins/xbmc-addon-xvdr/xbmc-addon-xvdr-9999.ebuild
deleted file mode 100644
index 8f64cf07d266..000000000000
--- a/media-plugins/xbmc-addon-xvdr/xbmc-addon-xvdr-9999.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools multilib git-r3
-
-DESCRIPTION="XBMC addon: add VDR (http://www.tvdr.de/) as a TV/PVR Backend"
-HOMEPAGE="https://github.com/pipelka/xbmc-addon-xvdr"
-EGIT_REPO_URI="https://github.com/pipelka/xbmc-addon-xvdr.git"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	export STRIP=true
-	eautoreconf
-}
-
-src_configure() {
-	econf --prefix=/usr/$(get_libdir)/xbmc
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-}
-
-pkg_info() {
-	einfo "This add-on requires the installed "media-lugins/vdr-xvdr" plugin on the VDR server."
-	einfo "VDR itself dosn't need any patches or modification to use all the current features."
-	einfo "IMPORTANT:"
-	einfo "Please disable *all* PVR addons *before* running the XVDR addon!"
-}