gentoo resync : 31.08.2021

22 files changed, 274 insertions, 160 deletions

diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index d08624319273..9b511c8d53ab 100644
--- a/media-plugins/Manifest.gz
+++ b/media-plugins/Manifest.gz
diff --git a/media-plugins/grilo-plugins/Manifest b/media-plugins/grilo-plugins/Manifest
index 0bedb8d550f7..a9db7f566ce9 100644
--- a/media-plugins/grilo-plugins/Manifest
+++ b/media-plugins/grilo-plugins/Manifest
@@ -1,5 +1,5 @@
 AUX 0.3.13-meson-goa.patch 2376 BLAKE2B 35a35af7aebf3c7f735affdcb2775a556eef8aafbde8aada3e8ea83fa67db9d0a0f992115eb4d54dd69736ae813b0cdef8d25b2991f4cb1361f0d451fe1f43a6 SHA512 ee3959e0c7eabc7f7fbdd6ddbd0c10242ffb9ebe427915115430f10bec821fc5b66dc8315a75337e69875ea060ec3a8c10ef6979534a1e47b408ebbf4785e6bd
 AUX 0.3.13-meson-tracker3-test.patch 966 BLAKE2B 85daac660794ae43c592a7a344d82dff0bc008b2f32a5a66e724a867ead059bb4c9f2f6a9c4c9a3fbf6ace8b7f2b12abd353b2ace08e1c5d2e712837721c36e8 SHA512 da7677753209a8da8d75cb258bd88e003fd2ea647bd1c2bfde4e63bcc48b7d0df3600b5d9e0192461f49b20bb56c605613c088e85b8b4e955b34457d231f8a00
 DIST grilo-plugins-0.3.13.tar.xz 1835320 BLAKE2B 3c39c652700eba0d6c557dbfa700a4f8f1b52ecadb757d7c36b5a3023f096fcb7587f4b054f75eb12ffee61b423abbca73d7847d902450d23b5527024f260058 SHA512 7edccc7366623c3dab56f7c95156327db08efdf038563c9be3e423c517a1117003ef516a069f9a2e877f6a610dad6783d3087d111b039ce7bdc6657124cf8e25
-EBUILD grilo-plugins-0.3.13.ebuild 3230 BLAKE2B d27fd29832d3cc03027a685e2b8a6702e320cf2c3e63a84b47d0f231eae2235e3781f5c1b2085f136aa8b33ab3f4b85e6eb18c755f5d6e46b8672c1b55864220 SHA512 340e54e4fe0dd4ee4acdf9d29230a51672d4be8e724ce1ae927be8292170b57e81a61f204afaa196cff6a13eb37dce8cbe752fd1c7f68e17019bccfa1eac89c5
+EBUILD grilo-plugins-0.3.13.ebuild 3237 BLAKE2B a7bed1b246cfc05fffe85dbe445994e0404d69eefca75e9c0084dadbe8e0cac884042434c228c6076276407f2b461ce2afa6b0345b106dfccd2cd1a1c8c92f79 SHA512 1fb6c2be771643d8f339e505c7e12050cf827f7278d10083ca1bc052fcc5696428c2dad74eda3c16622f256d2d921cca83055b62ba04767076cca0f0fea00e2e
 MISC metadata.xml 920 BLAKE2B c6119dc73ede7e500e3113f03677f81d65d4a2a524e84847f010e6c9215b96feed5fcaf400166471c25075742268cbe7639e23cd11447e0e795146b29dec797e SHA512 322b01e064c5656e9d9c7e2343d7feb76f35bd9ea6e5174ce3702747e5c4dd5de9ab60e9c91d72db171ad62a90f84eedcc03b3547ef7bc8e231090c7eaef9ac7
diff --git a/media-plugins/grilo-plugins/grilo-plugins-0.3.13.ebuild b/media-plugins/grilo-plugins/grilo-plugins-0.3.13.ebuild
index a4224bdc0875..65c4e305388f 100644
--- a/media-plugins/grilo-plugins/grilo-plugins-0.3.13.ebuild
+++ b/media-plugins/grilo-plugins/grilo-plugins-0.3.13.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Grilo"
 
 LICENSE="LGPL-2.1+"
 SLOT="0.3"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="daap chromaprint flickr freebox gnome-online-accounts lua test thetvdb tracker upnp-av +youtube"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
diff --git a/media-plugins/kodi-audioencoder-flac/Manifest b/media-plugins/kodi-audioencoder-flac/Manifest
index bc6a122bc2d8..a1cefecd3292 100644
--- a/media-plugins/kodi-audioencoder-flac/Manifest
+++ b/media-plugins/kodi-audioencoder-flac/Manifest
@@ -1,4 +1,6 @@
+DIST kodi-audioencoder-flac-19.0.0.tar.gz 41951 BLAKE2B c2464faabe31035d7d04eaff3ab8f36bd4a47db76e17bf821261fbf28377c94ed94df314cc01bbc06bfa2d8b4f23a13d40c7e9dbfb47d5dfcccb141e34a2f17a SHA512 a870069b7283f2d870327675353e79942ddb7358fa042b51b21f940d0c128700619274afaae2d820b7a2bfbd2289e4cce2d2075d4a10cebc6b15d014f77fd1e8
 DIST kodi-audioencoder-flac-3.0.0.tar.gz 27573 BLAKE2B ccef84245eb6ce23527b33900e22e304282477eccca728f5a899db80d7b1f64a00fd1de65f4303bf4261554c038d48adf49f417a8161a9359e9ead81c7288a7b SHA512 73dd9526a498dd92076eb98044f75baaeb4dd93251f6a9a2d9e9a9a8553fb9b047b861b8518c2fe2803ce06cd794a5436f80561bedd82de1fc2df727f28d1b7c
