gentoo resync : 08.07.2021

34 files changed, 805 insertions, 0 deletions

diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index 57c0f1b6d92e..3d362ae82f9c 100644
--- a/media-plugins/Manifest.gz
+++ b/media-plugins/Manifest.gz
diff --git a/media-plugins/kodi-inputstream-ffmpegdirect/Manifest b/media-plugins/kodi-inputstream-ffmpegdirect/Manifest
index 1e800de219d3..fd765853b2be 100644
--- a/media-plugins/kodi-inputstream-ffmpegdirect/Manifest
+++ b/media-plugins/kodi-inputstream-ffmpegdirect/Manifest
@@ -1,4 +1,10 @@
 DIST kodi-inputstream-ffmpegdirect-1.21.3.tar.gz 251832 BLAKE2B cbaa585a3c03afece8fec690f6a7677c9c80ec08130f987633f6327eefba577167fddc89fbae33bc3d3965a41e5f30d3b691625059e620f36a85ebf7155d7011 SHA512 19c70665b518c9e1231cc0f955ede3669c2b6b2e136a2082a49f52a9aa0b4cc93621f467613309c0d9091f13505b451c13ec4722fcbde2c70bb847fb881da9df
+DIST kodi-inputstream-ffmpegdirect-1.21.4.tar.gz 273268 BLAKE2B 4e8ac6b790a0118cef8be4447ade2c41b828e3d3dac1ba6a5c72e9f3df5e8151f5e942325d471f96cc345394a622728bfc5b2b61563c394c0f13e2f2960787d5 SHA512 769ad0be12c68c78e82f050c046645050d302b02b158afa66e626b456c10cff2cb5d7df2be3a36dfb20cad0d40ac2de1b3cf1ae0a9dcf9a70691669d54304bb0
+DIST kodi-inputstream-ffmpegdirect-1.21.5.tar.gz 274498 BLAKE2B fa4fe24515dd6066503b274e5b3d989483f03d9f375342862049d7829ee192ee496bdfaa8d1eb0c9e79cec36b33b3e9016e678299916dabc96bbf8a99316c62e SHA512 178b7859289453c88f9e6ee335fba79a70139b94e6dcee55e109e6c1201c39d85764409db1958dc2f9b09a471636f00a63287cd085ce573c241712c2f8efe2d1
+DIST kodi-inputstream-ffmpegdirect-1.21.6.tar.gz 274580 BLAKE2B 202743bab99de5ebd8fc049600b7e5e342a3e8ddff3b58d8fd4440fd460a9cb87713e0de584a57e21cbab86f5b31eb2d12d3ec622ace641d3bf2fa3f3d21ab8f SHA512 dbbde7fc542eab3e51de3ba0ec216adc2c4d91123360b745dc02e0ed689cc8159596c081a9213aec02a7d5b04760b48ec7299c33868b06250621207e997e64ba
 EBUILD kodi-inputstream-ffmpegdirect-1.21.3.ebuild 956 BLAKE2B 6cbc3ca17b1e5e8a10deac2d087debe80c6232d3e8ca3eff3c4717ac3f57547f545b5ff8070d22697ebf1b2bed478b28f921c9db494e6b3af16def26be2b81c7 SHA512 07f4a9d60b27c40b74e09c972934b0503ba4c32edfcb4bdba3ca3b0db57dc0eefcc96af6884a31f0054de3d22aeb42b82df72f6ea3c1d3b8cb71911e25181e1d
+EBUILD kodi-inputstream-ffmpegdirect-1.21.4.ebuild 956 BLAKE2B 6cbc3ca17b1e5e8a10deac2d087debe80c6232d3e8ca3eff3c4717ac3f57547f545b5ff8070d22697ebf1b2bed478b28f921c9db494e6b3af16def26be2b81c7 SHA512 07f4a9d60b27c40b74e09c972934b0503ba4c32edfcb4bdba3ca3b0db57dc0eefcc96af6884a31f0054de3d22aeb42b82df72f6ea3c1d3b8cb71911e25181e1d
+EBUILD kodi-inputstream-ffmpegdirect-1.21.5.ebuild 956 BLAKE2B 6cbc3ca17b1e5e8a10deac2d087debe80c6232d3e8ca3eff3c4717ac3f57547f545b5ff8070d22697ebf1b2bed478b28f921c9db494e6b3af16def26be2b81c7 SHA512 07f4a9d60b27c40b74e09c972934b0503ba4c32edfcb4bdba3ca3b0db57dc0eefcc96af6884a31f0054de3d22aeb42b82df72f6ea3c1d3b8cb71911e25181e1d
+EBUILD kodi-inputstream-ffmpegdirect-1.21.6.ebuild 956 BLAKE2B 6cbc3ca17b1e5e8a10deac2d087debe80c6232d3e8ca3eff3c4717ac3f57547f545b5ff8070d22697ebf1b2bed478b28f921c9db494e6b3af16def26be2b81c7 SHA512 07f4a9d60b27c40b74e09c972934b0503ba4c32edfcb4bdba3ca3b0db57dc0eefcc96af6884a31f0054de3d22aeb42b82df72f6ea3c1d3b8cb71911e25181e1d
 EBUILD kodi-inputstream-ffmpegdirect-9999.ebuild 949 BLAKE2B b3455c47c5ba05ceed17ec36b9ad7dd2945e5f8a1eb1e3483081ad85ae118ccc8dd6a124eb3676aceb993a24e4191b1cd4361c4d51086f8ad683f9d8c7158498 SHA512 b4dc908c9c95f9ac46ca1d3637fb9243d50654d99e8d08d36ee05431902f4011efe909ef339a43aa542250e73e91568de8c38230869d9ee9ed0d5b033bcda0ff
 MISC metadata.xml 504 BLAKE2B c76c1e4a42638c9bdefd5c505de0a5fe31994d7a25ec2ee7e35af14c5c5ad4ad393a3d70e14275cd89a1286d2afcc32b26b659ba64569182a5902c521aef54bf SHA512 93585dda17a5955936376ae86c2f0efd32a9c67d9451321dcb2face19279f47e1190482bc0178524a812fb5647fd7adf97df1b942d289d52788361ef9e6c3e2c
diff --git a/media-plugins/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect-1.21.4.ebuild b/media-plugins/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect-1.21.4.ebuild
new file mode 100644
index 000000000000..4ea51e4a1095
--- /dev/null
+++ b/media-plugins/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect-1.21.4.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="Kodi's FFMpeg Direct Inputstream addon"
+HOMEPAGE="https://github.com/xbmc/inputstream.ffmpegdirect"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/inputstream.ffmpegdirect.git"
+	EGIT_BRANCH="Matrix"
+	inherit git-r3
+	;;
+*)
+	KEYWORDS="~amd64 ~arm64"
+	CODENAME="Matrix"
+	SRC_URI="https://github.com/xbmc/inputstream.ffmpegdirect/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/inputstream.ffmpegdirect-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+BDEPEND="
+	virtual/pkgconfig
+	"
+
+COMMON_DEPEND="
+	media-video/ffmpeg[encode,libxml2,zlib]
+	virtual/libiconv
+	app-arch/bzip2
+	=media-tv/kodi-19*
+	"
+
+DEPEND="
+	${COMMON_DEPEND}
+	"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	"
+
+src_prepare() {
+	[ -d depends ] && rm -rf depends || die
+	cmake_src_prepare
+}
diff --git a/media-plugins/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect-1.21.5.ebuild b/media-plugins/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect-1.21.5.ebuild
new file mode 100644
index 000000000000..4ea51e4a1095
--- /dev/null
+++ b/media-plugins/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect-1.21.5.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="Kodi's FFMpeg Direct Inputstream addon"
+HOMEPAGE="https://github.com/xbmc/inputstream.ffmpegdirect"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/inputstream.ffmpegdirect.git"
+	EGIT_BRANCH="Matrix"
+	inherit git-r3
+	;;
+*)
+	KEYWORDS="~amd64 ~arm64"
+	CODENAME="Matrix"
+	SRC_URI="https://github.com/xbmc/inputstream.ffmpegdirect/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/inputstream.ffmpegdirect-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+BDEPEND="
+	virtual/pkgconfig
+	"
+
+COMMON_DEPEND="
+	media-video/ffmpeg[encode,libxml2,zlib]
+	virtual/libiconv
+	app-arch/bzip2
+	=media-tv/kodi-19*
+	"
+
+DEPEND="
+	${COMMON_DEPEND}
+	"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	"
+
+src_prepare() {
+	[ -d depends ] && rm -rf depends || die
+	cmake_src_prepare
+}
diff --git a/media-plugins/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect-1.21.6.ebuild b/media-plugins/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect-1.21.6.ebuild
new file mode 100644
index 000000000000..4ea51e4a1095
--- /dev/null
+++ b/media-plugins/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect-1.21.6.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="Kodi's FFMpeg Direct Inputstream addon"
+HOMEPAGE="https://github.com/xbmc/inputstream.ffmpegdirect"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/inputstream.ffmpegdirect.git"
+	EGIT_BRANCH="Matrix"
+	inherit git-r3
+	;;
+*)
+	KEYWORDS="~amd64 ~arm64"
+	CODENAME="Matrix"
+	SRC_URI="https://github.com/xbmc/inputstream.ffmpegdirect/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/inputstream.ffmpegdirect-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+BDEPEND="
+	virtual/pkgconfig
+	"
+
+COMMON_DEPEND="
+	media-video/ffmpeg[encode,libxml2,zlib]
+	virtual/libiconv
+	app-arch/bzip2
+	=media-tv/kodi-19*
+	"
+
+DEPEND="
+	${COMMON_DEPEND}
+	"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	"
+
+src_prepare() {
+	[ -d depends ] && rm -rf depends || die
+	cmake_src_prepare
+}
diff --git a/media-plugins/kodi-pvr-argustv/Manifest b/media-plugins/kodi-pvr-argustv/Manifest
index 28e1b0212386..cb0aff2ad96f 100644
--- a/media-plugins/kodi-pvr-argustv/Manifest
+++ b/media-plugins/kodi-pvr-argustv/Manifest
@@ -2,9 +2,11 @@ DIST kodi-pvr-argustv-6.0.1.tar.gz 153659 BLAKE2B c991b1addcc81e4e07f763b0794f2a
 DIST kodi-pvr-argustv-6.0.2.tar.gz 154313 BLAKE2B 54cf2619e1aa3bab0876ac3e5d18e5acbacbf336d8c697cfb5ad1135577e085330b98d89cd25cf551afa44c09acc4433267b799e511e79e8263eb9cfa365fdcb SHA512 dd6b40d274fe2325660865fd9a814baff0a3440d98d076d8636efcd65fbca63972e8ae22f04bd149f2feac1e8334a87c751031fdd1d915089f766e1089590f4e
 DIST kodi-pvr-argustv-7.0.0.tar.gz 154784 BLAKE2B 5a6b604de69e5645814101191d3b79027f7b0aebea0eaf30962c9e70bf5228a99e936a50b36be33671a30b4cd4e2d2d33325b1161f22c738369f2f241c086664 SHA512 8ebe04087a0f0db0efcc111ecab6a8940d23dabd6244c6fca44c05a9fceaec54cbd175fe9bd6d79c6d95c6787c8fc147b76e06b6ce509da6007f3ab0d4bf8840
 DIST kodi-pvr-argustv-7.1.1.tar.gz 156270 BLAKE2B 57436cc9c896a08b2b7b2eff94401530f90bc8bc5b38f24c94b0616e353f97cc2f23973637a95413d12e9459a9e0d4014a38f671d69c9854b3b4d923a9dd7531 SHA512 831fd6d7dba40aef87a9cf6b36bfcda66f53fb36cc8487f741ba33b8cadf87b053ada0cc1b463d46abfa976054eedd5ba7428704ef8d2574a1b23acadfd49f82
