2024-01-14 19:33:58 UTC

author: Repository mirror & CI <repomirrorci@gentoo.org> 2024-01-14 19:34:01 +0000
committer: Repository mirror & CI <repomirrorci@gentoo.org> 2024-01-14 19:34:01 +0000
commit: 0edf919dc3b2dd958587e6d4a529436194aa9841 (patch)
tree: 7fe5f5650c7abf9a559fd95736314921ce66debc /metadata/md5-cache/media-plugins
parent: Merge updates from master (diff)
download: gentoo-0edf919dc3b2dd958587e6d4a529436194aa9841.tar.gz
gentoo-0edf919dc3b2dd958587e6d4a529436194aa9841.tar.bz2
gentoo-0edf919dc3b2dd958587e6d4a529436194aa9841.zip
128 files changed, 256 insertions, 256 deletions
diff --git a/metadata/md5-cache/media-plugins/frei0r-plugins-1.7.0-r2 b/metadata/md5-cache/media-plugins/frei0r-plugins-1.7.0-r2
index dc9f93a6edb5..1bbd30e79f7d 100644
--- a/metadata/md5-cache/media-plugins/frei0r-plugins-1.7.0-r2
+++ b/metadata/md5-cache/media-plugins/frei0r-plugins-1.7.0-r2
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5 doc? ( app-text/doxygen )
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5 doc? ( app-text/doxygen )
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] facedetect? ( >=media-libs/opencv-2.3.0:=[contribdnn,features2d,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scale0tilt? ( >=media-libs/gavl-1.2.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 DESCRIPTION=A minimalistic plugin API for video effects
@@ -11,5 +11,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] facedetect? ( >=media-libs/opencv-2.3.0:=[contribdnn,features2d,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scale0tilt? ( >=media-libs/gavl-1.2.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=https://files.dyne.org/frei0r/releases/frei0r-plugins-1.7.0.tar.gz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	cmake-multilib	37d23064f303dcf23453353ab8c77059	docs	7f3c0d47338743498c69f1887a139f57
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	cmake-multilib	37d23064f303dcf23453353ab8c77059	docs	7f3c0d47338743498c69f1887a139f57
 _md5_=27a36c800dc3f4df50f0f2d614213672
diff --git a/metadata/md5-cache/media-plugins/frei0r-plugins-1.8.0 b/metadata/md5-cache/media-plugins/frei0r-plugins-1.8.0
index 8d6ca4b0d878..98d4f7a370e9 100644
--- a/metadata/md5-cache/media-plugins/frei0r-plugins-1.8.0
+++ b/metadata/md5-cache/media-plugins/frei0r-plugins-1.8.0
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5 doc? ( app-text/doxygen )
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5 doc? ( app-text/doxygen )
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] facedetect? ( >=media-libs/opencv-2.3.0:=[contribdnn,features2d,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scale0tilt? ( >=media-libs/gavl-1.2.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 DESCRIPTION=A minimalistic plugin API for video effects
@@ -11,5 +11,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] facedetect? ( >=media-libs/opencv-2.3.0:=[contribdnn,features2d,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scale0tilt? ( >=media-libs/gavl-1.2.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=https://files.dyne.org/frei0r/releases/frei0r-plugins-1.8.0.tar.gz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	cmake-multilib	37d23064f303dcf23453353ab8c77059	docs	7f3c0d47338743498c69f1887a139f57
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	cmake-multilib	37d23064f303dcf23453353ab8c77059	docs	7f3c0d47338743498c69f1887a139f57
 _md5_=9283b8c3904af66235d6e1d3b68c8062
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-modplug-3.0.0 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-modplug-3.0.0
index 50efe3bf0c09..774528014143 100644
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-modplug-3.0.0
+++ b/metadata/md5-cache/media-plugins/kodi-audiodecoder-modplug-3.0.0
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND==media-tv/kodi-19* >=media-libs/libmodplug-0.8.9.0
 DESCRIPTION=Modplug decoder addon for Kodi
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND==media-tv/kodi-19* >=media-libs/libmodplug-0.8.9.0
 SLOT=0
 SRC_URI=https://github.com/xbmc/audiodecoder.modplug/archive/3.0.0-Matrix.tar.gz -> kodi-audiodecoder-modplug-3.0.0.tar.gz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
 _md5_=217c055b74395997e56139df4e52d178
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-modplug-9999 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-modplug-9999
index 6a54a24e0d93..284faf659823 100644
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-modplug-9999
+++ b/metadata/md5-cache/media-plugins/kodi-audiodecoder-modplug-9999
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=~media-tv/kodi-9999 >=media-libs/libmodplug-0.8.9.0
 DESCRIPTION=Modplug decoder addon for Kodi
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 >=media-libs/libmodplug-0.8.9.0
 SLOT=0
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
 _md5_=217c055b74395997e56139df4e52d178
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-nosefart-3.0.0 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-nosefart-3.0.0
index eb053f47c1bd..e8dc4ddb14c1 100644
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-nosefart-3.0.0
+++ b/metadata/md5-cache/media-plugins/kodi-audiodecoder-nosefart-3.0.0
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND==media-tv/kodi-19*
 DESCRIPTION=Nosefart decoder addon for Kodi
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-19*
 SLOT=0
 SRC_URI=https://github.com/xbmc/audiodecoder.nosefart/archive/3.0.0-Matrix.tar.gz -> kodi-audiodecoder-nosefart-3.0.0.tar.gz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
 _md5_=c34f88411da870c7d7c508252013cd0b
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-nosefart-9999 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-nosefart-9999
index 8f728458c3ac..1e5d3043079c 100644
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-nosefart-9999
+++ b/metadata/md5-cache/media-plugins/kodi-audiodecoder-nosefart-9999
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=~media-tv/kodi-9999
 DESCRIPTION=Nosefart decoder addon for Kodi
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999
 SLOT=0
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
 _md5_=b1573b46fabab110d166d428240172ea
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-sacd-0.1.1 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-sacd-0.1.1
index 0a44549006f8..6fade7dc1437 100644
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-sacd-0.1.1
+++ b/metadata/md5-cache/media-plugins/kodi-audiodecoder-sacd-0.1.1
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND==media-tv/kodi-19* media-sound/wavpack virtual/libiconv
 DESCRIPTION=Super Audio CD ISO-Image decoder addon for Kodi
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND==media-tv/kodi-19* media-sound/wavpack virtual/libiconv
 SLOT=0
 SRC_URI=https://github.com/xbmc/audiodecoder.sacd/archive/0.1.1-Matrix.tar.gz -> kodi-audiodecoder-sacd-0.1.1.tar.gz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
 _md5_=174a7c2fa4f0695dd12845f87fc608a3
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-sacd-9999 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-sacd-9999
index 41c1a7037fef..f20e60a81db6 100644
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-sacd-9999
+++ b/metadata/md5-cache/media-plugins/kodi-audiodecoder-sacd-9999
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=~media-tv/kodi-9999 media-sound/wavpack virtual/libiconv
 DESCRIPTION=Super Audio CD ISO-Image decoder addon for Kodi
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 media-sound/wavpack virtual/libiconv
 SLOT=0
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
 _md5_=174a7c2fa4f0695dd12845f87fc608a3
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-sidplay-3.0.0 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-sidplay-3.0.0
index b41f1723b1d8..d50b74bb0808 100644
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-sidplay-3.0.0
+++ b/metadata/md5-cache/media-plugins/kodi-audiodecoder-sidplay-3.0.0
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND==media-tv/kodi-19* media-libs/libsidplay:2
 DESCRIPTION=SidPlay decoder addon for Kodi
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-19* media-libs/libsidplay:2
 SLOT=0
 SRC_URI=https://github.com/xbmc/audiodecoder.sidplay/archive/3.0.0-Matrix.tar.gz -> kodi-audiodecoder-sidplay-3.0.0.tar.gz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
 _md5_=f7620a2b76cf36e8245c127fe869aa7a
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-sidplay-9999 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-sidplay-9999
index 1040d9be0e1e..7f627c0e8134 100644
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-sidplay-9999
+++ b/metadata/md5-cache/media-plugins/kodi-audiodecoder-sidplay-9999
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=~media-tv/kodi-9999 media-libs/libsidplay:2
 DESCRIPTION=SidPlay decoder addon for Kodi
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 media-libs/libsidplay:2
 SLOT=0
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
 _md5_=26fbc6a442445c0be1956d5ce5d20005
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-snesapu-3.0.0 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-snesapu-3.0.0
index 74920eaac5af..49e5b46fc49e 100644
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-snesapu-3.0.0
+++ b/metadata/md5-cache/media-plugins/kodi-audiodecoder-snesapu-3.0.0
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND==media-tv/kodi-19*
 DESCRIPTION=SPC decoder addon for Kodi
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-19*
 SLOT=0
 SRC_URI=https://github.com/xbmc/audiodecoder.snesapu/archive/3.0.0-Matrix.tar.gz -> kodi-audiodecoder-snesapu-3.0.0.tar.gz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
 _md5_=9035dbbc65f5b78eece52352876a9448
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-snesapu-9999 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-snesapu-9999
index e984c98f464b..1d00eed2c287 100644
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-snesapu-9999
+++ b/metadata/md5-cache/media-plugins/kodi-audiodecoder-snesapu-9999
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=~media-tv/kodi-9999
 DESCRIPTION=SPC decoder addon for Kodi
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999
 SLOT=0
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
 _md5_=f541b876f25f2e08ca6be443d14dfca3
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-stsound-3.0.0 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-stsound-3.0.0
index 5fafe52bc784..44376a7de594 100644
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-stsound-3.0.0
+++ b/metadata/md5-cache/media-plugins/kodi-audiodecoder-stsound-3.0.0
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND==media-tv/kodi-19*
 DESCRIPTION=SPC decoder addon for Kodi
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-19*
 SLOT=0
 SRC_URI=https://github.com/xbmc/audiodecoder.stsound/archive/3.0.0-Matrix.tar.gz -> kodi-audiodecoder-stsound-3.0.0.tar.gz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
 _md5_=c8e476996b1ea9a66e79f924594884d3
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-stsound-9999 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-stsound-9999
index 51ed47eb121b..424e15dc3b3a 100644
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-stsound-9999
+++ b/metadata/md5-cache/media-plugins/kodi-audiodecoder-stsound-9999
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=~media-tv/kodi-9999
 DESCRIPTION=SPC decoder addon for Kodi
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999
 SLOT=0
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
 _md5_=553b79585ba9f85b877804ce9b0fe346
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-timidity-3.0.0 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-timidity-3.0.0
index d722e9acd9aa..fe2f36492a09 100644
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-timidity-3.0.0
+++ b/metadata/md5-cache/media-plugins/kodi-audiodecoder-timidity-3.0.0
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND==media-tv/kodi-19*
 DESCRIPTION=Timidity decoder addon for Kodi
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-19*
 SLOT=0
 SRC_URI=https://github.com/xbmc/audiodecoder.timidity/archive/3.0.0-Matrix.tar.gz -> kodi-audiodecoder-timidity-3.0.0-Matrix.tar.gz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
 _md5_=056f4cce952c3d1f97105a7577aa311a
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-timidity-9999 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-timidity-9999
index aaf3b850adce..9c353efe08af 100644
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-timidity-9999
+++ b/metadata/md5-cache/media-plugins/kodi-audiodecoder-timidity-9999
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=~media-tv/kodi-9999
 DESCRIPTION=Timidity decoder addon for Kodi
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999
 SLOT=0
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
 _md5_=a8fbbdb76e0fae835ad01f5adb956edc
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-vgmstream-3.0.0 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-vgmstream-3.0.0
index 07298b362a12..602c9fd435c3 100644
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-vgmstream-3.0.0
+++ b/metadata/md5-cache/media-plugins/kodi-audiodecoder-vgmstream-3.0.0
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND==media-tv/kodi-19*
 DESCRIPTION=vgmstream decoder addon for Kodi
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-19*
 SLOT=0
 SRC_URI=https://github.com/xbmc/audiodecoder.vgmstream/archive/3.0.0-Matrix.tar.gz -> kodi-audiodecoder-vgmstream-3.0.0.tar.gz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
 _md5_=cd822441b63c906c11d821c6b3b29916
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-vgmstream-9999 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-vgmstream-9999
index 031f592fcd8f..42340b8a20ac 100644
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-vgmstream-9999
+++ b/metadata/md5-cache/media-plugins/kodi-audiodecoder-vgmstream-9999
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=~media-tv/kodi-9999
 DESCRIPTION=vgmstream decoder addon for Kodi
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999
 SLOT=0
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
 _md5_=07e556d5cab6f8f4e98a774bc96b1e12
diff --git a/metadata/md5-cache/media-plugins/kodi-audioencoder-flac-19.0.0-r1 b/metadata/md5-cache/media-plugins/kodi-audioencoder-flac-19.0.0-r1
index ffcedcb8608b..cb0877bee7f3 100644
--- a/metadata/md5-cache/media-plugins/kodi-audioencoder-flac-19.0.0-r1
+++ b/metadata/md5-cache/media-plugins/kodi-audioencoder-flac-19.0.0-r1
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND==media-tv/kodi-19* >=media-libs/libogg-1.3.5 media-libs/flac:=
 DESCRIPTION=Flac encoder addon for Kodi
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND==media-tv/kodi-19* >=media-libs/libogg-1.3.5 media-libs/flac:=
 SLOT=0
 SRC_URI=https://github.com/xbmc/audioencoder.flac/archive/19.0.0-Matrix.tar.gz -> kodi-audioencoder-flac-19.0.0.tar.gz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
 _md5_=9d4c59f9b4602a8063a8f8972edf95c1
diff --git a/metadata/md5-cache/media-plugins/kodi-audioencoder-flac-9999 b/metadata/md5-cache/media-plugins/kodi-audioencoder-flac-9999
index e20b16219c07..3d4170395699 100644
--- a/metadata/md5-cache/media-plugins/kodi-audioencoder-flac-9999
+++ b/metadata/md5-cache/media-plugins/kodi-audioencoder-flac-9999
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=~media-tv/kodi-9999 >=media-libs/libogg-1.3.5 media-libs/flac:=
 DESCRIPTION=Flac encoder addon for Kodi
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 >=media-libs/libogg-1.3.5 media-libs/flac:=
 SLOT=0
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
 _md5_=9d4c59f9b4602a8063a8f8972edf95c1
diff --git a/metadata/md5-cache/media-plugins/kodi-audioencoder-lame-19.0.0 b/metadata/md5-cache/media-plugins/kodi-audioencoder-lame-19.0.0
index a7714f39cdf4..695c5496ebae 100644
--- a/metadata/md5-cache/media-plugins/kodi-audioencoder-lame-19.0.0
+++ b/metadata/md5-cache/media-plugins/kodi-audioencoder-lame-19.0.0
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND==media-tv/kodi-19* >=media-sound/lame-3.100
 DESCRIPTION=Lame MP3 encoder addon for Kodi
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND==media-tv/kodi-19* >=media-sound/lame-3.100
 SLOT=0
 SRC_URI=https://github.com/xbmc/audioencoder.lame/archive/19.0.0-Matrix.tar.gz -> kodi-audioencoder-lame-19.0.0.tar.gz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
 _md5_=25eba38c709604c823e45235fac6710c
diff --git a/metadata/md5-cache/media-plugins/kodi-audioencoder-lame-9999 b/metadata/md5-cache/media-plugins/kodi-audioencoder-lame-9999
index 3d74015172b2..351754d15c52 100644
--- a/metadata/md5-cache/media-plugins/kodi-audioencoder-lame-9999
+++ b/metadata/md5-cache/media-plugins/kodi-audioencoder-lame-9999
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=~media-tv/kodi-9999 >=media-sound/lame-3.100
 DESCRIPTION=Lame MP3 encoder addon for Kodi
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 >=media-sound/lame-3.100
 SLOT=0
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
 _md5_=396941fb6bfd38f0135c8d6699257107
diff --git a/metadata/md5-cache/media-plugins/kodi-audioencoder-vorbis-19.0.0 b/metadata/md5-cache/media-plugins/kodi-audioencoder-vorbis-19.0.0
index df47a7a8a399..34510b5ae40a 100644
--- a/metadata/md5-cache/media-plugins/kodi-audioencoder-vorbis-19.0.0
+++ b/metadata/md5-cache/media-plugins/kodi-audioencoder-vorbis-19.0.0
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND==media-tv/kodi-19* >=media-libs/libogg-1.3.5 >=media-libs/libvorbis-1.3.6
 DESCRIPTION=Vorbis encoder addon for Kodi
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND==media-tv/kodi-19* >=media-libs/libogg-1.3.5 >=media-libs/libvorbis-1.3.6
 SLOT=0
 SRC_URI=https://github.com/xbmc/audioencoder.vorbis/archive/19.0.0-Matrix.tar.gz -> kodi-audioencoder-vorbis-19.0.0.tar.gz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
 _md5_=a34455158b0802a1fb66fc33598158e8
diff --git a/metadata/md5-cache/media-plugins/kodi-audioencoder-vorbis-9999 b/metadata/md5-cache/media-plugins/kodi-audioencoder-vorbis-9999
index 9ff47dbe84a7..0c1ca0d57507 100644
--- a/metadata/md5-cache/media-plugins/kodi-audioencoder-vorbis-9999
+++ b/metadata/md5-cache/media-plugins/kodi-audioencoder-vorbis-9999
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=~media-tv/kodi-9999 >=media-libs/libogg-1.3.5 >=media-libs/libvorbis-1.3.6
 DESCRIPTION=Vorbis encoder addon for Kodi
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 >=media-libs/libogg-1.3.5 >=media-libs/libvorbis-1.3.6
 SLOT=0
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
 _md5_=a34455158b0802a1fb66fc33598158e8
diff --git a/metadata/md5-cache/media-plugins/kodi-audioencoder-wav-19.0.0 b/metadata/md5-cache/media-plugins/kodi-audioencoder-wav-19.0.0
index d0ecebb14aff..4b258b2fd05a 100644
--- a/metadata/md5-cache/media-plugins/kodi-audioencoder-wav-19.0.0
+++ b/metadata/md5-cache/media-plugins/kodi-audioencoder-wav-19.0.0
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND==media-tv/kodi-19*
 DESCRIPTION=WAV encoder addon for Kodi
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-19*
 SLOT=0
 SRC_URI=https://github.com/xbmc/audioencoder.wav/archive/19.0.0-Matrix.tar.gz -> kodi-audioencoder-wav-19.0.0.tar.gz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
 _md5_=0fb2c511b3c6e1bf19c4fc20f6419ac7
diff --git a/metadata/md5-cache/media-plugins/kodi-audioencoder-wav-9999 b/metadata/md5-cache/media-plugins/kodi-audioencoder-wav-9999
index 362bcf841df8..4f1c9368ea58 100644
--- a/metadata/md5-cache/media-plugins/kodi-audioencoder-wav-9999
+++ b/metadata/md5-cache/media-plugins/kodi-audioencoder-wav-9999
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=~media-tv/kodi-9999
 DESCRIPTION=WAV encoder addon for Kodi
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999
 SLOT=0
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
 _md5_=f68412babd0b4401950279d88bab254e
diff --git a/metadata/md5-cache/media-plugins/kodi-game-libretro-19.0.0 b/metadata/md5-cache/media-plugins/kodi-game-libretro-19.0.0
index 63184e361704..e8ac3f82ef82 100644
--- a/metadata/md5-cache/media-plugins/kodi-game-libretro-19.0.0
+++ b/metadata/md5-cache/media-plugins/kodi-game-libretro-19.0.0
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND==media-tv/kodi-19*
 DESCRIPTION=Libretro compatibility layer for the Kodi Game API
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-19*
 SLOT=0
 SRC_URI=https://github.com/kodi-game/game.libretro/archive/19.0.0-Matrix.tar.gz -> kodi-game-libretro-19.0.0.tar.gz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
 _md5_=8e1c96805943f2eb0fa8fb7bdfb49f17
diff --git a/metadata/md5-cache/media-plugins/kodi-game-libretro-9999 b/metadata/md5-cache/media-plugins/kodi-game-libretro-9999
index b606efdadc26..8a07379d6ce3 100644
--- a/metadata/md5-cache/media-plugins/kodi-game-libretro-9999
+++ b/metadata/md5-cache/media-plugins/kodi-game-libretro-9999
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=~media-tv/kodi-9999
 DESCRIPTION=Libretro compatibility layer for the Kodi Game API
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999
 SLOT=0
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
 _md5_=ebe35956bfc45a3ef368ba718004eb9f
diff --git a/metadata/md5-cache/media-plugins/kodi-game-libretro-bnes-0.83.0.8 b/metadata/md5-cache/media-plugins/kodi-game-libretro-bnes-0.83.0.8
index 64e0c8e7f043..d9d54b38a281 100644
--- a/metadata/md5-cache/media-plugins/kodi-game-libretro-bnes-0.83.0.8
+++ b/metadata/md5-cache/media-plugins/kodi-game-libretro-bnes-0.83.0.8
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND==media-tv/kodi-19* games-emulation/libretro-bnes
 DESCRIPTION=bNES GameClient for Kodi
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=media-plugins/kodi-game-libretro =media-tv/kodi-19* games-emulation/libretro-bnes
 SLOT=0
 SRC_URI=https://github.com/kodi-game/game.libretro.bnes/archive/0.83.0.8-Matrix.tar.gz -> kodi-game-libretro-bnes-0.83.0.8.tar.gz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
 _md5_=183d227e31bbd4035621db12b2975929
diff --git a/metadata/md5-cache/media-plugins/kodi-game-libretro-bnes-9999 b/metadata/md5-cache/media-plugins/kodi-game-libretro-bnes-9999
index f63115bce22e..c5850f254ac1 100644
--- a/metadata/md5-cache/media-plugins/kodi-game-libretro-bnes-9999
+++ b/metadata/md5-cache/media-plugins/kodi-game-libretro-bnes-9999
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=~media-tv/kodi-9999 games-emulation/libretro-bnes
 DESCRIPTION=bNES GameClient for Kodi
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=media-plugins/kodi-game-libretro ~media-tv/kodi-9999 games-emulation/libretro-bnes
 SLOT=0
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
 _md5_=183d227e31bbd4035621db12b2975929
diff --git a/metadata/md5-cache/media-plugins/kodi-game-libretro-dosbox-0.74.0.9 b/metadata/md5-cache/media-plugins/kodi-game-libretro-dosbox-0.74.0.9
index 57173b145f3e..7060c39ca341 100644
--- a/metadata/md5-cache/media-plugins/kodi-game-libretro-dosbox-0.74.0.9
+++ b/metadata/md5-cache/media-plugins/kodi-game-libretro-dosbox-0.74.0.9
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND==media-tv/kodi-19* games-emulation/libretro-dosbox
 DESCRIPTION=DOSBox GameClient for Kodi
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=media-plugins/kodi-game-libretro =media-tv/kodi-19* games-emulation/libretro-dosbox
 SLOT=0
 SRC_URI=https://github.com/kodi-game/game.libretro.dosbox/archive/0.74.0.9-Matrix.tar.gz -> kodi-game-libretro-dosbox-0.74.0.9.tar.gz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
 _md5_=fe3ae42420c385b42ed9879b7bc6b7fa
diff --git a/metadata/md5-cache/media-plugins/kodi-game-libretro-dosbox-9999 b/metadata/md5-cache/media-plugins/kodi-game-libretro-dosbox-9999
index 817934ab0986..9d7683de0e9d 100644
--- a/metadata/md5-cache/media-plugins/kodi-game-libretro-dosbox-9999
+++ b/metadata/md5-cache/media-plugins/kodi-game-libretro-dosbox-9999
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=~media-tv/kodi-9999 games-emulation/libretro-dosbox
 DESCRIPTION=DOSBox GameClient for Kodi
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=media-plugins/kodi-game-libretro ~media-tv/kodi-9999 games-emulation/libretro-dosbox
 SLOT=0
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
 _md5_=622ae2eb306e3b319c73a4246669fda2
diff --git a/metadata/md5-cache/media-plugins/kodi-game-libretro-nestopia-1.51.0.16 b/metadata/md5-cache/media-plugins/kodi-game-libretro-nestopia-1.51.0.16
index b08071a0f5ad..936e1d9b130d 100644
--- a/metadata/md5-cache/media-plugins/kodi-game-libretro-nestopia-1.51.0.16
+++ b/metadata/md5-cache/media-plugins/kodi-game-libretro-nestopia-1.51.0.16
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND==media-tv/kodi-19* games-emulation/libretro-nestopia
 DESCRIPTION=Nestopia GameClient for Kodi
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=media-plugins/kodi-game-libretro =media-tv/kodi-19* games-emulation/libretro-nestopia
 SLOT=0
 SRC_URI=https://github.com/kodi-game/game.libretro.nestopia/archive/1.51.0.16-Matrix.tar.gz -> kodi-game-libretro-nestopia-1.51.0.16.tar.gz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
 _md5_=1a74d1174748878f24cc8778097254db
diff --git a/metadata/md5-cache/media-plugins/kodi-game-libretro-nestopia-9999 b/metadata/md5-cache/media-plugins/kodi-game-libretro-nestopia-9999
index 2a31c4792a5f..e4bd9449049c 100644
--- a/metadata/md5-cache/media-plugins/kodi-game-libretro-nestopia-9999
+++ b/metadata/md5-cache/media-plugins/kodi-game-libretro-nestopia-9999
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=~media-tv/kodi-9999 games-emulation/libretro-nestopia
 DESCRIPTION=Nestopia GameClient for Kodi
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=media-plugins/kodi-game-libretro ~media-tv/kodi-9999 games-emulation/libretro-nestopia
 SLOT=0
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
 _md5_=1a74d1174748878f24cc8778097254db
diff --git a/metadata/md5-cache/media-plugins/kodi-game-libretro-snes9x-1.60.0.20 b/metadata/md5-cache/media-plugins/kodi-game-libretro-snes9x-1.60.0.20
index d7ad176de4c5..287597a1ba5d 100644
--- a/metadata/md5-cache/media-plugins/kodi-game-libretro-snes9x-1.60.0.20
+++ b/metadata/md5-cache/media-plugins/kodi-game-libretro-snes9x-1.60.0.20
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND==media-tv/kodi-19* games-emulation/libretro-snes9x
 DESCRIPTION=Snes9x GameClient for Kodi
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=media-plugins/kodi-game-libretro =media-tv/kodi-19* games-emulation/libretro-snes9x
 SLOT=0
 SRC_URI=https://github.com/kodi-game/game.libretro.snes9x/archive/1.60.0.20-Matrix.tar.gz -> kodi-game-libretro-snes9x-1.60.0.20.tar.gz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
 _md5_=95f0178e252f2bfcd77dcc6d6d897823
diff --git a/metadata/md5-cache/media-plugins/kodi-game-libretro-snes9x-9999 b/metadata/md5-cache/media-plugins/kodi-game-libretro-snes9x-9999
index 397c189446b8..b2beaacd6108 100644
--- a/metadata/md5-cache/media-plugins/kodi-game-libretro-snes9x-9999
+++ b/metadata/md5-cache/media-plugins/kodi-game-libretro-snes9x-9999
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=~media-tv/kodi-9999 games-emulation/libretro-snes9x
 DESCRIPTION=Snes9x GameClient for Kodi
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=media-plugins/kodi-game-libretro ~media-tv/kodi-9999 games-emulation/libretro-snes9x
 SLOT=0
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
 _md5_=95f0178e252f2bfcd77dcc6d6d897823
diff --git a/metadata/md5-cache/media-plugins/kodi-game-libretro-twentyfortyeight-1.0.0.118 b/metadata/md5-cache/media-plugins/kodi-game-libretro-twentyfortyeight-1.0.0.118
index a004c5ae1be8..c209353224b5 100644
--- a/metadata/md5-cache/media-plugins/kodi-game-libretro-twentyfortyeight-1.0.0.118
+++ b/metadata/md5-cache/media-plugins/kodi-game-libretro-twentyfortyeight-1.0.0.118
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND==media-tv/kodi-19* games-emulation/libretro-twentyfortyeight
 DESCRIPTION=2048 for Kodi
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=media-plugins/kodi-game-libretro =media-tv/kodi-19* games-emulation/libretro-twentyfortyeight
 SLOT=0
 SRC_URI=https://github.com/kodi-game/game.libretro.2048/archive/1.0.0.118-Matrix.tar.gz -> kodi-game-libretro-twentyfortyeight-1.0.0.118.tar.gz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
 _md5_=e5dc9ab1e5ae4b501a1d72fd686c2d8b
diff --git a/metadata/md5-cache/media-plugins/kodi-game-libretro-twentyfortyeight-9999 b/metadata/md5-cache/media-plugins/kodi-game-libretro-twentyfortyeight-9999
index 981a60df933e..19d515930a3d 100644
--- a/metadata/md5-cache/media-plugins/kodi-game-libretro-twentyfortyeight-9999
+++ b/metadata/md5-cache/media-plugins/kodi-game-libretro-twentyfortyeight-9999
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=~media-tv/kodi-9999 games-emulation/libretro-twentyfortyeight
 DESCRIPTION=2048 for Kodi
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=media-plugins/kodi-game-libretro ~media-tv/kodi-9999 games-emulation/libretro-twentyfortyeight
 SLOT=0
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
 _md5_=04f9ade6d1e9c2af766fd356a856855f
diff --git a/metadata/md5-cache/media-plugins/kodi-imagedecoder-heif-19.0.0 b/metadata/md5-cache/media-plugins/kodi-imagedecoder-heif-19.0.0
index ec13a884765c..86bda7d3ce62 100644
--- a/metadata/md5-cache/media-plugins/kodi-imagedecoder-heif-19.0.0
+++ b/metadata/md5-cache/media-plugins/kodi-imagedecoder-heif-19.0.0
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND==media-tv/kodi-19* >=media-libs/libde265-1.0.8 >=media-libs/libheif-1.12.0
 DESCRIPTION=HEIF image decoder for Kodi
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND==media-tv/kodi-19* >=media-libs/libde265-1.0.8 >=media-libs/libheif-1.12.0
 SLOT=0
 SRC_URI=https://github.com/xbmc/imagedecoder.heif/archive/19.0.0-Matrix.tar.gz -> kodi-imagedecoder-heif-19.0.0.tar.gz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
 _md5_=557ca67d7749114bd6fec352af6daa25
diff --git a/metadata/md5-cache/media-plugins/kodi-imagedecoder-heif-9999 b/metadata/md5-cache/media-plugins/kodi-imagedecoder-heif-9999
index f6e6c4415669..3bde512ee9be 100644
--- a/metadata/md5-cache/media-plugins/kodi-imagedecoder-heif-9999
+++ b/metadata/md5-cache/media-plugins/kodi-imagedecoder-heif-9999
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND==media-tv/kodi-9999* >=media-libs/libde265-1.0.8 >=media-libs/libheif-1.6.2
 DESCRIPTION=HEIF image decoder for Kodi
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND==media-tv/kodi-9999* >=media-libs/libde265-1.0.8 >=media-libs/libheif-1.6.2
 SLOT=0
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
 _md5_=0bd5fd15327394a53d5f464e2a221326
diff --git a/metadata/md5-cache/media-plugins/kodi-imagedecoder-raw-19.0.0 b/metadata/md5-cache/media-plugins/kodi-imagedecoder-raw-19.0.0
index 08eb924bc139..6d228991c602 100644
--- a/metadata/md5-cache/media-plugins/kodi-imagedecoder-raw-19.0.0
+++ b/metadata/md5-cache/media-plugins/kodi-imagedecoder-raw-19.0.0
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND==media-tv/kodi-19* >=media-libs/libjpeg-turbo-2.1.1 >=media-libs/libraw-0.20.2[jpeg,lcms] >=media-libs/lcms-2.12
 DESCRIPTION=RAW image decoder for Kodi
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND==media-tv/kodi-19* >=media-libs/libjpeg-turbo-2.1.1 >=media-libs/libraw-0.20.2[jpeg,lcms] >=media-libs/lcms-2.12
 SLOT=0
 SRC_URI=https://github.com/xbmc/imagedecoder.raw/archive/19.0.0-Matrix.tar.gz -> kodi-imagedecoder-raw-19.0.0.tar.gz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
 _md5_=979681db7b27a1d3ecd5dddc91240cd3
diff --git a/metadata/md5-cache/media-plugins/kodi-imagedecoder-raw-9999 b/metadata/md5-cache/media-plugins/kodi-imagedecoder-raw-9999
index 433903b3d23f..2625cdb4ba9a 100644
--- a/metadata/md5-cache/media-plugins/kodi-imagedecoder-raw-9999
+++ b/metadata/md5-cache/media-plugins/kodi-imagedecoder-raw-9999
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=~media-tv/kodi-9999 >=media-libs/libjpeg-turbo-2.1.1 >=media-libs/libraw-0.20.2[jpeg,lcms] >=media-libs/lcms-2.12
 DESCRIPTION=RAW image decoder for Kodi
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 >=media-libs/libjpeg-turbo-2.1.1 >=media-libs/libraw-0.20.2[jpeg,lcms] >=media-libs/lcms-2.12
 SLOT=0
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
 _md5_=979681db7b27a1d3ecd5dddc91240cd3
diff --git a/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-19.0.0 b/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-19.0.0
index edc38aade8be..36087a6933e8 100644
--- a/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-19.0.0
+++ b/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-19.0.0
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-libs/expat =media-tv/kodi-19* test? ( dev-cpp/gtest )
 DESCRIPTION=Kodi's Adaptive inputstream addon
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/expat =media-tv/kodi-19*
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/peak3d/inputstream.adaptive/archive/19.0.0-Matrix.tar.gz -> kodi-inputstream-adaptive-19.0.0.tar.gz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
 _md5_=e6eb9dbf94e1023552f1c9e89ea0137f
diff --git a/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-9999 b/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-9999
index 1e32523f6afe..42c3b344296e 100644
--- a/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-9999
+++ b/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-9999
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=dev-libs/expat =media-tv/kodi-19* test? ( dev-cpp/gtest )
 DESCRIPTION=Kodi's Adaptive inputstream addon
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=dev-libs/expat =media-tv/kodi-19*
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
 _md5_=82bb3fa48c656cba4d23f725cf0e0f09
diff --git a/metadata/md5-cache/media-plugins/kodi-inputstream-ffmpegdirect-19.0.0 b/metadata/md5-cache/media-plugins/kodi-inputstream-ffmpegdirect-19.0.0
index 9f6136121572..ffa868b3ef65 100644
--- a/metadata/md5-cache/media-plugins/kodi-inputstream-ffmpegdirect-19.0.0
+++ b/metadata/md5-cache/media-plugins/kodi-inputstream-ffmpegdirect-19.0.0
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=media-video/ffmpeg[encode,libxml2,zlib] virtual/libiconv app-arch/bzip2 =media-tv/kodi-19*
 DESCRIPTION=Kodi's FFMpeg Direct Inputstream addon
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=media-video/ffmpeg[encode,libxml2,zlib] virtual/libiconv app-arch/bzip2 =media-tv/kodi-19*
 SLOT=0
 SRC_URI=https://github.com/xbmc/inputstream.ffmpegdirect/archive/19.0.0-Matrix.tar.gz -> kodi-inputstream-ffmpegdirect-19.0.0.tar.gz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
 _md5_=5105d516358a5473fab08ce7ea82ade6
diff --git a/metadata/md5-cache/media-plugins/kodi-inputstream-ffmpegdirect-9999 b/metadata/md5-cache/media-plugins/kodi-inputstream-ffmpegdirect-9999
index 5add3c6e9fb9..a81b47adf855 100644
--- a/metadata/md5-cache/media-plugins/kodi-inputstream-ffmpegdirect-9999
+++ b/metadata/md5-cache/media-plugins/kodi-inputstream-ffmpegdirect-9999
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=media-video/ffmpeg[encode,libxml2,zlib] virtual/libiconv app-arch/bzip2 =media-tv/kodi-19*
 DESCRIPTION=Kodi's FFMpeg Direct Inputstream addon
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=media-video/ffmpeg[encode,libxml2,zlib] virtual/libiconv app-arch/bzip2 =media-tv/kodi-19*
 SLOT=0
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
 _md5_=ea929365174840d95df724a875230488
diff --git a/metadata/md5-cache/media-plugins/kodi-inputstream-rtmp-19.0.0 b/metadata/md5-cache/media-plugins/kodi-inputstream-rtmp-19.0.0
index 075f8d640b9c..67961d08b7b4 100644
--- a/metadata/md5-cache/media-plugins/kodi-inputstream-rtmp-19.0.0
+++ b/metadata/md5-cache/media-plugins/kodi-inputstream-rtmp-19.0.0
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND==media-tv/kodi-19*:= media-video/rtmpdump[ssl]
 DESCRIPTION=Kodi's RTMP inputstream addon
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND==media-tv/kodi-19*:= media-video/rtmpdump[ssl]
 SLOT=0
 SRC_URI=https://github.com/xbmc/inputstream.rtmp/archive/19.0.0-Matrix.tar.gz -> kodi-inputstream-rtmp-19.0.0.tar.gz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
 _md5_=804b475e5a6f7b44d7b6f58fca78a5ed
diff --git a/metadata/md5-cache/media-plugins/kodi-inputstream-rtmp-9999 b/metadata/md5-cache/media-plugins/kodi-inputstream-rtmp-9999
index 6b214de34630..bf0d596982cd 100644
--- a/metadata/md5-cache/media-plugins/kodi-inputstream-rtmp-9999
+++ b/metadata/md5-cache/media-plugins/kodi-inputstream-rtmp-9999
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=~media-tv/kodi-9999 media-video/rtmpdump[ssl]
 DESCRIPTION=Kodi's RTMP inputstream addon
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 media-video/rtmpdump[ssl]
 SLOT=0
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
 _md5_=51aa8e0d6e6ce35ea74895abb738758c
diff --git a/metadata/md5-cache/media-plugins/kodi-peripheral-joystick-19.0.0 b/metadata/md5-cache/media-plugins/kodi-peripheral-joystick-19.0.0
index 05d2aca7e640..e18df84c598a 100644
--- a/metadata/md5-cache/media-plugins/kodi-peripheral-joystick-19.0.0
+++ b/metadata/md5-cache/media-plugins/kodi-peripheral-joystick-19.0.0
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND==media-tv/kodi-19* dev-libs/libpcre dev-libs/tinyxml
 DESCRIPTION=Libretro compatibility layer for the Kodi Game API
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-19* dev-libs/libpcre dev-libs/tinyxml
 SLOT=0
 SRC_URI=https://github.com/xbmc/peripheral.joystick/archive/19.0.0-Matrix.tar.gz -> kodi-peripheral-joystick-19.0.0.tar.gz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
 _md5_=fd45399c680119538f4f5f7a37b713e2
diff --git a/metadata/md5-cache/media-plugins/kodi-peripheral-joystick-9999 b/metadata/md5-cache/media-plugins/kodi-peripheral-joystick-9999
index 264bc152fa17..703d295d6adc 100644
--- a/metadata/md5-cache/media-plugins/kodi-peripheral-joystick-9999
+++ b/metadata/md5-cache/media-plugins/kodi-peripheral-joystick-9999
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=~media-tv/kodi-9999 dev-libs/libpcre dev-libs/tinyxml
 DESCRIPTION=Libretro compatibility layer for the Kodi Game API
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 dev-libs/libpcre dev-libs/tinyxml
 SLOT=0
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
 _md5_=c178a6bd6db9bccc9e7dc733c3d12401
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-argustv-7.1.2 b/metadata/md5-cache/media-plugins/kodi-pvr-argustv-7.1.2
index 61a1ef42b87f..b612d5da6f11 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-argustv-7.1.2
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-argustv-7.1.2
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND==media-tv/kodi-19* dev-libs/jsoncpp
 DESCRIPTION=Kodi's ARGUS TV client addon
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-19* dev-libs/jsoncpp
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.argustv/archive/7.1.2-Matrix.tar.gz -> kodi-pvr-argustv-7.1.2.tar.gz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
 _md5_=7fa9b9e33616a2eae5c74104806777b1
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-argustv-9999 b/metadata/md5-cache/media-plugins/kodi-pvr-argustv-9999
index 5b1f3fc62642..23e45f10ba38 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-argustv-9999
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-argustv-9999
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=~media-tv/kodi-9999 dev-libs/jsoncpp
 DESCRIPTION=Kodi's ARGUS TV client addon
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 dev-libs/jsoncpp
 SLOT=0
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
 _md5_=364f2693a9a4c1dfa6b091b60fe288ec
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-demo-7.1.4 b/metadata/md5-cache/media-plugins/kodi-pvr-demo-7.1.4
index e5860f8eb152..4365223c0282 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-demo-7.1.4
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-demo-7.1.4
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND==media-tv/kodi-19* dev-libs/tinyxml
 DESCRIPTION=Demo PVR for Kodi
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-19* dev-libs/tinyxml
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.demo/archive/7.1.4-Matrix.tar.gz -> kodi-pvr-demo-7.1.4.tar.gz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
 _md5_=ade8c58ea09056b637c7f963f6d6f9f9
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-demo-9999 b/metadata/md5-cache/media-plugins/kodi-pvr-demo-9999
index e7e2961b5508..cd7b281f7449 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-demo-9999
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-demo-9999
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=~media-tv/kodi-9999 dev-libs/tinyxml
 DESCRIPTION=Demo PVR for Kodi
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 dev-libs/tinyxml
 SLOT=0
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
 _md5_=89159a91b8e077e83496d71b692ae9db
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-dvblink-9.1.2 b/metadata/md5-cache/media-plugins/kodi-pvr-dvblink-9.1.2
index a7216027c735..4c3bd9f87b3d 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-dvblink-9.1.2
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-dvblink-9.1.2
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND==media-tv/kodi-19* dev-libs/tinyxml2
 DESCRIPTION=Kodi's DVBLink client addon
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-19* dev-libs/tinyxml2
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.dvblink/archive/9.1.2-Matrix.tar.gz -> kodi-pvr-dvblink-9.1.2.tar.gz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
 _md5_=301d66a05d088298c61616ceb30e06cd
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-dvblink-9999 b/metadata/md5-cache/media-plugins/kodi-pvr-dvblink-9999
index 9422d333e235..16d4fe9fd76d 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-dvblink-9999
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-dvblink-9999
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=~media-tv/kodi-9999 dev-libs/tinyxml2
 DESCRIPTION=Kodi's DVBLink client addon
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 dev-libs/tinyxml2
 SLOT=0
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
 _md5_=75c8c917acc5b30460cf06536066fe60
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-dvbviewer-7.3.3 b/metadata/md5-cache/media-plugins/kodi-pvr-dvbviewer-7.3.3
index e853fcc6ed70..272889d5b48d 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-dvbviewer-7.3.3
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-dvbviewer-7.3.3
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND==media-tv/kodi-19* dev-libs/tinyxml
 DESCRIPTION=Kodi's DVBViewer client addon
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-19* dev-libs/tinyxml
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.dvbviewer/archive/7.3.3-Matrix.tar.gz -> kodi-pvr-dvbviewer-7.3.3-Matrix.tar.gz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
 _md5_=9b58362aff7ed1977336ae4e5797d5cf
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-dvbviewer-9999 b/metadata/md5-cache/media-plugins/kodi-pvr-dvbviewer-9999
index b1c0710b9936..8cfd556f5533 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-dvbviewer-9999
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-dvbviewer-9999
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=~media-tv/kodi-9999 dev-libs/tinyxml
 DESCRIPTION=Kodi's DVBViewer client addon
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 dev-libs/tinyxml
 SLOT=0
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
 _md5_=0d402bfe1408350a07bda74cc5b08694
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-filmon-6.1.2 b/metadata/md5-cache/media-plugins/kodi-pvr-filmon-6.1.2
index 240498d9eb1c..d9e9d55b6e34 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-filmon-6.1.2
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-filmon-6.1.2
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND==media-tv/kodi-19* dev-libs/jsoncpp
 DESCRIPTION=Kodi's Filmon client addon
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-19* dev-libs/jsoncpp
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.filmon/archive/6.1.2-Matrix.tar.gz -> kodi-pvr-filmon-6.1.2.tar.gz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
 _md5_=431ff8674f3d1d36a464011034d02c13
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-filmon-9999 b/metadata/md5-cache/media-plugins/kodi-pvr-filmon-9999
index 3753def07612..f1e2538f4f39 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-filmon-9999
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-filmon-9999
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=~media-tv/kodi-9999 dev-libs/jsoncpp
 DESCRIPTION=Kodi's Filmon client addon
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 dev-libs/jsoncpp
 SLOT=0
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
 _md5_=3087614c5a1464d00a07a54e4f83ea22
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-hts-8.4.0 b/metadata/md5-cache/media-plugins/kodi-pvr-hts-8.4.0
index 7173a5d8e226..7c7f66ab8203 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-hts-8.4.0
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-hts-8.4.0
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND==media-tv/kodi-19*
 DESCRIPTION=Tvheadend Live TV and Radio PVR client addon for Kodi
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-19*
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.hts/archive/8.4.0-Matrix.tar.gz -> kodi-pvr-hts-8.4.0.tar.gz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
 _md5_=0274b4aa1c101f5bdf26f9c0adc9830c
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-hts-9999 b/metadata/md5-cache/media-plugins/kodi-pvr-hts-9999
index 550ef79a825a..2c69479be918 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-hts-9999
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-hts-9999
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=~media-tv/kodi-9999
 DESCRIPTION=Tvheadend Live TV and Radio PVR client addon for Kodi
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999
 SLOT=0
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
 _md5_=aad8a75ce079c7f3fba663537f736414
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-7.6.9 b/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-7.6.9
index 162b5719b80f..83690212f293 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-7.6.9
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-7.6.9
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-libs/pugixml =media-tv/kodi-19* sys-libs/zlib
 DESCRIPTION=Kodi's IPTVSimple client addon
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/pugixml =media-tv/kodi-19* sys-libs/zlib
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.iptvsimple/archive/7.6.9-Matrix.tar.gz -> kodi-pvr-iptvsimple-7.6.9.tar.gz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
 _md5_=83333caae1b7f093080ef3a8cd465654
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-9999 b/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-9999
index 42ed9c013c30..bc4b4071ea2a 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-9999
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-9999
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=dev-libs/pugixml ~media-tv/kodi-9999 sys-libs/zlib
 DESCRIPTION=Kodi's IPTVSimple client addon
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=dev-libs/pugixml ~media-tv/kodi-9999 sys-libs/zlib
 SLOT=0
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
 _md5_=caffacd697b40d33e596197e8e82b565
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-mediaportal-tvserver-8.2.1 b/metadata/md5-cache/media-plugins/kodi-pvr-mediaportal-tvserver-8.2.1
index 17c68ee0858d..9f8fe206d7f1 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-mediaportal-tvserver-8.2.1
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-mediaportal-tvserver-8.2.1
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND==media-tv/kodi-19* dev-libs/tinyxml
 DESCRIPTION=Kodi's MediaPortal TVServer client addon
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-19* dev-libs/tinyxml
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.mediaportal.tvserver/archive/8.2.1-Matrix.tar.gz -> kodi-pvr-mediaportal-tvserver-8.2.1.tar.gz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
 _md5_=fd8fcc7662099393dcc030866f97a248
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-mediaportal-tvserver-9999 b/metadata/md5-cache/media-plugins/kodi-pvr-mediaportal-tvserver-9999
index 8dc1f4ed347e..1208604f09e1 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-mediaportal-tvserver-9999
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-mediaportal-tvserver-9999
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=~media-tv/kodi-9999 dev-libs/tinyxml
 DESCRIPTION=Kodi's MediaPortal TVServer client addon
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 dev-libs/tinyxml
 SLOT=0
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
 _md5_=fd8fcc7662099393dcc030866f97a248
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-mythtv-7.3.1 b/metadata/md5-cache/media-plugins/kodi-pvr-mythtv-7.3.1
index b659bcf3b0e4..76503658747b 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-mythtv-7.3.1
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-mythtv-7.3.1
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=sys-libs/zlib =media-tv/kodi-19*
 DESCRIPTION=MythTV PVR for Kodi
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/zlib =media-tv/kodi-19*
 SLOT=0
 SRC_URI=https://github.com/janbar/pvr.mythtv/archive/7.3.1-Matrix.tar.gz -> kodi-pvr-mythtv-7.3.1.tar.gz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
 _md5_=61f0c467cad40d9a09eb8dbfddb3780c
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-mythtv-9999 b/metadata/md5-cache/media-plugins/kodi-pvr-mythtv-9999
index ef717afb40f1..e28d3e9a9261 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-mythtv-9999
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-mythtv-9999
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=sys-libs/zlib ~media-tv/kodi-9999
 DESCRIPTION=MythTV PVR for Kodi
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=sys-libs/zlib ~media-tv/kodi-9999
 SLOT=0
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
 _md5_=0294532edebfcf0e5e6465e2c601cc54
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-8.2.6 b/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-8.2.6
index cb47baa7fcba..80cfc73816f6 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-8.2.6
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-8.2.6
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND==media-tv/kodi-19* dev-libs/tinyxml2
 DESCRIPTION=Kodi's NextPVR client addon
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-19* dev-libs/tinyxml2
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.nextpvr/archive/8.2.6-Matrix.tar.gz -> kodi-pvr-nextpvr-8.2.6.tar.gz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
 _md5_=ca4c53900186dc3ef139139d913d7f48
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-9999 b/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-9999
index 5b03df46e0ea..9156e7098736 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-9999
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-9999
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=~media-tv/kodi-9999 dev-libs/tinyxml2
 DESCRIPTION=Kodi's NextPVR client addon
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 dev-libs/tinyxml2
 SLOT=0
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
 _md5_=8a963b63ead519e6cee1c8b44cf2afd9
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-njoy-7.1.1 b/metadata/md5-cache/media-plugins/kodi-pvr-njoy-7.1.1
index 2eef057044d9..3d869fd6a0dd 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-njoy-7.1.1
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-njoy-7.1.1
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND==media-tv/kodi-19* dev-libs/tinyxml
 DESCRIPTION=Kodi's Njoy N7 client addon
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-19* dev-libs/tinyxml
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.njoy/archive/7.1.1-Matrix.tar.gz -> kodi-pvr-njoy-7.1.1.tar.gz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
 _md5_=2d6182f884ad4c2d44614379ff5bcc97
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-njoy-9999 b/metadata/md5-cache/media-plugins/kodi-pvr-njoy-9999
index da85cea26495..c3d658558bfd 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-njoy-9999
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-njoy-9999
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=~media-tv/kodi-9999 dev-libs/tinyxml
 DESCRIPTION=Kodi's Njoy N7 client addon
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 dev-libs/tinyxml
 SLOT=0
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
 _md5_=1ab5e04331fee9e6a4f13c53f6354999
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-pctv-6.1.1 b/metadata/md5-cache/media-plugins/kodi-pvr-pctv-6.1.1
index d7382edef4f8..da83556e5e7b 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-pctv-6.1.1
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-pctv-6.1.1
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND==media-tv/kodi-19* dev-libs/jsoncpp
 DESCRIPTION=Kodi's PCTV client addon
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-19* dev-libs/jsoncpp
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.pctv/archive/6.1.1-Matrix.tar.gz -> kodi-pvr-pctv-6.1.1.tar.gz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
 _md5_=68ab846f80772a64e43594d050ffb65e
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-pctv-9999 b/metadata/md5-cache/media-plugins/kodi-pvr-pctv-9999
index 6ff805ad2553..7c5b4c830487 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-pctv-9999
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-pctv-9999
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=~media-tv/kodi-9999 dev-libs/jsoncpp
 DESCRIPTION=Kodi's PCTV client addon
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 dev-libs/jsoncpp
 SLOT=0
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
 _md5_=dc7d16e070e36df168e9a21f653cc9db
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-stalker-7.1.1 b/metadata/md5-cache/media-plugins/kodi-pvr-stalker-7.1.1
index a56337798e2e..25cfca3347a6 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-stalker-7.1.1
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-stalker-7.1.1
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND==media-tv/kodi-19* dev-libs/jsoncpp dev-libs/tinyxml
 DESCRIPTION=Kodi's Stalker client addon
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-19* dev-libs/jsoncpp dev-libs/tinyxml
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.stalker/archive/7.1.1-Matrix.tar.gz -> kodi-pvr-stalker-7.1.1.tar.gz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
 _md5_=12c096ae873717f179782ffe61d59b82
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-stalker-9999 b/metadata/md5-cache/media-plugins/kodi-pvr-stalker-9999
index fd47650c2245..a52b9a9e85ef 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-stalker-9999
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-stalker-9999
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=~media-tv/kodi-9999 dev-libs/jsoncpp dev-libs/tinyxml
 DESCRIPTION=Kodi's Stalker client addon
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 dev-libs/jsoncpp dev-libs/tinyxml
 SLOT=0
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
 _md5_=248dbf0bec6d2127ba5db89ae84b4339
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vbox-8.1.2 b/metadata/md5-cache/media-plugins/kodi-pvr-vbox-8.1.2
index 392c4c184aa2..4b0f66882138 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-vbox-8.1.2
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-vbox-8.1.2
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND==media-tv/kodi-19* dev-libs/tinyxml2
 DESCRIPTION=Kodi's VBox Home TV Gateway PVR client addon
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-19* dev-libs/tinyxml2
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.vbox/archive/8.1.2-Matrix.tar.gz -> kodi-pvr-vbox-8.1.2.tar.gz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
 _md5_=0596d478586d35c389fe983899e5270a
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vbox-9999 b/metadata/md5-cache/media-plugins/kodi-pvr-vbox-9999
index aed70d08e5e5..1dc97b06b44c 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-vbox-9999
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-vbox-9999
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=~media-tv/kodi-9999 dev-libs/tinyxml2
 DESCRIPTION=Kodi's VBox Home TV Gateway PVR client addon
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 dev-libs/tinyxml2
 SLOT=0
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
 _md5_=c4e2dc22af1c488730d63beaafe81fb7
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vdr-vnsi-19.0.5 b/metadata/md5-cache/media-plugins/kodi-pvr-vdr-vnsi-19.0.5
index 1eaea75b99d5..d731d826ed8b 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-vdr-vnsi-19.0.5
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-vdr-vnsi-19.0.5
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND==media-tv/kodi-19* virtual/opengl
 DESCRIPTION=Kodi PVR addon VNSI
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-19* virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.vdr.vnsi/archive/19.0.5-Matrix.tar.gz -> kodi-pvr-vdr-vnsi-19.0.5.tar.gz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
 _md5_=857d3c70e92a5064364986048cf5aff9
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vdr-vnsi-9999 b/metadata/md5-cache/media-plugins/kodi-pvr-vdr-vnsi-9999
index 4f013ffe5a1d..5c60813017f6 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-vdr-vnsi-9999
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-vdr-vnsi-9999
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=~media-tv/kodi-9999 virtual/opengl
 DESCRIPTION=Kodi PVR addon VNSI
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 virtual/opengl
 SLOT=0
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
 _md5_=1d0b6e2eca0b1516eeab29d67d061f28
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-7.4.9 b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-7.4.9
index 83917985a1a6..d63ead55f1f0 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-7.4.9
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-7.4.9
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND==media-tv/kodi-19* dev-libs/tinyxml dev-cpp/nlohmann_json
 DESCRIPTION=Kodi's VuPlus client addon
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-19* dev-libs/tinyxml dev-cpp/nlohmann_json
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.vuplus/archive/7.4.9-Matrix.tar.gz -> kodi-pvr-vuplus-7.4.9.tar.gz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
 _md5_=aec77f31d984481de32e11d2cd9fd151
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-9999 b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-9999
index acb241184727..ab19dbc63ed9 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-9999
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-9999
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=~media-tv/kodi-9999 dev-libs/tinyxml dev-cpp/nlohmann_json
 DESCRIPTION=Kodi's VuPlus client addon
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 dev-libs/tinyxml dev-cpp/nlohmann_json
 SLOT=0
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
 _md5_=a7390a03c3cc1d9eca36c9277978f955
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-wmc-6.1.2 b/metadata/md5-cache/media-plugins/kodi-pvr-wmc-6.1.2
index 0d7cb8431681..799bbfbac992 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-wmc-6.1.2
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-wmc-6.1.2
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND==media-tv/kodi-19* =dev-libs/libplatform-2*
 DESCRIPTION=Kodi's Windows Media Center client addon
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-19* =dev-libs/libplatform-2*
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.wmc/archive/6.1.2-Matrix.tar.gz -> kodi-pvr-wmc-6.1.2.tar.gz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
 _md5_=dc7ad21c98b3a7f1ba483e16ab11ab6d
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-wmc-9999 b/metadata/md5-cache/media-plugins/kodi-pvr-wmc-9999
index ae5f07cc7e3f..6569a1892d1e 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-wmc-9999
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-wmc-9999
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=~media-tv/kodi-9999 =dev-libs/libplatform-2*
 DESCRIPTION=Kodi's Windows Media Center client addon
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 =dev-libs/libplatform-2*
 SLOT=0
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
 _md5_=3e8db33841c5c89d5c8169144adc1365
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-zattoo-19.7.9 b/metadata/md5-cache/media-plugins/kodi-pvr-zattoo-19.7.9
index 82be52fb398e..0618a7b9791d 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-zattoo-19.7.9
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-zattoo-19.7.9
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND==media-tv/kodi-19* dev-libs/rapidjson dev-libs/tinyxml2 virtual/opengl
 DESCRIPTION=Zattoo PVR addon for Kodi
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND==media-tv/kodi-19* dev-libs/rapidjson dev-libs/tinyxml2 virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/rbuehlma/pvr.zattoo/archive/19.7.9-Matrix.tar.gz -> kodi-pvr-zattoo-19.7.9.tar.gz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
 _md5_=e92a1f1a0917c209207f355d5ed736aa
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-zattoo-9999 b/metadata/md5-cache/media-plugins/kodi-pvr-zattoo-9999
index dce210ff37ab..7ffc0151d567 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-zattoo-9999
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-zattoo-9999
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=~media-tv/kodi-9999 dev-libs/rapidjson dev-libs/tinyxml2 virtual/opengl
 DESCRIPTION=Zattoo PVR addon for Kodi
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 dev-libs/rapidjson dev-libs/tinyxml2 virtual/opengl
 SLOT=0
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
 _md5_=e92a1f1a0917c209207f355d5ed736aa
diff --git a/metadata/md5-cache/media-plugins/kodi-screensaver-asteroids-2.4.2-r1 b/metadata/md5-cache/media-plugins/kodi-screensaver-asteroids-2.4.2-r1
index cd196950a707..3af4548fdb74 100644
--- a/metadata/md5-cache/media-plugins/kodi-screensaver-asteroids-2.4.2-r1
+++ b/metadata/md5-cache/media-plugins/kodi-screensaver-asteroids-2.4.2-r1
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND==media-tv/kodi-19*:= >=media-libs/glm-0.9.9.8-r1
 DESCRIPTION=Asteroids screensaver for Kodi
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND==media-tv/kodi-19*:= >=media-libs/glm-0.9.9.8-r1
 SLOT=0
 SRC_URI=https://github.com/xbmc/screensaver.asteroids/archive/2.4.2-Matrix.tar.gz -> kodi-screensaver-asteroids-2.4.2.tar.gz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
 _md5_=dede65626323cb615b6ae68a152f6527
diff --git a/metadata/md5-cache/media-plugins/kodi-screensaver-asteroids-9999 b/metadata/md5-cache/media-plugins/kodi-screensaver-asteroids-9999
index 4545b58f7415..29f323fccd4e 100644
--- a/metadata/md5-cache/media-plugins/kodi-screensaver-asteroids-9999
+++ b/metadata/md5-cache/media-plugins/kodi-screensaver-asteroids-9999
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=~media-tv/kodi-9999 >=media-libs/glm-0.9.9.8-r1
 DESCRIPTION=Asteroids screensaver for Kodi
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 >=media-libs/glm-0.9.9.8-r1
 SLOT=0
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
 _md5_=dede65626323cb615b6ae68a152f6527
diff --git a/metadata/md5-cache/media-plugins/kodi-screensaver-asterwave-3.3.0 b/metadata/md5-cache/media-plugins/kodi-screensaver-asterwave-3.3.0
index 397ca650bd18..22466e800079 100644
--- a/metadata/md5-cache/media-plugins/kodi-screensaver-asterwave-3.3.0
+++ b/metadata/md5-cache/media-plugins/kodi-screensaver-asterwave-3.3.0
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND==media-tv/kodi-19*:= >=media-libs/glm-0.9.9.8-r1
 DESCRIPTION=AsterWave screensaver for Kodi
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND==media-tv/kodi-19*:= >=media-libs/glm-0.9.9.8-r1
 SLOT=0
 SRC_URI=https://github.com/xbmc/screensaver.asterwave/archive/3.3.0-Matrix.tar.gz -> kodi-screensaver-asterwave-3.3.0.tar.gz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
 _md5_=bdc29dcda0614f1d44f7a6d3e76c206d
diff --git a/metadata/md5-cache/media-plugins/kodi-screensaver-asterwave-9999 b/metadata/md5-cache/media-plugins/kodi-screensaver-asterwave-9999
index 3f6c0f465326..650117a8002b 100644
--- a/metadata/md5-cache/media-plugins/kodi-screensaver-asterwave-9999
+++ b/metadata/md5-cache/media-plugins/kodi-screensaver-asterwave-9999
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=~media-tv/kodi-9999 >=media-libs/glm-0.9.9.8-r1
 DESCRIPTION=AsterWave screensaver for Kodi
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 >=media-libs/glm-0.9.9.8-r1
 SLOT=0
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
 _md5_=bdc29dcda0614f1d44f7a6d3e76c206d
diff --git a/metadata/md5-cache/media-plugins/kodi-screensaver-biogenesis-2.3.2-r1 b/metadata/md5-cache/media-plugins/kodi-screensaver-biogenesis-2.3.2-r1
index 327c84cfa157..198c68ebd3ac 100644
--- a/metadata/md5-cache/media-plugins/kodi-screensaver-biogenesis-2.3.2-r1
+++ b/metadata/md5-cache/media-plugins/kodi-screensaver-biogenesis-2.3.2-r1
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND==media-tv/kodi-19*:=
 DESCRIPTION=Biogenesis screensaver for Kodi
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND==media-tv/kodi-19*:=
 SLOT=0
 SRC_URI=https://github.com/xbmc/screensaver.biogenesis/archive/2.3.2-Matrix.tar.gz -> kodi-screensaver-biogenesis-2.3.2.tar.gz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
 _md5_=d127c0cfd164c99fa9641cdd6320b5f1
diff --git a/metadata/md5-cache/media-plugins/kodi-screensaver-biogenesis-9999 b/metadata/md5-cache/media-plugins/kodi-screensaver-biogenesis-9999
index 47ea9e302983..709c2dd7f316 100644
--- a/metadata/md5-cache/media-plugins/kodi-screensaver-biogenesis-9999
+++ b/metadata/md5-cache/media-plugins/kodi-screensaver-biogenesis-9999
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=~media-tv/kodi-9999
 DESCRIPTION=Biogenesis screensaver for Kodi
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999
 SLOT=0
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
 _md5_=d127c0cfd164c99fa9641cdd6320b5f1
diff --git a/metadata/md5-cache/media-plugins/kodi-screensaver-cpblobs-3.4.0 b/metadata/md5-cache/media-plugins/kodi-screensaver-cpblobs-3.4.0
index bd0c945c7994..dc2e5f69beca 100644
--- a/metadata/md5-cache/media-plugins/kodi-screensaver-cpblobs-3.4.0
+++ b/metadata/md5-cache/media-plugins/kodi-screensaver-cpblobs-3.4.0
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND==media-tv/kodi-19*:= >=media-libs/glm-0.9.9.8-r1
 DESCRIPTION=CpBlobs screensaver for Kodi
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND==media-tv/kodi-19*:= >=media-libs/glm-0.9.9.8-r1
 SLOT=0
 SRC_URI=https://github.com/xbmc/screensaver.cpblobs/archive/3.4.0-Matrix.tar.gz -> kodi-screensaver-cpblobs-3.4.0.tar.gz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
 _md5_=6e533b5b5f61b9892d41432c4406d054
diff --git a/metadata/md5-cache/media-plugins/kodi-screensaver-cpblobs-9999 b/metadata/md5-cache/media-plugins/kodi-screensaver-cpblobs-9999
index 220e0dadbdfc..b4555ecd1763 100644
--- a/metadata/md5-cache/media-plugins/kodi-screensaver-cpblobs-9999
+++ b/metadata/md5-cache/media-plugins/kodi-screensaver-cpblobs-9999
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=~media-tv/kodi-9999 >=media-libs/glm-0.9.9.8-r1
 DESCRIPTION=CpBlobs screensaver for Kodi
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 >=media-libs/glm-0.9.9.8-r1
 SLOT=0
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
 _md5_=6e533b5b5f61b9892d41432c4406d054
diff --git a/metadata/md5-cache/media-plugins/kodi-screensaver-greynetic-2.3.1-r1 b/metadata/md5-cache/media-plugins/kodi-screensaver-greynetic-2.3.1-r1
index e1fa124146aa..8c44f2d8be3a 100644
--- a/metadata/md5-cache/media-plugins/kodi-screensaver-greynetic-2.3.1-r1
+++ b/metadata/md5-cache/media-plugins/kodi-screensaver-greynetic-2.3.1-r1
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND==media-tv/kodi-19*:= >=media-libs/glm-0.9.9.8-r1 virtual/opengl
 DESCRIPTION=Greynetic screensaver for Kodi
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND==media-tv/kodi-19*:= >=media-libs/glm-0.9.9.8-r1 virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/xbmc/screensaver.greynetic/archive/2.3.1-Matrix.tar.gz -> kodi-screensaver-greynetic-2.3.1.tar.gz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
 _md5_=2f0b3ad46cb73f7ad9e2b7911b0968a7
diff --git a/metadata/md5-cache/media-plugins/kodi-screensaver-greynetic-9999 b/metadata/md5-cache/media-plugins/kodi-screensaver-greynetic-9999
index 8d2040fa61f9..7321d48559a1 100644
--- a/metadata/md5-cache/media-plugins/kodi-screensaver-greynetic-9999
+++ b/metadata/md5-cache/media-plugins/kodi-screensaver-greynetic-9999
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=~media-tv/kodi-9999 >=media-libs/glm-0.9.9.8-r1 virtual/opengl
 DESCRIPTION=Greynetic screensaver for Kodi
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 >=media-libs/glm-0.9.9.8-r1 virtual/opengl
 SLOT=0
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
 _md5_=2f0b3ad46cb73f7ad9e2b7911b0968a7
diff --git a/metadata/md5-cache/media-plugins/kodi-screensaver-matrixtrails-2.6.0 b/metadata/md5-cache/media-plugins/kodi-screensaver-matrixtrails-2.6.0
index 38088602423c..4253a1a3fa2a 100644
--- a/metadata/md5-cache/media-plugins/kodi-screensaver-matrixtrails-2.6.0
+++ b/metadata/md5-cache/media-plugins/kodi-screensaver-matrixtrails-2.6.0
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND==media-tv/kodi-19*:= virtual/opengl
 DESCRIPTION=Matrix Trails screensaver for Kodi
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND==media-tv/kodi-19*:= virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/xbmc/screensaver.matrixtrails/archive/2.6.0-Matrix.tar.gz -> kodi-screensaver-matrixtrails-2.6.0.tar.gz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
 _md5_=2b61b3e0bcff6603a6581c30420dc246
diff --git a/metadata/md5-cache/media-plugins/kodi-screensaver-matrixtrails-9999 b/metadata/md5-cache/media-plugins/kodi-screensaver-matrixtrails-9999
index a71b16b3b5a1..5c834d2fbe97 100644
--- a/metadata/md5-cache/media-plugins/kodi-screensaver-matrixtrails-9999
+++ b/metadata/md5-cache/media-plugins/kodi-screensaver-matrixtrails-9999
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=~media-tv/kodi-9999 virtual/opengl
 DESCRIPTION=Matrix Trails screensaver for Kodi
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 virtual/opengl
 SLOT=0
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
 _md5_=2b61b3e0bcff6603a6581c30420dc246
diff --git a/metadata/md5-cache/media-plugins/kodi-screensaver-pingpong-2.2.2-r1 b/metadata/md5-cache/media-plugins/kodi-screensaver-pingpong-2.2.2-r1
index f146c88a5cb2..e543bfda42ab 100644
--- a/metadata/md5-cache/media-plugins/kodi-screensaver-pingpong-2.2.2-r1
+++ b/metadata/md5-cache/media-plugins/kodi-screensaver-pingpong-2.2.2-r1
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND==media-tv/kodi-19*:= >=media-libs/glm-0.9.9.8-r1 virtual/opengl
 DESCRIPTION=Ping-pong screensaver for Kodi
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND==media-tv/kodi-19*:= >=media-libs/glm-0.9.9.8-r1 virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/xbmc/screensaver.pingpong/archive/2.2.2-Matrix.tar.gz -> kodi-screensaver-pingpong-2.2.2.tar.gz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
 _md5_=6a68882ed13e769e373af1c03228162f
diff --git a/metadata/md5-cache/media-plugins/kodi-screensaver-pingpong-9999 b/metadata/md5-cache/media-plugins/kodi-screensaver-pingpong-9999
index 982007049930..197474ab5ed5 100644
--- a/metadata/md5-cache/media-plugins/kodi-screensaver-pingpong-9999
+++ b/metadata/md5-cache/media-plugins/kodi-screensaver-pingpong-9999
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=~media-tv/kodi-9999 >=media-libs/glm-0.9.9.8-r1 virtual/opengl
 DESCRIPTION=Ping-pong screensaver for Kodi
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 >=media-libs/glm-0.9.9.8-r1 virtual/opengl
 SLOT=0
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
 _md5_=6a68882ed13e769e373af1c03228162f
diff --git a/metadata/md5-cache/media-plugins/kodi-screensaver-pyro-3.3.0 b/metadata/md5-cache/media-plugins/kodi-screensaver-pyro-3.3.0
index cc65e5740f94..7f9f31e89490 100644
--- a/metadata/md5-cache/media-plugins/kodi-screensaver-pyro-3.3.0
+++ b/metadata/md5-cache/media-plugins/kodi-screensaver-pyro-3.3.0
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND==media-tv/kodi-19*
 DESCRIPTION=Pyro screensaver for Kodi
@@ -9,5 +9,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/xbmc/screensaver.pyro/archive/3.3.0-Matrix.tar.gz -> kodi-screensaver-pyro-3.3.0.tar.gz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
 _md5_=0b1f116859e4049e61dc8c1d4a0f5b69
diff --git a/metadata/md5-cache/media-plugins/kodi-screensaver-pyro-9999 b/metadata/md5-cache/media-plugins/kodi-screensaver-pyro-9999
index f5527b15b361..8a6131a83cd8 100644
--- a/metadata/md5-cache/media-plugins/kodi-screensaver-pyro-9999
+++ b/metadata/md5-cache/media-plugins/kodi-screensaver-pyro-9999
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=~media-tv/kodi-9999
 DESCRIPTION=Pyro screensaver for Kodi
@@ -8,5 +8,5 @@ INHERIT=cmake kodi-addon git-r3
 LICENSE=GPL-2
 PROPERTIES=live
 SLOT=0
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
 _md5_=cb9c7038a0a0fa767b60ec4a06802405
diff --git a/metadata/md5-cache/media-plugins/kodi-screensaver-shadertoy-3.2.0 b/metadata/md5-cache/media-plugins/kodi-screensaver-shadertoy-3.2.0
index 0f5809389041..da4c65af00b2 100644
--- a/metadata/md5-cache/media-plugins/kodi-screensaver-shadertoy-3.2.0
+++ b/metadata/md5-cache/media-plugins/kodi-screensaver-shadertoy-3.2.0
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND==media-tv/kodi-19*:= >=media-libs/glm-0.9.9.8-r1
 DESCRIPTION=Shadertoy screensaver for Kodi
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND==media-tv/kodi-19*:= >=media-libs/glm-0.9.9.8-r1
 SLOT=0
 SRC_URI=https://github.com/xbmc/screensaver.shadertoy/archive/3.2.0-Matrix.tar.gz -> kodi-screensaver-shadertoy-3.2.0.tar.gz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
 _md5_=b2477d7861b154004fab27455c824f75
diff --git a/metadata/md5-cache/media-plugins/kodi-screensaver-shadertoy-9999 b/metadata/md5-cache/media-plugins/kodi-screensaver-shadertoy-9999
index fa71d0253ba3..b072d4e55bcf 100644
--- a/metadata/md5-cache/media-plugins/kodi-screensaver-shadertoy-9999
+++ b/metadata/md5-cache/media-plugins/kodi-screensaver-shadertoy-9999
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=~media-tv/kodi-9999 >=media-libs/glm-0.9.9.8-r1
 DESCRIPTION=Shadertoy screensaver for Kodi
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 >=media-libs/glm-0.9.9.8-r1
 SLOT=0
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
 _md5_=b2477d7861b154004fab27455c824f75
diff --git a/metadata/md5-cache/media-plugins/kodi-screensaver-stars-2.4.0 b/metadata/md5-cache/media-plugins/kodi-screensaver-stars-2.4.0
index 011633ce9acd..112a1bf6799e 100644
--- a/metadata/md5-cache/media-plugins/kodi-screensaver-stars-2.4.0
+++ b/metadata/md5-cache/media-plugins/kodi-screensaver-stars-2.4.0
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND==media-tv/kodi-19*:=
 DESCRIPTION=Stars screensaver for Kodi
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND==media-tv/kodi-19*:=
 SLOT=0
 SRC_URI=https://github.com/xbmc/screensaver.stars/archive/2.4.0-Matrix.tar.gz -> kodi-screensaver-stars-2.4.0.tar.gz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
 _md5_=805915a02d5381f9f99b64408e5c5b32
diff --git a/metadata/md5-cache/media-plugins/kodi-screensaver-stars-9999 b/metadata/md5-cache/media-plugins/kodi-screensaver-stars-9999
index c6652c9b45a6..8a7ea7d2e6e7 100644
--- a/metadata/md5-cache/media-plugins/kodi-screensaver-stars-9999
+++ b/metadata/md5-cache/media-plugins/kodi-screensaver-stars-9999
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=~media-tv/kodi-9999
 DESCRIPTION=Stars screensaver for Kodi
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999
 SLOT=0
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
 _md5_=805915a02d5381f9f99b64408e5c5b32
diff --git a/metadata/md5-cache/media-plugins/kodi-vfs-libarchive-2.0.1-r1 b/metadata/md5-cache/media-plugins/kodi-vfs-libarchive-2.0.1-r1
index d55235002489..194e5fcc8f14 100644
--- a/metadata/md5-cache/media-plugins/kodi-vfs-libarchive-2.0.1-r1
+++ b/metadata/md5-cache/media-plugins/kodi-vfs-libarchive-2.0.1-r1
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=app-arch/libarchive[bzip2,lz4,lzma,lzo,zlib(+)] app-arch/lzma app-arch/bzip2 sys-libs/zlib app-arch/lz4 dev-libs/lzo:2 >=dev-libs/openssl-1.0.2l:0= =media-tv/kodi-19*
 DESCRIPTION=Libarchive VFS add-on for Kodi
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=app-arch/libarchive[bzip2,lz4,lzma,lzo,zlib(+)] app-arch/lzma app-arch/bzip2 sys-libs/zlib app-arch/lz4 dev-libs/lzo:2 >=dev-libs/openssl-1.0.2l:0= =media-tv/kodi-19*
 SLOT=0
 SRC_URI=https://github.com/xbmc/vfs.libarchive/archive/2.0.1-Matrix.tar.gz -> kodi-vfs-libarchive-2.0.1.tar.gz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
 _md5_=22e1a62ecf4c0a01553e98f1fb5a370c
diff --git a/metadata/md5-cache/media-plugins/kodi-vfs-libarchive-9999 b/metadata/md5-cache/media-plugins/kodi-vfs-libarchive-9999
index 45665b312b7f..319714303e5b 100644
--- a/metadata/md5-cache/media-plugins/kodi-vfs-libarchive-9999
+++ b/metadata/md5-cache/media-plugins/kodi-vfs-libarchive-9999
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=app-arch/libarchive[bzip2,lz4,lzma,lzo,zlib(+)] app-arch/lzma app-arch/bzip2 sys-libs/zlib app-arch/lz4 dev-libs/lzo:2 >=dev-libs/openssl-1.0.2l:0= ~media-tv/kodi-9999
 DESCRIPTION=Libarchive VFS add-on for Kodi
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=app-arch/libarchive[bzip2,lz4,lzma,lzo,zlib(+)] app-arch/lzma app-arch/bzip2 sys-libs/zlib app-arch/lz4 dev-libs/lzo:2 >=dev-libs/openssl-1.0.2l:0= ~media-tv/kodi-9999
 SLOT=0
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
 _md5_=af5336807c250c4434dab99588d2004d
diff --git a/metadata/md5-cache/media-plugins/kodi-vfs-rar-4.0.0 b/metadata/md5-cache/media-plugins/kodi-vfs-rar-4.0.0
index 7f91e4c2bac8..7f83c9b1f087 100644
--- a/metadata/md5-cache/media-plugins/kodi-vfs-rar-4.0.0
+++ b/metadata/md5-cache/media-plugins/kodi-vfs-rar-4.0.0
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND==media-tv/kodi-19*:= dev-libs/tinyxml
 DESCRIPTION=RAR VFS addon for Kodi
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND==media-tv/kodi-19*:= dev-libs/tinyxml
 SLOT=0
 SRC_URI=https://github.com/xbmc/vfs.rar/archive/4.0.0-Matrix.tar.gz -> kodi-vfs-rar-4.0.0.tar.gz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
 _md5_=3a38ed5767e64262b547a27fcab44b8c
diff --git a/metadata/md5-cache/media-plugins/kodi-vfs-rar-9999 b/metadata/md5-cache/media-plugins/kodi-vfs-rar-9999
index 69e1319bdd1f..2b710b47061f 100644
--- a/metadata/md5-cache/media-plugins/kodi-vfs-rar-9999
+++ b/metadata/md5-cache/media-plugins/kodi-vfs-rar-9999
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=~media-tv/kodi-9999 dev-libs/tinyxml
 DESCRIPTION=RAR VFS addon for Kodi
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 dev-libs/tinyxml
 SLOT=0
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
 _md5_=3a38ed5767e64262b547a27fcab44b8c
diff --git a/metadata/md5-cache/media-plugins/kodi-vfs-sftp-2.0.0 b/metadata/md5-cache/media-plugins/kodi-vfs-sftp-2.0.0
index e6149e92057f..ee2dac879e24 100644
--- a/metadata/md5-cache/media-plugins/kodi-vfs-sftp-2.0.0
+++ b/metadata/md5-cache/media-plugins/kodi-vfs-sftp-2.0.0
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=net-libs/libssh[sftp] =media-tv/kodi-19*
 DESCRIPTION=SFTP VFS addon for Kodi
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=net-libs/libssh[sftp] =media-tv/kodi-19*
 SLOT=0
 SRC_URI=https://github.com/xbmc/vfs.sftp/archive/2.0.0-Matrix.tar.gz -> kodi-vfs-sftp-2.0.0.tar.gz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
 _md5_=a0aa61d143e649eec34bc9769a39e478
diff --git a/metadata/md5-cache/media-plugins/kodi-vfs-sftp-9999 b/metadata/md5-cache/media-plugins/kodi-vfs-sftp-9999
index 92dc67a80fb0..26c54bf0094d 100644
--- a/metadata/md5-cache/media-plugins/kodi-vfs-sftp-9999
+++ b/metadata/md5-cache/media-plugins/kodi-vfs-sftp-9999
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=net-libs/libssh[sftp] ~media-tv/kodi-9999
 DESCRIPTION=SFTP VFS addon for Kodi
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=net-libs/libssh[sftp] ~media-tv/kodi-9999
 SLOT=0
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
 _md5_=f8ea423949e8da62407a04c7bde59485
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-fishbmc-19.0.0 b/metadata/md5-cache/media-plugins/kodi-visualization-fishbmc-19.0.0
index d2661594efde..07cd28df1578 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-fishbmc-19.0.0
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-fishbmc-19.0.0
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND==media-tv/kodi-19*:= >=media-libs/glm-0.9.9.8-r1 virtual/opengl
 DESCRIPTION=Fische visualizer for Kodi
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND==media-tv/kodi-19*:= >=media-libs/glm-0.9.9.8-r1 virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/xbmc/visualization.fishbmc/archive/19.0.0-Matrix.tar.gz -> kodi-visualization-fishbmc-19.0.0.tar.gz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
 _md5_=ec5b0b0ec5f35ff49463a1e738be49c3
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-fishbmc-9999 b/metadata/md5-cache/media-plugins/kodi-visualization-fishbmc-9999
index 88bd43dddc2c..82618b981469 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-fishbmc-9999
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-fishbmc-9999
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=~media-tv/kodi-9999 >=media-libs/glm-0.9.9.8-r1 virtual/opengl
 DESCRIPTION=Fische visualizer for Kodi
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 >=media-libs/glm-0.9.9.8-r1 virtual/opengl
 SLOT=0
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
 _md5_=ebbbd8aca8ace586546a901a28f869fe
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-goom-19.0.0 b/metadata/md5-cache/media-plugins/kodi-visualization-goom-19.0.0
index 536e534fb6a1..6a9851b02819 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-goom-19.0.0
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-goom-19.0.0
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND==media-tv/kodi-19*:= >=media-libs/glm-0.9.9.8-r1 virtual/opengl
 DESCRIPTION=Goom visualizer for Kodi
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND==media-tv/kodi-19*:= >=media-libs/glm-0.9.9.8-r1 virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/xbmc/visualization.goom/archive/19.0.0-Matrix.tar.gz -> kodi-visualization-goom-19.0.0.tar.gz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
 _md5_=749b963c94def9a8e728097f547fe7fc
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-goom-9999 b/metadata/md5-cache/media-plugins/kodi-visualization-goom-9999
index f2ebf6ee4b7d..56afa24a71ef 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-goom-9999
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-goom-9999
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=~media-tv/kodi-9999 >=media-libs/glm-0.9.9.8-r1 virtual/opengl
 DESCRIPTION=Goom visualizer for Kodi
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 >=media-libs/glm-0.9.9.8-r1 virtual/opengl
 SLOT=0
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
 _md5_=541fee7b3aecb0c9dfa7618105154f9c
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-projectm-19.0.1 b/metadata/md5-cache/media-plugins/kodi-visualization-projectm-19.0.1
index 516a6b28c111..845580129830 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-projectm-19.0.1
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-projectm-19.0.1
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND==media-tv/kodi-19*:= virtual/opengl >=media-libs/libprojectm-3.1.2:=
 DESCRIPTION=ProjectM visualizer for Kodi
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND==media-tv/kodi-19*:= virtual/opengl >=media-libs/libprojectm-3.1.2:=
 SLOT=0
 SRC_URI=https://github.com/xbmc/visualization.projectm/archive/19.0.1-Matrix.tar.gz -> kodi-visualization-projectm-19.0.1.tar.gz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
 _md5_=4964b85457f7f784849f20a665508551
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-projectm-9999 b/metadata/md5-cache/media-plugins/kodi-visualization-projectm-9999
index 3a88ec61f0c2..7752acd5dbf6 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-projectm-9999
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-projectm-9999
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=~media-tv/kodi-9999 virtual/opengl >=media-libs/libprojectm-3.1.12:=
 DESCRIPTION=ProjectM visualizer for Kodi
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 virtual/opengl >=media-libs/libprojectm-3.1.12:=
 SLOT=0
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
 _md5_=b5a547f833dfbaafe29d47a463f143f1
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-shadertoy-19.1.1 b/metadata/md5-cache/media-plugins/kodi-visualization-shadertoy-19.1.1
index 115a4682bb0e..450a1f3f9d29 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-shadertoy-19.1.1
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-shadertoy-19.1.1
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND==media-tv/kodi-19* >=media-libs/glm-0.9.9.8-r1 virtual/opengl
 DESCRIPTION=Shadertoy visualizer for Kodi
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-19* >=media-libs/glm-0.9.9.8-r1 virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/xbmc/visualization.shadertoy/archive/19.1.1-Matrix.tar.gz -> kodi-visualization-shadertoy-19.1.1.tar.gz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
 _md5_=a1221ed7342575e69acd92d7f34b0abb
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-shadertoy-9999 b/metadata/md5-cache/media-plugins/kodi-visualization-shadertoy-9999
index bb0d1593931e..a041c2b4faef 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-shadertoy-9999
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-shadertoy-9999
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=~media-tv/kodi-9999 >=media-libs/glm-0.9.9.8-r1 virtual/opengl
 DESCRIPTION=Shadertoy visualizer for Kodi
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 >=media-libs/glm-0.9.9.8-r1 virtual/opengl
 SLOT=0
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
 _md5_=cc5fcb5de7ddfa7d0e6b953b39eba5e6
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-spectrum-19.0.0 b/metadata/md5-cache/media-plugins/kodi-visualization-spectrum-19.0.0
index da8e3355667c..3824e948e791 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-spectrum-19.0.0
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-spectrum-19.0.0
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND==media-tv/kodi-19*:= >=media-libs/glm-0.9.9.8-r1 virtual/opengl
 DESCRIPTION=Spectrum visualizer for Kodi
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND==media-tv/kodi-19*:= >=media-libs/glm-0.9.9.8-r1 virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/xbmc/visualization.spectrum/archive/19.0.0-Matrix.tar.gz -> kodi-visualization-spectrum-19.0.0.tar.gz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
 _md5_=c00a342acbe1661f9acba1676d4b5db9
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-spectrum-9999 b/metadata/md5-cache/media-plugins/kodi-visualization-spectrum-9999
index ce99f9bea426..8f39b857e0f4 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-spectrum-9999
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-spectrum-9999
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=~media-tv/kodi-9999 >=media-libs/glm-0.9.9.8-r1 virtual/opengl
 DESCRIPTION=Spectrum visualizer for Kodi
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 >=media-libs/glm-0.9.9.8-r1 virtual/opengl
 SLOT=0
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
 _md5_=79d8e2ef4139d44fc2cd352db5c6c72b
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-starburst-19.0.0 b/metadata/md5-cache/media-plugins/kodi-visualization-starburst-19.0.0
index f34debaa1a14..d4dc3dbf47de 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-starburst-19.0.0
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-starburst-19.0.0
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND==media-tv/kodi-19*:= >=media-libs/glm-0.9.9.8-r1 virtual/opengl
 DESCRIPTION=StarBurst visualizer for Kodi
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND==media-tv/kodi-19*:= >=media-libs/glm-0.9.9.8-r1 virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/xbmc/visualization.starburst/archive/19.0.0-Matrix.tar.gz -> kodi-visualization-starburst-19.0.0.tar.gz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
 _md5_=d158c26ce5ad6c301e4223c7fa3e1335
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-starburst-9999 b/metadata/md5-cache/media-plugins/kodi-visualization-starburst-9999
index d198d7df3449..f90ea79f20f3 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-starburst-9999
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-starburst-9999
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=~media-tv/kodi-9999 >=media-libs/glm-0.9.9.8-r1 virtual/opengl
 DESCRIPTION=StarBurst visualizer for Kodi
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 >=media-libs/glm-0.9.9.8-r1 virtual/opengl
 SLOT=0
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
 _md5_=edcdcc5756db5db55d9f4b55231a7034
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-waveform-19.0.1 b/metadata/md5-cache/media-plugins/kodi-visualization-waveform-19.0.1
index 0c9ef829e083..ff3208b47a42 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-waveform-19.0.1
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-waveform-19.0.1
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND==media-tv/kodi-19*:= >=media-libs/glm-0.9.9.8-r1 virtual/opengl
 DESCRIPTION=Waveform visualizer for Kodi
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND==media-tv/kodi-19*:= >=media-libs/glm-0.9.9.8-r1 virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/xbmc/visualization.waveform/archive/19.0.1-Matrix.tar.gz -> kodi-visualization-waveform-19.0.1.tar.gz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1
 _md5_=18f09748a43ba9bdab749ddcc3c3e74b
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-waveform-9999 b/metadata/md5-cache/media-plugins/kodi-visualization-waveform-9999
index c25e1328ef7f..cb9f76beadb0 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-waveform-9999
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-waveform-9999
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=~media-tv/kodi-9999 >=media-libs/glm-0.9.9.8-r1 virtual/opengl
 DESCRIPTION=Waveform visualizer for Kodi
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 >=media-libs/glm-0.9.9.8-r1 virtual/opengl
 SLOT=0
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
 _md5_=74dacc948ce3c07cfdd8b0b64323818f
diff --git a/metadata/md5-cache/media-plugins/libvisual-projectm-2.1.1 b/metadata/md5-cache/media-plugins/libvisual-projectm-2.1.1
index bbf30aa0139e..e59a313fd27f 100644
--- a/metadata/md5-cache/media-plugins/libvisual-projectm-2.1.1
+++ b/metadata/md5-cache/media-plugins/libvisual-projectm-2.1.1
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=media-libs/libprojectm-3.1.12:0= media-libs/libsdl =media-libs/libvisual-0.4* virtual/opengl
 DESCRIPTION=A libvisual graphical music visualization plugin similar to milkdrop
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=>=media-libs/libprojectm-3.1.12:0= media-libs/libsdl =media-libs/libvisual-0.4* virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/projectM-visualizer/frontend-libvisual-plug-in/archive/refs/tags/v2.1.1.tar.gz -> libvisual-projectm-2.1.1-gh.tar.gz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c
 _md5_=9b2a566154d01663daaa6faf2e8ad32d
diff --git a/metadata/md5-cache/media-plugins/qmmp-plugin-pack-1.6.1 b/metadata/md5-cache/media-plugins/qmmp-plugin-pack-1.6.1
index f2243abdfd3e..9597d46fff18 100644
--- a/metadata/md5-cache/media-plugins/qmmp-plugin-pack-1.6.1
+++ b/metadata/md5-cache/media-plugins/qmmp-plugin-pack-1.6.1
@@ -1,4 +1,4 @@
-BDEPEND=dev-qt/linguist-tools:5 app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=dev-qt/linguist-tools:5 app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 media-libs/libsamplerate media-libs/taglib =media-sound/qmmp-1.6* media-video/ffmpeg:= dev-lang/yasm
 DESCRIPTION=Set of extra plugins for Qmmp
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 media-libs/libsamplerate media-libs/taglib =media-sound/qmmp-1.6* media-video/ffmpeg:=
 SLOT=0
 SRC_URI=https://qmmp.ylsoftware.com/files/qmmp-plugin-pack/1.6/qmmp-plugin-pack-1.6.1.tar.bz2
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c
 _md5_=4e38d73f2fce0ece63ea926fc804c547
author	Repository mirror & CI <repomirrorci@gentoo.org>	2024-01-14 19:34:01 +0000
committer	Repository mirror & CI <repomirrorci@gentoo.org>	2024-01-14 19:34:01 +0000
commit	0edf919dc3b2dd958587e6d4a529436194aa9841 (patch)
tree	7fe5f5650c7abf9a559fd95736314921ce66debc /metadata/md5-cache/media-plugins
parent	Merge updates from master (diff)
download	gentoo-0edf919dc3b2dd958587e6d4a529436194aa9841.tar.gz gentoo-0edf919dc3b2dd958587e6d4a529436194aa9841.tar.bz2 gentoo-0edf919dc3b2dd958587e6d4a529436194aa9841.zip