+EBUILD kodi-audioencoder-flac-19.0.0.ebuild 836 BLAKE2B a6060a598ce4300f420eb3e279feaa280faecfa175550fd7be5bc4cec44f40de80864b7ebe381d6399eadae1088375aa2b1f8949785a32e1a0441e8b100b0756 SHA512 01bf47b13907de8ff611002f0dc452cc60c5d0558ad755cd9ddce606fbb3e60e65333be938f321f7fac2405abc8cfd3e50e39a87d571bcb1ef4775c56a5822af
 EBUILD kodi-audioencoder-flac-3.0.0.ebuild 836 BLAKE2B ed91e07e247dcab3fe573f921abaab3b13ecdb9a7f562cd54e52839522a6d9b43fd3589e497897facf4a56dd75b28f1cfe3e3612bca5b3c420931bc404402efc SHA512 66ffc8c975b60c9c2af0845104b945a05abb8095373095b87e70daba4bff674da1154a987406719a487f21c3630b4eb191f064fb163ef855762e0bffc2a833ab
-EBUILD kodi-audioencoder-flac-9999.ebuild 824 BLAKE2B 897e82bd0d5d7f1ba00b20d70b913be3b200e9d4bf527bc70d73ce9b44f54462906d4bb4211a686ae1f045c20d401fee19419b7d0cb69669decd3c12ec11bdf4 SHA512 300ddeb7a8d3e0f966fe87f57f80ae2fcb2ee82ea8471e3df885b14b6f720f4c734675ffd44b4457916f5a4acba33297b0a774bebe4f04290d6c848f4d4f83cc
+EBUILD kodi-audioencoder-flac-9999.ebuild 836 BLAKE2B a6060a598ce4300f420eb3e279feaa280faecfa175550fd7be5bc4cec44f40de80864b7ebe381d6399eadae1088375aa2b1f8949785a32e1a0441e8b100b0756 SHA512 01bf47b13907de8ff611002f0dc452cc60c5d0558ad755cd9ddce606fbb3e60e65333be938f321f7fac2405abc8cfd3e50e39a87d571bcb1ef4775c56a5822af
 MISC metadata.xml 365 BLAKE2B 2dfd719dd4e21870127bbdbb5f1599fb493cf30a410e1ace810015ab8680e19cc976fb36716cf20dccdba8fbe10b9e12e814e5574b952a90dcd9b80a76391d93 SHA512 e579a5ee02bf4bd0d0da392dcc4116ea45b24fa7cf409dcf39776dfda598395382279f18044db6dc7287a2270c12316a65801f5a5445c05f16c9229238fb6cc9
diff --git a/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-19.0.0.ebuild b/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-19.0.0.ebuild
new file mode 100644
index 000000000000..8a94ebc7216f
--- /dev/null
+++ b/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-19.0.0.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="Flac encoder addon for Kodi"
+HOMEPAGE="https://github.com/xbmc/audioencoder.flac"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/audioencoder.flac.git"
+	inherit git-r3
+	DEPEND="~media-tv/kodi-9999"
+	;;
+*)
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	CODENAME="Matrix"
+	SRC_URI="https://github.com/xbmc/audioencoder.flac/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/audioencoder.flac-${PV}-${CODENAME}"
+	DEPEND="=media-tv/kodi-19*"
+	;;
+esac
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+
+DEPEND+="
+	>=media-libs/libogg-1.3.5
+	media-libs/flac
+	"
+RDEPEND="
+	${DEPEND}
+	"
+
+src_prepare() {
+	[ -d depends ] && rm -rf depends || die
+	cmake_src_prepare
+}
diff --git a/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-9999.ebuild b/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-9999.ebuild
index 580c59f48c6e..8a94ebc7216f 100644
--- a/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-9999.ebuild
+++ b/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ case ${PV} in
 	DEPEND="~media-tv/kodi-9999"
 	;;
 *)
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 	CODENAME="Matrix"
 	SRC_URI="https://github.com/xbmc/audioencoder.flac/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/audioencoder.flac-${PV}-${CODENAME}"
@@ -30,7 +30,7 @@ SLOT="0"
 IUSE=""
 
 DEPEND+="
-	>=media-libs/libogg-1.3.4
+	>=media-libs/libogg-1.3.5
 	media-libs/flac
 	"
 RDEPEND="
diff --git a/media-plugins/kodi-audioencoder-vorbis/Manifest b/media-plugins/kodi-audioencoder-vorbis/Manifest
index cabcc8a55ade..c9d07cf87244 100644
--- a/media-plugins/kodi-audioencoder-vorbis/Manifest
+++ b/media-plugins/kodi-audioencoder-vorbis/Manifest
@@ -1,4 +1,6 @@
+DIST kodi-audioencoder-vorbis-19.0.0.tar.gz 32058 BLAKE2B faeabd15682b244e19bbf93dbf3a6d69642c803a640b6e2cb0ae5a73a40c47afd18179d3ae4db8e032bf5d59c6452d54176a8c4eed6ce30479d6cbb3c2b4aa13 SHA512 3f6cec4ec4f2ab6af674c3527b85f41025e7df512a521883de9bba719b85d41ff2897294d616f9294b8cd794b290ac7e4dda8dd252bcc3a47c723bfb2e7e526e
 DIST kodi-audioencoder-vorbis-3.0.1.tar.gz 23518 BLAKE2B b995969f3d23ba0af692f571a7a92855b73d99f7360b169b7e69bb6e8cb6761de430a80041eef101025c9d83b05479780f3c67785161516d81934fbf07fb78e3 SHA512 f0e9e152574881943f4c8bad6e8249e502590503104e5c456858e25634004c223e9be91b274b2870dd07327254664f7ffa5549cf573241192088a3287d2511ad