+DIST kodi-pvr-argustv-7.1.2.tar.gz 158003 BLAKE2B bf16201bf0f272796aa4e2518ed07113f268b32bf9af857f600b09dc7e86eb00de2a542047fd8742bfb6c523942018816d6130f715dfe2e21d3939debae5f8d5 SHA512 980786c37e1c28e3d8cbe53ef1a9bcdd0dee585bdfe2654154a571d5b9f48b8139f3acc9e3cab06302900ec933f2525875b99ca8ad562ff137a94db875bef59b
 EBUILD kodi-pvr-argustv-6.0.1.ebuild 694 BLAKE2B 1fd8029faa8e1cddf6bdeabb6e9226c43ca3861fd9cfc5ea4909053698b281991ca6fa097a9d5834c0fb5b23755a027984f42f5920a630b1d52d8ebcd644293a SHA512 86ba51038e6265b422ac94fe135da3d7ad95744114210f7afb429866f27cac56efed011d17b1e4c57eda467a86123849887bbbc53a8797996bf59fe2041707e0
 EBUILD kodi-pvr-argustv-6.0.2.ebuild 668 BLAKE2B a1303104329b47ec058f717af1c47e4383d9694498000a86e4db6902c73b9748a8abb85975401d6b366062cb915eb1fd98944b61454b7cf46840a13ebb70bda4 SHA512 078bf8ff025c0b4131422726df39a7410ba7f2b86e8741d96a5a3964c2e0fd1c3e6b4b9453a4b4857e4cd228905b3b3328bcaaeb3bd276bc7c137095142da659
 EBUILD kodi-pvr-argustv-7.0.0.ebuild 668 BLAKE2B a1303104329b47ec058f717af1c47e4383d9694498000a86e4db6902c73b9748a8abb85975401d6b366062cb915eb1fd98944b61454b7cf46840a13ebb70bda4 SHA512 078bf8ff025c0b4131422726df39a7410ba7f2b86e8741d96a5a3964c2e0fd1c3e6b4b9453a4b4857e4cd228905b3b3328bcaaeb3bd276bc7c137095142da659
 EBUILD kodi-pvr-argustv-7.1.1.ebuild 668 BLAKE2B 027f075f47ef9dc83f9e53861ab037380ab052b66a310c2b08383dce5f116782d375d9607ac352ab0f39d34c9eb9c6f2a7d1a41de9a21f7e6791394404502944 SHA512 8695541454068f484d0766d3873e115111f5e25f03abd59f7362d4e942080d96baa1bc67f5f2d05ebcf5eb686872dd56959d34a01f6842edc7a049d538ebe94a
+EBUILD kodi-pvr-argustv-7.1.2.ebuild 668 BLAKE2B 027f075f47ef9dc83f9e53861ab037380ab052b66a310c2b08383dce5f116782d375d9607ac352ab0f39d34c9eb9c6f2a7d1a41de9a21f7e6791394404502944 SHA512 8695541454068f484d0766d3873e115111f5e25f03abd59f7362d4e942080d96baa1bc67f5f2d05ebcf5eb686872dd56959d34a01f6842edc7a049d538ebe94a
 EBUILD kodi-pvr-argustv-9999.ebuild 669 BLAKE2B 802dd70801dad6deae7a7e0c840b7fa047195f4c32d28ee21c26d213e01002387deb860d3704af690110f93ef204970af2db8a271d7005d43c194846b58eb9e4 SHA512 ce01f62b84b15a9ca39260ec23a25a18b0cb3a8ae165dfa1845e2e24baf1f14df10d98cbd88ed29f31090afb4bddeda27f48374abc1d77851695a4b76afe1534
 MISC metadata.xml 363 BLAKE2B da6b30af0962fa998c28cc4b8a730c3cb44459c7e0d9f74d1f6a524d78b98c2cef7a8fafff6b89d5965d9fda730e646b154141af90e408e5e7c7b96133d5b4e4 SHA512 b4605de6bcb982cf41261f9b9c4496a0f43fc8d9d7f49a64921a266fd988a2e23352456394c61c1b8e87cbc2e18bf6f5b957b4398763d3bf66ce9525115b5127
diff --git a/media-plugins/kodi-pvr-argustv/kodi-pvr-argustv-7.1.2.ebuild b/media-plugins/kodi-pvr-argustv/kodi-pvr-argustv-7.1.2.ebuild
new file mode 100644
index 000000000000..897f6aa64638
--- /dev/null
+++ b/media-plugins/kodi-pvr-argustv/kodi-pvr-argustv-7.1.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="Kodi's ARGUS TV client addon"
+HOMEPAGE="https://github.com/kodi-pvr/pvr.argustv"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.argustv.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Matrix"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/kodi-pvr/pvr.argustv/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/pvr.argustv-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-19*
+	dev-libs/jsoncpp
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
diff --git a/media-plugins/kodi-pvr-demo/Manifest b/media-plugins/kodi-pvr-demo/Manifest
index dfcd9b8806a9..c6a83b0659a7 100644
--- a/media-plugins/kodi-pvr-demo/Manifest
+++ b/media-plugins/kodi-pvr-demo/Manifest
@@ -1,4 +1,6 @@
 DIST kodi-pvr-demo-7.1.3.tar.gz 42285 BLAKE2B c2bb67dc47bb85e26bc4cd34d72d272507bb635b1e6f5d14ce57575b6493448bb362a0ac7e0334852b84e9fe4f0f1df611ec9965c11f05dbd91f9b1a93ef7d22 SHA512 faf896f1a531d9bb35c36cd303ec75f66f22030fedc43c1a83a25591d7297e57148bf8adc34d6072370c861b34ee1b9bc037997817cfdd651b069c0057366d2e
+DIST kodi-pvr-demo-7.1.4.tar.gz 47972 BLAKE2B 3950951573c03da2c6a9f599e2c5122fc208004fd4ad4acf88af2760a5502a087aeba2351c938d60aa54981805dafdd3802c7bd58b8eba8028ff205069b93a31 SHA512 7f1468727024cbe627c2e0608e02815877593f23b9592d6caaadf2147dbc48b09f0405db5b67de9277cef362715de68d2099152f5fc9fc137b67bbc34f3a1e87
 EBUILD kodi-pvr-demo-7.1.3.ebuild 645 BLAKE2B bb4ee9b5989c1950672511adb5483312a274d72772d26b6556fed2f2a968d805e2ac0d7ae02a726cb3e807559f2ab2205c4b10100290a75fd241c8f19fc70bda SHA512 b229363ccf6423298714e9de62288ac990a0f86c3356784e427815ea47210179123d1d9b7d20355d628140440985e18c016de09044d974dbd35d75a34444cd26
+EBUILD kodi-pvr-demo-7.1.4.ebuild 645 BLAKE2B bb4ee9b5989c1950672511adb5483312a274d72772d26b6556fed2f2a968d805e2ac0d7ae02a726cb3e807559f2ab2205c4b10100290a75fd241c8f19fc70bda SHA512 b229363ccf6423298714e9de62288ac990a0f86c3356784e427815ea47210179123d1d9b7d20355d628140440985e18c016de09044d974dbd35d75a34444cd26
 EBUILD kodi-pvr-demo-9999.ebuild 646 BLAKE2B cd1cdad1b6fbd450f79c2e16927f76db90734062b66a185070e42ff06590c404e1736ee42fd42ab10229710c9307b2da5824b7b513434d2e2589cb2102a4cb56 SHA512 98b19d4b466f173b0b14dd3a56c118a6b3d6822a977e8bb922bbdb1314310d55478288082feea641f8280d1758cb3a3d2a680a004e7654f1f383c8fe684afec3
 MISC metadata.xml 366 BLAKE2B 7e2c022e027a3c4d0c1f5d5aa889b390fa079d8c71b16ea773403b9bbce28c7dae01d370d741575255b20dd4b7cf1b9d3f58161ac271c8829ed26d65920f5876 SHA512 379194149299ccced43f0c2054ef9fd8c049e4d9397c062ece4dd2e517f1f10a670cf53626daf7f53261981ac346c38e7aed9ae0710527843051a2d861c7f655
diff --git a/media-plugins/kodi-pvr-demo/kodi-pvr-demo-7.1.4.ebuild b/media-plugins/kodi-pvr-demo/kodi-pvr-demo-7.1.4.ebuild
new file mode 100644
index 000000000000..cb6e25589b8d
--- /dev/null
+++ b/media-plugins/kodi-pvr-demo/kodi-pvr-demo-7.1.4.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="Demo PVR for Kodi"
+HOMEPAGE="https://github.com/kodi-pvr/pvr.demo"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.demo.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Matrix"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/kodi-pvr/pvr.demo/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/pvr.demo-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-19*
+	dev-libs/tinyxml
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
diff --git a/media-plugins/kodi-pvr-hts/Manifest b/media-plugins/kodi-pvr-hts/Manifest
index fda4f4d39c76..cfab7cb68f29 100644
--- a/media-plugins/kodi-pvr-hts/Manifest
+++ b/media-plugins/kodi-pvr-hts/Manifest
@@ -1,4 +1,8 @@
 DIST kodi-pvr-hts-8.3.0.tar.gz 181974 BLAKE2B d86bea7a037ea0abf4a2e6e9b45fb7c69f03d4f29f7b97f9ed0367bee3d243e09fb1b3998c437e9103672de4bd8fa7422f5c89ac35e87c5ebccf730f3d2a3c71 SHA512 4c49e5351608da49317e4916e8f60d88df0f9f907ce0cae026708e758f6937e33ab25dcb82351986dc3f3b8d73f40222db38bdb3db046c8b67b0c17ef7892abf
+DIST kodi-pvr-hts-8.3.1.tar.gz 190434 BLAKE2B d1a2d17e94e02ec37d0598c5d550859db46214bb0acc20034b809386935301499cba53bae8db8668099d82deab986983f3952cc879a4160ae1bf1b992c347b6d SHA512 adbc77518f45d0c745edb8c1c687b4a3165b8d96f62f5a923b327f0ad89a52a7f1d45ad4541ac1dd9bc8f22b2537c018d977db4e0e8ee6fa3c9495bd36eb7fc3
+DIST kodi-pvr-hts-8.3.2.tar.gz 190508 BLAKE2B b48ba46bc640d23ea7157c7a4c013879e201a30d8c45849cdbfa33e4d52bd9508761d241f67db980fb9c518aa9921781907329f3ef3f1388cd8321bd49eb0bf5 SHA512 5ff3791c0413cc6a3ddfece9da1296611dc2bd8fd726260ded391f04f2a259a7ead756f7a069c1a5d3e2d9249e03b767b0553a2a71d297adea8644ee27f1fa7e
 EBUILD kodi-pvr-hts-8.3.0.ebuild 660 BLAKE2B af6290e032f043698bd3f20363d418c6ac0ae79f254ce14925c65679ccef0940031bb8cd02bdbea18078e65d5fe2a7791dc9538aca70fa85dc05bb6385a50e3f SHA512 06a5ae4506d08d097b6628251db215d97609a29fbeefb036c9fc8e90c7235ad73a2cd45fab204a601d8e72b4aff9f0c0f7205ea4a7997ec299b68745ba862088
+EBUILD kodi-pvr-hts-8.3.1.ebuild 660 BLAKE2B af6290e032f043698bd3f20363d418c6ac0ae79f254ce14925c65679ccef0940031bb8cd02bdbea18078e65d5fe2a7791dc9538aca70fa85dc05bb6385a50e3f SHA512 06a5ae4506d08d097b6628251db215d97609a29fbeefb036c9fc8e90c7235ad73a2cd45fab204a601d8e72b4aff9f0c0f7205ea4a7997ec299b68745ba862088
+EBUILD kodi-pvr-hts-8.3.2.ebuild 660 BLAKE2B af6290e032f043698bd3f20363d418c6ac0ae79f254ce14925c65679ccef0940031bb8cd02bdbea18078e65d5fe2a7791dc9538aca70fa85dc05bb6385a50e3f SHA512 06a5ae4506d08d097b6628251db215d97609a29fbeefb036c9fc8e90c7235ad73a2cd45fab204a601d8e72b4aff9f0c0f7205ea4a7997ec299b68745ba862088
 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-8.3.1.ebuild b/media-plugins/kodi-pvr-hts/kodi-pvr-hts-8.3.1.ebuild
new file mode 100644
index 000000000000..2229139c850a
--- /dev/null
+++ b/media-plugins/kodi-pvr-hts/kodi-pvr-hts-8.3.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 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.3.2.ebuild b/media-plugins/kodi-pvr-hts/kodi-pvr-hts-8.3.2.ebuild
new file mode 100644
index 000000000000..2229139c850a
--- /dev/null
+++ b/media-plugins/kodi-pvr-hts/kodi-pvr-hts-8.3.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 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-iptvsimple/Manifest b/media-plugins/kodi-pvr-iptvsimple/Manifest
index 80675d024714..59ada0385886 100644
--- a/media-plugins/kodi-pvr-iptvsimple/Manifest
+++ b/media-plugins/kodi-pvr-iptvsimple/Manifest
@@ -1,6 +1,8 @@
 DIST kodi-pvr-iptvsimple-7.6.5.tar.gz 192388 BLAKE2B 596622b1058c392656dc27fd0a1b615f9fe1ce12695adc4e26aa5417e5250d6f18fcc3cafaab4d6c53d00c44fb57821fdc976b4efe369e24a3997921606dbeef SHA512 ef16b71cb1adf6d68e74935a12d5ecb8c52c732f5a69e0765558107f356686c83427356bbef3227b6744ea314ef2f1e6c2548ecb1f90a38a521d351048fac43a
 DIST kodi-pvr-iptvsimple-7.6.6.tar.gz 282395 BLAKE2B cdb3a98f9e727aad872f91a9f8784a797c0a87f6ce05ec0a21630b3912fc8a5b6548b94fcff58c35c62618c00bcedb8abcf45b7073afcd35dfde576034e75617 SHA512 7a927bed2e2121f3949a706cbd0f8085462f66dc8cfe3bfd686364cb8412f7feec53440054839ea2b6ac8bc124a15875112aff906c04c86d5867194e42875c30
+DIST kodi-pvr-iptvsimple-7.6.7.tar.gz 283836 BLAKE2B ac9a49ce09dfb02c5f69c57bbcfe2112fe7c68610e702c1690bf07398d53954512650294eb34d82cc3da037b6925beda4bb226ae55526c1a5837a97631b6e0e7 SHA512 ba9d70da83cb503f30027b2d57941f84a13b335596d085cc59a1dc61ce05e08735c6dd260fc17ac9175035a5928f211d045a8da462e323f6e9d7ed852eeede95
 EBUILD kodi-pvr-iptvsimple-7.6.5.ebuild 776 BLAKE2B 3f732410c2799908207212bcc3db44a769c448e56d02d9ef965fca8e9fec915e467e4ed29a9402ef85feca32d9c9632646bef71766738f368ce3d6dbd7c8c88f SHA512 80c6d16b413c8d87cb15eca37e5d9f6a7d211f72f50e4c7ecfbab1e66c293bacc89550cbdc5c510776bf5c2669b6d9900d0e09174fba2df5bbdbccab912a0ad9
 EBUILD kodi-pvr-iptvsimple-7.6.6.ebuild 776 BLAKE2B 3f732410c2799908207212bcc3db44a769c448e56d02d9ef965fca8e9fec915e467e4ed29a9402ef85feca32d9c9632646bef71766738f368ce3d6dbd7c8c88f SHA512 80c6d16b413c8d87cb15eca37e5d9f6a7d211f72f50e4c7ecfbab1e66c293bacc89550cbdc5c510776bf5c2669b6d9900d0e09174fba2df5bbdbccab912a0ad9