+EBUILD kodi-audioencoder-vorbis-19.0.0.ebuild 860 BLAKE2B 048888c59b60be0dbc4bf44503358f0eb8ae637606841feab58bbd6428a2206b1d952eabc7badb4f615a66488136e48921c07b7df2861002cc1db1995fcd7027 SHA512 d9022fd48097e4293b2256cf7a36967132afeabf360c0f3be9a8a0a7a9e5d7712ad47f269629d3768f9577595b8f5c605442626c68ddd5a331e66f19248f112a
 EBUILD kodi-audioencoder-vorbis-3.0.1.ebuild 860 BLAKE2B 3e5402c69dbe6e1e8fd6e7f6e8c3ed1f3da39bd4de200da0f5208df7bb979fa58c6b2f994a878a6ade2647133acda1514bd622ee82660d3e44d30adab382143f SHA512 73f1ea46308124406678b8f76f92a6205ac8d39d68d3d1990dc3db3f530c3efb748e4ce2fa517f18b4237a673369ed05f3569e29108dbdc9508a95141268eab1
-EBUILD kodi-audioencoder-vorbis-9999.ebuild 848 BLAKE2B 698ad3ef068771e23e33627f6bc8c9cc9ba7f960a4204fe5c4bba07087a2f41a1e91127ff05a6372e84b4675e15e5a2cd63da1d767dba372020abe205e58331c SHA512 4f0cbb2f72456a357639f908658b1aae54a273e29a5f91c9c4f63989029675f79b96d8f000761000542346633a5574a699adf857b382fdff620267b111a6bca8
+EBUILD kodi-audioencoder-vorbis-9999.ebuild 860 BLAKE2B 048888c59b60be0dbc4bf44503358f0eb8ae637606841feab58bbd6428a2206b1d952eabc7badb4f615a66488136e48921c07b7df2861002cc1db1995fcd7027 SHA512 d9022fd48097e4293b2256cf7a36967132afeabf360c0f3be9a8a0a7a9e5d7712ad47f269629d3768f9577595b8f5c605442626c68ddd5a331e66f19248f112a
 MISC metadata.xml 367 BLAKE2B 11692fb9114c236f280f27769f4417913e3d49f2a194951d4147b7f3c4ade671734debd0fcbf12cc62a94c3364a60030f49f5f62f82749d8e930dba85dcbb342 SHA512 46178b6ca66f8406dc513e3b3271b5887e12890771af254d04f62bfbd6e303f6e87c787c9478f0f242d0b77e94706d81ffcf2e4f8dfe0bab7e9b7a173cc2ce19
diff --git a/media-plugins/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis-19.0.0.ebuild b/media-plugins/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis-19.0.0.ebuild
new file mode 100644
index 000000000000..c9f224ea7241
--- /dev/null
+++ b/media-plugins/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis-19.0.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="Vorbis encoder addon for Kodi"
+HOMEPAGE="https://github.com/xbmc/audioencoder.vorbis"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/audioencoder.vorbis.git"
+	inherit git-r3
+	DEPEND="~media-tv/kodi-9999"
+	;;
+*)
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	CODENAME="Matrix"
+	SRC_URI="https://github.com/xbmc/audioencoder.vorbis/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/audioencoder.vorbis-${PV}-${CODENAME}"
+	DEPEND="=media-tv/kodi-19*"
+	;;
+esac
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+
+DEPEND+="
+	>=media-libs/libogg-1.3.5
+	>=media-libs/libvorbis-1.3.6
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
+
+src_prepare() {
+	[ -d depends ] && rm -rf depends || die
+	cmake_src_prepare
+}
diff --git a/media-plugins/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis-9999.ebuild b/media-plugins/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis-9999.ebuild
index 78220ef2dae9..c9f224ea7241 100644
--- a/media-plugins/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis-9999.ebuild
+++ b/media-plugins/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ case ${PV} in
 	DEPEND="~media-tv/kodi-9999"
 	;;
 *)
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 	CODENAME="Matrix"
 	SRC_URI="https://github.com/xbmc/audioencoder.vorbis/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/audioencoder.vorbis-${PV}-${CODENAME}"
@@ -30,7 +30,7 @@ SLOT="0"
 IUSE=""
 
 DEPEND+="
-	>=media-libs/libogg-1.3.4
+	>=media-libs/libogg-1.3.5
 	>=media-libs/libvorbis-1.3.6
 	"
 
diff --git a/media-plugins/kodi-imagedecoder-heif/Manifest b/media-plugins/kodi-imagedecoder-heif/Manifest
index 8d5580ea4396..b5833e446b6c 100644
--- a/media-plugins/kodi-imagedecoder-heif/Manifest
+++ b/media-plugins/kodi-imagedecoder-heif/Manifest
@@ -1,6 +1,8 @@
 DIST kodi-imagedecoder-heif-1.3.0.tar.gz 32393 BLAKE2B 76981fe8759e93b2aaf5db5452db4fb414d295d637bdd38950fb89ba0e21c9b22a7ed87dc183bd3c47f457c09672348e9af74a9015408ce4214dc847599cbae0 SHA512 63181558f31804a1dd12f4a895535ab303c5e3c5f75b5fcc5bdda892b31a78d9b48b917d85dba66df23a8d118eea83825d24c4b797b289be11169b3a1a29df4a
 DIST kodi-imagedecoder-heif-1.4.0.tar.gz 32045 BLAKE2B 87da40bcb13d4ca26df4563231b08cd9535dca0197d40ed0a2baff991db05978bdaa074ce16f631822b06a660086e222427bc43fe34c153cc6eb1084f790d398 SHA512 a26fc84aeba8a9aaffde3a2187b50c99697df542faffda10b4958db1947fd9c0c4fb7cc02c2e1f959c6d3296ed47430b8d2a0be460aa497ab94fb67f1a25a8e4