+EBUILD kodi-pvr-iptvsimple-7.6.7.ebuild 776 BLAKE2B 3f732410c2799908207212bcc3db44a769c448e56d02d9ef965fca8e9fec915e467e4ed29a9402ef85feca32d9c9632646bef71766738f368ce3d6dbd7c8c88f SHA512 80c6d16b413c8d87cb15eca37e5d9f6a7d211f72f50e4c7ecfbab1e66c293bacc89550cbdc5c510776bf5c2669b6d9900d0e09174fba2df5bbdbccab912a0ad9
 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-7.6.7.ebuild b/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-7.6.7.ebuild
new file mode 100644
index 000000000000..36d5b715c65a
--- /dev/null
+++ b/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-7.6.7.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 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-mediaportal-tvserver/Manifest b/media-plugins/kodi-pvr-mediaportal-tvserver/Manifest
index d1745d9bc137..998f4dc366f9 100644
--- a/media-plugins/kodi-pvr-mediaportal-tvserver/Manifest
+++ b/media-plugins/kodi-pvr-mediaportal-tvserver/Manifest
@@ -1,4 +1,6 @@
 DIST kodi-pvr-mediaportal-tvserver-8.2.0.tar.gz 405092 BLAKE2B ae20d4dc06ed8b6ffa1487c932f8938267b3bed4ff28c42a6721de5bf416aa3a2517658fc8044369b83895f0c0c0774b25a57c24fc324cd06d4bebe453b3caa6 SHA512 43c13cc131a66195d8afff9214ebdc21ae6b69011e6695c2f57ee86efba3bb50032728eb118c2f8b0124dc3a8bceb00dd68320a6b03330c3054bc3de89194a5e
+DIST kodi-pvr-mediaportal-tvserver-8.2.1.tar.gz 411048 BLAKE2B 803b47e42d7b7e777293f2d777a7bddbc2b0400b7bd43d5b441829276e6a7512cc3d30a2949a3d4703da7282804e536e2420a1f40cb05dc6143bdee931adaebe SHA512 d257992bf77a49bf9b130bf91764b2c174bae955c8fcc3e487bc65c5f963963e10e15855019e9dcf3c9e8ed2fa3e7db874e7282cd269d313cc15c664f88c9ad1
 EBUILD kodi-pvr-mediaportal-tvserver-8.2.0.ebuild 772 BLAKE2B 633152a7656f906a0c0dca4793704a7a456ca373a196774464ab4070ff8e6912fde4b55ff1ae32459e50c39c8427109b4aee4114edc7d71c3033588f661dff94 SHA512 6d6e368dfce0855d37466de324597ba571d4d797e96443904f859575ffa4714665ef2a9ccb4a1b0f972bbf2c93c1de66dfc8b5114ca0344af49ed9cfb798911e
+EBUILD kodi-pvr-mediaportal-tvserver-8.2.1.ebuild 772 BLAKE2B 633152a7656f906a0c0dca4793704a7a456ca373a196774464ab4070ff8e6912fde4b55ff1ae32459e50c39c8427109b4aee4114edc7d71c3033588f661dff94 SHA512 6d6e368dfce0855d37466de324597ba571d4d797e96443904f859575ffa4714665ef2a9ccb4a1b0f972bbf2c93c1de66dfc8b5114ca0344af49ed9cfb798911e
 EBUILD kodi-pvr-mediaportal-tvserver-9999.ebuild 772 BLAKE2B 633152a7656f906a0c0dca4793704a7a456ca373a196774464ab4070ff8e6912fde4b55ff1ae32459e50c39c8427109b4aee4114edc7d71c3033588f661dff94 SHA512 6d6e368dfce0855d37466de324597ba571d4d797e96443904f859575ffa4714665ef2a9ccb4a1b0f972bbf2c93c1de66dfc8b5114ca0344af49ed9cfb798911e
 MISC metadata.xml 376 BLAKE2B db54d74039c98be0838f484491e46b98f18d84f40236ff007160584a03e6f76cd3856f41863fcd3f7e22dafa9aa981f1ff9b41a4db841336b63b2453421e5b11 SHA512 e37880dad44c38b574f229adf0def58ccf6b3d66f7fe751b0a3abec1c873b43a65e6ba51ba2a96912152bb3d90ee61afe8886802dd4c1b6978597c327a5c1de5
diff --git a/media-plugins/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver-8.2.1.ebuild b/media-plugins/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver-8.2.1.ebuild
new file mode 100644
index 000000000000..1de2f204415a
--- /dev/null
+++ b/media-plugins/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver-8.2.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="Kodi's MediaPortal TVServer client addon"
+HOMEPAGE="https://github.com/kodi-pvr/pvr.mediaportal.tvserver"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.mediaportal.tvserver.git"
+	inherit git-r3
+	DEPEND="~media-tv/kodi-9999"
+	;;
+*)
+	CODENAME="Matrix"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/kodi-pvr/pvr.mediaportal.tvserver/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/pvr.mediaportal.tvserver-${PV}-${CODENAME}"
+	DEPEND="=media-tv/kodi-19*"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND+="
+	dev-libs/tinyxml
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
diff --git a/media-plugins/kodi-pvr-nextpvr/Manifest b/media-plugins/kodi-pvr-nextpvr/Manifest
index 789dbe61c9aa..0b7b03969508 100644
--- a/media-plugins/kodi-pvr-nextpvr/Manifest
+++ b/media-plugins/kodi-pvr-nextpvr/Manifest
@@ -1,4 +1,8 @@
 DIST kodi-pvr-nextpvr-8.2.3.tar.gz 150375 BLAKE2B 56493c4f7cb1a42c5b792934ffe5495b8c8083fb12a262a96f47fcadab53a1acbb3c614bb3c507980860bf2cc0c54be374207bdeaf9bb6478991c299c960081a SHA512 6a0bc9e170726246fb46e6fee6c829c36afd570be98ae53901da7fd8a72c319887d8a179dc9b227b8ef0b1628767b7257ef650bc127598d1e1337328c2aa4842
+DIST kodi-pvr-nextpvr-8.2.4.tar.gz 158037 BLAKE2B 7696679bc7f4d667df95e674e48d1616aba2588f4e1ed5e5d388520369c9ab16e75748203a18d5f85df4cbb1f1cb7eb8371fd2717bce79ef12edd82b0028ad6d SHA512 e256eb268afeed810e7fe94194762a3f22ba7f24bccb06a4ac137170864d96daae00094fd185354d88baedba34dd54e15c935f4dca6b268b0c74b1e9415ddeeb
+DIST kodi-pvr-nextpvr-8.2.5.tar.gz 158146 BLAKE2B 2e6060b151b0e16decbab39762facdb7d05ddc8c8d1288894ba53e28d6ebd484799399793482dbd2e7adf1db10b0ad89dc1169a528e5ed362e3835942bcedd8e SHA512 7ff620339c03a7519d2ea01be66a18df7a800ddc7e997fef2826d956565e67b8e5ce95d959409b7a476df39947a0b430de91d7e34d8163718cba0f9f3fd7ed24
 EBUILD kodi-pvr-nextpvr-8.2.3.ebuild 668 BLAKE2B b37563bb5faa6c67c518869eb57534793b0dcdc8c9e9a87015fa900134b73c589a8c1256a9eaca5c98ffa2e73713f41931ab674ce4a9e108929f2a3edde8b61c SHA512 5870d672c0d7f2edc34078f5b7372e2beac1cda9b2e54d347e615209f6f0b600da4c2031931e1c881d8081a756a70e2b404ff35a575756ce7e873e0e55f82102
+EBUILD kodi-pvr-nextpvr-8.2.4.ebuild 668 BLAKE2B b37563bb5faa6c67c518869eb57534793b0dcdc8c9e9a87015fa900134b73c589a8c1256a9eaca5c98ffa2e73713f41931ab674ce4a9e108929f2a3edde8b61c SHA512 5870d672c0d7f2edc34078f5b7372e2beac1cda9b2e54d347e615209f6f0b600da4c2031931e1c881d8081a756a70e2b404ff35a575756ce7e873e0e55f82102
+EBUILD kodi-pvr-nextpvr-8.2.5.ebuild 668 BLAKE2B b37563bb5faa6c67c518869eb57534793b0dcdc8c9e9a87015fa900134b73c589a8c1256a9eaca5c98ffa2e73713f41931ab674ce4a9e108929f2a3edde8b61c SHA512 5870d672c0d7f2edc34078f5b7372e2beac1cda9b2e54d347e615209f6f0b600da4c2031931e1c881d8081a756a70e2b404ff35a575756ce7e873e0e55f82102
 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-8.2.4.ebuild b/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-8.2.4.ebuild