+DIST kodi-imagedecoder-heif-19.0.0.tar.gz 34506 BLAKE2B 054791cfc86327e02d21e22c706241603ac425ac73fce5c44513737060dbcd7abf15c34569fbeb14adbd95d4b5bd2bc1ec189b3e6206fa00b23049eeffd8584e SHA512 73e2dc0cdbc4ab99d3c1e96ac465e3a3f834ff8fc9dc900f42f2e04405bac01149fcc6da74bb2f4b6fd6c69945a6700a2ff878e64b3f17c1fcefb1d2f7f640d7
 EBUILD kodi-imagedecoder-heif-1.3.0.ebuild 884 BLAKE2B 1e69301d94bf4bf583c66ded081ff191234fdc87218e9e372c36dd0caec7368290bff4bea2e13a9fc63f2410acd0387d07ff120d038bbff383b96e910369e0a2 SHA512 5807c66ba348329784067c89ff6eab698bf3b037d7d0d9b613f604b0eb24cfeadbd7a771c129f71474ac37421288fa6d7f1781d7da5ed02b4d97befb47dd0269
 EBUILD kodi-imagedecoder-heif-1.4.0.ebuild 884 BLAKE2B 83e813a0cf3e51f8377ede94f298754f0474f673a06f487fea4c8f45e76dab5311055481b3b4428a25d0f22a5fb73d6a7f648b7495bd2d877ad265463c963987 SHA512 76ddbb2f30a8859b74e57c1aba0389195e68ab02078c760cebdfd9fa3b3e667d85034484dd41f8221284c325ff819cd0b22c9eb35cd0f7e05b5e9f46b9ac4549
+EBUILD kodi-imagedecoder-heif-19.0.0.ebuild 885 BLAKE2B 7df430ab0299dcd16b0314c0127d1a9b44fe531d1cf42fd1ac7efc73c6786efb509c33958546d798dabb7d26d83de7385e087bc5917682c35a9316d7909b5704 SHA512 6e3752b8e7f6d24c148c177a46b37f64c1c6dba6bb9f2fec321a4bd59a52c532353d579e60fd30b128e8d03e5a0efdc0d389c4da4a3369ea8feb6c0ad709920a
 EBUILD kodi-imagedecoder-heif-9999.ebuild 884 BLAKE2B 83e813a0cf3e51f8377ede94f298754f0474f673a06f487fea4c8f45e76dab5311055481b3b4428a25d0f22a5fb73d6a7f648b7495bd2d877ad265463c963987 SHA512 76ddbb2f30a8859b74e57c1aba0389195e68ab02078c760cebdfd9fa3b3e667d85034484dd41f8221284c325ff819cd0b22c9eb35cd0f7e05b5e9f46b9ac4549
 MISC metadata.xml 509 BLAKE2B 1d779aecbb0c70795ee2022e634922fcfd0951d654a63ebf777b6a69d9fc5c5d2404dda687de298cd81ee40f836d6088fc57136db337f2c506f65c7419a6f245 SHA512 8fee416035a69cf7391eeef4d5c679d6c4861616d6999d38d32c3ef6acf7d76ecd552b3246a125b8d026173d45b28568698bf6e61a2bfce3b3c8a6d9d4dcd2a8
diff --git a/media-plugins/kodi-imagedecoder-heif/kodi-imagedecoder-heif-19.0.0.ebuild b/media-plugins/kodi-imagedecoder-heif/kodi-imagedecoder-heif-19.0.0.ebuild
new file mode 100644
index 000000000000..48eb3666477b
--- /dev/null
+++ b/media-plugins/kodi-imagedecoder-heif/kodi-imagedecoder-heif-19.0.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+KODI_PLUGIN_NAME="imagedecoder.heif"
+DESCRIPTION="HEIF image decoder for Kodi"
+HOMEPAGE="https://github.com/xbmc/imagedecoder.heif"
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}.git"
+	inherit git-r3
+	DEPEND="=media-tv/kodi-9999*"
+
+	;;
+*)
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	CODENAME="Matrix"
+	SRC_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}"
+	DEPEND="=media-tv/kodi-19*"
+	;;
+esac
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+
+DEPEND+="
+	>=media-libs/libde265-1.0.8
+	>=media-libs/libheif-1.12.0
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
+
+src_prepare() {
+	[ -d depends ] && rm -rf depends || die
+	cmake_src_prepare
+}
diff --git a/media-plugins/kodi-imagedecoder-raw/Manifest b/media-plugins/kodi-imagedecoder-raw/Manifest
index 22272b9b8f2f..1b9c27e39466 100644
--- a/media-plugins/kodi-imagedecoder-raw/Manifest
+++ b/media-plugins/kodi-imagedecoder-raw/Manifest
@@ -1,4 +1,6 @@
+DIST kodi-imagedecoder-raw-19.0.0.tar.gz 54689 BLAKE2B a55e5f9ccd9c4304bba0705eab60b20d3b0b701377c0f770c41b4bde4ada310d618d64e862787279abaeb3f52c0b065effc2666a62b7e960fb156316b59f1370 SHA512 4d0e96db52c43234f27fce0ca9628c57457fbdb002464f1d8b168988264cd4666966f285298b7c0c1f69239d3bb774a7eda827b66107f7851ad265a07d236de9
 DIST kodi-imagedecoder-raw-3.0.1.tar.gz 51343 BLAKE2B 04fb42a64dfd712bcefc6c81af6519566c1cfdfaf97115dec28d4cb05794b918baf4d50179bbc43faac41294b8398f615e6562a310503b13bd18b2d236559bde SHA512 ac4c3a4d042bb8c18340efb2f2929f6301089a407731d6cc371b7b888da978bfb017e0e563d614209bce396f9425c4a618b6109f228c4943282ab4b823f159de