new file mode 100644
index 000000000000..f1d5484de0ab
--- /dev/null
+++ b/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-8.2.4.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 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.2.5.ebuild b/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-8.2.5.ebuild
new file mode 100644
index 000000000000..f1d5484de0ab
--- /dev/null
+++ b/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-8.2.5.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 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-njoy/Manifest b/media-plugins/kodi-pvr-njoy/Manifest
index 7a18988e6a22..8b67cb9d63df 100644
--- a/media-plugins/kodi-pvr-njoy/Manifest
+++ b/media-plugins/kodi-pvr-njoy/Manifest
@@ -1,6 +1,8 @@
 DIST kodi-pvr-njoy-6.0.0.tar.gz 54587 BLAKE2B 94d499840f91a1ffc57fbd3d364df1810eb82807532c8a95d66a8a2cd3e3da6c6177a01ae97ff5936aa9b35fa4ab6e1b8ed56691fe32213031f433691090cbc2 SHA512 3279226b3aef3511d7fc5c0cd73f6bb943321f8ee903a1f3736e707488c6ea7e14ab930ef54b22548a87f8daa6e19fc33f7f86d62e4b7ac53ad7eb4dfe526fd1
 DIST kodi-pvr-njoy-7.0.0.tar.gz 54987 BLAKE2B c43498d3c29aed4d785373e56180fbc2be225e37be73c6c8a2ae7e40db27f7060aeb5dd3f98a38aaac1b3f098ce5ae2d27bd5a4a1edd4d512f5be78780323586 SHA512 a69757cd1d236ef0bf2624fe8f20485536a23d3c62f1c859f20a0f776a9353726e5fd53b3eed852ad0edc8f502d2aceabdcd6c74141504015948dd7d101a5ee1
+DIST kodi-pvr-njoy-7.1.1.tar.gz 56749 BLAKE2B f1849e2b114dd873c78ae48b25223f28a45b5ca46ef7a244ddecab9ec0a33de31c22b1709ee698161052de9104c023b448e196259f02d2c98a02d44f25aaa0cd SHA512 fceeda6d4f967f250ffbb5dc2a4d0cd9248cf61447ccbeb6152f5812186fcca2d41222038ffd53f7d7361ca06fe92599d7eb44d0850e03e9605d33e89086a201
 EBUILD kodi-pvr-njoy-6.0.0.ebuild 655 BLAKE2B d51d50533f4892bf7d9f75f473c10ea0a1526636c650171e2bfcec676bc34f8061cfbe961ae9576ab6987b4d950d1d2bcb06045999810f5a4e06cee37a735f45 SHA512 6c66fdd69d5e7cb0a3d8c586bcec60b920626dc1a87c97d0bed03fb40c99efdda93f42cf08f0adeba13447db9676c84b28c3fe41092063157f515689b2fbbafe
 EBUILD kodi-pvr-njoy-7.0.0.ebuild 655 BLAKE2B d51d50533f4892bf7d9f75f473c10ea0a1526636c650171e2bfcec676bc34f8061cfbe961ae9576ab6987b4d950d1d2bcb06045999810f5a4e06cee37a735f45 SHA512 6c66fdd69d5e7cb0a3d8c586bcec60b920626dc1a87c97d0bed03fb40c99efdda93f42cf08f0adeba13447db9676c84b28c3fe41092063157f515689b2fbbafe
+EBUILD kodi-pvr-njoy-7.1.1.ebuild 655 BLAKE2B 783b4ad02382b83fb4999b60833efa4e1b31c051843c018c6fe35e6ef68d8b6443c3b1b188bf2647ecb17824ec02f90cc3c6faab832cd2cb8e43cff8267fb397 SHA512 7797ee020c1880278ba15ad8eb29605b43d1661780c197e2906d8708c40d0945e475c760b544ace9a1a225aff6c543db48e24e15fcb052832136b6ec5e4b6a7a
 EBUILD kodi-pvr-njoy-9999.ebuild 656 BLAKE2B d408f7bfb0a2b90b1a840ead5402b3da96157c6b6b6fb45d574e2b4b11f466fa378eaa8eeb6aeb1d9bd9aa0e98ecaed65d7de521ac39d3d38da1cd42e98da4e4 SHA512 d30ee6601c254b39b02c37fafb420ae2731227f51ab6a8cd0349f52c8906949b41ed57155e373901e4048c4e1adbeffde5500f557d4a891781cd87ee07d94b85
 MISC metadata.xml 360 BLAKE2B 27d1d9abf8f1618cd3e546bfa1c29e384fcb69ee53b7ab5a7a2ae6f45173954d24e5507cdc793653e91341654067de1bb25badfb85e1b4ec675dace0aeb430f4 SHA512 1de1505e9a311bc88a60df4857c570a3467ce0ff326d59b8ce008a841a21b5025ce8e5e436fb88b15a0d346101a0377fb2a30c6db3de9afa2eeef1785501078d
diff --git a/media-plugins/kodi-pvr-njoy/kodi-pvr-njoy-7.1.1.ebuild b/media-plugins/kodi-pvr-njoy/kodi-pvr-njoy-7.1.1.ebuild
new file mode 100644
index 000000000000..67f65adeb215
--- /dev/null
+++ b/media-plugins/kodi-pvr-njoy/kodi-pvr-njoy-7.1.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="Kodi's Njoy N7 client addon"
+HOMEPAGE="https://github.com/kodi-pvr/pvr.njoy"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.njoy.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Matrix"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/kodi-pvr/pvr.njoy/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/pvr.njoy-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-19*
+	dev-libs/tinyxml
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
diff --git a/media-plugins/kodi-pvr-pctv/Manifest b/media-plugins/kodi-pvr-pctv/Manifest
index d36df7951925..7d514fef1228 100644
--- a/media-plugins/kodi-pvr-pctv/Manifest
+++ b/media-plugins/kodi-pvr-pctv/Manifest
@@ -1,6 +1,8 @@
 DIST kodi-pvr-pctv-5.0.0.tar.gz 65924 BLAKE2B cf2a526359457d057c32fd0ec726e59fa64010b51f1cb48841c387f38834433062487c1c12ae83aed9e653a639a4d6329145ee07f21972b0d452d5f9f9919189 SHA512 88addbfea0d39384ccb8818e88984e8eb55f9214f350285a6fa42de18045611c0cf98937e252fcd787b473fddcee0f2b3760262d901fc4b158aa4b416332b795
 DIST kodi-pvr-pctv-6.0.0.tar.gz 65852 BLAKE2B d0bf91ebea7a2d01fb87a79deaad8edd5bfed8be71e723df11fec4b2186f5d9785dab023e67e2290b958adb245446a3b448b0f1498026ec15de6637c7778ca31 SHA512 33bb46f872832835a16fdcc25bec8a67cf800e80c22bf59241e5eaddc3f7d6fedd9a60155b49b6b21c2c3a478cd5f4be503a120c04cf566fd8329ca08df2b0f0
+DIST kodi-pvr-pctv-6.1.1.tar.gz 67214 BLAKE2B 468382cf62dc9c54b01a7ccce25ec73afc5bb405285adc561fc44125f9b57ec3702d6d3dad4a9fafb50ec9ae58974d1b6ae95347913abb7b67e3ad72d31ef1b7 SHA512 12fa2d9299ed84ec89cf4f159946cb007a9a7d404d68a72eb5b63711b4ade6af054107d4880f81d8b3b6683f02aa2495b9c3fbf5d1f5e3d0aa7b8a3316b028ed
 EBUILD kodi-pvr-pctv-5.0.0.ebuild 652 BLAKE2B 9312b0e48638475e6cb2cee4257afac0d4e0f2342987f52f9876cb9376ef182ea87e635ef6c1bf9dbe543e1a6860bbd189932ea315651b7617e6218bf7b461c2 SHA512 d03c811c7be9209db2f1eb6e0990675381951a40401fb137f9569ef5b3e039af5ee62a7220da4b3a72a9bad5e0ca2aeda7cf56977c5ac063af90cae06a26422f
 EBUILD kodi-pvr-pctv-6.0.0.ebuild 652 BLAKE2B 9312b0e48638475e6cb2cee4257afac0d4e0f2342987f52f9876cb9376ef182ea87e635ef6c1bf9dbe543e1a6860bbd189932ea315651b7617e6218bf7b461c2 SHA512 d03c811c7be9209db2f1eb6e0990675381951a40401fb137f9569ef5b3e039af5ee62a7220da4b3a72a9bad5e0ca2aeda7cf56977c5ac063af90cae06a26422f
+EBUILD kodi-pvr-pctv-6.1.1.ebuild 652 BLAKE2B 74cf66388639099ea69e7928d4efd06297db22be583fa35d0feca9fab0c74ac77a05789072cf1d1656e433ea9b0788684c3b5002857a407b04ca760bdac3eb92 SHA512 61460a66854fcf58594610edb5e20d6ffdf2268583ed217106f58320c2762e86f5fcb3490d1d4b819281c05efc19b99944481331aa9488a49bd32d6d9674c233
 EBUILD kodi-pvr-pctv-9999.ebuild 653 BLAKE2B 94014b007543d55e5e419af01d1b1a28792a5fb01728cdb02cdf5256e7ca9b565104817eca6fefc86488b441da97763212f310f5684bee052b8d79c5bfa9dece SHA512 94f34ce270a89ec35993f5949bfccaf200a8b4f7ad3599ac6dd359ab5d4458eae81c371d42fd6005c1273355341490733a3c10c44e93b0bf0944511adffbcbcc
 MISC metadata.xml 360 BLAKE2B f2b84405411d2bdfcad9298321d32f2f1231e005195bf7d022c4bfc7581d0f4dea0bbf3c95f94644f36eb19908b63da44ddc669cc2cff524f6e13be4bbd27edf SHA512 82a152069b67602b9a7478e68a0377e1de7aaf64c6f45a336d6b9f89cde36bf7f571f6768d93467597284d3ad1f308b49e3baab48caf887587d30479d2f52440