+EBUILD kodi-imagedecoder-raw-19.0.0.ebuild 919 BLAKE2B 8b6e258977724e80c94ce126b5480230f762aa5aa26a64e48dd332f6295a3f08d4f71211801a599537d397bc1c2fc5a2ad1518fd84885d58ee110f7c3e96bad2 SHA512 6606130180bd5964087944159d0715aea3ec9a958c2a303a494da7698747df79bb9b0f992cd430be1c9f4ac3bc0f06413a1244bf367391c05e74195cb088ac87
 EBUILD kodi-imagedecoder-raw-3.0.1.ebuild 884 BLAKE2B 1a4214d97a41f14394cb703087fe016096768634b4b6b941e17971305e02a103cbe1b7fe9ebf6eb047fd274823c110bedb55186fec8f4d0d20a66d386ed279b4 SHA512 6a9e04845544e7493d6fd5277cd9a3926736193c337ceea33dd2b10fe025abace63c18824b6d3cb28de5737dd3b55ba278986cb595c6d91d07559641780e25ea
-EBUILD kodi-imagedecoder-raw-9999.ebuild 872 BLAKE2B 64b8d15b4ca3cf877cd1a965536911c9ccb5af8397fc3cec65a5648dc6fe1bf846bf9c22e425938a57ac21bcc720df69c7cdf3819e8bbe3ceb59cbff3b2956b3 SHA512 14c3d76a0fa85a7bc1d3fa8efcbc8cd7de3d75064778c2e624f58b80d60fd9d3231266c142620f42554b373644c1acc0355eb8a7cc732a2608b7cdad740fcb02
+EBUILD kodi-imagedecoder-raw-9999.ebuild 919 BLAKE2B 8b6e258977724e80c94ce126b5480230f762aa5aa26a64e48dd332f6295a3f08d4f71211801a599537d397bc1c2fc5a2ad1518fd84885d58ee110f7c3e96bad2 SHA512 6606130180bd5964087944159d0715aea3ec9a958c2a303a494da7698747df79bb9b0f992cd430be1c9f4ac3bc0f06413a1244bf367391c05e74195cb088ac87
 MISC metadata.xml 508 BLAKE2B e19da72a167cca7ec58192943f8ff4cb0ce8fc105c3cc1fc169bfadba232e8e2c9665a8c830d86674d891c7cf50e9cb235e6639be85411cd613451e7a5c17b14 SHA512 fa0adb78c2c7b5a6fee1f177313ddc6fe1906b4c5e385e2c190982b672dd8ba77f0fff7bd1adda7acb773864f493016f0bfd0b02647b5f6132ab8e1965d2e820
diff --git a/media-plugins/kodi-imagedecoder-raw/kodi-imagedecoder-raw-19.0.0.ebuild b/media-plugins/kodi-imagedecoder-raw/kodi-imagedecoder-raw-19.0.0.ebuild
new file mode 100644
index 000000000000..9a8d65704eb5
--- /dev/null
+++ b/media-plugins/kodi-imagedecoder-raw/kodi-imagedecoder-raw-19.0.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+KODI_PLUGIN_NAME="imagedecoder.raw"
+DESCRIPTION="RAW image decoder for Kodi"
+HOMEPAGE="https://github.com/xbmc/imagedecoder.raw"
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}.git"
+	inherit git-r3
+	DEPEND="~media-tv/kodi-9999"
+	;;
+*)
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	CODENAME="Matrix"
+	SRC_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}"
+	DEPEND="=media-tv/kodi-19*"
+	;;
+esac
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+
+DEPEND+="
+	>=media-libs/libjpeg-turbo-2.1.1
+	>=media-libs/libraw-0.20.2[jpeg,lcms]
+	>=media-libs/lcms-2.12
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
+
+src_prepare() {
+	[ -d depends ] && rm -rf depends || die
+	cmake_src_prepare
+}
diff --git a/media-plugins/kodi-imagedecoder-raw/kodi-imagedecoder-raw-9999.ebuild b/media-plugins/kodi-imagedecoder-raw/kodi-imagedecoder-raw-9999.ebuild
index c9ee870557e8..9a8d65704eb5 100644
--- a/media-plugins/kodi-imagedecoder-raw/kodi-imagedecoder-raw-9999.ebuild
+++ b/media-plugins/kodi-imagedecoder-raw/kodi-imagedecoder-raw-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ case ${PV} in
 	DEPEND="~media-tv/kodi-9999"
 	;;
 *)
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 	CODENAME="Matrix"
 	SRC_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}"
@@ -30,8 +30,9 @@ SLOT="0"
 IUSE=""
 
 DEPEND+="
-	>=media-libs/libraw-0.19.5[jpeg,lcms]
-	>=media-libs/lcms-2.9
+	>=media-libs/libjpeg-turbo-2.1.1
+	>=media-libs/libraw-0.20.2[jpeg,lcms]
+	>=media-libs/lcms-2.12
 	"
 
 RDEPEND="
diff --git a/media-plugins/live/Manifest b/media-plugins/live/Manifest
index e2acedff589c..439accf2e11e 100644
--- a/media-plugins/live/Manifest
+++ b/media-plugins/live/Manifest
@@ -1,6 +1,4 @@
 AUX config.gentoo-so-r3 539 BLAKE2B e80c461f69a991641100d3966d1d100dc7fe8c15e3edc358bcd8ebd17a3f8c4d00a5557c9983f51a251a4602dcc378138df736f13665f5d5140081e047df0f5b SHA512 3f7d4a860b45ff6769fe1f29e694dfb897ab5b7c50f3d0d896425d300be6277df850cdb67cf311a0671ba747339b32f65d44a95b020940b3d1ac5764d873f20f
-DIST live.2020.05.15.tar.gz 7229400 BLAKE2B 74532c178aa1044750110eb52561b99cd70874574ee84992201a145b18091d4f8475e2a299a83f0fe42c7e64483d46175fb76465a22509db3ba2633aff1327f6 SHA512 d53fb7e8c586f50e561aa361567ccd45babdbbcbe96a06d95e42a04a54b23ac3f474fefcacf94a49b604008623acf06789b92238364713853babbe356eeac4aa
 DIST live.2021.05.22.tar.gz 682749 BLAKE2B 38663f8c5dbd8cccf4e5cfe685b0eb393559195eba852fcdf6c38c7be936948d2727da91e829aedbde08eab6edb6082533d14061edfcf125d82c925bffdb9f90 SHA512 4021cbdaffb48b9b361e931fa71f89db1e116fe8c4e57df78d54493b111a8c6249431cc418a20352a45a75ef240712609eed3aa7468c6049996dd2451ae2941c