diff --git a/media-plugins/kodi-pvr-pctv/kodi-pvr-pctv-6.1.1.ebuild b/media-plugins/kodi-pvr-pctv/kodi-pvr-pctv-6.1.1.ebuild
new file mode 100644
index 000000000000..f8e3bd50adfe
--- /dev/null
+++ b/media-plugins/kodi-pvr-pctv/kodi-pvr-pctv-6.1.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="Kodi's PCTV client addon"
+HOMEPAGE="https://github.com/kodi-pvr/pvr.pctv"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.pctv.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Matrix"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/kodi-pvr/pvr.pctv/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/pvr.pctv-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-19*
+	dev-libs/jsoncpp
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
diff --git a/media-plugins/kodi-pvr-stalker/Manifest b/media-plugins/kodi-pvr-stalker/Manifest
index bdfeaeaf5857..9e0d1a8838eb 100644
--- a/media-plugins/kodi-pvr-stalker/Manifest
+++ b/media-plugins/kodi-pvr-stalker/Manifest
@@ -2,9 +2,11 @@ DIST kodi-pvr-stalker-6.0.0.tar.gz 114838 BLAKE2B 31f567d73dc4851acd748bcfa81870
 DIST kodi-pvr-stalker-6.0.1.tar.gz 114575 BLAKE2B cb42fcd4ecc7c65bac75eb12579d0dcdb5827312c275a9db998953366c6a59a1033d7d26cc9db91c909d694340bb0eaf53e9d982604ec45b8cb349c4210565c4 SHA512 e71e37e7b440cb2d4e6f72400cdb457fbcdcc39893cbe70144b9ac1941429f45b00dbf7516b25a8ac874ae471a14335ce74c845239a444446b1fda97361b0757
 DIST kodi-pvr-stalker-6.0.2.tar.gz 114593 BLAKE2B 673a512ba369a85c6b08820bce845ec38d1ad4710767e585fe18f24c73bbf2b589ed3b52e3a0868a468e57094509ec2bbf1a7477c3602aafbac40095e2948bad SHA512 c8d5a2fce823e9dd00af53f12544ef6f5294b736032fc94d53312b018fb9d6ccbb9a2249cf4d41a40c89b0a0e42dbf252c7897e14c33e5f75487620260e493a5
 DIST kodi-pvr-stalker-7.0.0.tar.gz 114736 BLAKE2B a039de58e9f0cc687553b9bf852b4b4fe2f7d1af2682322b29d97c7452b8f2bf5015b72262ae680557666144403bed605b9379e4b7a79eb1e832091cf21e8f98 SHA512 d916bf0bf12196672c8576a1e30fb4a6e4fca48d0dcb0e5dbf28bdd78a4266d13a801d92b304bc2b08cc80c45c78081b3676d71331ef42849e99ecfd5848a88d
+DIST kodi-pvr-stalker-7.1.1.tar.gz 118225 BLAKE2B 258c45c85ad71109e44c2fd52bbe9b04aed996cee12b7e2651ddc3170a5c0c6409d0beaf1fffef28cb71a78d0ce621c69297762be32e15f660c3f0fada2c610d SHA512 9f47dcc44f1f5448b36b456778e8592768e28253083aae26a7d65e1f793c841b0c5fb2f83cd398e0895cdd7e31a608c340c518e4d7e63d0075d93fef5f738739
 EBUILD kodi-pvr-stalker-6.0.0.ebuild 790 BLAKE2B a4496feeb3d9c7b45a68ad3446da701dc1a9e89994a6fce095ad350d9ebca8950f8491a52d7260f3a1a1f241462b6afab2e1c3e334e7a34f6da5ce0a7b5bb3dc SHA512 52f717dd999f9ceea6e725b091f0bec8848185af2e217cff13c5f313ff823c932411391d104d399fa6b49f4d74bb2ae484a57d3e3932cd6b038db86f2fdb96d4
 EBUILD kodi-pvr-stalker-6.0.1.ebuild 764 BLAKE2B 05f17933376d5b3638424ca0bd391d8c18e12f447e0c87f7a356c8926472576e2a5877ac34f5f4b152571194af70617550b404799317a91203b2108a5b49be0c SHA512 e295129a519729c63b6f4c25250493dc424cf4b84bc6a02b1df8811a029a4987f26b34730d22938b52d748ede4c2a427816e3cf613df3de6a12af08ff9b2902c
 EBUILD kodi-pvr-stalker-6.0.2.ebuild 764 BLAKE2B 05f17933376d5b3638424ca0bd391d8c18e12f447e0c87f7a356c8926472576e2a5877ac34f5f4b152571194af70617550b404799317a91203b2108a5b49be0c SHA512 e295129a519729c63b6f4c25250493dc424cf4b84bc6a02b1df8811a029a4987f26b34730d22938b52d748ede4c2a427816e3cf613df3de6a12af08ff9b2902c
 EBUILD kodi-pvr-stalker-7.0.0.ebuild 764 BLAKE2B 05f17933376d5b3638424ca0bd391d8c18e12f447e0c87f7a356c8926472576e2a5877ac34f5f4b152571194af70617550b404799317a91203b2108a5b49be0c SHA512 e295129a519729c63b6f4c25250493dc424cf4b84bc6a02b1df8811a029a4987f26b34730d22938b52d748ede4c2a427816e3cf613df3de6a12af08ff9b2902c
+EBUILD kodi-pvr-stalker-7.1.1.ebuild 764 BLAKE2B f6808a5ddbd994ec10c4898b9def7433032b435466315d3ceeee19b7ebff03b8b11c3c9df60bc787f7626c8cf8b80a01af0f083d05b2cc5bda01e1206b4ef32c SHA512 f20f86f433535538ac7865421c9ecb775c153322dc04e41e9dbf13f9308df52b2460cebec3dba4d706f8bc22272032a286463497007abb8decbdd957f63cab41
 EBUILD kodi-pvr-stalker-9999.ebuild 765 BLAKE2B 318d9c6605fbed8919332cab9fd6d12e3dc0af107c89666818d26e1325f46e0c4f86d5ba8275daccdf83df6958983fb22abac7f26d4a87e0059694ed15e29a15 SHA512 053da8b2b6eb218e1f33e1fcccb6c12ef7662530acb4cf19b20fef47005db281064167a1d68c6d2d9848f3ffbca13c63a82e4259c31ce732c91737be12acdfa8
 MISC metadata.xml 363 BLAKE2B 441ed938c2873d07448fa182f11a8724189e92b53a818bf5138c469f6d8cc2316b44acc96ea4caedfdb33eb125c66fa1855fdd6680123ac5a2204f2c83030d2e SHA512 9480f6ef8510d5e861be5d595a7dbc80a89099b11d545870f6b41a7a0d89515c41c08e74ed4ee7b7672c217af48e60195956aaf02f11fb81ad0bed474d0522ea
diff --git a/media-plugins/kodi-pvr-stalker/kodi-pvr-stalker-7.1.1.ebuild b/media-plugins/kodi-pvr-stalker/kodi-pvr-stalker-7.1.1.ebuild
new file mode 100644
index 000000000000..ada67b2164b4
--- /dev/null
+++ b/media-plugins/kodi-pvr-stalker/kodi-pvr-stalker-7.1.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="Kodi's Stalker client addon"
+HOMEPAGE="https://github.com/kodi-pvr/pvr.stalker"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.stalker.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Matrix"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/kodi-pvr/pvr.stalker/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/pvr.stalker-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-19*
+	dev-libs/jsoncpp
+	dev-libs/tinyxml
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
+
+src_prepare() {
+	[ -d depends ] && rm -rf depends || die
+	cmake_src_prepare
+}
diff --git a/media-plugins/kodi-pvr-vbox/Manifest b/media-plugins/kodi-pvr-vbox/Manifest
index 53bf6af91fea..590e84e36d7b 100644
--- a/media-plugins/kodi-pvr-vbox/Manifest
+++ b/media-plugins/kodi-pvr-vbox/Manifest
@@ -4,11 +4,13 @@ DIST kodi-pvr-vbox-7.0.2.tar.gz 159326 BLAKE2B a4d463e52417ef82d13ca29dae9b6cc4e
 DIST kodi-pvr-vbox-7.0.3.tar.gz 159325 BLAKE2B c31b44ec28f6c3f1a0a031f2d435b3a2659913cf2e7a0a00ffb4006c11c5e9298e7d0354645d972b64b76ae40c111693b19cb2b262ae163d01a6d2b67806a70c SHA512 eb46342f63218285a36ca8298a021858517a11752a53af998a73969d267a28f1693d8c6b7132292dfd5e12d8903e8b5a00dda4ebf51363bdec03c6d712239b53
 DIST kodi-pvr-vbox-8.0.0.tar.gz 159484 BLAKE2B e431632d5ce282d29a976426e92f93d946c7bdc8078164ee4da8f22e795c14fb8b66f183f0957bb8b322762dab673e7c320db2102d21162097502f098f5cff5c SHA512 5d2d1e4fb824d8a3851650d5cfc539b19c6d10983cfb3a5ad931ad835613fbd6089eaabd5de1807eab16039bac98e49623ca27022b09b864610b0c751499bda9
 DIST kodi-pvr-vbox-8.1.1.tar.gz 163007 BLAKE2B 7f88ffbb8b939457f25d47f1e29d7a85a4941e8ce6457e7d6ab27fa2d1f2848da3e37dbc2986e8e0e07d837197141402808f0c6a99c287555b463ff8ff3a5438 SHA512 5df148a9ce5faebc6abcf359616a6ebfc38ea0039574ca6c7bb4f2ff3b644d5a880f1caa8746d8f5b4787720152c478a3b1a7eeaa64b5310214354ec540e3781
+DIST kodi-pvr-vbox-8.1.2.tar.gz 163016 BLAKE2B a140551485e4bcfa1b067d56b571a046afd7e10944c1b34221739b2a3c9ef6f17523b01a019ba7e049557970a1c9eaa9bf6733887357ab89d498774ca1e1aa20 SHA512 f0e3bed8305d9f7762ed41c3350029e5b374cacf3bf936e5b35503f651761e7addca1f961a7d44739dfd92e48bdd7756c53b616e2183c91c446afc2411598eed
 EBUILD kodi-pvr-vbox-7.0.0.ebuild 699 BLAKE2B 3ca6d54444eeb7e3107e725698ca26ccbc881b4f836ef001099aa38858bfb18d6b9efb2696f76eed9ac4c2068a3c04d361306a65ac4db2f1666494a3b32ec2ac SHA512 d977479ac9890ac3a1fd2206aa27bb27b2fd3a109a3ab9c57c8910d738e517168553891e9e80563493ce855ffab589316cbad3acb9d43abc10173c9fdde719cc
 EBUILD kodi-pvr-vbox-7.0.1.ebuild 673 BLAKE2B 78aa8207b33b7d5efac06abed5352c35fe0b3284090c34dfecfb4ea9c22d97be0d088441897d36c1cb8c4596f0032f1bffd651861565b67b98200265afa180ec SHA512 923567eb272223b86ae86bd8281778713ba398b46539845c675e12e4b7c5ada66aa21915333b8332039f2ef2bceed8ae9b4fa5b79303518285c495ccc412466f
 EBUILD kodi-pvr-vbox-7.0.2.ebuild 673 BLAKE2B 78aa8207b33b7d5efac06abed5352c35fe0b3284090c34dfecfb4ea9c22d97be0d088441897d36c1cb8c4596f0032f1bffd651861565b67b98200265afa180ec SHA512 923567eb272223b86ae86bd8281778713ba398b46539845c675e12e4b7c5ada66aa21915333b8332039f2ef2bceed8ae9b4fa5b79303518285c495ccc412466f
 EBUILD kodi-pvr-vbox-7.0.3.ebuild 673 BLAKE2B 78aa8207b33b7d5efac06abed5352c35fe0b3284090c34dfecfb4ea9c22d97be0d088441897d36c1cb8c4596f0032f1bffd651861565b67b98200265afa180ec SHA512 923567eb272223b86ae86bd8281778713ba398b46539845c675e12e4b7c5ada66aa21915333b8332039f2ef2bceed8ae9b4fa5b79303518285c495ccc412466f
 EBUILD kodi-pvr-vbox-8.0.0.ebuild 673 BLAKE2B 78aa8207b33b7d5efac06abed5352c35fe0b3284090c34dfecfb4ea9c22d97be0d088441897d36c1cb8c4596f0032f1bffd651861565b67b98200265afa180ec SHA512 923567eb272223b86ae86bd8281778713ba398b46539845c675e12e4b7c5ada66aa21915333b8332039f2ef2bceed8ae9b4fa5b79303518285c495ccc412466f
 EBUILD kodi-pvr-vbox-8.1.1.ebuild 673 BLAKE2B 455c393a01fe938609f33b18b6204ae959f1af6f256997006964f57c7b40a631852c118cebb717a9d7c42e58143988246680b2d0b35bc267f3810b854cd8645d SHA512 586c6d2340585143ca6d45f50b76e8e5c19a6e1fafcfd69bff2f5a2d081bce25d677a6373d9bd02b192f84d483fa609631b002a22039766947cb64904ce2c7b3
+EBUILD kodi-pvr-vbox-8.1.2.ebuild 673 BLAKE2B 455c393a01fe938609f33b18b6204ae959f1af6f256997006964f57c7b40a631852c118cebb717a9d7c42e58143988246680b2d0b35bc267f3810b854cd8645d SHA512 586c6d2340585143ca6d45f50b76e8e5c19a6e1fafcfd69bff2f5a2d081bce25d677a6373d9bd02b192f84d483fa609631b002a22039766947cb64904ce2c7b3
 EBUILD kodi-pvr-vbox-9999.ebuild 674 BLAKE2B b592bbd6fe222c5d78f91cffef013fda2b46bcb9f973f0d28271d176551c00aa4aa17f93af173109243fd0848301fb013adb2243b622a55a58c5fe3c86ac16f3 SHA512 07a6264c0db07e3f8d6bf45c206de39f737ff185548c669d6c84e2b2c1193169027145a2cafdfb37ff72ffeb33ea5f714a8d45f86869bbe9cda53f95aaf4666d
 MISC metadata.xml 360 BLAKE2B 6dd189877e8d7b23ca5520768e4450c561c0a74ef25a60130ad676d95f97762028baaad86d487d7c5def4f715ac1f8b06ff1458d78c1b03ca5e128790bc0f7b6 SHA512 3b81e335f3205bc319e458667e92fde865cedf5a9721793b67d9a61067ba839aa70b9d91ceae8eae6f382d1104b6e42bd5f4f427bd8499810c2f51c3f1ce611d
diff --git a/media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-8.1.2.ebuild b/media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-8.1.2.ebuild
new file mode 100644
index 000000000000..349e008af303
--- /dev/null
+++ b/media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-8.1.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="Kodi's VBox Home TV Gateway PVR client addon"
+HOMEPAGE="https://github.com/kodi-pvr/pvr.vbox"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.vbox.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Matrix"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/kodi-pvr/pvr.vbox/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/pvr.vbox-${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-vdr-vnsi/Manifest b/media-plugins/kodi-pvr-vdr-vnsi/Manifest
index 48cc37a47976..5be83a8d616b 100644
--- a/media-plugins/kodi-pvr-vdr-vnsi/Manifest
+++ b/media-plugins/kodi-pvr-vdr-vnsi/Manifest
@@ -1,4 +1,6 @@
 DIST kodi-pvr-vdr-vnsi-8.2.2.tar.gz 167074 BLAKE2B fe6cafacb16b31456f3d6f103a836a20cb2fac9d55aad56df858975ba23b9e5de4d29bebc97e276028289a98b196f96f0c30135f94d8316ea6da1c7154a16775 SHA512 e5ad58926058473feb089ad96acb4b348c674fc77ec412449cde36d508c75409bc6bfb24bd804b5f50a202e83a8a01b6fd823a1667de368c1f4b768512d519d8
+DIST kodi-pvr-vdr-vnsi-8.2.3.tar.gz 171586 BLAKE2B e7b9beed693c84f7a94657eed297a1d76669c2ffcee5be5604d1dc239b9de0811848aaafa87396125f5eacdb28ea7db0e8d3d52f7d4c63e46e0c830aadc8f4d0 SHA512 9fbb3e988fe6352fde230ce072b35e591d69015bbfd93a4e61b2719a1f36ef495d23db30d44a6c611dcc1b4e36339b454138902c3f815940c5a77ff2b3d9c62a
 EBUILD kodi-pvr-vdr-vnsi-8.2.2.ebuild 661 BLAKE2B 6f60f4bb43efc2b2e8bbba4b7e2f24d9c874482e3155cfc7d03f16cd0175c23ff6b0a9dc1213f198b834ad66025f2e5bfbd46be235149ff5121c141739f6cd8f SHA512 0d09ac8c609e093d6c257058d4c3c5a4cd886930eea51d29c215f0d17f5471a14079f02c69cc9604718338cf11c54a7a31576f6f27192edb85e584cd8b9f57f1
+EBUILD kodi-pvr-vdr-vnsi-8.2.3.ebuild 661 BLAKE2B 6f60f4bb43efc2b2e8bbba4b7e2f24d9c874482e3155cfc7d03f16cd0175c23ff6b0a9dc1213f198b834ad66025f2e5bfbd46be235149ff5121c141739f6cd8f SHA512 0d09ac8c609e093d6c257058d4c3c5a4cd886930eea51d29c215f0d17f5471a14079f02c69cc9604718338cf11c54a7a31576f6f27192edb85e584cd8b9f57f1
 EBUILD kodi-pvr-vdr-vnsi-9999.ebuild 662 BLAKE2B 384eeccddd28b9d8d779d82a84b5682f0e20360532c8ab2cb4afd727e3ea557c95d264640834d792d82a975665dfd769e82513f0bf5d689891930a373274e441 SHA512 bb86dda212c0ec83c1b8aae29698bcfd0109b426a718ef5e4c801fc598e050c3272fc0569c0603f21eadd146ca0d6687f16fa5d73752aba1dc2f9270eae6826c
 MISC metadata.xml 364 BLAKE2B 988d1dbec12e51a3931d0d1b94becdc96aafff8d91a5337384e1d893f66e2b1577a0337328c7039fd88a5bcbdd5fcf88f3caee48bd6833fe660621d5b65790e3 SHA512 61bab939dac811a9ddd566765443cf264be0b2229104d4cdd662fa05cb84622815eb7802c07b79c8e500f167fb7e8750a57966d3cbc6ab8ac921802f67806c49