-EBUILD live-2020.05.15.ebuild 3102 BLAKE2B b1d44c9f667783a15b5263bf48a5e386b65359fc5cfc0accc02877e80e674e3ea6b3507ae090d2ac5597dbeaa0efcf84ddd4a3f26fc9967be76c77846b1dd6d7 SHA512 035327659e92059fd807bfb20d36dbe7c1126aa505f8581ec71e90319303cde3c6bf0547b78e7f4b39c5c5c40ab823719de550ac91f568de7280a7deae715f2c
 EBUILD live-2021.05.22.ebuild 3109 BLAKE2B af54967cdf34cfeb6b7f175902a69aac1d3b01dad02e3e90c7da47dd170a7c363270e1bdb90ee2d1d297726fcf4cbbc9e7e52c395c2a4d8b62af652f359525e1 SHA512 5ec35a0d90bec902ba75a4398189100b04b482c864707fa01be6259046a58eaa1d4055717080edcf109967dcd81dbba6a1f7ffeee138e158b23bb62e64b1a588
 MISC metadata.xml 221 BLAKE2B dbd3c4ca4e95a1ad33f79e707799593ad704252f4f1c17e08c7e42ede0e4ad153eb659fc130717823dad18cab485c7b941a7089d2d964b96d2e2f7c5f1ba8df2 SHA512 e5a88aac41d38b1bdf0becef8d0a08d1875eb803fac3f791524a7810c8068cfd2239a42717bddf9835daf6c0b2c5d5592b12669882bbc2abaab39955d7de7fb4
diff --git a/media-plugins/live/live-2020.05.15.ebuild b/media-plugins/live/live-2020.05.15.ebuild
deleted file mode 100644
index 0e286745c49f..000000000000
--- a/media-plugins/live/live-2020.05.15.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Libraries for standards-based RTP/RTCP/RTSP multimedia streaming"
-HOMEPAGE="http://www.live555.com/"
-SRC_URI="http://www.live555.com/liveMedia/public/${P/-/.}.tar.gz"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
-IUSE="ssl"
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="
-	ssl? (
-		dev-libs/openssl:0=
-	)
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( "live-shared/README" )
-
-# Alexis Ballier <aballier@gentoo.org>, Sam James <sam@gentoo.org>
-# Be careful, bump this everytime you bump the package and the ABI has changed.
-# If you don't know, ask someone.
-# You may wish to use a site like https://abi-laboratory.pro/index.php?view=timeline&l=live555
-LIVE_ABI_VERSION=9
-SLOT="0/${LIVE_ABI_VERSION}"
-
-S="${WORKDIR}/live"
-
-src_prepare() {
-	default
-
-	cp "${FILESDIR}/config.gentoo-so-r3" "${S}/config.gentoo-so-r1" || die
-
-	# This is all legacy stuff which needs to be cleaned up
-	case ${CHOST} in
-		*-solaris*)
-			sed -i \
-				-e '/^COMPILE_OPTS /s/$/ -DSOLARIS -DXLOCALE_NOT_USED/' \
-				-e '/^LIBS_FOR_CONSOLE_APPLICATION /s/$/ -lsocket -lnsl/' \
-				live/config.gentoo-so-r1 \
-				|| die
-		;;
-		*-darwin*)
-			sed -i \
-				-e '/^COMPILE_OPTS /s/$/ -DBSD=1 -DHAVE_SOCKADDR_LEN=1/' \
-				-e '/^LINK /s/$/ /' \
-				-e '/^LIBRARY_LINK /s/=.*$/= $(CXX) -o /' \
-				-e '/^LIBRARY_LINK_OPTS /s:-shared.*$:-undefined suppress -flat_namespace -dynamiclib -install_name '"${EPREFIX}/usr/$(get_libdir)/"'$@:' \
-				-e '/^LIB_SUFFIX /s/so/dylib/' \
-				live/config.gentoo-so-r1 \
-				|| die
-		;;
-	esac
-}
-
-src_configure() {
-	# This ebuild uses its own build system
-	# We don't want to call ./configure or anything here.
-	# The only thing we can do is honour the user's SSL preference.
-	if use ssl ; then
-		sed -i 's/-DNO_OPENSSL=1//' "${S}/config.gentoo-so-r1" || die
-	fi
-
-	# Bug 718912
-	tc-export CC CXX
-
-	# And defer to the scripts that upstream provide.
-	./genMakefiles gentoo-so-r1 || die
-}
-
-src_compile() {
-	export suffix="${LIVE_ABI_VERSION}.so"
-	local link_opts="$(usex ssl "$($(tc-getPKG_CONFIG) --libs libssl libcrypto)" '') -L. ${LDFLAGS}"
-	local lib_suffix="${suffix#.}"
-
-	einfo "Beginning shared library build"
-	emake LINK_OPTS="${link_opts}" LIB_SUFFIX="${lib_suffix}"
-
-	for i in liveMedia groupsock UsageEnvironment BasicUsageEnvironment ; do
-		cd "${S}/${i}" || die
-		ln -s "lib${i}.${suffix}" "lib${i}.so" || die
-	done
-
-	einfo "Beginning programs build"
-	for i in proxyServer mediaServer ; do
-		cd "${S}/${i}" || die
-		emake LINK_OPTS="${link_opts}"
-	done
-}
-
-src_install() {
-	for library in UsageEnvironment liveMedia BasicUsageEnvironment groupsock ; do
-		dolib.so "${S}/${library}/lib${library}.${suffix}"
-		dosym "lib${library}.${suffix}" "/usr/$(get_libdir)/lib${library}.so"
-
-		insinto /usr/include/"${library}"
-		doins "${S}/${library}"/include/*h
-	done
-
-	dobin "${S}"/mediaServer/live555MediaServer
-	dobin "${S}"/proxyServer/live555ProxyServer
-}
diff --git a/media-plugins/vdr-filebrowser/Manifest b/media-plugins/vdr-filebrowser/Manifest
index e9ab741006a4..9a9501cd0846 100644
--- a/media-plugins/vdr-filebrowser/Manifest
+++ b/media-plugins/vdr-filebrowser/Manifest
@@ -2,6 +2,8 @@ AUX commands.conf 1903 BLAKE2B eca20176c0182a3dd8797964dc27108b28e746ab869371f82
 AUX order.conf 1049 BLAKE2B 49381323555d56f676ee3dc42b82c66a113b9458fc43988fbec5b8b9207837b54b2ffeeb40d5a24c6a02a487347404bebb08fee06febbb520de6689433665084 SHA512 cf0abf6f2962055b631fd97b166b8842747a0b36d6ce9f86db3b5c9f195c1d6138cae103875840b1de7ed0e8f378e3e0ee9230c0e7c9b888e90b8b5c40b0f86d
 AUX othercommands.conf 657 BLAKE2B 7191895f6e5e108c66ff0ab3041eff1f415c0c004e7a68893110794d258c8dff0efe73a9f149f5e4dc042126107585ec56863e50160aa54733654a3dd64b2ef6 SHA512 23551b03709bb142ad6ee85669f5ac2ad9857b81938186430ab1a775cf6d1859f75d6f0103faf525e9cae9e4b6aedacbfdf98dd0f227e5283c4119e1607a4ee5
 AUX sources.conf 338 BLAKE2B 966aa26a4633886ea5975786b122bd3f815269f3cb34874d739454f9557e3bcbef60a5c0a68eaabacea09ae98fca2a9d2aaa1dc70dbce32aceb5a32e7d07f090 SHA512 58c9e56e6e9cd120f2aa2d3466932f6115ac29966040c8795fc74b088cd71f428fddcde8f3e8001941758920fb57a8f2dfeca8090bec63d4626382e956b2c4ae
-DIST vdr-filebrowser-0.2.1.tgz 60870 BLAKE2B 44c1143ea122113cff05199325e219770b9de6c99f87b79d8daa6aa7324e5384ef46ce25d7e627a2570218d7d2ad66612465addb7fb634e4269e816e06e5dfdc SHA512 2807983513f7ac94d2be109d8fe09ac6a2c2af80ad09c51f58d4fab9fb5abc263a63ef301595915a4b0433dfba2e212c659db7c37d86bba065002fc17e763d6e
-EBUILD vdr-filebrowser-0.2.1.ebuild 665 BLAKE2B a76aacf1bad7ce5cfe77eaa3ecbd18ddb3f3316001bccefa3cdc08fa12903be806974bf4b9cef3f96392b2686ae9800d5c8d67b63b6eec168b3f978b65a9d573 SHA512 aee32b910a5a691bf9e7bd38ea09436a0b37e5a45ffdae2dfe9a4d10adc13c2634e6e5a6137861bed6ac27f4962a7a371d035f1c3ff741eee39bcee3f751a2bf
-MISC metadata.xml 243 BLAKE2B 6287033e852823666551691771936aead83e7394d6c41f6f5a43a4c21309300e6fcfd90e8a87a82eb90433f86344426c07f2fb7833e7226d2e3c4df9fda1d2d6 SHA512 f7d6e467a5a96c0afdd42df3c0f3866240defc5bbea5ccddf4c0b1a3c004225af5d46dab67d45a5ac34535391584f3b3727fe79ef6cef1a11413636bbc35cf06
+AUX vdr-filebrowser-0.2.3-Makefile.patch 331 BLAKE2B f15127d7150f001b893dc08ec1f051ef3fbd9c1e9657c26e2a166aaa4cc92fabf2c07ba36108527b79553fa9eb560a314cf16f3a546e6a65e3dfb737fd8b053d SHA512 e11e3867e3e96c616abd622ca3aa082a6d6bf682d8629049826c51a6f8e851d732412b0481cd3ad7d8cb7fb4e3458233443c65a8a7a73fd961f578f80d110781
+AUX vdr-filebrowser-0.2.3-clang.patch 488 BLAKE2B d7265ba87b99c9e50963a7ad94b075ac84eb89a8c274bedc0c6e03068bc3163ccaa8fce6327931586feeae5e43f06eab1721039f8f644bc8c5f4f063203d5d0b SHA512 9ddba8b26a4cbc5fe2f7ec7604a51d564df384bc06f1a6a9b871dbe022cb2dbc762c3270d61b67e71f4249591a7618bbffd699f2db2ad0e04b71434a4c8a7065
+DIST vdr-filebrowser-0.2.3_p20210521.tar.gz 59659 BLAKE2B 1b369fa2d53326768e09d1e0e7d39a449d92b2c5bb1b609c792c107867eb3d0099a9654aff8e83aad86e189990412000eb24b64907fff3aff49a846631c060bf SHA512 0abc015e5c64b5f99bab4449262b1c8a1dbd8af97b1f6983fe6e1dc95794242ef6835b23c5877e0a3b9164f2f70742311274826380f1779aaeec9501c2a3a9d3
+EBUILD vdr-filebrowser-0.2.3_p20210521.ebuild 928 BLAKE2B 9fefd803834129118efe8120889e0b6f9792864cc9846ba0bda3cea2d409ce62155fb51d694c56961067bc36194df9202069dcc5d407d50f545e1cb80e9f99bb SHA512 dad915f55717b3a0ed773f5896b721c8d3f833face12046a9ca99e73140f55de212b659ccd081a72b36e2f78c317ad9f363bb2cdb88c6c17b8f3660e8bc28d48
+MISC metadata.xml 477 BLAKE2B 082ad4f53e9c433ebb519be1cba7b079d1372d8b18b169092f4dd17cea14c4be99f4a3ca49934305817a45ca8208c079c85fe4d9bb0ba3c9cfb4754b02dec9c1 SHA512 9d317606d6f1dde6af151f99db3e0a119a47e2a6816da518a343777980236f93942e8fc3694fb5f80ad6a1c6b6e4b9d81064dbb7b2bfe4694a65fbd05cf9ac8f
diff --git a/media-plugins/vdr-filebrowser/files/vdr-filebrowser-0.2.3-Makefile.patch b/media-plugins/vdr-filebrowser/files/vdr-filebrowser-0.2.3-Makefile.patch
new file mode 100644
index 000000000000..f0013f4c8743
--- /dev/null
+++ b/media-plugins/vdr-filebrowser/files/vdr-filebrowser-0.2.3-Makefile.patch
@@ -0,0 +1,11 @@
+--- a/Makefile	2021-08-14 19:52:35.575039425 +0200
++++ b/Makefile	2021-08-14 19:53:00.403530958 +0200
+@@ -47,8 +47,6 @@
+ 
+ ### Includes and Defines (add further entries here):
+ 
+-#INCLUDES +=
+-INCLUDES += -I$(VDRDIR)/include -I$(DVBDIR)/include
+ DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
+ DEFINES += -DFILEBROWSER_PLUGIN_BUILD
+ 
diff --git a/media-plugins/vdr-filebrowser/files/vdr-filebrowser-0.2.3-clang.patch b/media-plugins/vdr-filebrowser/files/vdr-filebrowser-0.2.3-clang.patch
new file mode 100644
index 000000000000..d9805cae6a37
--- /dev/null
+++ b/media-plugins/vdr-filebrowser/files/vdr-filebrowser-0.2.3-clang.patch
@@ -0,0 +1,11 @@
+--- a/command-sources.c	2021-08-14 21:20:11.367590500 +0200
++++ b/command-sources.c	2021-08-14 21:20:26.375889660 +0200
+@@ -93,7 +93,7 @@
+ void cFilebrowserCommandSourcesList::cSource::SwitchTo(cFilebrowserStatebag* Statebag)
+ {
+   D(fprintf(stderr, "[filebrowser] Setting new source: %s\n", *Path));
+-  sprintf(Statebag->BaseDir, "%s", Path);
++  sprintf(Statebag->BaseDir, "%s", *Path);
+   Statebag->CurrentFiles->Clear();
+   Statebag->CurrentDirectory=Path;
+   Statebag->Filter=Filter;
diff --git a/media-plugins/vdr-filebrowser/metadata.xml b/media-plugins/vdr-filebrowser/metadata.xml
index 27f419c289c3..cd73dfdd5965 100644
--- a/media-plugins/vdr-filebrowser/metadata.xml
+++ b/media-plugins/vdr-filebrowser/metadata.xml
@@ -1,8 +1,16 @@
 <?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>
+	<maintainer type="person">
+		<email>martin.dummer@gmx.net</email>
+		<name>Martin Dummer</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>vdr@gentoo.org</email>
+		<name>Gentoo VDR Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-plugins/vdr-filebrowser/vdr-filebrowser-0.2.1.ebuild b/media-plugins/vdr-filebrowser/vdr-filebrowser-0.2.1.ebuild
deleted file mode 100644
index 72689c20a4a7..000000000000
--- a/media-plugins/vdr-filebrowser/vdr-filebrowser-0.2.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit vdr-plugin-2
-
-DESCRIPTION="VDR plugin: file manager plugin for moving or renaming files in VDR"
-HOMEPAGE="http://vdr.nasenbaeren.net/filebrowser/"
-SRC_URI="http://vdr.nasenbaeren.net/filebrowser/${P}.tgz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=media-video/vdr-1.4.0"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	vdr-plugin-2_src_install
-
-	insinto	/etc/vdr/plugins/filebrowser
-	doins   "${FILESDIR}"/commands.conf
-	doins   "${FILESDIR}"/order.conf
-	doins   "${FILESDIR}"/othercommands.conf
-	doins   "${FILESDIR}"/sources.conf
-}
diff --git a/media-plugins/vdr-filebrowser/vdr-filebrowser-0.2.3_p20210521.ebuild b/media-plugins/vdr-filebrowser/vdr-filebrowser-0.2.3_p20210521.ebuild
new file mode 100644
index 000000000000..0f8ff861872c
--- /dev/null
+++ b/media-plugins/vdr-filebrowser/vdr-filebrowser-0.2.3_p20210521.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit vdr-plugin-2
+
+GIT_COMMIT_ID="e09ba5519cf6db68190a2b176f0b6b442c870057"
+DESCRIPTION="VDR plugin: file manager plugin for moving or renaming files in VDR"
+HOMEPAGE="https://github.com/vdr-projects/vdr-plugin-filebrowser"
+SRC_URI="https://github.com/vdr-projects/vdr-plugin-filebrowser/archive/${GIT_COMMIT_ID}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/vdr-plugin-filebrowser-${GIT_COMMIT_ID}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=">=media-video/vdr-1.4.0"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/vdr-filebrowser-0.2.3-Makefile.patch"
+	"${FILESDIR}/vdr-filebrowser-0.2.3-clang.patch"
+)
+
+src_install() {
+	default
+
+	insinto	/etc/vdr/plugins/filebrowser
+	doins "${FILESDIR}"/commands.conf
+	doins "${FILESDIR}"/order.conf
+	doins "${FILESDIR}"/othercommands.conf
+	doins "${FILESDIR}"/sources.conf
+}