diff --git a/media-plugins/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi-8.2.3.ebuild b/media-plugins/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi-8.2.3.ebuild
new file mode 100644
index 000000000000..3dd5faf015b3
--- /dev/null
+++ b/media-plugins/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi-8.2.3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="Kodi PVR addon VNSI"
+HOMEPAGE="https://github.com/kodi-pvr/pvr.vdr.vnsi"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.vdr.vnsi.git"
+	inherit git-r3
+	;;
+*)
+	KEYWORDS="~amd64 ~x86"
+	CODENAME="Matrix"
+	SRC_URI="https://github.com/kodi-pvr/pvr.vdr.vnsi/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/pvr.vdr.vnsi-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-19*
+	virtual/opengl
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
diff --git a/media-plugins/kodi-pvr-vuplus/Manifest b/media-plugins/kodi-pvr-vuplus/Manifest
index e9d0d7cd618b..90d803c4357e 100644
--- a/media-plugins/kodi-pvr-vuplus/Manifest
+++ b/media-plugins/kodi-pvr-vuplus/Manifest
@@ -1,4 +1,8 @@
 DIST kodi-pvr-vuplus-7.4.3.tar.gz 285230 BLAKE2B 0ef24cb24f745494ea86ea025943bd4c159beaa684cacad569ef603d355b917351b92dd145d1fc8e3069896f404727f6aaa2567b5f3633fcfa9dbdd1c60fd09e SHA512 b563c29600126ac0d25c744be64d060691331a875b7945c211f1267daa43d8db034c717b1def49ad85aaf50f81826e4c7ffcff08ad4422fa67abe2ea3cf5557f
+DIST kodi-pvr-vuplus-7.4.4.tar.gz 946491 BLAKE2B d3a64a10b7d0b0774aadf6290f70a6f8fd90de0790616d4b64927316c46929c77cb49fa0d69aaf5ba847513d5ad1fa2d208557e4b0b071c04bda94f53a3d086f SHA512 21d705116816d6acc1b70b6b1bebc0ca4bc0eedc2e55c204697608597d6bc88be47b16f18a2d1b04f8f22600a5388062ae259842702ab1d2170ace496edee2b7
+DIST kodi-pvr-vuplus-7.4.5.tar.gz 947455 BLAKE2B 055afbc8dd7e902771b88e34b47ff7d42ab6e30de27d1779f54847a4d04cda920552b3bbcac46e1ae26f5a113f014d04998aec71b83c4ab242f966035df398ce SHA512 04ba9ab1b7aee4418c305538ac880aae80c1523fed10d7104dce8a294c072d6be87469016fc673e4d54cc1faaab0074cd15f6edf3207ad88a962d4a41844985b
 EBUILD kodi-pvr-vuplus-7.4.3.ebuild 764 BLAKE2B 34294324ae2b481783ce3dced714f8f60c6dea8d0fb8a9e9e971e86fc5c6fbc30ee24494bc5e8fddeb4459790a4a5b7f0db1b96788a686bd64f11056c499b7b3 SHA512 6f92acf11b269e64f0ed4931d75fcff76ffd4371bc26e44ca77cd009c40a9f9be41f8fc05a885199977ae29c114d586b807e5e2cf2b4e75a753e6bafa0043596
+EBUILD kodi-pvr-vuplus-7.4.4.ebuild 764 BLAKE2B 34294324ae2b481783ce3dced714f8f60c6dea8d0fb8a9e9e971e86fc5c6fbc30ee24494bc5e8fddeb4459790a4a5b7f0db1b96788a686bd64f11056c499b7b3 SHA512 6f92acf11b269e64f0ed4931d75fcff76ffd4371bc26e44ca77cd009c40a9f9be41f8fc05a885199977ae29c114d586b807e5e2cf2b4e75a753e6bafa0043596
+EBUILD kodi-pvr-vuplus-7.4.5.ebuild 764 BLAKE2B 34294324ae2b481783ce3dced714f8f60c6dea8d0fb8a9e9e971e86fc5c6fbc30ee24494bc5e8fddeb4459790a4a5b7f0db1b96788a686bd64f11056c499b7b3 SHA512 6f92acf11b269e64f0ed4931d75fcff76ffd4371bc26e44ca77cd009c40a9f9be41f8fc05a885199977ae29c114d586b807e5e2cf2b4e75a753e6bafa0043596
 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-vuplus/kodi-pvr-vuplus-7.4.4.ebuild b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-7.4.4.ebuild
new file mode 100644
index 000000000000..20323489f843
--- /dev/null
+++ b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-7.4.4.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 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/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-7.4.5.ebuild b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-7.4.5.ebuild
new file mode 100644
index 000000000000..20323489f843
--- /dev/null
+++ b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-7.4.5.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 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/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-wmc/Manifest b/media-plugins/kodi-pvr-wmc/Manifest
index 201cbb2934e2..025bb8e4e269 100644
--- a/media-plugins/kodi-pvr-wmc/Manifest
+++ b/media-plugins/kodi-pvr-wmc/Manifest
@@ -1,4 +1,6 @@
 DIST kodi-pvr-wmc-6.1.1.tar.gz 185138 BLAKE2B c01e5c5d0b70e90d91a44d90170f308ef51fba287574ef8f89d091cfd26ee1a7dc520d4abcf9f7ae2e280af5fa0db0dcdcb2b626d1888e9dd835eb18f9617eae SHA512 4d9adbe042e6b9a0f8b03be2d3981255199a76960d1a94541f0d2bee64efec76de24c8a387b3ae867f0e1d4633d25890a3870e85dc7d683f2db904e006a52df4
+DIST kodi-pvr-wmc-6.1.2.tar.gz 190018 BLAKE2B 311406bfdaf2aa36eb8f11257de65d555581acdcff19d6cb0bceb2d1cebe3a33fcd49cfd2344095e5ae482431f00964c6d95843e0c6702c2e2f3d2e7092d3096 SHA512 b0e53c8494a5c811182358afbc7834b7cc51104839c7b4bf59047ef00e4b9bbf013368d94f095fa384dd4aa590a1f64c0235328b652962cd39430273c8e41c0b
 EBUILD kodi-pvr-wmc-6.1.1.ebuild 671 BLAKE2B e17ba5285a0582c02a90770f51011686dc5ce76b161c61f39948755a2400482a04e51a7f23a2cfc5dcdd1d1f13bd081699f6dd7b9778850e8738f0946261aa94 SHA512 8b8d41dcf46f06a76593e36d8c098c3835d488b5b08d18eae6221a6f11e0f2d46532d46ae17ff60740820a2f13c19f70cebcb05412632ad71c6e51db93535bf8
+EBUILD kodi-pvr-wmc-6.1.2.ebuild 671 BLAKE2B e17ba5285a0582c02a90770f51011686dc5ce76b161c61f39948755a2400482a04e51a7f23a2cfc5dcdd1d1f13bd081699f6dd7b9778850e8738f0946261aa94 SHA512 8b8d41dcf46f06a76593e36d8c098c3835d488b5b08d18eae6221a6f11e0f2d46532d46ae17ff60740820a2f13c19f70cebcb05412632ad71c6e51db93535bf8
 EBUILD kodi-pvr-wmc-9999.ebuild 672 BLAKE2B d33f39250a6b1faad7a0a70451a31c08af9fa51f90fc691aea2227585c8b6abd6a07c66bf088c54230df701c242984d89b14d21c01d44a12e522df14a4492f73 SHA512 a4c10a79ad84582c2a7384c84da599446c42cf75e8b878510743a23b7b95c375c440944231f396ce239371c791fb5e7c8a60f21e89a6822df7b66885fc0d1fec
 MISC metadata.xml 359 BLAKE2B 99172ce599f04aaaff1486b3967fcaca97a2a4de94e44563e44425c9d758e4442125440c7abb1e8af9ca6d6f3422d1f6b65dcb7541007bf498defa94e794da69 SHA512 13670f9122af7af78519b9a3299ec63c4c6ac1b24f9c3a6c30df1728454229397eb0422bd00fcfbe108fd45f5581801dd7ad585fd40a6b3fba68aa85735f6f1e
diff --git a/media-plugins/kodi-pvr-wmc/kodi-pvr-wmc-6.1.2.ebuild b/media-plugins/kodi-pvr-wmc/kodi-pvr-wmc-6.1.2.ebuild
new file mode 100644
index 000000000000..66f8557b7b1b
--- /dev/null
+++ b/media-plugins/kodi-pvr-wmc/kodi-pvr-wmc-6.1.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="Kodi's Windows Media Center client addon"
+HOMEPAGE="https://github.com/kodi-pvr/pvr.wmc"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.wmc.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Matrix"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/kodi-pvr/pvr.wmc/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/pvr.wmc-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-19*
+	=dev-libs/libplatform-2*
+	"
+RDEPEND="
+	${DEPEND}
+	"