gentoo auto-resync : 15:01:2024 - 01:16:32

author: V3n3RiX <venerix@koprulu.sector> 2024-01-15 01:16:32 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2024-01-15 01:16:32 +0000
commit: 7387c23ff485f2416512185bf64584028335b993 (patch)
tree: 77f6578297f64937d732133db350b968dfe538e3 /metadata/md5-cache/dev-libs
parent: d8a50857c27d3253561374390ac9ed8c1b65d9bc (diff)
310 files changed, 626 insertions, 656 deletions
diff --git a/metadata/md5-cache/dev-libs/FBGEMM-2023.02.10 b/metadata/md5-cache/dev-libs/FBGEMM-2023.02.10
index 52434bbcf689..349bcd7254c5 100644
--- a/metadata/md5-cache/dev-libs/FBGEMM-2023.02.10
+++ b/metadata/md5-cache/dev-libs/FBGEMM-2023.02.10
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-cpp/gtest ) doc? ( || ( ( dev-lang/python:3.12 dev-python/sphinx[python_targets_python3_12(-)] dev-python/sphinx-rtd-theme[python_targets_python3_12(-)] dev-python/breathe[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/sphinx[python_targets_python3_11(-)] dev-python/sphinx-rtd-theme[python_targets_python3_11(-)] dev-python/breathe[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinx-rtd-theme[python_targets_python3_10(-)] dev-python/breathe[python_targets_python3_10(-)] ) ) ) || ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=test? ( dev-cpp/gtest ) doc? ( || ( ( dev-lang/python:3.12 dev-python/sphinx[python_targets_python3_12(-)] dev-python/sphinx-rtd-theme[python_targets_python3_12(-)] dev-python/breathe[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/sphinx[python_targets_python3_11(-)] dev-python/sphinx-rtd-theme[python_targets_python3_11(-)] dev-python/breathe[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinx-rtd-theme[python_targets_python3_10(-)] dev-python/breathe[python_targets_python3_10(-)] ) ) ) || ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=>=dev-libs/asmjit-2022.07.02 dev-libs/cpuinfo
 DESCRIPTION=Facebook GEneral Matrix Multiplication
@@ -12,5 +12,5 @@ RDEPEND=>=dev-libs/asmjit-2022.07.02 dev-libs/cpuinfo
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pytorch/FBGEMM/archive/03b2046676707da64504e898490ab46104d4682a.tar.gz -> FBGEMM-2023.02.10.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=7f6a105d09bbc07fa3bafa36b723ba7a
diff --git a/metadata/md5-cache/dev-libs/FBGEMM-2023.11.02 b/metadata/md5-cache/dev-libs/FBGEMM-2023.11.02
index 87725c32d2c6..2c2a41638626 100644
--- a/metadata/md5-cache/dev-libs/FBGEMM-2023.11.02
+++ b/metadata/md5-cache/dev-libs/FBGEMM-2023.11.02
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-cpp/gtest ) doc? ( || ( ( dev-lang/python:3.12 dev-python/sphinx[python_targets_python3_12(-)] dev-python/sphinx-rtd-theme[python_targets_python3_12(-)] dev-python/breathe[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/sphinx[python_targets_python3_11(-)] dev-python/sphinx-rtd-theme[python_targets_python3_11(-)] dev-python/breathe[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinx-rtd-theme[python_targets_python3_10(-)] dev-python/breathe[python_targets_python3_10(-)] ) ) ) || ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=test? ( dev-cpp/gtest ) doc? ( || ( ( dev-lang/python:3.12 dev-python/sphinx[python_targets_python3_12(-)] dev-python/sphinx-rtd-theme[python_targets_python3_12(-)] dev-python/breathe[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/sphinx[python_targets_python3_11(-)] dev-python/sphinx-rtd-theme[python_targets_python3_11(-)] dev-python/breathe[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinx-rtd-theme[python_targets_python3_10(-)] dev-python/breathe[python_targets_python3_10(-)] ) ) ) || ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=>=dev-libs/asmjit-2022.07.02 dev-libs/cpuinfo
 DESCRIPTION=Facebook GEneral Matrix Multiplication
@@ -12,5 +12,5 @@ RDEPEND=>=dev-libs/asmjit-2022.07.02 dev-libs/cpuinfo
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pytorch/FBGEMM/archive/cdae5d97e3aa9fda4222f31c04dbd80249c918d1.tar.gz -> FBGEMM-2023.11.02.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=76d975528cf76c54315148437da1b552
diff --git a/metadata/md5-cache/dev-libs/FP16-2021.03.20-r4 b/metadata/md5-cache/dev-libs/FP16-2021.03.20-r4
index 30869cbce7bb..d4f448ba12f9 100644
--- a/metadata/md5-cache/dev-libs/FP16-2021.03.20-r4
+++ b/metadata/md5-cache/dev-libs/FP16-2021.03.20-r4
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-cpp/gtest ) app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=test? ( dev-cpp/gtest ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-libs/psimd
 DESCRIPTION=conversion to/from half-precision floating point formats
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_tar
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Maratyszcza/FP16/archive/0a92994d729ff76a58f692d3028ca1b64b145d91.tar.gz -> FP16-2021.03.20.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=9b62991ca29f4f40cd08935370e56bad
diff --git a/metadata/md5-cache/dev-libs/FXdiv-2020.12.09-r1 b/metadata/md5-cache/dev-libs/FXdiv-2020.12.09-r1
index 056f76ae2183..b7693967960c 100644
--- a/metadata/md5-cache/dev-libs/FXdiv-2020.12.09-r1
+++ b/metadata/md5-cache/dev-libs/FXdiv-2020.12.09-r1
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-cpp/gtest ) app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=test? ( dev-cpp/gtest ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Division via fixed-point multiplication by inverse
 EAPI=8
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Maratyszcza/FXdiv/archive/63058eff77e11aa15bf531df5dd34395ec3017c8.tar.gz -> FXdiv-2020.12.09.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=e304eb2e5de5cddf653e2fa1b4556af2
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index a7644c6a2a5d..00bc3c296bca 100644
--- a/metadata/md5-cache/dev-libs/Manifest.gz
+++ b/metadata/md5-cache/dev-libs/Manifest.gz
diff --git a/metadata/md5-cache/dev-libs/apache-arrow-14.0.1 b/metadata/md5-cache/dev-libs/apache-arrow-14.0.1
index 42983b591493..ee161445777e 100644
--- a/metadata/md5-cache/dev-libs/apache-arrow-14.0.1
+++ b/metadata/md5-cache/dev-libs/apache-arrow-14.0.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=brotli? ( app-arch/brotli:= ) bzip2? ( app-arch/bzip2:= ) compute? ( dev-libs/libutf8proc:= ) dataset? ( dev-libs/libutf8proc:= re2? ( dev-libs/re2:= ) ) lz4? ( app-arch/lz4:= ) parquet? ( dev-libs/libutf8proc:= dev-libs/thrift:= ssl? ( dev-libs/openssl:= ) ) snappy? ( app-arch/snappy:= ) zlib? ( sys-libs/zlib:= ) zstd? ( app-arch/zstd:= ) dev-cpp/xsimd >=dev-libs/boost-1.81.0 json? ( dev-libs/rapidjson ) test? ( dev-cpp/gflags dev-cpp/gtest )
 DESCRIPTION=A cross-language development platform for in-memory data.
@@ -13,5 +13,5 @@ REQUIRED_USE=test? ( json parquet? ( zstd ) ) ssl? ( json )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/arrow/arrow-14.0.1/apache-arrow-14.0.1.tar.gz test? ( https://github.com/apache/parquet-testing/archive/b2e7cc755159196e3a068c8594f7acbaecfdaaac.tar.gz -> apache-arrow-parquet-data-b2e7cc755159196e3a068c8594f7acbaecfdaaac.tar.gz https://github.com/apache/arrow-testing/archive/d2c73bf78246331d8e58b6f11aa8aa199cbb5929.tar.gz -> apache-arrow-arrow-data-d2c73bf78246331d8e58b6f11aa8aa199cbb5929.tar.gz )
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=e06505a75204a48eacc44ba650c017a5
diff --git a/metadata/md5-cache/dev-libs/apache-arrow-14.0.2 b/metadata/md5-cache/dev-libs/apache-arrow-14.0.2
index f926b99be659..6118b867dfcb 100644
--- a/metadata/md5-cache/dev-libs/apache-arrow-14.0.2
+++ b/metadata/md5-cache/dev-libs/apache-arrow-14.0.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=brotli? ( app-arch/brotli:= ) bzip2? ( app-arch/bzip2:= ) compute? ( dev-libs/libutf8proc:= ) dataset? ( dev-libs/libutf8proc:= re2? ( dev-libs/re2:= ) ) lz4? ( app-arch/lz4:= ) parquet? ( dev-libs/libutf8proc:= dev-libs/thrift:= ssl? ( dev-libs/openssl:= ) ) snappy? ( app-arch/snappy:= ) zlib? ( sys-libs/zlib:= ) zstd? ( app-arch/zstd:= ) dev-cpp/xsimd >=dev-libs/boost-1.81.0 json? ( dev-libs/rapidjson ) test? ( dev-cpp/gflags dev-cpp/gtest )
 DESCRIPTION=A cross-language development platform for in-memory data.
@@ -13,5 +13,5 @@ REQUIRED_USE=test? ( json parquet? ( zstd ) ) ssl? ( json )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/arrow/arrow-14.0.2/apache-arrow-14.0.2.tar.gz test? ( https://github.com/apache/parquet-testing/archive/b2e7cc755159196e3a068c8594f7acbaecfdaaac.tar.gz -> apache-arrow-parquet-data-b2e7cc755159196e3a068c8594f7acbaecfdaaac.tar.gz https://github.com/apache/arrow-testing/archive/d2c73bf78246331d8e58b6f11aa8aa199cbb5929.tar.gz -> apache-arrow-arrow-data-d2c73bf78246331d8e58b6f11aa8aa199cbb5929.tar.gz )
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=7ba79888b1f2b853118fdc9c530aa4f8
diff --git a/metadata/md5-cache/dev-libs/asmjit-2021.11.13 b/metadata/md5-cache/dev-libs/asmjit-2021.11.13
index ed090f452d45..79b578d38f97 100644
--- a/metadata/md5-cache/dev-libs/asmjit-2021.11.13
+++ b/metadata/md5-cache/dev-libs/asmjit-2021.11.13
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-cpp/gtest ) app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=test? ( dev-cpp/gtest ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Machine code generation for C++
 EAPI=8
@@ -10,5 +10,5 @@ LICENSE=ZLIB
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/asmjit/asmjit/archive/4ec760a3d1f69e32ba460ecd2513f29b8428700b.tar.gz -> asmjit-2021.11.13.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=87661faf832b914e0e4673aa44b5d4b4
diff --git a/metadata/md5-cache/dev-libs/asmjit-2022.07.02 b/metadata/md5-cache/dev-libs/asmjit-2022.07.02
index d1719dfb8bb2..c499f25f93a0 100644
--- a/metadata/md5-cache/dev-libs/asmjit-2022.07.02
+++ b/metadata/md5-cache/dev-libs/asmjit-2022.07.02
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-cpp/gtest ) app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=test? ( dev-cpp/gtest ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Machine code generation for C++
 EAPI=8
@@ -10,5 +10,5 @@ LICENSE=ZLIB
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/asmjit/asmjit/archive/c59847629d3a19da4d10f0be4ac33b43fc4a100f.tar.gz -> asmjit-2022.07.02.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=1378017b78b9225b06d2e96ffb3b4e2a
diff --git a/metadata/md5-cache/dev-libs/atcore-1.0.0 b/metadata/md5-cache/dev-libs/atcore-1.0.0
index 798a9d85994b..c6732d298364 100644
--- a/metadata/md5-cache/dev-libs/atcore-1.0.0
+++ b/metadata/md5-cache/dev-libs/atcore-1.0.0
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-qt/linguist-tools-5.12.3:5 doc? ( app-text/doxygen[dot] ) app-alternatives/ninja >=dev-util/cmake-3.20.5 dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.106.0:*
+BDEPEND=>=dev-qt/linguist-tools-5.12.3:5 doc? ( app-text/doxygen[dot] ) app-alternatives/ninja >=dev-build/cmake-3.20.5 dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.106.0:*
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
 DEPEND=>=dev-qt/qtserialport-5.12.3:5 gui? ( >=dev-qt/qtcharts-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
 DESCRIPTION=API to manage the serial connection between the computer and 3D Printers
@@ -13,5 +13,5 @@ RDEPEND=>=dev-qt/qtserialport-5.12.3:5 gui? ( >=dev-qt/qtcharts-5.12.3:5 >=dev-q
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://kde/stable/atcore/1.0.0/atcore-1.0.0.tar.xz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	ecm	a9d1de06ef0d5d4de7114a10dcb64daa	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	kde.org	60fcb935e4206806bf9f38e3537521a2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	ecm	a9d1de06ef0d5d4de7114a10dcb64daa	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	kde.org	60fcb935e4206806bf9f38e3537521a2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=ed4fdcd68ea095585e1384228db75ce2
diff --git a/metadata/md5-cache/dev-libs/avro-c-1.9.1-r2 b/metadata/md5-cache/dev-libs/avro-c-1.9.1-r2
index 942ee09e6bc2..6bc76d3e358b 100644
--- a/metadata/md5-cache/dev-libs/avro-c-1.9.1-r2
+++ b/metadata/md5-cache/dev-libs/avro-c-1.9.1-r2
@@ -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/snappy:= >=dev-libs/jansson-2.3:= sys-libs/zlib
 DESCRIPTION=c library for the apache avro data serialization system
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=app-arch/snappy:= >=dev-libs/jansson-2.3:= sys-libs/zlib
 SLOT=0
 SRC_URI=https://archive.apache.org/dist/avro/avro-1.9.1/c/avro-c-1.9.1.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=6a8cad20d9f9617df3f9c520e17392e2
diff --git a/metadata/md5-cache/dev-libs/aws-c-cal-0.4.5 b/metadata/md5-cache/dev-libs/aws-c-cal-0.4.5
index b9b5694e1ff4..1c37421111bb 100644
--- a/metadata/md5-cache/dev-libs/aws-c-cal-0.4.5
+++ b/metadata/md5-cache/dev-libs/aws-c-cal-0.4.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=>=dev-libs/aws-c-common-0.4.62:=[static-libs=] >=dev-libs/openssl-1.1.1:=[static-libs=]
 DESCRIPTION=Crypto Abstraction Layer: Cross-Platform C99 wrapper for cryptography primitives
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/awslabs/aws-c-cal/archive/v0.4.5.tar.gz -> aws-c-cal-0.4.5.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=b81f7ddf56c463c1b962d2e8dadab894
diff --git a/metadata/md5-cache/dev-libs/aws-c-common-0.4.62 b/metadata/md5-cache/dev-libs/aws-c-common-0.4.62
index 0c79daf3388e..396330b52264 100644
--- a/metadata/md5-cache/dev-libs/aws-c-common-0.4.62
+++ b/metadata/md5-cache/dev-libs/aws-c-common-0.4.62
@@ -1,4 +1,4 @@
-BDEPEND=|| ( >dev-util/cmake-3.19.1 <dev-util/cmake-3.19.0 ) app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=|| ( >dev-build/cmake-3.19.1 <dev-build/cmake-3.19.0 ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Core c99 package for AWS SDK for C
 EAPI=7
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/awslabs/aws-c-common/archive/v0.4.62.tar.gz -> aws-c-common-0.4.62.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=a66498e95e23ed07f7f9417d3a0aadd6
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=b6704843cdde448faae1db6fbf6ee4a0
diff --git a/metadata/md5-cache/dev-libs/aws-c-common-0.5.2 b/metadata/md5-cache/dev-libs/aws-c-common-0.5.2
index d30fac701523..31f60ced8445 100644
--- a/metadata/md5-cache/dev-libs/aws-c-common-0.5.2
+++ b/metadata/md5-cache/dev-libs/aws-c-common-0.5.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
 DESCRIPTION=Core c99 package for AWS SDK for C
 EAPI=7
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/awslabs/aws-c-common/archive/v0.5.2.tar.gz -> aws-c-common-0.5.2.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=b2e32b5994b51a5bffbc240e9e3fcda6
diff --git a/metadata/md5-cache/dev-libs/aws-c-event-stream-0.2.5-r1 b/metadata/md5-cache/dev-libs/aws-c-event-stream-0.2.5-r1
index 80db96769973..e7d37113d4e6 100644
--- a/metadata/md5-cache/dev-libs/aws-c-event-stream-0.2.5-r1
+++ b/metadata/md5-cache/dev-libs/aws-c-event-stream-0.2.5-r1
@@ -1,4 +1,4 @@
-BDEPEND=|| ( >dev-util/cmake-3.19.1 <dev-util/cmake-3.19.0 ) app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=|| ( >dev-build/cmake-3.19.1 <dev-build/cmake-3.19.0 ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=dev-libs/aws-c-common-0.4.62:=[static-libs=] >=dev-libs/aws-c-io-0.7.0:=[static-libs=] >=dev-libs/aws-checksums-0.1.10:=[static-libs=]
 DESCRIPTION=C99 implementation of the vnd.amazon.eventstream content-type
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/awslabs/aws-c-event-stream/archive/v0.2.5.tar.gz -> aws-c-event-stream-0.2.5.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=cee1abee2bc3d454e3448f41d7fc733d
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=ab81c758b2f7253c13778fa2fd3509e2
diff --git a/metadata/md5-cache/dev-libs/aws-c-event-stream-0.2.7 b/metadata/md5-cache/dev-libs/aws-c-event-stream-0.2.7
index d100c0ae1842..8a36a44490d7 100644
--- a/metadata/md5-cache/dev-libs/aws-c-event-stream-0.2.7
+++ b/metadata/md5-cache/dev-libs/aws-c-event-stream-0.2.7
@@ -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/aws-c-common-0.5.2:=[static-libs=] >=dev-libs/aws-c-io-0.9.2:=[static-libs=] >=dev-libs/aws-checksums-0.1.10:=[static-libs=]
 DESCRIPTION=C99 implementation of the vnd.amazon.eventstream content-type
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/awslabs/aws-c-event-stream/archive/v0.2.7.tar.gz -> aws-c-event-stream-0.2.7.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=adee10f5729f537db49c920bbf80d04b
diff --git a/metadata/md5-cache/dev-libs/aws-c-io-0.7.0-r1 b/metadata/md5-cache/dev-libs/aws-c-io-0.7.0-r1
index f974244da5da..329a68b96490 100644
--- a/metadata/md5-cache/dev-libs/aws-c-io-0.7.0-r1
+++ b/metadata/md5-cache/dev-libs/aws-c-io-0.7.0-r1
@@ -1,4 +1,4 @@
-BDEPEND=|| ( >dev-util/cmake-3.19.1 <dev-util/cmake-3.19.0 ) app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=|| ( >dev-build/cmake-3.19.1 <dev-build/cmake-3.19.0 ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=dev-libs/aws-c-cal-0.4.5:=[static-libs=] >=dev-libs/aws-c-common-0.4.62:=[static-libs=] >=dev-libs/s2n-0.10.21:=[static-libs=]
 DESCRIPTION=AWS SDK for C module, handles IO and TLS work for application protocols
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/awslabs/aws-c-io/archive/v0.7.0.tar.gz -> aws-c-io-0.7.0.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=e916c93e8c9faf05f849c17441ebe946
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=4ccb3547a0a444f0ff8e43f7253cabbc
diff --git a/metadata/md5-cache/dev-libs/aws-c-io-0.9.2 b/metadata/md5-cache/dev-libs/aws-c-io-0.9.2
index d4350f1b6fe3..021a7ed4454f 100644
--- a/metadata/md5-cache/dev-libs/aws-c-io-0.9.2
+++ b/metadata/md5-cache/dev-libs/aws-c-io-0.9.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=>=dev-libs/aws-c-cal-0.4.5:=[static-libs=] >=dev-libs/aws-c-common-0.5.2:=[static-libs=] >=dev-libs/s2n-0.10.21:=[static-libs=]
 DESCRIPTION=AWS SDK for C module, handles IO and TLS work for application protocols
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/awslabs/aws-c-io/archive/v0.9.2.tar.gz -> aws-c-io-0.9.2.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=42b360ca127d36a98b3098778e318fb9
diff --git a/metadata/md5-cache/dev-libs/aws-checksums-0.1.10 b/metadata/md5-cache/dev-libs/aws-checksums-0.1.10
index 77f3fdd743cf..b82879b07581 100644
--- a/metadata/md5-cache/dev-libs/aws-checksums-0.1.10
+++ b/metadata/md5-cache/dev-libs/aws-checksums-0.1.10
@@ -1,4 +1,4 @@
-BDEPEND=|| ( >dev-util/cmake-3.19.1 <dev-util/cmake-3.19.0 ) app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=|| ( >dev-build/cmake-3.19.1 <dev-build/cmake-3.19.0 ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=dev-libs/aws-c-common-0.4.62:=[static-libs=]
 DESCRIPTION=Cross-Platform HW accelerated CRC32c and CRC32 with software fallbacks
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/awslabs/aws-checksums/archive/v0.1.10.tar.gz -> aws-checksums-0.1.10.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=216c4cf499e6dbae4fa3f929a1454be7
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=bbdb090127f8a085c830bd9b381de00a
diff --git a/metadata/md5-cache/dev-libs/ayatana-ido-0.9.2 b/metadata/md5-cache/dev-libs/ayatana-ido-0.9.2
index 458cb864ceb8..6e468e41c27f 100644
--- a/metadata/md5-cache/dev-libs/ayatana-ido-0.9.2
+++ b/metadata/md5-cache/dev-libs/ayatana-ido-0.9.2
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/vala:0.56[vapigen(+)] ) test? ( dev-cpp/gtest ) app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=|| ( dev-lang/vala:0.56[vapigen(+)] ) test? ( dev-cpp/gtest ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=dev-libs/glib-2.58:2 >=x11-libs/gtk+-3.24:3[introspection]
 DESCRIPTION=Ayatana Application Indicators (Shared Library)
@@ -12,5 +12,5 @@ RDEPEND=>=dev-libs/glib-2.58:2 >=x11-libs/gtk+-3.24:3[introspection]
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/AyatanaIndicators/ayatana-ido/archive/0.9.2.tar.gz -> ayatana-ido-0.9.2.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	vala	e477903dbe0105930c51f170a592dc16	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	vala	e477903dbe0105930c51f170a592dc16	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=b84e4a9edd32eb8960f042e634fceafa
diff --git a/metadata/md5-cache/dev-libs/ayatana-ido-0.9.3 b/metadata/md5-cache/dev-libs/ayatana-ido-0.9.3
index b602092413f6..57225f40eb12 100644
--- a/metadata/md5-cache/dev-libs/ayatana-ido-0.9.3
+++ b/metadata/md5-cache/dev-libs/ayatana-ido-0.9.3
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/vala:0.56[vapigen(+)] ) test? ( dev-cpp/gtest ) app-alternatives/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+BDEPEND=|| ( dev-lang/vala:0.56[vapigen(+)] ) test? ( dev-cpp/gtest ) app-alternatives/ninja >=dev-build/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=dev-libs/glib-2.58:2 >=x11-libs/gtk+-3.24:3[introspection]
 DESCRIPTION=Ayatana Application Indicators (Shared Library)
@@ -12,5 +12,5 @@ RDEPEND=>=dev-libs/glib-2.58:2 >=x11-libs/gtk+-3.24:3[introspection]
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/AyatanaIndicators/ayatana-ido/archive/0.9.3.tar.gz -> ayatana-ido-0.9.3.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	vala	e477903dbe0105930c51f170a592dc16	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	vala	e477903dbe0105930c51f170a592dc16	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=69af0e5ea1d6519c6d8b725637954543
diff --git a/metadata/md5-cache/dev-libs/blake3-1.4.1 b/metadata/md5-cache/dev-libs/blake3-1.4.1
index d8472316a05d..166a8fa36b9b 100644
--- a/metadata/md5-cache/dev-libs/blake3-1.4.1
+++ b/metadata/md5-cache/dev-libs/blake3-1.4.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
 DESCRIPTION=a fast cryptographic hash function
 EAPI=8
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm64 ~loong ~riscv ~x86
 LICENSE=|| ( CC0-1.0 Apache-2.0 )
 SLOT=0/0
 SRC_URI=https://github.com/BLAKE3-team/BLAKE3/archive/refs/tags/1.4.1.tar.gz -> blake3-1.4.1.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=dfb241bd46ed771eae9a83a46f84b73f
diff --git a/metadata/md5-cache/dev-libs/blake3-1.5.0 b/metadata/md5-cache/dev-libs/blake3-1.5.0
index 4c29b6c0dfd2..43a8ce89d56b 100644
--- a/metadata/md5-cache/dev-libs/blake3-1.5.0
+++ b/metadata/md5-cache/dev-libs/blake3-1.5.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
 DESCRIPTION=a fast cryptographic hash function
 EAPI=8
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ~arm ~arm64 ~loong ~riscv ~sparc ~x86
 LICENSE=|| ( CC0-1.0 Apache-2.0 )
 SLOT=0/0
 SRC_URI=https://github.com/BLAKE3-team/BLAKE3/archive/refs/tags/1.5.0.tar.gz -> blake3-1.5.0.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=2eaa4537c3bedbd06f9727da1b0f4436
diff --git a/metadata/md5-cache/dev-libs/c-blosc-1.21.5 b/metadata/md5-cache/dev-libs/c-blosc-1.21.5
index 94d44ea87c02..64baa88ba343 100644
--- a/metadata/md5-cache/dev-libs/c-blosc-1.21.5
+++ b/metadata/md5-cache/dev-libs/c-blosc-1.21.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=lz4? ( >=app-arch/lz4-1.7.5:= ) snappy? ( app-arch/snappy:= ) zlib? ( sys-libs/zlib:= ) zstd? ( app-arch/zstd:= )
 DESCRIPTION=Blocking, shuffling and lossless compression library
@@ -12,5 +12,5 @@ RDEPEND=lz4? ( >=app-arch/lz4-1.7.5:= ) snappy? ( app-arch/snappy:= ) zlib? ( sy
 RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://github.com/Blosc/c-blosc/archive/v1.21.5.tar.gz -> c-blosc-1.21.5.gh.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=8bee68f2e935c24b8aebfeeaac2fc56e
diff --git a/metadata/md5-cache/dev-libs/c-blosc2-2.10.5 b/metadata/md5-cache/dev-libs/c-blosc2-2.10.5
index 1614b0fe946e..41eca758541c 100644
--- a/metadata/md5-cache/dev-libs/c-blosc2-2.10.5
+++ b/metadata/md5-cache/dev-libs/c-blosc2-2.10.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=>=app-arch/lz4-1.7.5:= zlib? ( sys-libs/zlib:= ) zstd? ( app-arch/zstd:= )
 DESCRIPTION=Blocking, shuffling and lossless compression library
@@ -13,5 +13,5 @@ REQUIRED_USE=test? ( zlib zstd )
 RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://github.com/Blosc/c-blosc2/archive/v2.10.5.tar.gz -> c-blosc2-2.10.5.gh.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=b07fe3cf07cc4f5c45b36a6d4f6fadb4
diff --git a/metadata/md5-cache/dev-libs/c-blosc2-2.11.2 b/metadata/md5-cache/dev-libs/c-blosc2-2.11.2
index 25e72fb3121d..109e42af6a99 100644
--- a/metadata/md5-cache/dev-libs/c-blosc2-2.11.2
+++ b/metadata/md5-cache/dev-libs/c-blosc2-2.11.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=>=app-arch/lz4-1.7.5:= zlib? ( sys-libs/zlib:= ) zstd? ( app-arch/zstd:= )
 DESCRIPTION=Blocking, shuffling and lossless compression library
@@ -13,5 +13,5 @@ REQUIRED_USE=test? ( zlib zstd )
 RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://github.com/Blosc/c-blosc2/archive/v2.11.2.tar.gz -> c-blosc2-2.11.2.gh.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=c1de5012a9b34b1f3319ff29c1f3333a
diff --git a/metadata/md5-cache/dev-libs/c-blosc2-2.11.3 b/metadata/md5-cache/dev-libs/c-blosc2-2.11.3
index 96c61efc03dc..a174794f897a 100644
--- a/metadata/md5-cache/dev-libs/c-blosc2-2.11.3
+++ b/metadata/md5-cache/dev-libs/c-blosc2-2.11.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=>=app-arch/lz4-1.7.5:= zlib? ( sys-libs/zlib:= ) zstd? ( app-arch/zstd:= )
 DESCRIPTION=Blocking, shuffling and lossless compression library
@@ -13,5 +13,5 @@ REQUIRED_USE=test? ( zlib zstd )
 RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://github.com/Blosc/c-blosc2/archive/v2.11.3.tar.gz -> c-blosc2-2.11.3.gh.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=c1de5012a9b34b1f3319ff29c1f3333a
diff --git a/metadata/md5-cache/dev-libs/c-blosc2-2.12.0 b/metadata/md5-cache/dev-libs/c-blosc2-2.12.0
index fac18e424cb5..da5ff8c148d8 100644
--- a/metadata/md5-cache/dev-libs/c-blosc2-2.12.0
+++ b/metadata/md5-cache/dev-libs/c-blosc2-2.12.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=>=app-arch/lz4-1.7.5:= zlib? ( sys-libs/zlib:= ) zstd? ( app-arch/zstd:= )
 DESCRIPTION=Blocking, shuffling and lossless compression library
@@ -13,5 +13,5 @@ REQUIRED_USE=test? ( zlib zstd )
 RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://github.com/Blosc/c-blosc2/archive/v2.12.0.tar.gz -> c-blosc2-2.12.0.gh.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=30a1cb3741b89f3da7cf5f345c729e67
diff --git a/metadata/md5-cache/dev-libs/cJSON-1.7.16 b/metadata/md5-cache/dev-libs/cJSON-1.7.16
index 2e6b914cecc6..3ea4b5848ffd 100644
--- a/metadata/md5-cache/dev-libs/cJSON-1.7.16
+++ b/metadata/md5-cache/dev-libs/cJSON-1.7.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
 DESCRIPTION=Ultralightweight JSON parser in ANSI C
 EAPI=7
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/DaveGamble/cJSON/archive/v1.7.16.tar.gz -> cJSON-1.7.16.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=6c938b52a095ce47818a30ecffb6ed9e
diff --git a/metadata/md5-cache/dev-libs/cJSON-1.7.17 b/metadata/md5-cache/dev-libs/cJSON-1.7.17
index 24e4383dec5c..af6ac6d9693b 100644
--- a/metadata/md5-cache/dev-libs/cJSON-1.7.17
+++ b/metadata/md5-cache/dev-libs/cJSON-1.7.17
@@ -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
 DESCRIPTION=Ultralightweight JSON parser in ANSI C
 EAPI=7
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/DaveGamble/cJSON/archive/v1.7.17.tar.gz -> cJSON-1.7.17.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=9dc330785c0a2f82d4e51f437fa8b4dc
diff --git a/metadata/md5-cache/dev-libs/capnproto-0.10.2 b/metadata/md5-cache/dev-libs/capnproto-0.10.2
index c4acf6b2d42c..0232e47c6527 100644
--- a/metadata/md5-cache/dev-libs/capnproto-0.10.2
+++ b/metadata/md5-cache/dev-libs/capnproto-0.10.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=ssl? ( dev-libs/openssl:0= ) zlib? ( sys-libs/zlib:0= ) test? ( dev-cpp/gtest )
 DESCRIPTION=RPC/Serialization system with capabilities support
@@ -12,5 +12,5 @@ RDEPEND=ssl? ( dev-libs/openssl:0= ) zlib? ( sys-libs/zlib:0= )
 RESTRICT=!test? ( test )
 SLOT=0/091
 SRC_URI=https://github.com/sandstorm-io/capnproto/archive/v0.10.2.tar.gz -> capnproto-0.10.2.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=6494b8b50ff6b7402f2851d71ea1ed4b
diff --git a/metadata/md5-cache/dev-libs/capnproto-0.10.4-r1 b/metadata/md5-cache/dev-libs/capnproto-0.10.4-r1
index f2161d7e821b..f4cfc07d43a5 100644
--- a/metadata/md5-cache/dev-libs/capnproto-0.10.4-r1
+++ b/metadata/md5-cache/dev-libs/capnproto-0.10.4-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=ssl? ( dev-libs/openssl:= ) zlib? ( sys-libs/zlib:= ) test? ( dev-cpp/gtest )
 DESCRIPTION=RPC/Serialization system with capabilities support
@@ -12,5 +12,5 @@ RDEPEND=ssl? ( dev-libs/openssl:= ) zlib? ( sys-libs/zlib:= )
 RESTRICT=!test? ( test )
 SLOT=0/0.10.4
 SRC_URI=https://github.com/sandstorm-io/capnproto/archive/v0.10.4.tar.gz -> capnproto-0.10.4.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=87df242f21b0f4e6f770a8f11447dae5
diff --git a/metadata/md5-cache/dev-libs/capnproto-0.9.1 b/metadata/md5-cache/dev-libs/capnproto-0.9.1
index a9628342621e..7c9f9c28e90b 100644
--- a/metadata/md5-cache/dev-libs/capnproto-0.9.1
+++ b/metadata/md5-cache/dev-libs/capnproto-0.9.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=ssl? ( dev-libs/openssl:0= ) zlib? ( sys-libs/zlib:0= ) test? ( dev-cpp/gtest )
 DESCRIPTION=RPC/Serialization system with capabilities support
@@ -12,5 +12,5 @@ RDEPEND=ssl? ( dev-libs/openssl:0= ) zlib? ( sys-libs/zlib:0= )
 RESTRICT=!test? ( test )
 SLOT=0/091
 SRC_URI=https://github.com/sandstorm-io/capnproto/archive/v0.9.1.tar.gz -> capnproto-0.9.1.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=b561ad6598f47b2fd88db12a06ab05a9
diff --git a/metadata/md5-cache/dev-libs/capstone-4.0.2-r2 b/metadata/md5-cache/dev-libs/capstone-4.0.2-r2
index 66f363969294..abbe477b2f66 100644
--- a/metadata/md5-cache/dev-libs/capstone-4.0.2-r2
+++ b/metadata/md5-cache/dev-libs/capstone-4.0.2-r2
@@ -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=python? ( python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) ) python? ( dev-python/setuptools[python_targets_python3_10(-)?,python_targets_python3_11(-)?] )
 DESCRIPTION=disassembly/disassembler framework + bindings
@@ -13,5 +13,5 @@ REQUIRED_USE=python? ( || ( python_targets_python3_10 python_targets_python3_11
 RESTRICT=test
 SLOT=0/4
 SRC_URI=https://github.com/capstone-engine/capstone/archive/4.0.2.tar.gz -> capstone-4.0.2.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	distutils-r1	b9318b5e40104e608d7e4582121fb561	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	distutils-r1	b9318b5e40104e608d7e4582121fb561	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=4ba79d7e302c33f9d0ce8da92bbb0eee
diff --git a/metadata/md5-cache/dev-libs/capstone-5.0.1 b/metadata/md5-cache/dev-libs/capstone-5.0.1
index b2b193fb736c..2a3e6be0d280 100644
--- a/metadata/md5-cache/dev-libs/capstone-5.0.1
+++ b/metadata/md5-cache/dev-libs/capstone-5.0.1
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( python? ( python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) ) ) app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=>=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( python? ( python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) ) ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=python? ( python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) ) python? ( dev-python/setuptools[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] )
 DESCRIPTION=disassembly/disassembler framework + bindings
@@ -13,5 +13,5 @@ REQUIRED_USE=python? ( || ( python_targets_python3_10 python_targets_python3_11
 RESTRICT=!test? ( test )
 SLOT=0/5
 SRC_URI=https://github.com/capstone-engine/capstone/archive/5.0.1.tar.gz -> capstone-5.0.1.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	distutils-r1	b9318b5e40104e608d7e4582121fb561	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	distutils-r1	b9318b5e40104e608d7e4582121fb561	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=38d6dcbbd03a6fac27e39b21ca6cafac
diff --git a/metadata/md5-cache/dev-libs/capstone-9999 b/metadata/md5-cache/dev-libs/capstone-9999
index ba77cd40e791..edbada08b93d 100644
--- a/metadata/md5-cache/dev-libs/capstone-9999
+++ b/metadata/md5-cache/dev-libs/capstone-9999
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( python? ( python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) ) ) app-alternatives/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=>=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( python? ( python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) ) ) 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=python? ( python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) ) python? ( dev-python/setuptools[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] )
 DESCRIPTION=disassembly/disassembler framework + bindings
@@ -12,5 +12,5 @@ RDEPEND=python? ( python_targets_python3_10? ( dev-lang/python:3.10 ) python_tar
 REQUIRED_USE=python? ( || ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 ) )
 RESTRICT=!test? ( test )
 SLOT=0/5
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	distutils-r1	b9318b5e40104e608d7e4582121fb561	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	distutils-r1	b9318b5e40104e608d7e4582121fb561	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=793bddb57ff8150f2899e1747a3ff805
diff --git a/metadata/md5-cache/dev-libs/castxml-0.5.1-r1 b/metadata/md5-cache/dev-libs/castxml-0.5.1-r1
index 09e8c0ac02b0..67d2f52d46e9 100644
--- a/metadata/md5-cache/dev-libs/castxml-0.5.1-r1
+++ b/metadata/md5-cache/dev-libs/castxml-0.5.1-r1
@@ -1,4 +1,4 @@
-BDEPEND=<sys-devel/clang-16:= man? ( dev-python/sphinx ) app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=<sys-devel/clang-16:= man? ( dev-python/sphinx ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=<sys-devel/clang-16:= !!sys-devel/llvm:0
 DESCRIPTION=C-family abstract syntax tree XML output tool
@@ -12,5 +12,5 @@ RDEPEND=<sys-devel/clang-16:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/CastXML/CastXML/archive/v0.5.1.tar.gz -> castxml-0.5.1.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	llvm	dcfb437a52b5672e5f39deaae6f789c3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	llvm	dcfb437a52b5672e5f39deaae6f789c3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=9e3c5ded1f6369edc75eefef73396018
diff --git a/metadata/md5-cache/dev-libs/castxml-0.6.1 b/metadata/md5-cache/dev-libs/castxml-0.6.1
index 1673298e276d..229b3a027733 100644
--- a/metadata/md5-cache/dev-libs/castxml-0.6.1
+++ b/metadata/md5-cache/dev-libs/castxml-0.6.1
@@ -1,4 +1,4 @@
-BDEPEND=<sys-devel/clang-17:= man? ( dev-python/sphinx ) app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=<sys-devel/clang-17:= man? ( dev-python/sphinx ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=<sys-devel/clang-17:= !!sys-devel/llvm:0
 DESCRIPTION=C-family abstract syntax tree XML output tool
@@ -12,5 +12,5 @@ RDEPEND=<sys-devel/clang-17:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/CastXML/CastXML/archive/v0.6.1.tar.gz -> castxml-0.6.1.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	llvm	dcfb437a52b5672e5f39deaae6f789c3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	llvm	dcfb437a52b5672e5f39deaae6f789c3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=5c884a87deddd3855e0ff5b6451c3d1a
diff --git a/metadata/md5-cache/dev-libs/castxml-0.6.2 b/metadata/md5-cache/dev-libs/castxml-0.6.2
index 1994cfebe4fd..8ef09b790695 100644
--- a/metadata/md5-cache/dev-libs/castxml-0.6.2
+++ b/metadata/md5-cache/dev-libs/castxml-0.6.2
@@ -1,4 +1,4 @@
-BDEPEND=<sys-devel/clang-18:= man? ( dev-python/sphinx ) app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=<sys-devel/clang-18:= man? ( dev-python/sphinx ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=<sys-devel/clang-18:= !!sys-devel/llvm:0
 DESCRIPTION=C-family abstract syntax tree XML output tool
@@ -12,5 +12,5 @@ RDEPEND=<sys-devel/clang-18:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/CastXML/CastXML/archive/v0.6.2.tar.gz -> castxml-0.6.2.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	llvm	dcfb437a52b5672e5f39deaae6f789c3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	llvm	dcfb437a52b5672e5f39deaae6f789c3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=7703da1e502bcc169ef33af8674c6aee
diff --git a/metadata/md5-cache/dev-libs/cereal-1.3.2-r2 b/metadata/md5-cache/dev-libs/cereal-1.3.2-r2
index bc5b3233a544..b3134d540530 100644
--- a/metadata/md5-cache/dev-libs/cereal-1.3.2-r2
+++ b/metadata/md5-cache/dev-libs/cereal-1.3.2-r2
@@ -1,4 +1,4 @@
-BDEPEND=doc? ( app-text/doxygen ) app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=doc? ( app-text/doxygen ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-libs/rapidjson
 DESCRIPTION=Header-only C++11 serialization library
@@ -11,5 +11,5 @@ LICENSE=BSD
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/USCiLab/cereal/archive/v1.3.2.tar.gz -> cereal-1.3.2.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=f010620e748638641f9d1e422f9b1689
diff --git a/metadata/md5-cache/dev-libs/cgreen-1.3.0 b/metadata/md5-cache/dev-libs/cgreen-1.3.0
index 7f14ea172b4d..d45bb674c61b 100644
--- a/metadata/md5-cache/dev-libs/cgreen-1.3.0
+++ b/metadata/md5-cache/dev-libs/cgreen-1.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=sys-libs/glibc:=
 DESCRIPTION=Unit test and mocking framework for C and C++
@@ -10,5 +10,5 @@ LICENSE=ISC
 RDEPEND=sys-libs/glibc:=
 SLOT=0
 SRC_URI=https://github.com/cgreen-devs/cgreen/archive/1.3.0.tar.gz -> cgreen-1.3.0.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=8e0562a8ad3d0972b4008f1559580e96
diff --git a/metadata/md5-cache/dev-libs/check-0.15.2-r1 b/metadata/md5-cache/dev-libs/check-0.15.2-r1
index b372ae3910ce..8190b4e08de5 100644
--- a/metadata/md5-cache/dev-libs/check-0.15.2-r1
+++ b/metadata/md5-cache/dev-libs/check-0.15.2-r1
@@ -1,4 +1,4 @@
-BDEPEND=doc? ( app-text/doxygen ) app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=doc? ( app-text/doxygen ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=subunit? ( dev-python/subunit[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-apps/texinfo
 DESCRIPTION=A unit test framework for C
@@ -12,5 +12,5 @@ RDEPEND=subunit? ( dev-python/subunit[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(
 RESTRICT=ppc? ( test ) ppc64? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/libcheck/check/archive/0.15.2.tar.gz -> check-0.15.2.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=349a5213ddf6cdb6a782ed6e333550dc
diff --git a/metadata/md5-cache/dev-libs/collada-dom-2.5.0-r1 b/metadata/md5-cache/dev-libs/collada-dom-2.5.0-r1
index 013c98709b03..7e2f9c78ad3f 100644
--- a/metadata/md5-cache/dev-libs/collada-dom-2.5.0-r1
+++ b/metadata/md5-cache/dev-libs/collada-dom-2.5.0-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=dev-libs/boost:= dev-libs/libxml2 dev-libs/libpcre[cxx] sys-libs/zlib:=[minizip]
 DESCRIPTION=COLLADA Document Object Model (DOM) C++ Library
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=dev-libs/boost:= dev-libs/libxml2 dev-libs/libpcre[cxx] sys-libs/zlib:=[minizip]
 SLOT=0/25
 SRC_URI=https://github.com/rdiankov/collada-dom/archive/v2.5.0.tar.gz -> collada-dom-2.5.0.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=7d6b40292804d6974084ff4dbc7ee880
diff --git a/metadata/md5-cache/dev-libs/console_bridge-1.0.2 b/metadata/md5-cache/dev-libs/console_bridge-1.0.2
index 83d1a0c6da1f..a92e59b0e5d7 100644
--- a/metadata/md5-cache/dev-libs/console_bridge-1.0.2
+++ b/metadata/md5-cache/dev-libs/console_bridge-1.0.2
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-util/cppcheck ) app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=test? ( dev-util/cppcheck ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-libs/boost:=
 DESCRIPTION=A ROS-independent package for logging into rosconsole/rosout
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/boost:=
 RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://raw.githubusercontent.com/ament/ament_lint/0.9.5/ament_cppcheck/ament_cppcheck/main.py -> console_bridge-1.0.2-ament-0.9.5-cppcheck.py https://raw.githubusercontent.com/ament/ament_lint/0.9.5/ament_cpplint/ament_cpplint/cpplint.py -> console_bridge-1.0.2-ament-0.9.5-cpplint.py https://github.com/ros/console_bridge/archive/1.0.2.tar.gz -> console_bridge-1.0.2.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=3117f6dd3e00b7e21c445cffbb6302d7
diff --git a/metadata/md5-cache/dev-libs/console_bridge-9999 b/metadata/md5-cache/dev-libs/console_bridge-9999
index 017a17f4fa91..f3f3caa91fd1 100644
--- a/metadata/md5-cache/dev-libs/console_bridge-9999
+++ b/metadata/md5-cache/dev-libs/console_bridge-9999
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-util/cppcheck ) >=dev-vcs/git-1.8.2.1[curl] app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=test? ( dev-util/cppcheck ) >=dev-vcs/git-1.8.2.1[curl] app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=dev-libs/boost:=
 DESCRIPTION=A ROS-independent package for logging into rosconsole/rosout
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/boost:=
 RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://raw.githubusercontent.com/ament/ament_lint/0.9.5/ament_cppcheck/ament_cppcheck/main.py -> console_bridge-9999-ament-0.9.5-cppcheck.py https://raw.githubusercontent.com/ament/ament_lint/0.9.5/ament_cpplint/ament_cpplint/cpplint.py -> console_bridge-9999-ament-0.9.5-cpplint.py
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=3117f6dd3e00b7e21c445cffbb6302d7
diff --git a/metadata/md5-cache/dev-libs/cppcodec-0.2 b/metadata/md5-cache/dev-libs/cppcodec-0.2
index af61196d851c..9b9d9582a132 100644
--- a/metadata/md5-cache/dev-libs/cppcodec-0.2
+++ b/metadata/md5-cache/dev-libs/cppcodec-0.2
@@ -1,4 +1,4 @@
-BDEPEND=test? ( virtual/pkgconfig ) app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=test? ( virtual/pkgconfig ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=test? ( >=dev-cpp/catch-2.3.0:0 )
 DESCRIPTION=C++11 library to encode/decode base64, base64url, base32, base32hex and hex
@@ -11,5 +11,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tplgy/cppcodec/archive/v0.2.tar.gz -> cppcodec-0.2.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=833f28c3feb25ca9423e7136ddfbdffd
diff --git a/metadata/md5-cache/dev-libs/cppcodec-9999 b/metadata/md5-cache/dev-libs/cppcodec-9999
index 15ec4b9cc7dc..0133e21b54f7 100644
--- a/metadata/md5-cache/dev-libs/cppcodec-9999
+++ b/metadata/md5-cache/dev-libs/cppcodec-9999
@@ -1,4 +1,4 @@
-BDEPEND=test? ( virtual/pkgconfig ) app-alternatives/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=test? ( 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=test? ( >=dev-cpp/catch-2.3.0:0 )
 DESCRIPTION=C++11 library to encode/decode base64, base64url, base32, base32hex and hex
@@ -10,5 +10,5 @@ LICENSE=MIT
 PROPERTIES=live
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=833f28c3feb25ca9423e7136ddfbdffd
diff --git a/metadata/md5-cache/dev-libs/cpuinfo-2022.03.26-r1 b/metadata/md5-cache/dev-libs/cpuinfo-2022.03.26-r1
index 04e2956a6fd0..7b32b767edb6 100644
--- a/metadata/md5-cache/dev-libs/cpuinfo-2022.03.26-r1
+++ b/metadata/md5-cache/dev-libs/cpuinfo-2022.03.26-r1
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-cpp/gtest ) app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=test? ( dev-cpp/gtest ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=CPU INFOrmation library
 EAPI=8
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pytorch/cpuinfo/archive/b40bae27785787b6dd70788986fd96434cf90ae2.tar.gz -> cpuinfo-2022.03.26.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=dc715f1173710299facac01a94998ae7
diff --git a/metadata/md5-cache/dev-libs/cpuinfo-2022.08.19 b/metadata/md5-cache/dev-libs/cpuinfo-2022.08.19
index 4a4ee2a93ed0..a7e1d928db64 100644
--- a/metadata/md5-cache/dev-libs/cpuinfo-2022.08.19
+++ b/metadata/md5-cache/dev-libs/cpuinfo-2022.08.19
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-cpp/gtest ) app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=test? ( dev-cpp/gtest ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=CPU INFOrmation library
 EAPI=8
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pytorch/cpuinfo/archive/8ec7bd91ad0470e61cf38f618cc1f270dede599c.tar.gz -> cpuinfo-2022.08.19.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=68c5de3ab16e581978bbc02006284a98
diff --git a/metadata/md5-cache/dev-libs/cpuinfo-2023.01.13 b/metadata/md5-cache/dev-libs/cpuinfo-2023.01.13
index e18fa997f58e..23458b65d66e 100644
--- a/metadata/md5-cache/dev-libs/cpuinfo-2023.01.13
+++ b/metadata/md5-cache/dev-libs/cpuinfo-2023.01.13
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-cpp/gtest ) app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=test? ( dev-cpp/gtest ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=CPU INFOrmation library
 EAPI=8
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pytorch/cpuinfo/archive/6481e8bef08f606ddd627e4d3be89f64d62e1b8a.tar.gz -> cpuinfo-2023.01.13.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=d31068e703dd8fb25c9cf7880a3d6594
diff --git a/metadata/md5-cache/dev-libs/crc32c-1.1.2-r2 b/metadata/md5-cache/dev-libs/crc32c-1.1.2-r2
index d63a6a76467f..3807d25aeef2 100644
--- a/metadata/md5-cache/dev-libs/crc32c-1.1.2-r2
+++ b/metadata/md5-cache/dev-libs/crc32c-1.1.2-r2
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-cpp/gtest ) app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=test? ( dev-cpp/gtest ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=CRC32C implementation with support for CPU-specific acceleration instructions
 EAPI=8
@@ -10,5 +10,5 @@ LICENSE=BSD
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/crc32c/archive/1.1.2.tar.gz -> crc32c-1.1.2.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=5bcf65550ffb38e1386b2cf1ab794417
diff --git a/metadata/md5-cache/dev-libs/criterion-2.4.0 b/metadata/md5-cache/dev-libs/criterion-2.4.0
index 73dbc7160c81..d9b761cca401 100644
--- a/metadata/md5-cache/dev-libs/criterion-2.4.0
+++ b/metadata/md5-cache/dev-libs/criterion-2.4.0
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/cmake virtual/pkgconfig >=dev-build/meson-1.2.1 app-alternatives/ninja dev-build/meson-format-array
+BDEPEND=dev-build/cmake virtual/pkgconfig >=dev-build/meson-1.2.1 app-alternatives/ninja dev-build/meson-format-array
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-libs/nanomsg:= dev-libs/libgit2:= dev-libs/libffi:= >=dev-libs/boxfort-0.1.4 test? ( || ( ( dev-lang/python:3.11 dev-util/cram[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-util/cram[python_targets_python3_10(-)] ) ) )
 DESCRIPTION=Cross platform unit testing framework for C and C++
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Snaipe/Criterion/archive/refs/tags/v2.4.0.tar.gz -> criterion-2.4.0.tar.gz https://github.com/scottt/debugbreak/archive/6b79ec8d8f8d4603111f580a0537f8f31c484c32.tar.gz -> debugbreak-6b79ec8d8f8d4603111f580a0537f8f31c484c32.tar.gz https://github.com/attractivechaos/klib/archive/cdb7e9236dc47abf8da7ebd702cc6f7f21f0c502.tar.gz -> klib-cdb7e9236dc47abf8da7ebd702cc6f7f21f0c502.tar.gz https://github.com/nanopb/nanopb/archive/c9124132a604047d0ef97a09c0e99cd9bed2c818.tar.gz -> nanopb-c9124132a604047d0ef97a09c0e99cd9bed2c818.tar.gz
 _eclasses_=meson	e322276188f86eacb29ae081ba5485c8	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=59545785ec905950ff235cfd42a4fe90
+_md5_=4d74ce39d89b88d1703134451816d59f
diff --git a/metadata/md5-cache/dev-libs/criterion-2.4.1 b/metadata/md5-cache/dev-libs/criterion-2.4.1
index 7c6a3de6c809..6d3cd189b599 100644
--- a/metadata/md5-cache/dev-libs/criterion-2.4.1
+++ b/metadata/md5-cache/dev-libs/criterion-2.4.1
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/cmake virtual/pkgconfig >=dev-build/meson-1.2.1 app-alternatives/ninja dev-build/meson-format-array
+BDEPEND=dev-build/cmake virtual/pkgconfig >=dev-build/meson-1.2.1 app-alternatives/ninja dev-build/meson-format-array
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-libs/nanomsg:= dev-libs/libgit2:= dev-libs/libffi:= >=dev-libs/boxfort-0.1.4 test? ( || ( ( dev-lang/python:3.11 dev-util/cram[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-util/cram[python_targets_python3_10(-)] ) ) )
 DESCRIPTION=Cross platform unit testing framework for C and C++
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Snaipe/Criterion/archive/refs/tags/v2.4.1.tar.gz -> criterion-2.4.1.tar.gz https://github.com/scottt/debugbreak/archive/6b79ec8d8f8d4603111f580a0537f8f31c484c32.tar.gz -> debugbreak-6b79ec8d8f8d4603111f580a0537f8f31c484c32.tar.gz https://github.com/attractivechaos/klib/archive/cdb7e9236dc47abf8da7ebd702cc6f7f21f0c502.tar.gz -> klib-cdb7e9236dc47abf8da7ebd702cc6f7f21f0c502.tar.gz https://github.com/nanopb/nanopb/archive/c9124132a604047d0ef97a09c0e99cd9bed2c818.tar.gz -> nanopb-c9124132a604047d0ef97a09c0e99cd9bed2c818.tar.gz
 _eclasses_=meson	e322276188f86eacb29ae081ba5485c8	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=b4f4f3baf2ca16451dbba45cbe448bb9
+_md5_=716e72e2853bd279d534082b41724ded
diff --git a/metadata/md5-cache/dev-libs/crossguid-0.2.2_p20190529 b/metadata/md5-cache/dev-libs/crossguid-0.2.2_p20190529
index 58fa5ef14f34..4ebbf16eafef 100644
--- a/metadata/md5-cache/dev-libs/crossguid-0.2.2_p20190529
+++ b/metadata/md5-cache/dev-libs/crossguid-0.2.2_p20190529
@@ -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-apps/util-linux
 DESCRIPTION=Lightweight cross platform C++ GUID/UUID library
@@ -12,5 +12,5 @@ RDEPEND=sys-apps/util-linux
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/graeme-hill/crossguid/archive/ca1bf4b810e2d188d04cb6286f957008ee1b7681.tar.gz -> crossguid-0.2.2_p20190529.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=0bceafa683f2a702f662a5f3d0717117
diff --git a/metadata/md5-cache/dev-libs/cutlass-2.10.0-r1 b/metadata/md5-cache/dev-libs/cutlass-2.10.0-r1
index cc8d082b1559..7289afaa2bdf 100644
--- a/metadata/md5-cache/dev-libs/cutlass-2.10.0-r1
+++ b/metadata/md5-cache/dev-libs/cutlass-2.10.0-r1
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/nvidia-cuda-toolkit app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=dev-util/nvidia-cuda-toolkit app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=CUDA Templates for Linear Algebra Subroutines
 EAPI=8
@@ -8,5 +8,5 @@ KEYWORDS=~amd64
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/NVIDIA/cutlass/archive/refs/tags/v2.10.0.tar.gz -> cutlass-2.10.0.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	cuda	283d0f298f6c196c755a0f8d50daca85	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cuda	283d0f298f6c196c755a0f8d50daca85	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=e207b2a3dcb552f4b773a0a65308b3d8
diff --git a/metadata/md5-cache/dev-libs/cutlass-3.1.0 b/metadata/md5-cache/dev-libs/cutlass-3.1.0
index 57af04ebd10e..f71aa512cb81 100644
--- a/metadata/md5-cache/dev-libs/cutlass-3.1.0
+++ b/metadata/md5-cache/dev-libs/cutlass-3.1.0
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/nvidia-cuda-toolkit app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=dev-util/nvidia-cuda-toolkit app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=CUDA Templates for Linear Algebra Subroutines
 EAPI=8
@@ -8,5 +8,5 @@ KEYWORDS=~amd64
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/NVIDIA/cutlass/archive/refs/tags/v3.1.0.tar.gz -> cutlass-3.1.0.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	cuda	283d0f298f6c196c755a0f8d50daca85	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cuda	283d0f298f6c196c755a0f8d50daca85	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=e207b2a3dcb552f4b773a0a65308b3d8
diff --git a/metadata/md5-cache/dev-libs/cutlass-3.3.0 b/metadata/md5-cache/dev-libs/cutlass-3.3.0
index 33eb978602e5..2da4e9e5fe86 100644
--- a/metadata/md5-cache/dev-libs/cutlass-3.3.0
+++ b/metadata/md5-cache/dev-libs/cutlass-3.3.0
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/nvidia-cuda-toolkit app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=dev-util/nvidia-cuda-toolkit app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=CUDA Templates for Linear Algebra Subroutines
 EAPI=8
@@ -8,5 +8,5 @@ KEYWORDS=~amd64
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/NVIDIA/cutlass/archive/refs/tags/v3.3.0.tar.gz -> cutlass-3.3.0.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	cuda	283d0f298f6c196c755a0f8d50daca85	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cuda	283d0f298f6c196c755a0f8d50daca85	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=e207b2a3dcb552f4b773a0a65308b3d8
diff --git a/metadata/md5-cache/dev-libs/cxxopts-3.0.0 b/metadata/md5-cache/dev-libs/cxxopts-3.0.0
index b7045731b52f..a8ae02efb2ba 100644
--- a/metadata/md5-cache/dev-libs/cxxopts-3.0.0
+++ b/metadata/md5-cache/dev-libs/cxxopts-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
 DESCRIPTION=Lightweight C++ command line option parser
 EAPI=8
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0/3.0.0
 SRC_URI=https://github.com/jarro2783/cxxopts/archive/v3.0.0.tar.gz -> cxxopts-3.0.0.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=179c1ab6f20a350781150feb1074be9b
diff --git a/metadata/md5-cache/dev-libs/cxxopts-3.1.0 b/metadata/md5-cache/dev-libs/cxxopts-3.1.0
index b06b27d6e1c2..5793028bf4e2 100644
--- a/metadata/md5-cache/dev-libs/cxxopts-3.1.0
+++ b/metadata/md5-cache/dev-libs/cxxopts-3.1.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
 DESCRIPTION=Lightweight C++ command line option parser
 EAPI=8
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0/3.1.0
 SRC_URI=https://github.com/jarro2783/cxxopts/archive/v3.1.0.tar.gz -> cxxopts-3.1.0.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=baa931b7303f0b7dc0552fbb64fdaa46
diff --git a/metadata/md5-cache/dev-libs/date-3.0.0 b/metadata/md5-cache/dev-libs/date-3.0.0
index e34cabec5c52..a3cfedc0ecca 100644
--- a/metadata/md5-cache/dev-libs/date-3.0.0
+++ b/metadata/md5-cache/dev-libs/date-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
 DESCRIPTION=A date and time library based on the C++11/14/17 <chrono> header
 EAPI=7
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0/3.0.0
 SRC_URI=https://github.com/HowardHinnant/date/archive/v3.0.0.tar.gz -> date-3.0.0.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=86b15cd98025f55a06852184b8ae73e3
diff --git a/metadata/md5-cache/dev-libs/double-conversion-3.2.1 b/metadata/md5-cache/dev-libs/double-conversion-3.2.1
index 8da4fcc1c19b..1d672d7b7fb0 100644
--- a/metadata/md5-cache/dev-libs/double-conversion-3.2.1
+++ b/metadata/md5-cache/dev-libs/double-conversion-3.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
 DESCRIPTION=Binary-decimal and decimal-binary conversion routines for IEEE doubles
 EAPI=8
@@ -10,5 +10,5 @@ LICENSE=BSD
 RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=https://github.com/google/double-conversion/archive/v3.2.1.tar.gz -> double-conversion-3.2.1.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=b4d8f1ffa51ac7121666fbd62bc5d421
diff --git a/metadata/md5-cache/dev-libs/dynolog-0.3.1_p20230126-r1 b/metadata/md5-cache/dev-libs/dynolog-0.3.1_p20230126-r1
index 544f81d30977..191e30399a3d 100644
--- a/metadata/md5-cache/dev-libs/dynolog-0.3.1_p20230126-r1
+++ b/metadata/md5-cache/dev-libs/dynolog-0.3.1_p20230126-r1
@@ -1,4 +1,4 @@
-BDEPEND=>=virtual/rust-1.53 app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=>=virtual/rust-1.53 app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=dev-cpp/gflags dev-cpp/gtest dev-cpp/glog net-misc/curl
 DESCRIPTION=Performance monitoring daemon for heterogeneous CPU-GPU systems
@@ -12,5 +12,5 @@ RDEPEND=dev-cpp/gflags dev-cpp/gtest dev-cpp/glog net-misc/curl
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~tupone/distfiles/dynolog-0.3.1_p20230126.tar.gz https://crates.io/api/v1/crates/anyhow/1.0.75/download -> anyhow-1.0.75.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/clap/3.2.25/download -> clap-3.2.25.crate https://crates.io/api/v1/crates/clap_derive/3.2.25/download -> clap_derive-3.2.25.crate https://crates.io/api/v1/crates/clap_lex/0.2.4/download -> clap_lex-0.2.4.crate https://crates.io/api/v1/crates/hashbrown/0.12.3/download -> hashbrown-0.12.3.crate https://crates.io/api/v1/crates/heck/0.4.1/download -> heck-0.4.1.crate https://crates.io/api/v1/crates/hermit-abi/0.1.19/download -> hermit-abi-0.1.19.crate https://crates.io/api/v1/crates/indexmap/1.9.3/download -> indexmap-1.9.3.crate https://crates.io/api/v1/crates/itoa/1.0.9/download -> itoa-1.0.9.crate https://crates.io/api/v1/crates/libc/0.2.150/download -> libc-0.2.150.crate https://crates.io/api/v1/crates/once_cell/1.18.0/download -> once_cell-1.18.0.crate https://crates.io/api/v1/crates/os_str_bytes/6.6.1/download -> os_str_bytes-6.6.1.crate https://crates.io/api/v1/crates/proc-macro-error/1.0.4/download -> proc-macro-error-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-error-attr/1.0.4/download -> proc-macro-error-attr-1.0.4.crate https://crates.io/api/v1/crates/proc-macro2/1.0.70/download -> proc-macro2-1.0.70.crate https://crates.io/api/v1/crates/quote/1.0.33/download -> quote-1.0.33.crate https://crates.io/api/v1/crates/ryu/1.0.15/download -> ryu-1.0.15.crate https://crates.io/api/v1/crates/serde/1.0.193/download -> serde-1.0.193.crate https://crates.io/api/v1/crates/serde_derive/1.0.193/download -> serde_derive-1.0.193.crate https://crates.io/api/v1/crates/serde_json/1.0.108/download -> serde_json-1.0.108.crate https://crates.io/api/v1/crates/strsim/0.10.0/download -> strsim-0.10.0.crate https://crates.io/api/v1/crates/syn/1.0.109/download -> syn-1.0.109.crate https://crates.io/api/v1/crates/syn/2.0.39/download -> syn-2.0.39.crate https://crates.io/api/v1/crates/termcolor/1.4.0/download -> termcolor-1.4.0.crate https://crates.io/api/v1/crates/textwrap/0.16.0/download -> textwrap-0.16.0.crate https://crates.io/api/v1/crates/unicode-ident/1.0.12/download -> unicode-ident-1.0.12.crate https://crates.io/api/v1/crates/version_check/0.9.4/download -> version_check-0.9.4.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.6/download -> winapi-util-0.1.6.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate
-_eclasses_=cargo	73fb2994b06920774024efe3e647a564	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cargo	73fb2994b06920774024efe3e647a564	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=4dd34b84597ab989b72503a6ca3b0013
diff --git a/metadata/md5-cache/dev-libs/efl-1.27.0 b/metadata/md5-cache/dev-libs/efl-1.27.0
index 19b897549aec..ae16d269bdf9 100644
--- a/metadata/md5-cache/dev-libs/efl-1.27.0
+++ b/metadata/md5-cache/dev-libs/efl-1.27.0
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) virtual/pkgconfig doc? ( app-text/doxygen ) examples? ( sys-devel/gettext ) mono? ( dev-util/cmake ) nls? ( sys-devel/gettext ) wayland? ( dev-util/wayland-scanner ) >=dev-build/meson-1.2.1 app-alternatives/ninja dev-build/meson-format-array
+BDEPEND=|| ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) virtual/pkgconfig doc? ( app-text/doxygen ) examples? ( sys-devel/gettext ) mono? ( dev-build/cmake ) nls? ( sys-devel/gettext ) wayland? ( dev-util/wayland-scanner ) >=dev-build/meson-1.2.1 app-alternatives/ninja dev-build/meson-format-array
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
 DEPEND=lua_single_target_luajit? ( dev-lang/luajit:=[deprecated(+)] ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated(+)] ) !x11-themes/e-flat-theme dev-libs/libinput:= dev-libs/openssl:0= net-misc/curl media-libs/giflib:= media-libs/libjpeg-turbo:= media-libs/libpng:= sys-apps/dbus sys-libs/zlib X? ( !opengl? ( media-libs/mesa[egl(+),gles2] ) media-libs/freetype x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libxkbcommon wayland? ( x11-libs/libxkbcommon[X] ) ) avif? ( media-libs/libavif:= ) connman? ( net-misc/connman ) drm? ( dev-libs/libinput:= dev-libs/wayland media-libs/mesa[gbm(+)] x11-libs/libdrm x11-libs/libxkbcommon ) elogind? ( sys-auth/elogind virtual/libudev:= ) fontconfig? ( media-libs/fontconfig ) fribidi? ( dev-libs/fribidi ) glib? ( dev-libs/glib:2 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) harfbuzz? ( media-libs/harfbuzz:= ) heif? ( media-libs/libheif:= ) hyphen? ( dev-libs/hyphen ) ibus? ( app-i18n/ibus ) jpeg2k? ( media-libs/openjpeg:= ) jpegxl? ( media-libs/libjxl ) json? ( >=media-libs/rlottie-0.0.1_pre20200424:= ) mono? ( dev-lang/mono ) opengl? ( virtual/opengl ) pdf? ( app-text/poppler:=[cxx] ) physics? ( sci-physics/bullet:= ) postscript? ( app-text/libspectre ) pulseaudio? ( media-libs/libpulse ) raw? ( media-libs/libraw:= ) scim? ( app-i18n/scim ) sdl? ( media-libs/libsdl2 ) sound? ( media-libs/libsndfile ) svg? ( gnome-base/librsvg:2 ) system-lz4? ( app-arch/lz4:= ) systemd? ( sys-apps/systemd:= ) tiff? ( media-libs/tiff:= ) tslib? ( x11-libs/tslib:= ) unwind? ( sys-libs/libunwind:= ) v4l? ( media-libs/libv4l ) vnc? ( net-libs/libvncserver ) wayland? ( dev-libs/wayland media-libs/mesa[gles2,wayland] x11-libs/libxkbcommon ) webp? ( media-libs/libwebp:= ) xpm? ( x11-libs/libXpm ) xpresent? ( x11-libs/libXpresent ) zeroconf? ( net-dns/avahi ) X? ( x11-base/xorg-proto ) wayland? ( dev-libs/wayland-protocols )
 DESCRIPTION=Enlightenment Foundation Libraries all-in-one package
@@ -15,4 +15,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://download.enlightenment.org/rel/libs/efl/efl-1.27.0.tar.xz
 _eclasses_=lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	meson	e322276188f86eacb29ae081ba5485c8	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=e8066b71344806f01503cd7daf672ba9
+_md5_=9aa65181d1b15fcb4518d91a68f3eae7
diff --git a/metadata/md5-cache/dev-libs/fddl-20111124-r1 b/metadata/md5-cache/dev-libs/fddl-20111124-r1
index 7197ee3d5a62..bde680a35db9 100644
--- a/metadata/md5-cache/dev-libs/fddl-20111124-r1
+++ b/metadata/md5-cache/dev-libs/fddl-20111124-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 unpack
 DESCRIPTION=Free Decision Diagram Library
 EAPI=7
@@ -8,5 +8,5 @@ KEYWORDS=amd64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~pinkbyte/distfiles/snapshots/fddl-20111124.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	vcs-snapshot	eab6d8533446763c2e9777d8bbd1594e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	vcs-snapshot	eab6d8533446763c2e9777d8bbd1594e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=ad19b744031dbd9f34e9557d4d8b6485
diff --git a/metadata/md5-cache/dev-libs/flatbuffers-23.5.26 b/metadata/md5-cache/dev-libs/flatbuffers-23.5.26
index 805b697dc9d2..28ff5a263649 100644
--- a/metadata/md5-cache/dev-libs/flatbuffers-23.5.26
+++ b/metadata/md5-cache/dev-libs/flatbuffers-23.5.26
@@ -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
 DESCRIPTION=Memory efficient serialization library
 EAPI=8
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RESTRICT=!test? ( test )
 SLOT=0/23.5.26
 SRC_URI=https://github.com/google/flatbuffers/archive/v23.5.26.tar.gz -> flatbuffers-23.5.26.gh.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=d776e9dfe6dd8623c31199024f6c46ba
diff --git a/metadata/md5-cache/dev-libs/foma-0.10.0_p20220612 b/metadata/md5-cache/dev-libs/foma-0.10.0_p20220612
index 9ff834d313d6..e9d11373bf1c 100644
--- a/metadata/md5-cache/dev-libs/foma-0.10.0_p20220612
+++ b/metadata/md5-cache/dev-libs/foma-0.10.0_p20220612
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/yacc app-alternatives/lex app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-alternatives/yacc app-alternatives/lex app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=sys-libs/readline:= sys-libs/zlib
 DESCRIPTION=Multi-purpose finite-state toolkit
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=sys-libs/readline:= sys-libs/zlib
 SLOT=0/0.10
 SRC_URI=https://github.com/mhulden/foma/archive/9e8c3df573015a26c84e113ba710ef3d57c8e777.tar.gz -> foma-0.10.0_p20220612.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=40baea04d6429938f2b50c749619f393
diff --git a/metadata/md5-cache/dev-libs/foma-0.10.0_p20220612-r1 b/metadata/md5-cache/dev-libs/foma-0.10.0_p20220612-r1
index 83c2d19769b2..5dc7987ddc33 100644
--- a/metadata/md5-cache/dev-libs/foma-0.10.0_p20220612-r1
+++ b/metadata/md5-cache/dev-libs/foma-0.10.0_p20220612-r1
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/yacc app-alternatives/lex app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-alternatives/yacc app-alternatives/lex app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=sys-libs/readline:= sys-libs/zlib
 DESCRIPTION=Multi-purpose finite-state toolkit
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=sys-libs/readline:= sys-libs/zlib
 SLOT=0/0.10
 SRC_URI=https://github.com/mhulden/foma/archive/9e8c3df573015a26c84e113ba710ef3d57c8e777.tar.gz -> foma-0.10.0_p20220612.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=fa6638a0507c3305a4442f1375d3ba92
diff --git a/metadata/md5-cache/dev-libs/gost-engine-3.0.1 b/metadata/md5-cache/dev-libs/gost-engine-3.0.1
index f47553e69280..5ab0d51c2936 100644
--- a/metadata/md5-cache/dev-libs/gost-engine-3.0.1
+++ b/metadata/md5-cache/dev-libs/gost-engine-3.0.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=>=dev-libs/openssl-3.0.0:0= virtual/pkgconfig test? ( dev-lang/perl )
 DESCRIPTION=A reference implementation of the Russian GOST crypto algorithms for OpenSSL
@@ -12,5 +12,5 @@ RDEPEND=>=dev-libs/openssl-3.0.0:0=
 RESTRICT=!test? ( test )
 SLOT=0/3.0.1
 SRC_URI=https://github.com/gost-engine/engine/archive/v3.0.1.tar.gz -> gost-engine-3.0.1.tar.gz https://github.com/provider-corner/libprov/archive/8a126e09547630ef900177625626b6156052f0ee.tar.gz -> libprov-8a126e09547630ef900177625626b6156052f0ee.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=57ba94f908216412cbc82339a5cc96e4
diff --git a/metadata/md5-cache/dev-libs/gost-engine-3.0.1-r1 b/metadata/md5-cache/dev-libs/gost-engine-3.0.1-r1
index 34dda59cb7fa..0483eb931d6f 100644
--- a/metadata/md5-cache/dev-libs/gost-engine-3.0.1-r1
+++ b/metadata/md5-cache/dev-libs/gost-engine-3.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=>=dev-libs/openssl-3.0.0:0= virtual/pkgconfig test? ( dev-lang/perl )
 DESCRIPTION=A reference implementation of the Russian GOST crypto algorithms for OpenSSL
@@ -12,5 +12,5 @@ RDEPEND=>=dev-libs/openssl-3.0.0:0=
 RESTRICT=!test? ( test )
 SLOT=0/3.0.1
 SRC_URI=https://github.com/gost-engine/engine/archive/v3.0.1.tar.gz -> gost-engine-3.0.1.tar.gz https://github.com/provider-corner/libprov/archive/8a126e09547630ef900177625626b6156052f0ee.tar.gz -> libprov-8a126e09547630ef900177625626b6156052f0ee.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=311eb045a34ef35262c918617cdaf84c
diff --git a/metadata/md5-cache/dev-libs/gost-engine-3.0.2 b/metadata/md5-cache/dev-libs/gost-engine-3.0.2
index f622c2e293e2..57eeeb28f2b2 100644
--- a/metadata/md5-cache/dev-libs/gost-engine-3.0.2
+++ b/metadata/md5-cache/dev-libs/gost-engine-3.0.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=>=dev-libs/openssl-3.0.0:0= virtual/pkgconfig test? ( dev-lang/perl )
 DESCRIPTION=A reference implementation of the Russian GOST crypto algorithms for OpenSSL
@@ -12,5 +12,5 @@ RDEPEND=>=dev-libs/openssl-3.0.0:0=
 RESTRICT=!test? ( test )
 SLOT=0/3.0.2
 SRC_URI=https://github.com/gost-engine/engine/archive/v3.0.2.tar.gz -> gost-engine-3.0.2.tar.gz https://github.com/provider-corner/libprov/archive/8a126e09547630ef900177625626b6156052f0ee.tar.gz -> libprov-8a126e09547630ef900177625626b6156052f0ee.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=57ba94f908216412cbc82339a5cc96e4
diff --git a/metadata/md5-cache/dev-libs/gost-engine-3.0.3 b/metadata/md5-cache/dev-libs/gost-engine-3.0.3
index 921632a7119c..9a21e1c163e1 100644
--- a/metadata/md5-cache/dev-libs/gost-engine-3.0.3
+++ b/metadata/md5-cache/dev-libs/gost-engine-3.0.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=>=dev-libs/openssl-3.0.0:0= virtual/pkgconfig test? ( dev-lang/perl )
 DESCRIPTION=A reference implementation of the Russian GOST crypto algorithms for OpenSSL
@@ -12,5 +12,5 @@ RDEPEND=>=dev-libs/openssl-3.0.0:0=
 RESTRICT=!test? ( test )
 SLOT=0/3.0.3
 SRC_URI=https://github.com/gost-engine/engine/archive/v3.0.3.tar.gz -> gost-engine-3.0.3.tar.gz https://github.com/provider-corner/libprov/archive/8a126e09547630ef900177625626b6156052f0ee.tar.gz -> libprov-8a126e09547630ef900177625626b6156052f0ee.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=57ba94f908216412cbc82339a5cc96e4
diff --git a/metadata/md5-cache/dev-libs/gost-engine-9999 b/metadata/md5-cache/dev-libs/gost-engine-9999
index bcdf0dc8ef8d..6a3286155c9d 100644
--- a/metadata/md5-cache/dev-libs/gost-engine-9999
+++ b/metadata/md5-cache/dev-libs/gost-engine-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/openssl-3.0.0:0= virtual/pkgconfig test? ( dev-lang/perl )
 DESCRIPTION=A reference implementation of the Russian GOST crypto algorithms for OpenSSL
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=>=dev-libs/openssl-3.0.0:0=
 RESTRICT=!test? ( test )
 SLOT=0/9999
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=57ba94f908216412cbc82339a5cc96e4
diff --git a/metadata/md5-cache/dev-libs/grantlee-5.3.0 b/metadata/md5-cache/dev-libs/grantlee-5.3.0
index bfc071907e51..626015f2e0ec 100644
--- a/metadata/md5-cache/dev-libs/grantlee-5.3.0
+++ b/metadata/md5-cache/dev-libs/grantlee-5.3.0
@@ -1,4 +1,4 @@
-BDEPEND=doc? ( app-text/doxygen[dot] ) test? ( dev-qt/linguist-tools:5 ) app-alternatives/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+BDEPEND=doc? ( app-text/doxygen[dot] ) test? ( dev-qt/linguist-tools:5 ) app-alternatives/ninja >=dev-build/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 test? ( dev-qt/qttest:5 )
 DESCRIPTION=C++ string template engine based on the Django template system
@@ -12,5 +12,5 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=http://downloads.grantlee.org/grantlee-5.3.0.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=f302d64f1572dbb672402b4540a244ea
diff --git a/metadata/md5-cache/dev-libs/hidapi-0.13.1-r1 b/metadata/md5-cache/dev-libs/hidapi-0.13.1-r1
index 256036a0adcd..b83afb0e2fa8 100644
--- a/metadata/md5-cache/dev-libs/hidapi-0.13.1-r1
+++ b/metadata/md5-cache/dev-libs/hidapi-0.13.1-r1
@@ -1,4 +1,4 @@
-BDEPEND=doc? ( app-text/doxygen ) app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=doc? ( app-text/doxygen ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=virtual/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libudev: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 multi-platform library for USB and Bluetooth HID-Class devices
@@ -11,5 +11,5 @@ LICENSE=|| ( BSD GPL-3 HIDAPI )
 RDEPEND=virtual/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libudev: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://github.com/libusb/hidapi/archive/hidapi-0.13.1.tar.gz -> hidapi-0.13.1.tgz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=2ee20060391033af725187b1e702a2e7
diff --git a/metadata/md5-cache/dev-libs/hidapi-0.14.0 b/metadata/md5-cache/dev-libs/hidapi-0.14.0
index 326f8ee69fc3..97063fd1a0ae 100644
--- a/metadata/md5-cache/dev-libs/hidapi-0.14.0
+++ b/metadata/md5-cache/dev-libs/hidapi-0.14.0
@@ -1,4 +1,4 @@
-BDEPEND=doc? ( app-text/doxygen ) app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=doc? ( app-text/doxygen ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=virtual/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libudev: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 multi-platform library for USB and Bluetooth HID-Class devices
@@ -11,5 +11,5 @@ LICENSE=|| ( BSD GPL-3 HIDAPI )
 RDEPEND=virtual/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libudev: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://github.com/libusb/hidapi/archive/hidapi-0.14.0.tar.gz -> hidapi-0.14.0.tgz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=f3b9242a3f421a22ca71dffcb42d222c
diff --git a/metadata/md5-cache/dev-libs/hyperscan-5.4.2 b/metadata/md5-cache/dev-libs/hyperscan-5.4.2
index bc2df706b2d7..5afcf64ee901 100644
--- a/metadata/md5-cache/dev-libs/hyperscan-5.4.2
+++ b/metadata/md5-cache/dev-libs/hyperscan-5.4.2
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) dev-util/ragel app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=|| ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) dev-util/ragel app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst prepare setup test
 DEPEND=dev-libs/boost:=
 DESCRIPTION=High-performance regular expression matching library
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/boost:=
 REQUIRED_USE=cpu_flags_x86_ssse3
 SLOT=0
 SRC_URI=https://github.com/intel/hyperscan/archive/v5.4.2.tar.gz -> hyperscan-5.4.2.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=b63ca319d31f25e932e51087bb09df46
diff --git a/metadata/md5-cache/dev-libs/igraph-0.10.4 b/metadata/md5-cache/dev-libs/igraph-0.10.4
index 1c752e3bcd7d..f4d360750ca1 100644
--- a/metadata/md5-cache/dev-libs/igraph-0.10.4
+++ b/metadata/md5-cache/dev-libs/igraph-0.10.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=dev-libs/gmp:0= dev-libs/libxml2 sci-libs/arpack sci-mathematics/glpk:= virtual/blas virtual/lapack
 DESCRIPTION=Creating and manipulating undirected and directed graphs
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/gmp:0= dev-libs/libxml2 sci-libs/arpack sci-mathematics/glpk:=
 RESTRICT=!test? ( test )
 SLOT=0/0
 SRC_URI=https://github.com/igraph/igraph/releases/download/0.10.4/igraph-0.10.4.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=9a649ee6a3c01fb41a985647c3fba465
diff --git a/metadata/md5-cache/dev-libs/igraph-0.10.4-r1 b/metadata/md5-cache/dev-libs/igraph-0.10.4-r1
index 89f8cb189833..71fa98affd7f 100644
--- a/metadata/md5-cache/dev-libs/igraph-0.10.4-r1
+++ b/metadata/md5-cache/dev-libs/igraph-0.10.4-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=dev-libs/gmp:0= dev-libs/libxml2 sci-libs/arpack sci-mathematics/glpk:= sci-mathematics/plfit virtual/blas virtual/lapack
 DESCRIPTION=Creating and manipulating undirected and directed graphs
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/gmp:0= dev-libs/libxml2 sci-libs/arpack sci-mathematics/glpk:=
 RESTRICT=!test? ( test )
 SLOT=0/0
 SRC_URI=https://github.com/igraph/igraph/releases/download/0.10.4/igraph-0.10.4.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=90cdc9d6addee0a80f9bb628cdf66410
diff --git a/metadata/md5-cache/dev-libs/imath-3.1.6 b/metadata/md5-cache/dev-libs/imath-3.1.6
index 321f0e89b6c5..0e02f387542b 100644
--- a/metadata/md5-cache/dev-libs/imath-3.1.6
+++ b/metadata/md5-cache/dev-libs/imath-3.1.6
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig doc? ( python_single_target_python3_10? ( dev-python/breathe[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/breathe[python_targets_python3_11(-)] ) ) python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) ) app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=virtual/pkgconfig doc? ( python_single_target_python3_10? ( dev-python/breathe[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/breathe[python_targets_python3_11(-)] ) ) python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=sys-libs/zlib python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_10? ( dev-libs/boost:=[python,python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-libs/boost:=[python,python_targets_python3_11(-)] dev-python/numpy[python_targets_python3_11(-)] ) )
 DESCRIPTION=Imath basic math package
@@ -13,5 +13,5 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_10 python_single_target
 RESTRICT=!test? ( test )
 SLOT=3/29
 SRC_URI=https://github.com/AcademySoftwareFoundation/Imath/archive/refs/tags/v3.1.6.tar.gz -> imath-3.1.6.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=47e1df1352912e862c8973e5ec12120d
diff --git a/metadata/md5-cache/dev-libs/imath-3.1.9 b/metadata/md5-cache/dev-libs/imath-3.1.9
index d39ec3862259..fc41208ea7e0 100644
--- a/metadata/md5-cache/dev-libs/imath-3.1.9
+++ b/metadata/md5-cache/dev-libs/imath-3.1.9
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) ) app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=virtual/pkgconfig python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=sys-libs/zlib python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) python_single_target_python3_10? ( dev-libs/boost:=[python,python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-libs/boost:=[python,python_targets_python3_11(-)] dev-python/numpy[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-libs/boost:=[python,python_targets_python3_12(-)] dev-python/numpy[python_targets_python3_12(-)] ) )
 DESCRIPTION=Imath basic math package
@@ -13,5 +13,5 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_10 python_single_target
 RESTRICT=!test? ( test )
 SLOT=3/29
 SRC_URI=https://github.com/AcademySoftwareFoundation/Imath/archive/refs/tags/v3.1.9.tar.gz -> imath-3.1.9.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=3037255521664f6985fd7893f09f2eac
diff --git a/metadata/md5-cache/dev-libs/intel-compute-runtime-23.35.27191.9 b/metadata/md5-cache/dev-libs/intel-compute-runtime-23.35.27191.9
index d31f947eb862..b2db64a18d5a 100644
--- a/metadata/md5-cache/dev-libs/intel-compute-runtime-23.35.27191.9
+++ b/metadata/md5-cache/dev-libs/intel-compute-runtime-23.35.27191.9
@@ -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=dev-libs/intel-metrics-discovery:= dev-libs/intel-metrics-library:= dev-libs/libnl:3 dev-libs/libxml2:2 >=dev-util/intel-graphics-compiler-1.0.15136.4 >=dev-util/intel-graphics-system-controller-0.8.13:= media-libs/mesa >=virtual/opencl-3 l0? ( >=dev-libs/level-zero-1.14.0:= ) vaapi? ( x11-libs/libdrm[video_cards_intel] media-libs/libva )
 DESCRIPTION=Intel Graphics Compute Runtime for oneAPI Level Zero and OpenCL Driver
@@ -11,5 +11,5 @@ LICENSE=MIT
 RDEPEND=>=media-libs/gmmlib-22.3.5:=
 SLOT=0
 SRC_URI=https://github.com/intel/compute-runtime/archive/23.35.27191.9.tar.gz -> intel-compute-runtime-23.35.27191.9.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=10c1abe8d93f880a6d9e2400c8d57fac
diff --git a/metadata/md5-cache/dev-libs/intel-compute-runtime-23.48.27912.9 b/metadata/md5-cache/dev-libs/intel-compute-runtime-23.48.27912.9
index 90ed66140162..2f3c4a6effbd 100644
--- a/metadata/md5-cache/dev-libs/intel-compute-runtime-23.48.27912.9
+++ b/metadata/md5-cache/dev-libs/intel-compute-runtime-23.48.27912.9
@@ -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=dev-libs/intel-metrics-discovery:= dev-libs/intel-metrics-library:= dev-libs/libnl:3 dev-libs/libxml2:2 >=dev-util/intel-graphics-compiler-1.0.15136.4 >=dev-util/intel-graphics-system-controller-0.8.13:= media-libs/mesa >=virtual/opencl-3 l0? ( >=dev-libs/level-zero-1.14.0:= ) vaapi? ( x11-libs/libdrm[video_cards_intel] media-libs/libva )
 DESCRIPTION=Intel Graphics Compute Runtime for oneAPI Level Zero and OpenCL Driver
@@ -11,5 +11,5 @@ LICENSE=MIT
 RDEPEND=>=media-libs/gmmlib-22.3.5:=
 SLOT=0
 SRC_URI=https://github.com/intel/compute-runtime/archive/23.48.27912.9.tar.gz -> intel-compute-runtime-23.48.27912.9.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=1091796d182af3a40d5006f88b47324a
diff --git a/metadata/md5-cache/dev-libs/intel-metrics-discovery-1.12.165.1 b/metadata/md5-cache/dev-libs/intel-metrics-discovery-1.12.165.1
index 7e9a5e799838..e55a13bae14b 100644
--- a/metadata/md5-cache/dev-libs/intel-metrics-discovery-1.12.165.1
+++ b/metadata/md5-cache/dev-libs/intel-metrics-discovery-1.12.165.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=x11-libs/libdrm
 DESCRIPTION=A user mode library that provides access to GPU performance data
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libdrm
 SLOT=0/1.12.165.1
 SRC_URI=https://github.com/intel/metrics-discovery/archive/refs/tags/metrics-discovery-1.12.165.1.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=206b6b01ff5284d4fccd3ed2532cc4bc
diff --git a/metadata/md5-cache/dev-libs/intel-metrics-discovery-1.12.170 b/metadata/md5-cache/dev-libs/intel-metrics-discovery-1.12.170
index 42cbeca1a26e..2e56ee98a7c9 100644
--- a/metadata/md5-cache/dev-libs/intel-metrics-discovery-1.12.170
+++ b/metadata/md5-cache/dev-libs/intel-metrics-discovery-1.12.170
@@ -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=x11-libs/libdrm
 DESCRIPTION=A user mode library that provides access to GPU performance data
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libdrm
 SLOT=0/1.12.170
 SRC_URI=https://github.com/intel/metrics-discovery/archive/refs/tags/metrics-discovery-1.12.170.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=ee6fddf0960bdd20d54b42fc481c7a9f
diff --git a/metadata/md5-cache/dev-libs/intel-metrics-library-1.0.133 b/metadata/md5-cache/dev-libs/intel-metrics-library-1.0.133
index cbefbde5498e..090ff7f3909f 100644
--- a/metadata/md5-cache/dev-libs/intel-metrics-library-1.0.133
+++ b/metadata/md5-cache/dev-libs/intel-metrics-library-1.0.133
@@ -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=x11-libs/libdrm
 DESCRIPTION=User mode driver helper library that provides access to GPU performance counters
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libdrm
 SLOT=0/1.0.133
 SRC_URI=https://github.com/intel/metrics-library/archive/refs/tags/metrics-library-1.0.133.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=aefa05874ac4043a7ff41462f55997e8
diff --git a/metadata/md5-cache/dev-libs/intel-metrics-library-1.0.156 b/metadata/md5-cache/dev-libs/intel-metrics-library-1.0.156
index d7bce3c2d563..dbc072742c84 100644
--- a/metadata/md5-cache/dev-libs/intel-metrics-library-1.0.156
+++ b/metadata/md5-cache/dev-libs/intel-metrics-library-1.0.156
@@ -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=x11-libs/libdrm
 DESCRIPTION=User mode driver helper library that provides access to GPU performance counters
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libdrm
 SLOT=0/1.0.156
 SRC_URI=https://github.com/intel/metrics-library/archive/refs/tags/metrics-library-1.0.156.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=6773ffcc7dba88c24e4daa44851d2f46
diff --git a/metadata/md5-cache/dev-libs/intel-vc-intrinsics-0.13.0 b/metadata/md5-cache/dev-libs/intel-vc-intrinsics-0.13.0
index 55eacc411ec4..0129b80c4d58 100644
--- a/metadata/md5-cache/dev-libs/intel-vc-intrinsics-0.13.0
+++ b/metadata/md5-cache/dev-libs/intel-vc-intrinsics-0.13.0
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=|| ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-libs/libxml2:2= sys-devel/llvm:15 sys-libs/zlib !!sys-devel/llvm:0
 DESCRIPTION=A set of new intrinsics on top of core LLVM IR instructions
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=dev-libs/libxml2:2= sys-devel/llvm:15 sys-libs/zlib
 SLOT=0
 SRC_URI=https://github.com/intel/vc-intrinsics/archive/refs/tags/v0.13.0.tar.gz -> intel-vc-intrinsics-0.13.0.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	llvm	dcfb437a52b5672e5f39deaae6f789c3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	llvm	dcfb437a52b5672e5f39deaae6f789c3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=8cdc4aca8113c893ee8d27b8131b6668
diff --git a/metadata/md5-cache/dev-libs/intel-vc-intrinsics-0.16.0 b/metadata/md5-cache/dev-libs/intel-vc-intrinsics-0.16.0
index 25ec8a15c62a..e1718319f8eb 100644
--- a/metadata/md5-cache/dev-libs/intel-vc-intrinsics-0.16.0
+++ b/metadata/md5-cache/dev-libs/intel-vc-intrinsics-0.16.0
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=|| ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-libs/libxml2:2= sys-devel/llvm:15 sys-libs/zlib !!sys-devel/llvm:0
 DESCRIPTION=A set of new intrinsics on top of core LLVM IR instructions
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=dev-libs/libxml2:2= sys-devel/llvm:15 sys-libs/zlib
 SLOT=0
 SRC_URI=https://github.com/intel/vc-intrinsics/archive/refs/tags/v0.16.0.tar.gz -> intel-vc-intrinsics-0.16.0.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	llvm	dcfb437a52b5672e5f39deaae6f789c3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	llvm	dcfb437a52b5672e5f39deaae6f789c3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=989efd58f3c8d3629f9928a13d87201a
diff --git a/metadata/md5-cache/dev-libs/json-c-0.17 b/metadata/md5-cache/dev-libs/json-c-0.17
index 5fa7e1f16390..e6aedee9cd25 100644
--- a/metadata/md5-cache/dev-libs/json-c-0.17
+++ b/metadata/md5-cache/dev-libs/json-c-0.17
@@ -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
 DESCRIPTION=A JSON implementation in C
 EAPI=8
@@ -9,5 +9,5 @@ KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 s
 LICENSE=MIT
 SLOT=0/5
 SRC_URI=https://s3.amazonaws.com/json-c_releases/releases/json-c-0.17.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=3a8c007d813daefbccfb4cbadf152e9f
diff --git a/metadata/md5-cache/dev-libs/json-c-9999 b/metadata/md5-cache/dev-libs/json-c-9999
index b4b18d2533f4..c225fc912aae 100644
--- a/metadata/md5-cache/dev-libs/json-c-9999
+++ b/metadata/md5-cache/dev-libs/json-c-9999
@@ -1,4 +1,4 @@
-BDEPEND=doc? ( >=app-text/doxygen-1.8.13 ) app-alternatives/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=doc? ( >=app-text/doxygen-1.8.13 ) 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
 DESCRIPTION=A JSON implementation in C
 EAPI=8
@@ -8,5 +8,5 @@ IUSE=cpu_flags_x86_rdrand doc static-libs threads abi_x86_32 abi_x86_64 abi_x86_
 LICENSE=MIT
 PROPERTIES=live
 SLOT=0/5
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=46a433b38dd2f3b88fd71c8159b1ba10
diff --git a/metadata/md5-cache/dev-libs/jthread-1.3.3-r1 b/metadata/md5-cache/dev-libs/jthread-1.3.3-r1
index 2574049221ab..87d242d7fafb 100644
--- a/metadata/md5-cache/dev-libs/jthread-1.3.3-r1
+++ b/metadata/md5-cache/dev-libs/jthread-1.3.3-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
 DESCRIPTION=JThread provides some classes to make use of threads easy on different platforms
 EAPI=8
@@ -8,5 +8,5 @@ KEYWORDS=amd64 x86
 LICENSE=MIT
 SLOT=0/1.3.3
 SRC_URI=https://research.edm.uhasselt.be/jori/jthread/jthread-1.3.3.tar.bz2
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=0ea413cff9e8dcd911d6864ab43a5c13
diff --git a/metadata/md5-cache/dev-libs/kdiagram-2.8.0 b/metadata/md5-cache/dev-libs/kdiagram-2.8.0
index 1be328f11a18..b5dc0e99eb9a 100644
--- a/metadata/md5-cache/dev-libs/kdiagram-2.8.0
+++ b/metadata/md5-cache/dev-libs/kdiagram-2.8.0
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-qt/linguist-tools-5.15.1:5 app-alternatives/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-text/doxygen-1.8.13-r1 ) doc? ( dev-qt/qthelp:5 ) dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.106.0:*
+BDEPEND=>=dev-qt/linguist-tools-5.15.1:5 app-alternatives/ninja >=dev-build/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-text/doxygen-1.8.13-r1 ) doc? ( dev-qt/qthelp:5 ) dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.106.0:*
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
 DEPEND=>=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtprintsupport-5.15.1:5 >=dev-qt/qtsvg-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 DESCRIPTION=Powerful libraries (KChart, KGantt) for creating business diagrams
@@ -14,5 +14,5 @@ REQUIRED_USE=test? ( examples )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/kdiagram/2.8.0/kdiagram-2.8.0.tar.xz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	ecm	a9d1de06ef0d5d4de7114a10dcb64daa	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	kde.org	60fcb935e4206806bf9f38e3537521a2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	ecm	a9d1de06ef0d5d4de7114a10dcb64daa	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	kde.org	60fcb935e4206806bf9f38e3537521a2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=ea772ba1ab7654e645b4b3d13e9eaf20
diff --git a/metadata/md5-cache/dev-libs/kdiagram-3.0.1 b/metadata/md5-cache/dev-libs/kdiagram-3.0.1
index d35a54726cd4..43ff82d2b8c1 100644
--- a/metadata/md5-cache/dev-libs/kdiagram-3.0.1
+++ b/metadata/md5-cache/dev-libs/kdiagram-3.0.1
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-qt/qttools-6.6.0:6[linguist] app-alternatives/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-text/doxygen-1.8.13-r1 ) dev-qt/qttools:6[assistant] dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.245.0:*
+BDEPEND=>=dev-qt/qttools-6.6.0:6[linguist] app-alternatives/ninja >=dev-build/cmake-3.20.5 doc? ( >=app-text/doxygen-1.8.13-r1 ) dev-qt/qttools:6[assistant] dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.245.0:*
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
 DEPEND=>=dev-qt/qtbase-6.6.0:6[gui,widgets] >=dev-qt/qtsvg-6.6.0:6 doc? ( dev-qt/qt-docs:6 ) dev-qt/qtbase:6
 DESCRIPTION=Powerful libraries (KChart, KGantt) for creating business diagrams
@@ -14,5 +14,5 @@ REQUIRED_USE=test? ( examples )
 RESTRICT=!test? ( test )
 SLOT=6
 SRC_URI=mirror://kde/stable/kdiagram/3.0.1/kdiagram-3.0.1.tar.xz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	ecm	a9d1de06ef0d5d4de7114a10dcb64daa	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	kde.org	60fcb935e4206806bf9f38e3537521a2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	ecm	a9d1de06ef0d5d4de7114a10dcb64daa	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	kde.org	60fcb935e4206806bf9f38e3537521a2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=cff25d029244e9655e2e1f74b111d2e4
diff --git a/metadata/md5-cache/dev-libs/keystone-0.9.2-r2 b/metadata/md5-cache/dev-libs/keystone-0.9.2-r2
index 733e2f101fe3..3cdfb714a3c3 100644
--- a/metadata/md5-cache/dev-libs/keystone-0.9.2-r2
+++ b/metadata/md5-cache/dev-libs/keystone-0.9.2-r2
@@ -1,4 +1,4 @@
-BDEPEND=python? ( >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) ) app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=python? ( >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=python? ( python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) )
 DESCRIPTION=assembly/assembler framework + bindings
@@ -13,5 +13,5 @@ REQUIRED_USE=python? ( || ( python_targets_python3_10 python_targets_python3_11
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/keystone-engine/keystone/archive/0.9.2.tar.gz -> keystone-0.9.2.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	distutils-r1	b9318b5e40104e608d7e4582121fb561	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	distutils-r1	b9318b5e40104e608d7e4582121fb561	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=b4dd2b3ad5357858217c6e86cdeac7c5
diff --git a/metadata/md5-cache/dev-libs/keystone-0.9.2-r3 b/metadata/md5-cache/dev-libs/keystone-0.9.2-r3
index 92d181d21332..eb4b556d478c 100644
--- a/metadata/md5-cache/dev-libs/keystone-0.9.2-r3
+++ b/metadata/md5-cache/dev-libs/keystone-0.9.2-r3
@@ -1,4 +1,4 @@
-BDEPEND=python? ( >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) ) app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=python? ( >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=python? ( python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) )
 DESCRIPTION=assembly/assembler framework + bindings
@@ -13,5 +13,5 @@ REQUIRED_USE=python? ( || ( python_targets_python3_10 python_targets_python3_11
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/keystone-engine/keystone/archive/0.9.2.tar.gz -> keystone-0.9.2.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	distutils-r1	b9318b5e40104e608d7e4582121fb561	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	distutils-r1	b9318b5e40104e608d7e4582121fb561	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=df9647088d78d85f823e35b8b685695e
diff --git a/metadata/md5-cache/dev-libs/keystone-9999 b/metadata/md5-cache/dev-libs/keystone-9999
index ed3ecfb979ab..82fd9e2d44ae 100644
--- a/metadata/md5-cache/dev-libs/keystone-9999
+++ b/metadata/md5-cache/dev-libs/keystone-9999
@@ -1,4 +1,4 @@
-BDEPEND=python? ( >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) ) app-alternatives/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=python? ( >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) ) app-alternatives/ninja >=dev-build/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=python? ( python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) )
 DESCRIPTION=assembly/assembler framework + bindings
@@ -12,5 +12,5 @@ RDEPEND=python? ( python_targets_python3_10? ( dev-lang/python:3.10 ) python_tar
 REQUIRED_USE=python? ( || ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 ) )
 RESTRICT=test
 SLOT=0
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	distutils-r1	b9318b5e40104e608d7e4582121fb561	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	distutils-r1	b9318b5e40104e608d7e4582121fb561	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=d8f278c0e29e72068a705fa556d7ca59
diff --git a/metadata/md5-cache/dev-libs/kirigami-addons-0.11.0 b/metadata/md5-cache/dev-libs/kirigami-addons-0.11.0
index 3e3a196241e7..216b2157be9a 100644
--- a/metadata/md5-cache/dev-libs/kirigami-addons-0.11.0
+++ b/metadata/md5-cache/dev-libs/kirigami-addons-0.11.0
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-text/doxygen-1.8.13-r1 ) doc? ( dev-qt/qthelp:5 ) dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.106.0:*
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5 doc? ( >=app-text/doxygen-1.8.13-r1 ) doc? ( dev-qt/qthelp:5 ) dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.106.0:*
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
 DEPEND=>=dev-qt/qtdeclarative-5.15.9:5 >=dev-qt/qtgui-5.15.9:5 >=dev-qt/qtquickcontrols2-5.15.9:5 >=kde-frameworks/ki18n-5.106.0:5 >=kde-frameworks/kirigami-5.106.0:5 test? ( >=dev-qt/qtmultimedia-5.15.9:5[gstreamer,qml] media-libs/gst-plugins-base:1.0[ogg,vorbis] media-libs/gst-plugins-bad:1.0 media-libs/gst-plugins-good:1.0 x11-themes/sound-theme-freedesktop ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 DESCRIPTION=Visual end user components for Kirigami-based applications
@@ -13,5 +13,5 @@ RDEPEND=>=dev-qt/qtdeclarative-5.15.9:5 >=dev-qt/qtgui-5.15.9:5 >=dev-qt/qtquick
 RESTRICT=test !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/kirigami-addons/kirigami-addons-0.11.0.tar.xz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	ecm	a9d1de06ef0d5d4de7114a10dcb64daa	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	kde.org	60fcb935e4206806bf9f38e3537521a2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	ecm	a9d1de06ef0d5d4de7114a10dcb64daa	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	kde.org	60fcb935e4206806bf9f38e3537521a2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=ef37b6df59117d7f29da44a24ec00463
diff --git a/metadata/md5-cache/dev-libs/kirigami-addons-0.11.90 b/metadata/md5-cache/dev-libs/kirigami-addons-0.11.90
index aad9e3540678..ca9f6969e22e 100644
--- a/metadata/md5-cache/dev-libs/kirigami-addons-0.11.90
+++ b/metadata/md5-cache/dev-libs/kirigami-addons-0.11.90
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-text/doxygen-1.8.13-r1 ) dev-qt/qttools:6[assistant] dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.248.0:*
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5 doc? ( >=app-text/doxygen-1.8.13-r1 ) dev-qt/qttools:6[assistant] dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.248.0:*
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
 DEPEND=>=dev-qt/qtbase-6.6.0:6[gui] >=dev-qt/qtdeclarative-6.6.0:6 >=kde-frameworks/ki18n-5.248.0:6 >=kde-frameworks/kirigami-5.248.0:6 test? ( >=dev-qt/qtmultimedia-6.6.0:6[gstreamer,qml] media-libs/gst-plugins-base:1.0[ogg,vorbis] media-libs/gst-plugins-bad:1.0 media-libs/gst-plugins-good:1.0 x11-themes/sound-theme-freedesktop ) doc? ( dev-qt/qt-docs:6 ) dev-qt/qtbase:6
 DESCRIPTION=Visual end user components for Kirigami-based applications
@@ -13,5 +13,5 @@ RDEPEND=>=dev-qt/qtbase-6.6.0:6[gui] >=dev-qt/qtdeclarative-6.6.0:6 >=kde-framew
 RESTRICT=test !test? ( test )
 SLOT=6
 SRC_URI=mirror://kde/unstable/kirigami-addons/kirigami-addons-0.11.90.tar.xz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	ecm	a9d1de06ef0d5d4de7114a10dcb64daa	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	kde.org	60fcb935e4206806bf9f38e3537521a2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	ecm	a9d1de06ef0d5d4de7114a10dcb64daa	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	kde.org	60fcb935e4206806bf9f38e3537521a2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=987cd4fc1810411ba93823301b15bcfd
diff --git a/metadata/md5-cache/dev-libs/kopeninghours-23.08.4 b/metadata/md5-cache/dev-libs/kopeninghours-23.08.4
index d30563c5f94d..74ea36735994 100644
--- a/metadata/md5-cache/dev-libs/kopeninghours-23.08.4
+++ b/metadata/md5-cache/dev-libs/kopeninghours-23.08.4
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/yacc app-alternatives/lex app-alternatives/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-text/doxygen-1.8.13-r1 ) doc? ( dev-qt/qthelp:5 ) dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.106.0:*
+BDEPEND=app-alternatives/yacc app-alternatives/lex app-alternatives/ninja >=dev-build/cmake-3.20.5 doc? ( >=app-text/doxygen-1.8.13-r1 ) doc? ( dev-qt/qthelp:5 ) dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.106.0:*
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
 DEPEND=>=dev-libs/kpublictransport-23.08.4:5 >=dev-qt/qtdeclarative-5.15.9:5 >=kde-frameworks/kholidays-5.106.0:5 >=kde-frameworks/ki18n-5.106.0:5 sys-libs/zlib python? ( python_single_target_python3_10? ( >=dev-libs/boost-1.70:=[python,python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-libs/boost-1.70:=[python,python_targets_python3_11(-)] ) python_single_target_python3_12? ( >=dev-libs/boost-1.70:=[python,python_targets_python3_12(-)] ) ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 DESCRIPTION=Library for parsing and evaluating OSM opening hours expressions
@@ -14,5 +14,5 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_10 python_single_target
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/23.08.4/src/kopeninghours-23.08.4.tar.xz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	ecm	a9d1de06ef0d5d4de7114a10dcb64daa	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	gear.kde.org	236f5f1e8c3d93fca33b087177d55697	kde.org	60fcb935e4206806bf9f38e3537521a2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	ecm	a9d1de06ef0d5d4de7114a10dcb64daa	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	gear.kde.org	236f5f1e8c3d93fca33b087177d55697	kde.org	60fcb935e4206806bf9f38e3537521a2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=8e794c63b7b886bcb0bff161f7fc0071
diff --git a/metadata/md5-cache/dev-libs/kosmindoormap-23.08.4 b/metadata/md5-cache/dev-libs/kosmindoormap-23.08.4
index dfea559a1de7..37ca44e8688a 100644
--- a/metadata/md5-cache/dev-libs/kosmindoormap-23.08.4
+++ b/metadata/md5-cache/dev-libs/kosmindoormap-23.08.4
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/yacc app-alternatives/lex app-alternatives/ninja >=dev-util/cmake-3.20.5 dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.106.0:*
+BDEPEND=app-alternatives/yacc app-alternatives/lex app-alternatives/ninja >=dev-build/cmake-3.20.5 dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.106.0:*
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
 DEPEND=>=dev-libs/kpublictransport-23.08.4:5 dev-libs/protobuf:= >=dev-qt/qtdeclarative-5.15.9:5 >=dev-qt/qtgui-5.15.9:5 >=dev-qt/qtnetwork-5.15.9:5 >=kde-frameworks/ki18n-5.106.0:5 sys-libs/zlib openinghours? ( >=dev-libs/kopeninghours-23.08.4:5 ) test? ( >=dev-qt/qtwidgets-5.15.9:5 ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
 DESCRIPTION=Data Model and Extraction System for Travel Reservation information
@@ -13,5 +13,5 @@ RDEPEND=>=dev-libs/kpublictransport-23.08.4:5 dev-libs/protobuf:= >=dev-qt/qtdec
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/23.08.4/src/kosmindoormap-23.08.4.tar.xz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	ecm	a9d1de06ef0d5d4de7114a10dcb64daa	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	gear.kde.org	236f5f1e8c3d93fca33b087177d55697	kde.org	60fcb935e4206806bf9f38e3537521a2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	ecm	a9d1de06ef0d5d4de7114a10dcb64daa	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	gear.kde.org	236f5f1e8c3d93fca33b087177d55697	kde.org	60fcb935e4206806bf9f38e3537521a2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=bda9aab51aa87d4d5c5e091cc80d024e
diff --git a/metadata/md5-cache/dev-libs/kpeoplevcard-0.1-r1 b/metadata/md5-cache/dev-libs/kpeoplevcard-0.1-r1
index 31fa1c4f6390..bc05f3c4e4c3 100644
--- a/metadata/md5-cache/dev-libs/kpeoplevcard-0.1-r1
+++ b/metadata/md5-cache/dev-libs/kpeoplevcard-0.1-r1
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5 dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.82.0:*
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5 dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.82.0:*
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
 DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcontacts-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kpeople-5.82.0:5 dev-qt/qtcore:5
 DESCRIPTION=Library to expose vcards to KPeople
@@ -12,5 +12,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcontacts-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kpeople-5.82.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kpeoplevcard/0.1/kpeoplevcard-0.1.tar.xz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	ecm	a9d1de06ef0d5d4de7114a10dcb64daa	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	kde.org	60fcb935e4206806bf9f38e3537521a2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	ecm	a9d1de06ef0d5d4de7114a10dcb64daa	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	kde.org	60fcb935e4206806bf9f38e3537521a2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=cee198d7cf108c691bdb57983995e97d
diff --git a/metadata/md5-cache/dev-libs/kproperty-3.2.0 b/metadata/md5-cache/dev-libs/kproperty-3.2.0
index b45fd87b5435..dbf3d0957dc8 100644
--- a/metadata/md5-cache/dev-libs/kproperty-3.2.0
+++ b/metadata/md5-cache/dev-libs/kproperty-3.2.0
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-text/doxygen-1.8.13-r1 ) doc? ( dev-qt/qthelp:5 ) dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.60.0:*
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5 doc? ( >=app-text/doxygen-1.8.13-r1 ) doc? ( dev-qt/qthelp:5 ) dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.60.0:*
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
 DEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 DESCRIPTION=Property editing framework with editor widget similar to Qt Designer
@@ -13,5 +13,5 @@ RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kco
 RESTRICT=test !test? ( test )
 SLOT=5/4
 SRC_URI=mirror://kde/stable/kproperty/src/kproperty-3.2.0.tar.xz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	ecm	a9d1de06ef0d5d4de7114a10dcb64daa	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	kde.org	60fcb935e4206806bf9f38e3537521a2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	ecm	a9d1de06ef0d5d4de7114a10dcb64daa	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	kde.org	60fcb935e4206806bf9f38e3537521a2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=f84a7216d3c779b6b11a58c14967f9f3
diff --git a/metadata/md5-cache/dev-libs/kpublictransport-23.08.4 b/metadata/md5-cache/dev-libs/kpublictransport-23.08.4
index 33a4db396a83..348d701462d9 100644
--- a/metadata/md5-cache/dev-libs/kpublictransport-23.08.4
+++ b/metadata/md5-cache/dev-libs/kpublictransport-23.08.4
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-text/doxygen-1.8.13-r1 ) doc? ( dev-qt/qthelp:5 ) dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.106.0:*
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5 doc? ( >=app-text/doxygen-1.8.13-r1 ) doc? ( dev-qt/qthelp:5 ) dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.106.0:*
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
 DEPEND=dev-libs/protobuf:= >=dev-qt/qtdeclarative-5.15.9:5 >=dev-qt/qtgui-5.15.9:5 >=dev-qt/qtnetwork-5.15.9:5[ssl] >=kde-frameworks/ki18n-5.106.0:5 sys-libs/zlib networkmanager? ( >=kde-frameworks/networkmanager-qt-5.106.0:5 ) test? ( >=dev-qt/qtwidgets-5.15.9:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 DESCRIPTION=Library for accessing public transport timetables and other information
@@ -13,5 +13,5 @@ RDEPEND=dev-libs/protobuf:= >=dev-qt/qtdeclarative-5.15.9:5 >=dev-qt/qtgui-5.15.
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/23.08.4/src/kpublictransport-23.08.4.tar.xz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	ecm	a9d1de06ef0d5d4de7114a10dcb64daa	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	gear.kde.org	236f5f1e8c3d93fca33b087177d55697	kde.org	60fcb935e4206806bf9f38e3537521a2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	ecm	a9d1de06ef0d5d4de7114a10dcb64daa	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	gear.kde.org	236f5f1e8c3d93fca33b087177d55697	kde.org	60fcb935e4206806bf9f38e3537521a2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=bae5fd2a4f33e55d277321c3dac316f4
diff --git a/metadata/md5-cache/dev-libs/kreport-3.2.0-r3 b/metadata/md5-cache/dev-libs/kreport-3.2.0-r3
index a1dff821d1bb..54b9a5c3d801 100644
--- a/metadata/md5-cache/dev-libs/kreport-3.2.0-r3
+++ b/metadata/md5-cache/dev-libs/kreport-3.2.0-r3
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-text/doxygen-1.8.13-r1 ) doc? ( dev-qt/qthelp:5 ) dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.82.0:*
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-text/doxygen-1.8.13-r1 ) doc? ( dev-qt/qthelp:5 ) dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.82.0:*
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
 DEPEND=>=dev-libs/kproperty-3.2.0:5= >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kguiaddons-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 marble? ( kde-apps/marble:5= ) scripting? ( >=dev-qt/qtdeclarative-5.15.2:5 ) || ( dev-lang/python:3.11 dev-lang/python:3.10 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 DESCRIPTION=Framework for creation and generation of reports in multiple formats
@@ -13,5 +13,5 @@ RDEPEND=>=dev-libs/kproperty-3.2.0:5= >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsu
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/4
 SRC_URI=mirror://kde/stable/kreport/src/kreport-3.2.0.tar.xz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	ecm	a9d1de06ef0d5d4de7114a10dcb64daa	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	kde.org	60fcb935e4206806bf9f38e3537521a2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	ecm	a9d1de06ef0d5d4de7114a10dcb64daa	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	kde.org	60fcb935e4206806bf9f38e3537521a2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=75d3c49eda80c5e2367800132f582005
diff --git a/metadata/md5-cache/dev-libs/ktextaddons-1.2.1 b/metadata/md5-cache/dev-libs/ktextaddons-1.2.1
index 85f4cce309a5..244c7e821d3a 100644
--- a/metadata/md5-cache/dev-libs/ktextaddons-1.2.1
+++ b/metadata/md5-cache/dev-libs/ktextaddons-1.2.1
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( >=app-text/doxygen-1.8.13-r1 ) doc? ( dev-qt/qthelp:5 ) dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.103.0:*
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( >=app-text/doxygen-1.8.13-r1 ) doc? ( dev-qt/qthelp:5 ) dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.103.0:*
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
 DEPEND=dev-libs/qtkeychain:=[qt5(+)] >=dev-qt/qtgui-5.15.5:5 >=dev-qt/qtnetwork-5.15.5:5 >=dev-qt/qtwidgets-5.15.5:5 >=kde-frameworks/kconfig-5.103.0:5 >=kde-frameworks/kconfigwidgets-5.103.0:5 >=kde-frameworks/kcoreaddons-5.103.0:5 >=kde-frameworks/ki18n-5.103.0:5 >=kde-frameworks/kwidgetsaddons-5.103.0:5 >=kde-frameworks/kxmlgui-5.103.0:5 speech? ( >=dev-qt/qtspeech-5.15.5:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 DESCRIPTION=Various text handling addons
@@ -13,5 +13,5 @@ RDEPEND=dev-libs/qtkeychain:=[qt5(+)] >=dev-qt/qtgui-5.15.5:5 >=dev-qt/qtnetwork
 RESTRICT=test !test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/ktextaddons/ktextaddons-1.2.1.tar.xz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	ecm	a9d1de06ef0d5d4de7114a10dcb64daa	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	kde.org	60fcb935e4206806bf9f38e3537521a2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	ecm	a9d1de06ef0d5d4de7114a10dcb64daa	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	kde.org	60fcb935e4206806bf9f38e3537521a2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=7dfa33228be910810560b7399c776dcd
diff --git a/metadata/md5-cache/dev-libs/ktextaddons-1.5.3 b/metadata/md5-cache/dev-libs/ktextaddons-1.5.3
index d39d5063593b..6277a9d0479e 100644
--- a/metadata/md5-cache/dev-libs/ktextaddons-1.5.3
+++ b/metadata/md5-cache/dev-libs/ktextaddons-1.5.3
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5 designer? ( dev-qt/qttools:6[designer] ) doc? ( >=app-text/doxygen-1.8.13-r1 ) dev-qt/qttools:6[assistant] dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.245.0:*
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5 designer? ( dev-qt/qttools:6[designer] ) doc? ( >=app-text/doxygen-1.8.13-r1 ) dev-qt/qttools:6[assistant] dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.245.0:*
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
 DEPEND=>=dev-libs/qtkeychain-0.14.1-r1:=[qt6] >=dev-qt/qtbase-6.6.0:6[gui,network,widgets] >=dev-qt/qtmultimedia-6.6.0:6 >=kde-frameworks/karchive-5.245.0:6 >=kde-frameworks/kconfig-5.245.0:6 >=kde-frameworks/kconfigwidgets-5.245.0:6 >=kde-frameworks/kcoreaddons-5.245.0:6 >=kde-frameworks/ki18n-5.245.0:6 >=kde-frameworks/kio-5.245.0:6 >=kde-frameworks/sonnet-5.245.0:6 >=kde-frameworks/syntax-highlighting-5.245.0:6 speech? ( >=dev-qt/qtspeech-6.6.0:6 ) doc? ( dev-qt/qt-docs:6 ) dev-qt/qtbase:6
 DESCRIPTION=Various text handling addons
@@ -13,5 +13,5 @@ RDEPEND=>=dev-libs/qtkeychain-0.14.1-r1:=[qt6] >=dev-qt/qtbase-6.6.0:6[gui,netwo
 RESTRICT=test !test? ( test )
 SLOT=6
 SRC_URI=mirror://kde/stable/ktextaddons/ktextaddons-1.5.3.tar.xz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	ecm	a9d1de06ef0d5d4de7114a10dcb64daa	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	kde.org	60fcb935e4206806bf9f38e3537521a2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	ecm	a9d1de06ef0d5d4de7114a10dcb64daa	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	kde.org	60fcb935e4206806bf9f38e3537521a2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=98c5d79421212b5dfb6eb4f152bcaf9d
diff --git a/metadata/md5-cache/dev-libs/kweathercore-0.7 b/metadata/md5-cache/dev-libs/kweathercore-0.7
index d6bee927bbf5..bb33f68b4bf9 100644
--- a/metadata/md5-cache/dev-libs/kweathercore-0.7
+++ b/metadata/md5-cache/dev-libs/kweathercore-0.7
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-text/doxygen-1.8.13-r1 ) doc? ( dev-qt/qthelp:5 ) dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.99.0:*
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5 doc? ( >=app-text/doxygen-1.8.13-r1 ) doc? ( dev-qt/qthelp:5 ) dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.99.0:*
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
 DEPEND=>=dev-qt/qtnetwork-5.15.5:5 >=dev-qt/qtpositioning-5.15.5:5 >=kde-frameworks/kholidays-5.99.0:5 >=kde-frameworks/ki18n-5.99.0:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 DESCRIPTION=Library for retrieval of weather information including forecasts and alerts
@@ -12,5 +12,5 @@ RDEPEND=>=dev-qt/qtnetwork-5.15.5:5 >=dev-qt/qtpositioning-5.15.5:5 >=kde-framew
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/kweathercore/0.7/kweathercore-0.7.tar.xz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	ecm	a9d1de06ef0d5d4de7114a10dcb64daa	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	kde.org	60fcb935e4206806bf9f38e3537521a2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	ecm	a9d1de06ef0d5d4de7114a10dcb64daa	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	kde.org	60fcb935e4206806bf9f38e3537521a2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=9468ae1471368201cb0f97707c4c438c
diff --git a/metadata/md5-cache/dev-libs/kweathercore-0.8.0 b/metadata/md5-cache/dev-libs/kweathercore-0.8.0
index 5070a0be0134..842878c91383 100644
--- a/metadata/md5-cache/dev-libs/kweathercore-0.8.0
+++ b/metadata/md5-cache/dev-libs/kweathercore-0.8.0
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-text/doxygen-1.8.13-r1 ) dev-qt/qttools:6[assistant] dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.245.0:*
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5 doc? ( >=app-text/doxygen-1.8.13-r1 ) dev-qt/qttools:6[assistant] dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.245.0:*
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
 DEPEND=>=dev-qt/qtbase-6.6.0:6[network] >=dev-qt/qtpositioning-6.6.0:6 >=kde-frameworks/kholidays-5.245.0:6 >=kde-frameworks/ki18n-5.245.0:6 doc? ( dev-qt/qt-docs:6 ) dev-qt/qtbase:6
 DESCRIPTION=Library for retrieval of weather information including forecasts and alerts
@@ -12,5 +12,5 @@ RDEPEND=>=dev-qt/qtbase-6.6.0:6[network] >=dev-qt/qtpositioning-6.6.0:6 >=kde-fr
 RESTRICT=!test? ( test )
 SLOT=6
 SRC_URI=mirror://kde/stable/kweathercore/0.8.0/kweathercore-0.8.0.tar.xz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	ecm	a9d1de06ef0d5d4de7114a10dcb64daa	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	kde.org	60fcb935e4206806bf9f38e3537521a2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	ecm	a9d1de06ef0d5d4de7114a10dcb64daa	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	kde.org	60fcb935e4206806bf9f38e3537521a2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=49490842c8a034b826aee3f83ae1f9d9
diff --git a/metadata/md5-cache/dev-libs/leatherman-1.12.11 b/metadata/md5-cache/dev-libs/leatherman-1.12.11
index 733df4c7e48d..6efe0e8c43a2 100644
--- a/metadata/md5-cache/dev-libs/leatherman-1.12.11
+++ b/metadata/md5-cache/dev-libs/leatherman-1.12.11
@@ -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/boost:=[nls] net-misc/curl
 DESCRIPTION=A C++ toolkit
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/boost:=[nls] net-misc/curl
 RESTRICT=test
 SLOT=0/1.12.11
 SRC_URI=https://github.com/puppetlabs/leatherman/archive/1.12.11.tar.gz -> leatherman-1.12.11.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=6bbfd0b44229c36794630d1e25bb880d
diff --git a/metadata/md5-cache/dev-libs/level-zero-1.15.1 b/metadata/md5-cache/dev-libs/level-zero-1.15.1
index 00398b2bc0f1..f16fb7043540 100644
--- a/metadata/md5-cache/dev-libs/level-zero-1.15.1
+++ b/metadata/md5-cache/dev-libs/level-zero-1.15.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
 DESCRIPTION=oneAPI Level Zero headers, loader and validation layer
 EAPI=8
@@ -8,5 +8,5 @@ KEYWORDS=amd64
 LICENSE=MIT
 SLOT=0/1.15.1
 SRC_URI=https://github.com/oneapi-src/level-zero/archive/refs/tags/v1.15.1.tar.gz -> level-zero-1.15.1.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=5b267b4bb5616aa9a7d187e3c53f0912
diff --git a/metadata/md5-cache/dev-libs/level-zero-1.15.8 b/metadata/md5-cache/dev-libs/level-zero-1.15.8
index 0c9dfb5dc955..c3dd6d7d6e54 100644
--- a/metadata/md5-cache/dev-libs/level-zero-1.15.8
+++ b/metadata/md5-cache/dev-libs/level-zero-1.15.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
 DESCRIPTION=oneAPI Level Zero headers, loader and validation layer
 EAPI=8
@@ -8,5 +8,5 @@ KEYWORDS=~amd64
 LICENSE=MIT
 SLOT=0/1.15.8
 SRC_URI=https://github.com/oneapi-src/level-zero/archive/refs/tags/v1.15.8.tar.gz -> level-zero-1.15.8.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=2feb508d1af9e073d0efeb5612c0a74c
diff --git a/metadata/md5-cache/dev-libs/leveldb-1.23-r5 b/metadata/md5-cache/dev-libs/leveldb-1.23-r5
index 5d553cc9919d..9507e5ad016a 100644
--- a/metadata/md5-cache/dev-libs/leveldb-1.23-r5
+++ b/metadata/md5-cache/dev-libs/leveldb-1.23-r5
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-cpp/gtest ) app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=test? ( dev-cpp/gtest ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-libs/crc32c snappy? ( app-arch/snappy:= ) tcmalloc? ( dev-util/google-perftools:=[-minimal] )
 DESCRIPTION=A fast key-value storage library written at Google
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/crc32c snappy? ( app-arch/snappy:= ) tcmalloc? ( dev-util/googl
 RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://github.com/google/leveldb/archive/refs/tags/1.23.tar.gz -> leveldb-1.23.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=ec1c2b76950e1a640d91dfdf0052cf1a
diff --git a/metadata/md5-cache/dev-libs/libansilove-1.4.1 b/metadata/md5-cache/dev-libs/libansilove-1.4.1
index 23e5194adc84..6800179d3fc3 100644
--- a/metadata/md5-cache/dev-libs/libansilove-1.4.1
+++ b/metadata/md5-cache/dev-libs/libansilove-1.4.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-libs/gd:2=[png]
 DESCRIPTION=library to convert ANSi and artscene related file formats into PNG images
@@ -10,5 +10,5 @@ LICENSE=BSD-2
 RDEPEND=media-libs/gd:2=[png]
 SLOT=0
 SRC_URI=https://github.com/ansilove/libansilove/archive/refs/tags/1.4.1.tar.gz -> libansilove-1.4.1.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=22cae439bffae8cd6173d5d02c4052ba
diff --git a/metadata/md5-cache/dev-libs/libansilove-9999 b/metadata/md5-cache/dev-libs/libansilove-9999
index 8f9aa7a2059f..958671acb227 100644
--- a/metadata/md5-cache/dev-libs/libansilove-9999
+++ b/metadata/md5-cache/dev-libs/libansilove-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-libs/gd:2=[png]
 DESCRIPTION=library to convert ANSi and artscene related file formats into PNG images
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 PROPERTIES=live
 RDEPEND=media-libs/gd:2=[png]
 SLOT=0
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=43c3c5abb9cc53043b5837f7181474fc
diff --git a/metadata/md5-cache/dev-libs/libayatana-appindicator-0.5.91 b/metadata/md5-cache/dev-libs/libayatana-appindicator-0.5.91
index 607a62f3a949..6b3c4c147682 100644
--- a/metadata/md5-cache/dev-libs/libayatana-appindicator-0.5.91
+++ b/metadata/md5-cache/dev-libs/libayatana-appindicator-0.5.91
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/vala:0.56[vapigen(+)] ) test? ( dev-util/dbus-test-runner ) app-alternatives/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+BDEPEND=|| ( dev-lang/vala:0.56[vapigen(+)] ) test? ( dev-util/dbus-test-runner ) app-alternatives/ninja >=dev-build/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=dev-libs/glib-2.37:2 >=x11-libs/gtk+-3.24:3[introspection] dev-libs/libdbusmenu[gtk3] >=dev-libs/libayatana-indicator-0.8.4
 DESCRIPTION=Ayatana Application Indicators (Shared Library)
@@ -12,5 +12,5 @@ RDEPEND=>=dev-libs/glib-2.37:2 >=x11-libs/gtk+-3.24:3[introspection] dev-libs/li
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/AyatanaIndicators/libayatana-appindicator/archive/0.5.91.tar.gz -> libayatana-appindicator-0.5.91.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	vala	e477903dbe0105930c51f170a592dc16	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	vala	e477903dbe0105930c51f170a592dc16	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=207b949e7a76f8fe017a17731370ec7d
diff --git a/metadata/md5-cache/dev-libs/libayatana-appindicator-0.5.92 b/metadata/md5-cache/dev-libs/libayatana-appindicator-0.5.92
index 4b904e625d58..54f1eb84c378 100644
--- a/metadata/md5-cache/dev-libs/libayatana-appindicator-0.5.92
+++ b/metadata/md5-cache/dev-libs/libayatana-appindicator-0.5.92
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/vala:0.56[vapigen(+)] ) test? ( dev-util/dbus-test-runner ) app-alternatives/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+BDEPEND=|| ( dev-lang/vala:0.56[vapigen(+)] ) test? ( dev-util/dbus-test-runner ) app-alternatives/ninja >=dev-build/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=dev-libs/glib-2.37:2 >=x11-libs/gtk+-3.24:3[introspection] dev-libs/libdbusmenu[gtk3] >=dev-libs/libayatana-indicator-0.8.4
 DESCRIPTION=Ayatana Application Indicators (Shared Library)
@@ -12,5 +12,5 @@ RDEPEND=>=dev-libs/glib-2.37:2 >=x11-libs/gtk+-3.24:3[introspection] dev-libs/li
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/AyatanaIndicators/libayatana-appindicator/archive/0.5.92.tar.gz -> libayatana-appindicator-0.5.92.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	vala	e477903dbe0105930c51f170a592dc16	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	vala	e477903dbe0105930c51f170a592dc16	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=918eba73c6fad585c67b0f3a77b4ec6f
diff --git a/metadata/md5-cache/dev-libs/libayatana-indicator-0.9.3 b/metadata/md5-cache/dev-libs/libayatana-indicator-0.9.3
index 44d383ac87b8..4da85c6d9ef1 100644
--- a/metadata/md5-cache/dev-libs/libayatana-indicator-0.9.3
+++ b/metadata/md5-cache/dev-libs/libayatana-indicator-0.9.3
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/vala:0.56[vapigen(+)] ) test? ( dev-util/dbus-test-runner ) app-alternatives/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+BDEPEND=|| ( dev-lang/vala:0.56[vapigen(+)] ) test? ( dev-util/dbus-test-runner ) app-alternatives/ninja >=dev-build/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-libs/dbus-glib >=dev-libs/glib-2.58:2 >=x11-libs/gtk+-3.24:3[introspection] >=dev-libs/ayatana-ido-0.8.2
 DESCRIPTION=Ayatana Application Indicators (Shared Library)
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/dbus-glib >=dev-libs/glib-2.58:2 >=x11-libs/gtk+-3.24:3[introsp
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/AyatanaIndicators/libayatana-indicator/archive/0.9.3.tar.gz -> libayatana-indicator-0.9.3.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	vala	e477903dbe0105930c51f170a592dc16	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	vala	e477903dbe0105930c51f170a592dc16	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=db65fa047f7672656245a20c8c01f4e7
diff --git a/metadata/md5-cache/dev-libs/libbson-1.18.0 b/metadata/md5-cache/dev-libs/libbson-1.18.0
index a3c9be66bf87..6b207d719217 100644
--- a/metadata/md5-cache/dev-libs/libbson-1.18.0
+++ b/metadata/md5-cache/dev-libs/libbson-1.18.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-python/sphinx
 DESCRIPTION=Library routines related to building,parsing and iterating BSON documents
@@ -10,5 +10,5 @@ KEYWORDS=amd64 ~arm64 ~hppa ~loong ~ppc ~riscv ~sparc x86
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/mongodb/mongo-c-driver/releases/download/1.18.0/mongo-c-driver-1.18.0.tar.gz -> libbson-1.18.0.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=e3ca051039e38b8426e329fdb6140dda
diff --git a/metadata/md5-cache/dev-libs/libbson-1.24.4 b/metadata/md5-cache/dev-libs/libbson-1.24.4
index 0e1b0a4a4c82..e465e4840e88 100644
--- a/metadata/md5-cache/dev-libs/libbson-1.24.4
+++ b/metadata/md5-cache/dev-libs/libbson-1.24.4
@@ -1,4 +1,4 @@
-BDEPEND=dev-python/sphinx app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=dev-python/sphinx app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Library routines related to building,parsing and iterating BSON documents
 EAPI=8
@@ -9,5 +9,5 @@ KEYWORDS=~amd64 ~arm64 ~hppa ~loong ~ppc ~riscv ~sparc ~x86
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/mongodb/mongo-c-driver/releases/download/1.24.4/mongo-c-driver-1.24.4.tar.gz -> libbson-1.24.4.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=550130712c27d1ecb89776b8c84e41f8
diff --git a/metadata/md5-cache/dev-libs/libcbor-0.10.2 b/metadata/md5-cache/dev-libs/libcbor-0.10.2
index f450736cdae0..06a1999e8c55 100644
--- a/metadata/md5-cache/dev-libs/libcbor-0.10.2
+++ b/metadata/md5-cache/dev-libs/libcbor-0.10.2
@@ -1,4 +1,4 @@
-BDEPEND=doc? ( || ( ( dev-lang/python:3.11 dev-python/sphinx[python_targets_python3_11(-)] dev-python/sphinx-rtd-theme[python_targets_python3_11(-)] dev-python/breathe[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinx-rtd-theme[python_targets_python3_10(-)] dev-python/breathe[python_targets_python3_10(-)] ) ) ) test? ( dev-util/cmocka ) app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=doc? ( || ( ( dev-lang/python:3.11 dev-python/sphinx[python_targets_python3_11(-)] dev-python/sphinx-rtd-theme[python_targets_python3_11(-)] dev-python/breathe[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinx-rtd-theme[python_targets_python3_10(-)] dev-python/breathe[python_targets_python3_10(-)] ) ) ) test? ( dev-util/cmocka ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
 DESCRIPTION=CBOR protocol implementation for C and others
 EAPI=8
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0/0.10
 SRC_URI=https://github.com/PJK/libcbor/archive/v0.10.2.tar.gz -> libcbor-0.10.2.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=f0b3cde000517b2f1ee3fb6bff1e090a
diff --git a/metadata/md5-cache/dev-libs/libcec-6.0.2-r1 b/metadata/md5-cache/dev-libs/libcec-6.0.2-r1
index cff0d146079b..277e1196c452 100644
--- a/metadata/md5-cache/dev-libs/libcec-6.0.2-r1
+++ b/metadata/md5-cache/dev-libs/libcec-6.0.2-r1
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-util/cmake-3.20.5 virtual/pkgconfig
+BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5 virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test
 DEPEND=>=dev-libs/libplatform-2.0.0 python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) ) raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 ) udev? ( virtual/udev ) xrandr? ( x11-libs/libX11 x11-libs/libXrandr ) python? ( dev-lang/swig )
 DESCRIPTION=Library for communicating with the Pulse-Eight USB HDMI-CEC Adaptor
@@ -12,5 +12,5 @@ RDEPEND=>=dev-libs/libplatform-2.0.0 python? ( python_single_target_python3_10?
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_10 python_single_target_python3_11 ) )
 SLOT=0
 SRC_URI=https://github.com/Pulse-Eight/libcec/archive/libcec-6.0.2.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	udev	eec0bbab06977f1cfc5597269c1fa152	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	udev	eec0bbab06977f1cfc5597269c1fa152	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=c69de900aca15b3adc423d7cc1cb5184
diff --git a/metadata/md5-cache/dev-libs/libclc-15.0.7 b/metadata/md5-cache/dev-libs/libclc-15.0.7
index 5cf2f7ea1ba8..51e95bcf05dd 100644
--- a/metadata/md5-cache/dev-libs/libclc-15.0.7
+++ b/metadata/md5-cache/dev-libs/libclc-15.0.7
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/python:3.11 dev-lang/python:3.10 ) || ( ( sys-devel/clang:15 spirv? ( dev-util/spirv-llvm-translator:15 ) ) ( sys-devel/clang:14 spirv? ( dev-util/spirv-llvm-translator:14 ) ) ( sys-devel/clang:13 spirv? ( dev-util/spirv-llvm-translator:13 ) ) ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-16.0.4 ) app-alternatives/ninja >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-20 )
+BDEPEND=|| ( dev-lang/python:3.11 dev-lang/python:3.10 ) || ( ( sys-devel/clang:15 spirv? ( dev-util/spirv-llvm-translator:15 ) ) ( sys-devel/clang:14 spirv? ( dev-util/spirv-llvm-translator:14 ) ) ( sys-devel/clang:13 spirv? ( dev-util/spirv-llvm-translator:13 ) ) ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-16.0.4 ) app-alternatives/ninja >=dev-build/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-20 )
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=!!sys-devel/llvm:0
 DESCRIPTION=OpenCL C library
@@ -10,5 +10,5 @@ KEYWORDS=amd64 x86
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( MIT BSD )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig )
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	llvm	dcfb437a52b5672e5f39deaae6f789c3	llvm.org	0503cdd933e65383bc12f0ac4f5a5cad	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	llvm	dcfb437a52b5672e5f39deaae6f789c3	llvm.org	0503cdd933e65383bc12f0ac4f5a5cad	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=d1b95418d66b7940177352663526f1c3
diff --git a/metadata/md5-cache/dev-libs/libclc-16.0.6 b/metadata/md5-cache/dev-libs/libclc-16.0.6
index 313208aec35b..ab963322692a 100644
--- a/metadata/md5-cache/dev-libs/libclc-16.0.6
+++ b/metadata/md5-cache/dev-libs/libclc-16.0.6
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) || ( ( sys-devel/clang:16 spirv? ( dev-util/spirv-llvm-translator:16 ) ) ( sys-devel/clang:15 spirv? ( dev-util/spirv-llvm-translator:15 ) ) ( sys-devel/clang:14 spirv? ( dev-util/spirv-llvm-translator:14 ) ) ( sys-devel/clang:13 spirv? ( dev-util/spirv-llvm-translator:13 ) ) ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-16.0.4 ) app-alternatives/ninja >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-20 )
+BDEPEND=|| ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) || ( ( sys-devel/clang:16 spirv? ( dev-util/spirv-llvm-translator:16 ) ) ( sys-devel/clang:15 spirv? ( dev-util/spirv-llvm-translator:15 ) ) ( sys-devel/clang:14 spirv? ( dev-util/spirv-llvm-translator:14 ) ) ( sys-devel/clang:13 spirv? ( dev-util/spirv-llvm-translator:13 ) ) ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-16.0.4 ) app-alternatives/ninja >=dev-build/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-20 )
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=!!sys-devel/llvm:0
 DESCRIPTION=OpenCL C library
@@ -10,5 +10,5 @@ KEYWORDS=amd64 ~riscv x86
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( MIT BSD )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.6/llvm-project-16.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.6/llvm-project-16.0.6.src.tar.xz.sig )
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	llvm	dcfb437a52b5672e5f39deaae6f789c3	llvm.org	0503cdd933e65383bc12f0ac4f5a5cad	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	llvm	dcfb437a52b5672e5f39deaae6f789c3	llvm.org	0503cdd933e65383bc12f0ac4f5a5cad	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=60cec33a95d6e032d0564390f85e4b74
diff --git a/metadata/md5-cache/dev-libs/libclc-17.0.6 b/metadata/md5-cache/dev-libs/libclc-17.0.6
index 4501396a6fbf..df49e1f7558e 100644
--- a/metadata/md5-cache/dev-libs/libclc-17.0.6
+++ b/metadata/md5-cache/dev-libs/libclc-17.0.6
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) || ( ( sys-devel/clang:17 spirv? ( dev-util/spirv-llvm-translator:17 ) ) ( sys-devel/clang:16 spirv? ( dev-util/spirv-llvm-translator:16 ) ) ( sys-devel/clang:15 spirv? ( dev-util/spirv-llvm-translator:15 ) ) ( sys-devel/clang:14 spirv? ( dev-util/spirv-llvm-translator:14 ) ) ( sys-devel/clang:13 spirv? ( dev-util/spirv-llvm-translator:13 ) ) ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-16.0.4 ) app-alternatives/ninja >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-20 )
+BDEPEND=|| ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) || ( ( sys-devel/clang:17 spirv? ( dev-util/spirv-llvm-translator:17 ) ) ( sys-devel/clang:16 spirv? ( dev-util/spirv-llvm-translator:16 ) ) ( sys-devel/clang:15 spirv? ( dev-util/spirv-llvm-translator:15 ) ) ( sys-devel/clang:14 spirv? ( dev-util/spirv-llvm-translator:14 ) ) ( sys-devel/clang:13 spirv? ( dev-util/spirv-llvm-translator:13 ) ) ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-16.0.4 ) app-alternatives/ninja >=dev-build/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-20 )
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=!!sys-devel/llvm:0
 DESCRIPTION=OpenCL C library
@@ -10,5 +10,5 @@ KEYWORDS=amd64 ~arm64 ~riscv x86
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( MIT BSD )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.6/llvm-project-17.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.6/llvm-project-17.0.6.src.tar.xz.sig )
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	llvm	dcfb437a52b5672e5f39deaae6f789c3	llvm.org	0503cdd933e65383bc12f0ac4f5a5cad	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	llvm	dcfb437a52b5672e5f39deaae6f789c3	llvm.org	0503cdd933e65383bc12f0ac4f5a5cad	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=b47e6a9d06021f1da5fe066f85a10430
diff --git a/metadata/md5-cache/dev-libs/libclc-18.0.0.9999 b/metadata/md5-cache/dev-libs/libclc-18.0.0.9999
index 8791ab3466de..0e824994d2ab 100644
--- a/metadata/md5-cache/dev-libs/libclc-18.0.0.9999
+++ b/metadata/md5-cache/dev-libs/libclc-18.0.0.9999
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) || ( ( sys-devel/clang:17 spirv? ( dev-util/spirv-llvm-translator:17 ) ) ( sys-devel/clang:16 spirv? ( dev-util/spirv-llvm-translator:16 ) ) ( sys-devel/clang:15 spirv? ( dev-util/spirv-llvm-translator:15 ) ) ( sys-devel/clang:14 spirv? ( dev-util/spirv-llvm-translator:14 ) ) ( sys-devel/clang:13 spirv? ( dev-util/spirv-llvm-translator:13 ) ) ) app-alternatives/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=|| ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) || ( ( sys-devel/clang:17 spirv? ( dev-util/spirv-llvm-translator:17 ) ) ( sys-devel/clang:16 spirv? ( dev-util/spirv-llvm-translator:16 ) ) ( sys-devel/clang:15 spirv? ( dev-util/spirv-llvm-translator:15 ) ) ( sys-devel/clang:14 spirv? ( dev-util/spirv-llvm-translator:14 ) ) ( sys-devel/clang:13 spirv? ( dev-util/spirv-llvm-translator:13 ) ) ) app-alternatives/ninja >=dev-build/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=!!sys-devel/llvm:0
 DESCRIPTION=OpenCL C library
@@ -9,5 +9,5 @@ IUSE=+spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( MIT BSD )
 PROPERTIES=live
 SLOT=0
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	llvm	dcfb437a52b5672e5f39deaae6f789c3	llvm.org	0503cdd933e65383bc12f0ac4f5a5cad	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	llvm	dcfb437a52b5672e5f39deaae6f789c3	llvm.org	0503cdd933e65383bc12f0ac4f5a5cad	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=dc9bc15e80ab532bfe00e0f981ba4b75
diff --git a/metadata/md5-cache/dev-libs/libclc-18.0.0_pre20240106 b/metadata/md5-cache/dev-libs/libclc-18.0.0_pre20240106
index 51dc99b01e92..77ad84577da9 100644
--- a/metadata/md5-cache/dev-libs/libclc-18.0.0_pre20240106
+++ b/metadata/md5-cache/dev-libs/libclc-18.0.0_pre20240106
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) || ( ( sys-devel/clang:17 spirv? ( dev-util/spirv-llvm-translator:17 ) ) ( sys-devel/clang:16 spirv? ( dev-util/spirv-llvm-translator:16 ) ) ( sys-devel/clang:15 spirv? ( dev-util/spirv-llvm-translator:15 ) ) ( sys-devel/clang:14 spirv? ( dev-util/spirv-llvm-translator:14 ) ) ( sys-devel/clang:13 spirv? ( dev-util/spirv-llvm-translator:13 ) ) ) app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=|| ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) || ( ( sys-devel/clang:17 spirv? ( dev-util/spirv-llvm-translator:17 ) ) ( sys-devel/clang:16 spirv? ( dev-util/spirv-llvm-translator:16 ) ) ( sys-devel/clang:15 spirv? ( dev-util/spirv-llvm-translator:15 ) ) ( sys-devel/clang:14 spirv? ( dev-util/spirv-llvm-translator:14 ) ) ( sys-devel/clang:13 spirv? ( dev-util/spirv-llvm-translator:13 ) ) ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=!!sys-devel/llvm:0
 DESCRIPTION=OpenCL C library
@@ -9,5 +9,5 @@ IUSE=+spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( MIT BSD )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/a085402ef54379758e6c996dbaedfcb92ad222b5.tar.gz -> llvm-project-a085402ef54379758e6c996dbaedfcb92ad222b5.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	llvm	dcfb437a52b5672e5f39deaae6f789c3	llvm.org	0503cdd933e65383bc12f0ac4f5a5cad	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	llvm	dcfb437a52b5672e5f39deaae6f789c3	llvm.org	0503cdd933e65383bc12f0ac4f5a5cad	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=83f0db3606600007069c04fd917059f4
diff --git a/metadata/md5-cache/dev-libs/libclc-18.0.0_pre20240113 b/metadata/md5-cache/dev-libs/libclc-18.0.0_pre20240113
index 1a5f73b07ff9..f74e5d998438 100644
--- a/metadata/md5-cache/dev-libs/libclc-18.0.0_pre20240113
+++ b/metadata/md5-cache/dev-libs/libclc-18.0.0_pre20240113
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) || ( ( sys-devel/clang:17 spirv? ( dev-util/spirv-llvm-translator:17 ) ) ( sys-devel/clang:16 spirv? ( dev-util/spirv-llvm-translator:16 ) ) ( sys-devel/clang:15 spirv? ( dev-util/spirv-llvm-translator:15 ) ) ( sys-devel/clang:14 spirv? ( dev-util/spirv-llvm-translator:14 ) ) ( sys-devel/clang:13 spirv? ( dev-util/spirv-llvm-translator:13 ) ) ) app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=|| ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) || ( ( sys-devel/clang:17 spirv? ( dev-util/spirv-llvm-translator:17 ) ) ( sys-devel/clang:16 spirv? ( dev-util/spirv-llvm-translator:16 ) ) ( sys-devel/clang:15 spirv? ( dev-util/spirv-llvm-translator:15 ) ) ( sys-devel/clang:14 spirv? ( dev-util/spirv-llvm-translator:14 ) ) ( sys-devel/clang:13 spirv? ( dev-util/spirv-llvm-translator:13 ) ) ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=!!sys-devel/llvm:0
 DESCRIPTION=OpenCL C library
@@ -9,5 +9,5 @@ IUSE=+spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( MIT BSD )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/8d817f6479a5df874028a8b40fd30aecd3479005.tar.gz -> llvm-project-8d817f6479a5df874028a8b40fd30aecd3479005.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	llvm	dcfb437a52b5672e5f39deaae6f789c3	llvm.org	0503cdd933e65383bc12f0ac4f5a5cad	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	llvm	dcfb437a52b5672e5f39deaae6f789c3	llvm.org	0503cdd933e65383bc12f0ac4f5a5cad	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=83f0db3606600007069c04fd917059f4
diff --git a/metadata/md5-cache/dev-libs/libdbusmenu-qt-0.9.3_pre20160218-r3 b/metadata/md5-cache/dev-libs/libdbusmenu-qt-0.9.3_pre20160218-r3
index 8fb62eef055e..d10625d2f652 100644
--- a/metadata/md5-cache/dev-libs/libdbusmenu-qt-0.9.3_pre20160218-r3
+++ b/metadata/md5-cache/dev-libs/libdbusmenu-qt-0.9.3_pre20160218-r3
@@ -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-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5
 DESCRIPTION=Library providing Qt implementation of DBusMenu specification
@@ -10,5 +10,5 @@ LICENSE=LGPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5
 SLOT=0
 SRC_URI=https://launchpad.net/ubuntu/+archive/primary/+files/libdbusmenu-qt_0.9.3+16.04.20160218.orig.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=2fa0901de3365463b27aabae691f4db4
diff --git a/metadata/md5-cache/dev-libs/libdispatch-5.7.1 b/metadata/md5-cache/dev-libs/libdispatch-5.7.1
index d9da1a38c996..83abe5576c94 100644
--- a/metadata/md5-cache/dev-libs/libdispatch-5.7.1
+++ b/metadata/md5-cache/dev-libs/libdispatch-5.7.1
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/clang sys-devel/llvm virtual/pkgconfig app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=sys-devel/clang sys-devel/llvm virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=!gnustep-base/libobjc2 !sys-libs/blocksruntime
 DESCRIPTION=A library for concurrent code execution on multicore hardware
@@ -12,5 +12,5 @@ RDEPEND=!gnustep-base/libobjc2 !sys-libs/blocksruntime
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/apple/swift-corelibs-libdispatch/archive/swift-5.7.1-RELEASE.tar.gz -> libdispatch-5.7.1.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=e31ceebc547f292e7e79cd2d2c46a5f3
diff --git a/metadata/md5-cache/dev-libs/libdispatch-5.7.3 b/metadata/md5-cache/dev-libs/libdispatch-5.7.3
index 31da2f2d50cc..148b9712e792 100644
--- a/metadata/md5-cache/dev-libs/libdispatch-5.7.3
+++ b/metadata/md5-cache/dev-libs/libdispatch-5.7.3
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/clang sys-devel/llvm virtual/pkgconfig app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=sys-devel/clang sys-devel/llvm virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=!gnustep-base/libobjc2 !sys-libs/blocksruntime
 DESCRIPTION=A library for concurrent code execution on multicore hardware
@@ -12,5 +12,5 @@ RDEPEND=!gnustep-base/libobjc2 !sys-libs/blocksruntime
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/apple/swift-corelibs-libdispatch/archive/swift-5.7.3-RELEASE.tar.gz -> libdispatch-5.7.3.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=e31ceebc547f292e7e79cd2d2c46a5f3
diff --git a/metadata/md5-cache/dev-libs/libdispatch-5.8 b/metadata/md5-cache/dev-libs/libdispatch-5.8
index 8338ffa75b82..dda83ae87ac3 100644
--- a/metadata/md5-cache/dev-libs/libdispatch-5.8
+++ b/metadata/md5-cache/dev-libs/libdispatch-5.8
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/clang sys-devel/llvm virtual/pkgconfig app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=sys-devel/clang sys-devel/llvm virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=!gnustep-base/libobjc2 !sys-libs/blocksruntime
 DESCRIPTION=A library for concurrent code execution on multicore hardware
@@ -12,5 +12,5 @@ RDEPEND=!gnustep-base/libobjc2 !sys-libs/blocksruntime
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/apple/swift-corelibs-libdispatch/archive/swift-5.8-RELEASE.tar.gz -> libdispatch-5.8.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=29a611cc60ffe0e288aadaa6a7b21b7b
diff --git a/metadata/md5-cache/dev-libs/libdivsufsort-2.0.1-r2 b/metadata/md5-cache/dev-libs/libdivsufsort-2.0.1-r2
index 38d8e68a2daa..257aa0424af3 100644
--- a/metadata/md5-cache/dev-libs/libdivsufsort-2.0.1-r2
+++ b/metadata/md5-cache/dev-libs/libdivsufsort-2.0.1-r2
@@ -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 pretend setup test
 DESCRIPTION=Suffix-sorting library (for BWT)
 EAPI=8
@@ -9,5 +9,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/y-256/libdivsufsort/archive/2.0.1.tar.gz -> libdivsufsort-2.0.1.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=2ec9a2fc54eab362fea2c62dbe9995b2
diff --git a/metadata/md5-cache/dev-libs/libdynd-0.7.2-r1 b/metadata/md5-cache/dev-libs/libdynd-0.7.2-r1
index 5b7b5773fe09..bd6ed3ef9cbc 100644
--- a/metadata/md5-cache/dev-libs/libdynd-0.7.2-r1
+++ b/metadata/md5-cache/dev-libs/libdynd-0.7.2-r1
@@ -1,4 +1,4 @@
-BDEPEND=doc? ( app-text/doxygen[dot] ) app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=doc? ( app-text/doxygen[dot] ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-libs/c-blosc:= cuda? ( dev-util/nvidia-cuda-toolkit ) fftw? ( sci-libs/fftw:3.0 )
 DESCRIPTION=C++ dynamic multi-dimensionnal array library with Python exposure
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/c-blosc:= cuda? ( dev-util/nvidia-cuda-toolkit ) fftw? ( sci-li
 RESTRICT=!test? ( test )
 SLOT=0/0.7.2
 SRC_URI=https://github.com/libdynd/libdynd/archive/v0.7.2.tar.gz -> libdynd-0.7.2.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	cuda	283d0f298f6c196c755a0f8d50daca85	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cuda	283d0f298f6c196c755a0f8d50daca85	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=c71a1c836ab7277d68f202a52fce37c7
diff --git a/metadata/md5-cache/dev-libs/libebml-1.4.4 b/metadata/md5-cache/dev-libs/libebml-1.4.4
index 492f04ed5935..305effcc74d9 100644
--- a/metadata/md5-cache/dev-libs/libebml-1.4.4
+++ b/metadata/md5-cache/dev-libs/libebml-1.4.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
 DESCRIPTION=Extensible binary format library (kinda like XML)
 EAPI=8
@@ -8,5 +8,5 @@ KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~a
 LICENSE=LGPL-2.1
 SLOT=0/5
 SRC_URI=https://dl.matroska.org/downloads/libebml/libebml-1.4.4.tar.xz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=806f2f1fa3a36c49855ddf7692103d94
diff --git a/metadata/md5-cache/dev-libs/libei-1.2.0 b/metadata/md5-cache/dev-libs/libei-1.2.0
index 863abea182b3..ec8fdeed5356 100644
--- a/metadata/md5-cache/dev-libs/libei-1.2.0
+++ b/metadata/md5-cache/dev-libs/libei-1.2.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://gitlab.freedesktop.org/libinput/libei
 INHERIT=meson python-any-r1
 IUSE=elogind systemd test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=>=dev-libs/libevdev-1.9.902 || ( systemd? ( >=sys-apps/systemd-237 ) elogind? ( >=sys-auth/elogind-237 ) sys-libs/basu )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://gitlab.freedesktop.org/libinput/libei/-/archive/1.2.0/libei-1.2.0.tar.bz2 https://github.com/nemequ/munit/archive/fbbdf1467eb0d04a6ee465def2e529e4c87f2118.tar.gz -> munit-fbbdf1467eb0d04a6ee465def2e529e4c87f2118.tar.gz
 _eclasses_=meson	e322276188f86eacb29ae081ba5485c8	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=d8935a4a854c2ba374dd5ceb18cfc9d8
+_md5_=3e5302755033c72811785829c3953866
diff --git a/metadata/md5-cache/dev-libs/libfido2-1.13.0 b/metadata/md5-cache/dev-libs/libfido2-1.13.0
index fa74c51ccf77..9ebaf6d7705a 100644
--- a/metadata/md5-cache/dev-libs/libfido2-1.13.0
+++ b/metadata/md5-cache/dev-libs/libfido2-1.13.0
@@ -1,4 +1,4 @@
-BDEPEND=app-text/mandoc app-alternatives/ninja >=dev-util/cmake-3.20.5 virtual/pkgconfig
+BDEPEND=app-text/mandoc app-alternatives/ninja >=dev-build/cmake-3.20.5 virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test
 DEPEND=dev-libs/libcbor:= dev-libs/openssl:= sys-libs/zlib:= virtual/libudev:=
 DESCRIPTION=Provides library functionality for FIDO 2.0
@@ -11,5 +11,5 @@ LICENSE=BSD-2
 RDEPEND=dev-libs/libcbor:= dev-libs/openssl:= sys-libs/zlib:= virtual/libudev:= acct-group/plugdev
 SLOT=0/1
 SRC_URI=https://github.com/Yubico/libfido2/archive/1.13.0.tar.gz -> libfido2-1.13.0.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	udev	eec0bbab06977f1cfc5597269c1fa152	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	udev	eec0bbab06977f1cfc5597269c1fa152	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=526af09d098dc5bbb12a045977ccd1e0
diff --git a/metadata/md5-cache/dev-libs/libflatarray-0.4.0_pre20201009 b/metadata/md5-cache/dev-libs/libflatarray-0.4.0_pre20201009
index 019c9400c426..e85414bf28bc 100644
--- a/metadata/md5-cache/dev-libs/libflatarray-0.4.0_pre20201009
+++ b/metadata/md5-cache/dev-libs/libflatarray-0.4.0_pre20201009
@@ -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=cuda? ( dev-util/nvidia-cuda-toolkit )
 DESCRIPTION=Struct of arrays library with object oriented interface for C++
@@ -11,5 +11,5 @@ LICENSE=Boost-1.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/STEllAR-GROUP/libflatarray/archive/c8df37f6ac73250998b90c397458469902d6d9b9.tar.gz -> libflatarray-0.4.0_pre20201009.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	cuda	283d0f298f6c196c755a0f8d50daca85	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cuda	283d0f298f6c196c755a0f8d50daca85	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=53e4733346863f16ccb5eed2e5677080
diff --git a/metadata/md5-cache/dev-libs/libfmt-10.0.0 b/metadata/md5-cache/dev-libs/libfmt-10.0.0
index a3f84f762698..844a49feaa39 100644
--- a/metadata/md5-cache/dev-libs/libfmt-10.0.0
+++ b/metadata/md5-cache/dev-libs/libfmt-10.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
 DESCRIPTION=Small, safe and fast formatting library
 EAPI=8
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0/10.0.0
 SRC_URI=https://github.com/fmtlib/fmt/archive/10.0.0.tar.gz -> libfmt-10.0.0.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=350f2b6fcadd5b8f23ef9016ac8e383b
diff --git a/metadata/md5-cache/dev-libs/libfmt-10.1.0 b/metadata/md5-cache/dev-libs/libfmt-10.1.0
index 6c94b37f11a9..e851879276d3 100644
--- a/metadata/md5-cache/dev-libs/libfmt-10.1.0
+++ b/metadata/md5-cache/dev-libs/libfmt-10.1.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
 DESCRIPTION=Small, safe and fast formatting library
 EAPI=8
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0/10.1.0
 SRC_URI=https://github.com/fmtlib/fmt/archive/10.1.0.tar.gz -> libfmt-10.1.0.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=350f2b6fcadd5b8f23ef9016ac8e383b
diff --git a/metadata/md5-cache/dev-libs/libfmt-10.1.1 b/metadata/md5-cache/dev-libs/libfmt-10.1.1
index 23ad6ee1809e..d0c609fbf053 100644
--- a/metadata/md5-cache/dev-libs/libfmt-10.1.1
+++ b/metadata/md5-cache/dev-libs/libfmt-10.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
 DESCRIPTION=Small, safe and fast formatting library
 EAPI=8
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0/10.1.1
 SRC_URI=https://github.com/fmtlib/fmt/archive/10.1.1.tar.gz -> libfmt-10.1.1.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=350f2b6fcadd5b8f23ef9016ac8e383b
diff --git a/metadata/md5-cache/dev-libs/libfmt-10.2.0 b/metadata/md5-cache/dev-libs/libfmt-10.2.0
index e06d7a89357b..0e16d14da34f 100644
--- a/metadata/md5-cache/dev-libs/libfmt-10.2.0
+++ b/metadata/md5-cache/dev-libs/libfmt-10.2.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
 DESCRIPTION=Small, safe and fast formatting library
 EAPI=8
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0/10.2.0
 SRC_URI=https://github.com/fmtlib/fmt/archive/10.2.0.tar.gz -> libfmt-10.2.0.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=9aed3fcb3dc141f4ded71f075a7115b3
diff --git a/metadata/md5-cache/dev-libs/libfmt-10.2.1 b/metadata/md5-cache/dev-libs/libfmt-10.2.1
index c53615c536ce..fb1f7e99e8c9 100644
--- a/metadata/md5-cache/dev-libs/libfmt-10.2.1
+++ b/metadata/md5-cache/dev-libs/libfmt-10.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
 DESCRIPTION=Small, safe and fast formatting library
 EAPI=8
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0/10.2.1
 SRC_URI=https://github.com/fmtlib/fmt/archive/10.2.1.tar.gz -> libfmt-10.2.1.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=9aed3fcb3dc141f4ded71f075a7115b3
diff --git a/metadata/md5-cache/dev-libs/libfmt-9.1.0-r1 b/metadata/md5-cache/dev-libs/libfmt-9.1.0-r1
index 9b2ef3923467..9ed8187a963e 100644
--- a/metadata/md5-cache/dev-libs/libfmt-9.1.0-r1
+++ b/metadata/md5-cache/dev-libs/libfmt-9.1.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
 DESCRIPTION=Small, safe and fast formatting library
 EAPI=8
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0/9.1.0
 SRC_URI=https://github.com/fmtlib/fmt/archive/9.1.0.tar.gz -> libfmt-9.1.0.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=34e82a3b305eaf0dfc95680208e08da2
diff --git a/metadata/md5-cache/dev-libs/libfmt-9999 b/metadata/md5-cache/dev-libs/libfmt-9999
index d9762e71b0a3..efd269c1e38b 100644
--- a/metadata/md5-cache/dev-libs/libfmt-9999
+++ b/metadata/md5-cache/dev-libs/libfmt-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
 DESCRIPTION=Small, safe and fast formatting library
 EAPI=8
@@ -9,5 +9,5 @@ LICENSE=MIT
 PROPERTIES=live
 RESTRICT=!test? ( test )
 SLOT=0/9999
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=350f2b6fcadd5b8f23ef9016ac8e383b
diff --git a/metadata/md5-cache/dev-libs/libgaminggear-0.15.1 b/metadata/md5-cache/dev-libs/libgaminggear-0.15.1
index c0d0dedd81aa..c6e14c86c6bf 100644
--- a/metadata/md5-cache/dev-libs/libgaminggear-0.15.1
+++ b/metadata/md5-cache/dev-libs/libgaminggear-0.15.1
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/glib-utils doc? ( app-text/doxygen ) app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=dev-util/glib-utils doc? ( app-text/doxygen ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
 DEPEND=>=dev-db/sqlite-3.17:3 dev-libs/glib:2 media-libs/libcanberra x11-libs/cairo x11-libs/gtk+:2 x11-libs/libnotify x11-libs/pango dev-libs/libgudev media-libs/harfbuzz
 DESCRIPTION=Provides functionality for gaming input devices
@@ -12,5 +12,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-db/sqlite-3.17:3 dev-libs/glib:2 media-libs/libcanberra x11-libs/cairo x11-libs/gtk+:2 x11-libs/libnotify x11-libs/pango
 SLOT=0
 SRC_URI=mirror://sourceforge/libgaminggear/libgaminggear-0.15.1.tar.bz2
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=becceb5fa4a8054fbf88d8bc013993b1
diff --git a/metadata/md5-cache/dev-libs/libgit2-1.7.1 b/metadata/md5-cache/dev-libs/libgit2-1.7.1
index f9496608d9ea..5660c032976c 100644
--- a/metadata/md5-cache/dev-libs/libgit2-1.7.1
+++ b/metadata/md5-cache/dev-libs/libgit2-1.7.1
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) virtual/pkgconfig app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=|| ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-libs/libpcre2:= net-libs/http-parser:= sys-libs/zlib dev-libs/openssl:0= gssapi? ( virtual/krb5 ) ssh? ( net-libs/libssh2 )
 DESCRIPTION=A linkable library for Git
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/libpcre2:= net-libs/http-parser:= sys-libs/zlib dev-libs/openss
 RESTRICT=!test? ( test )
 SLOT=0/1.7
 SRC_URI=https://github.com/libgit2/libgit2/archive/v1.7.1.tar.gz -> libgit2-1.7.1.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=09b8e262a636162a0c93cd2734567c9c
diff --git a/metadata/md5-cache/dev-libs/libical-3.0.17 b/metadata/md5-cache/dev-libs/libical-3.0.17
index 524f1384462f..5759bca8199c 100644
--- a/metadata/md5-cache/dev-libs/libical-3.0.17
+++ b/metadata/md5-cache/dev-libs/libical-3.0.17
@@ -1,4 +1,4 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig doc? ( app-text/doxygen[dot] glib? ( dev-util/gtk-doc ) ) introspection? ( dev-libs/gobject-introspection ) test? ( || ( dev-lang/python:3.11 dev-lang/python:3.10 ) glib? ( || ( ( dev-lang/python:3.11 dev-python/pygobject:3[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/pygobject:3[python_targets_python3_10(-)] ) ) ) ) vala? ( || ( dev-lang/vala:0.56[vapigen(+)] ) ) app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=dev-lang/perl virtual/pkgconfig doc? ( app-text/doxygen[dot] glib? ( dev-util/gtk-doc ) ) introspection? ( dev-libs/gobject-introspection ) test? ( || ( dev-lang/python:3.11 dev-lang/python:3.10 ) glib? ( || ( ( dev-lang/python:3.11 dev-python/pygobject:3[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/pygobject:3[python_targets_python3_10(-)] ) ) ) ) vala? ( || ( dev-lang/vala:0.56[vapigen(+)] ) ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-libs/icu:= glib? ( dev-libs/glib:2 ) glib? ( dev-libs/libxml2:2 )
 DESCRIPTION=Implementation of basic iCAL protocols
@@ -13,5 +13,5 @@ REQUIRED_USE=introspection? ( glib ) vala? ( introspection )
 RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=https://github.com/libical/libical/releases/download/v3.0.17/libical-3.0.17.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	vala	e477903dbe0105930c51f170a592dc16	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	vala	e477903dbe0105930c51f170a592dc16	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=c71e907eab2810bc5ab36f768dfc5287
diff --git a/metadata/md5-cache/dev-libs/libmcfp-1.2.2 b/metadata/md5-cache/dev-libs/libmcfp-1.2.2
index 9d49d948eb08..b14f57d527e0 100644
--- a/metadata/md5-cache/dev-libs/libmcfp-1.2.2
+++ b/metadata/md5-cache/dev-libs/libmcfp-1.2.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=dev-libs/boost:=
 DESCRIPTION=A library that can collect configuration options from command line arguments
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/boost:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mhekkel/libmcfp/archive/refs/tags/v1.2.2.tar.gz -> libmcfp-1.2.2.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=a87214cd7de4ffc63f93e983e4dea41b
diff --git a/metadata/md5-cache/dev-libs/libmcfp-1.2.3 b/metadata/md5-cache/dev-libs/libmcfp-1.2.3
index f21160073161..8abb4065ce42 100644
--- a/metadata/md5-cache/dev-libs/libmcfp-1.2.3
+++ b/metadata/md5-cache/dev-libs/libmcfp-1.2.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=dev-libs/boost:=
 DESCRIPTION=A library that can collect configuration options from command line arguments
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/boost:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mhekkel/libmcfp/archive/refs/tags/v1.2.3.tar.gz -> libmcfp-1.2.3.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=4141ba5334aa2a26bd80063b01eca930
diff --git a/metadata/md5-cache/dev-libs/libmemcached-awesome-1.1.4 b/metadata/md5-cache/dev-libs/libmemcached-awesome-1.1.4
index 1928d2705a80..25f1b5f5f73b 100644
--- a/metadata/md5-cache/dev-libs/libmemcached-awesome-1.1.4
+++ b/metadata/md5-cache/dev-libs/libmemcached-awesome-1.1.4
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/yacc app-alternatives/lex virtual/pkgconfig app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-alternatives/yacc app-alternatives/lex virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=!app-forensics/memdump !dev-libs/libmemcached libevent? ( dev-libs/libevent:= ) sasl? ( dev-libs/cyrus-sasl:2 ) test? ( net-misc/memcached )
 DESCRIPTION=a C/C++ memcached client library
@@ -12,5 +12,5 @@ RDEPEND=!app-forensics/memdump !dev-libs/libmemcached libevent? ( dev-libs/libev
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/awesomized/libmemcached/archive/refs/tags/1.1.4.tar.gz -> libmemcached-awesome-1.1.4.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=30b7c03d666b3f8c4dfb6f0b7d868f74
diff --git a/metadata/md5-cache/dev-libs/libmirage-3.2.7 b/metadata/md5-cache/dev-libs/libmirage-3.2.7
index 5781ec858c1c..e1d231718734 100644
--- a/metadata/md5-cache/dev-libs/libmirage-3.2.7
+++ b/metadata/md5-cache/dev-libs/libmirage-3.2.7
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/desktop-file-utils dev-util/intltool sys-devel/gettext virtual/pkgconfig doc? ( dev-util/gtk-doc ) introspection? ( >=dev-libs/gobject-introspection-1.30 ) app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=dev-util/desktop-file-utils dev-util/intltool sys-devel/gettext virtual/pkgconfig doc? ( dev-util/gtk-doc ) introspection? ( >=dev-libs/gobject-introspection-1.30 ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm prepare test
 DEPEND=>=app-arch/bzip2-1:= >=app-arch/xz-utils-5:= >=dev-libs/glib-2.38:2 >=media-libs/libsamplerate-0.1:= >=media-libs/libsndfile-1.0:= sys-libs/zlib:= introspection? ( >=dev-libs/gobject-introspection-1.30 )
 DESCRIPTION=CD and DVD image access library
@@ -11,5 +11,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-arch/bzip2-1:= >=app-arch/xz-utils-5:= >=dev-libs/glib-2.38:2 >=media-libs/libsamplerate-0.1:= >=media-libs/libsndfile-1.0:= sys-libs/zlib:= introspection? ( >=dev-libs/gobject-introspection-1.30 )
 SLOT=0/11
 SRC_URI=https://download.sourceforge.net/cdemu/libmirage/libmirage-3.2.7.tar.xz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=02abe23060647af2e9a3c43572fc7a74
diff --git a/metadata/md5-cache/dev-libs/libphonenumber-8.12.39 b/metadata/md5-cache/dev-libs/libphonenumber-8.12.39
index 401cbf9330ad..a9aaf4e2d640 100644
--- a/metadata/md5-cache/dev-libs/libphonenumber-8.12.39
+++ b/metadata/md5-cache/dev-libs/libphonenumber-8.12.39
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig test? ( dev-cpp/gtest ) dev-build/make >=dev-util/cmake-3.20.5
+BDEPEND=virtual/pkgconfig test? ( dev-cpp/gtest ) dev-build/make >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-libs/icu:= dev-libs/protobuf:= dev-libs/boost:=
 DESCRIPTION=Library for parsing, formatting, and validating international phone numbers
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/icu:= dev-libs/protobuf:= dev-libs/boost:=
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/libphonenumber/archive/v8.12.39.tar.gz -> libphonenumber-8.12.39.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=c107f7d446b3898e82d86a16338edb18
diff --git a/metadata/md5-cache/dev-libs/libplatform-2.1.0.1-r2 b/metadata/md5-cache/dev-libs/libplatform-2.1.0.1-r2
index 650c3649e197..209c129a6a94 100644
--- a/metadata/md5-cache/dev-libs/libplatform-2.1.0.1-r2
+++ b/metadata/md5-cache/dev-libs/libplatform-2.1.0.1-r2
@@ -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
 DESCRIPTION=Platform support library used by libCEC and binary add-ons for Kodi
 EAPI=8
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ~arm arm64 ~riscv x86
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=https://github.com/Pulse-Eight/platform/archive/p8-platform-2.1.0.1.tar.gz -> libplatform-2.1.0.1.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=d8af88a203c71981e9676d1b74292691
diff --git a/metadata/md5-cache/dev-libs/libplatform-9999 b/metadata/md5-cache/dev-libs/libplatform-9999
index a6b66464ac45..ed25530be4ff 100644
--- a/metadata/md5-cache/dev-libs/libplatform-9999
+++ b/metadata/md5-cache/dev-libs/libplatform-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
 DESCRIPTION=Platform support library used by libCEC and binary add-ons for Kodi
 EAPI=8
@@ -7,5 +7,5 @@ INHERIT=cmake git-r3
 LICENSE=GPL-2+
 PROPERTIES=live
 SLOT=0
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=5bbae936cd785eb8c979fdd3857cc062
diff --git a/metadata/md5-cache/dev-libs/libpsl-native-7.3.2 b/metadata/md5-cache/dev-libs/libpsl-native-7.3.2
index 7eb776c5765d..70442489f2e4 100644
--- a/metadata/md5-cache/dev-libs/libpsl-native-7.3.2
+++ b/metadata/md5-cache/dev-libs/libpsl-native-7.3.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
 DESCRIPTION=Functionality missing from .NET Core via system calls
 EAPI=8
@@ -9,5 +9,5 @@ LICENSE=MIT
 RESTRICT=test
 SLOT=0/7.3
 SRC_URI=https://github.com/PowerShell/PowerShell-Native/archive/v7.3.2.tar.gz -> libpsl-native-7.3.2.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=3c7d19217d59d145914e331271692c27
diff --git a/metadata/md5-cache/dev-libs/libpsl-native-7.4.0 b/metadata/md5-cache/dev-libs/libpsl-native-7.4.0
index d5c32c19bd2d..54188d74f587 100644
--- a/metadata/md5-cache/dev-libs/libpsl-native-7.4.0
+++ b/metadata/md5-cache/dev-libs/libpsl-native-7.4.0
@@ -1,4 +1,4 @@
-BDEPEND=dev-cpp/gtest app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=dev-cpp/gtest app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Functionality missing from .NET Core via system calls
 EAPI=8
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=MIT
 SLOT=0/7.4
 SRC_URI=https://github.com/PowerShell/PowerShell-Native/archive/v7.4.0.tar.gz -> libpsl-native-7.4.0.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=c19e27e0ed22460938eb0a2cc298bfe6
diff --git a/metadata/md5-cache/dev-libs/libptytty-2.0-r1 b/metadata/md5-cache/dev-libs/libptytty-2.0-r1
index fcb17d236920..6f3bbe9640dd 100644
--- a/metadata/md5-cache/dev-libs/libptytty-2.0-r1
+++ b/metadata/md5-cache/dev-libs/libptytty-2.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
 DESCRIPTION=A library for mostly OS-independent handling of pty/tty/utmp/wtmp/lastlog
 EAPI=8
@@ -8,5 +8,5 @@ KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=http://dist.schmorp.de/libptytty/libptytty-2.0.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=b041867e8fa448037c3a8561c119b6be
diff --git a/metadata/md5-cache/dev-libs/libqtxdg-3.11.0 b/metadata/md5-cache/dev-libs/libqtxdg-3.11.0
index dd5d8b0c9b0e..e7ba2a437234 100644
--- a/metadata/md5-cache/dev-libs/libqtxdg-3.11.0
+++ b/metadata/md5-cache/dev-libs/libqtxdg-3.11.0
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-util/lxqt-build-tools-0.13.0 virtual/pkgconfig app-alternatives/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+BDEPEND=>=dev-util/lxqt-build-tools-0.13.0 virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install postinst prepare test
 DEPEND=dev-libs/glib:2 >=dev-qt/qtcore-5.15:5 >=dev-qt/qtdbus-5.15:5 >=dev-qt/qtgui-5.15:5= >=dev-qt/qtsvg-5.15:5 >=dev-qt/qtwidgets-5.15:5 >=dev-qt/qtxml-5.15:5 x11-misc/xdg-utils test? ( >=dev-qt/qttest-5.15:5 )
 DESCRIPTION=Qt Implementation of XDG Standards
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/glib:2 >=dev-qt/qtcore-5.15:5 >=dev-qt/qtdbus-5.15:5 >=dev-qt/q
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lxqt/libqtxdg/releases/download/3.11.0/libqtxdg-3.11.0.tar.xz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=0159d7eceffc821a83069b77a4065d28
diff --git a/metadata/md5-cache/dev-libs/libqtxdg-3.12.0 b/metadata/md5-cache/dev-libs/libqtxdg-3.12.0
index f7852f7db273..c2db289557ef 100644
--- a/metadata/md5-cache/dev-libs/libqtxdg-3.12.0
+++ b/metadata/md5-cache/dev-libs/libqtxdg-3.12.0
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-util/lxqt-build-tools-0.13.0 virtual/pkgconfig app-alternatives/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+BDEPEND=>=dev-util/lxqt-build-tools-0.13.0 virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install postinst prepare test
 DEPEND=dev-libs/glib:2 >=dev-qt/qtcore-5.15:5 >=dev-qt/qtdbus-5.15:5 >=dev-qt/qtgui-5.15:5= >=dev-qt/qtsvg-5.15:5 >=dev-qt/qtwidgets-5.15:5 >=dev-qt/qtxml-5.15:5 x11-misc/xdg-utils test? ( >=dev-qt/qttest-5.15:5 )
 DESCRIPTION=Qt Implementation of XDG Standards
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/glib:2 >=dev-qt/qtcore-5.15:5 >=dev-qt/qtdbus-5.15:5 >=dev-qt/q
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lxqt/libqtxdg/releases/download/3.12.0/libqtxdg-3.12.0.tar.xz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=344b92b1e867e82749fba9e27ec505b7
diff --git a/metadata/md5-cache/dev-libs/libtsm-4.0.2 b/metadata/md5-cache/dev-libs/libtsm-4.0.2
index 358d0037e4f1..06950525b347 100644
--- a/metadata/md5-cache/dev-libs/libtsm-4.0.2
+++ b/metadata/md5-cache/dev-libs/libtsm-4.0.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
 DESCRIPTION=Terminal Emulator State Machine
 EAPI=7
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1 MIT
 SLOT=0/4
 SRC_URI=https://github.com/Aetf/libtsm/archive/v4.0.2.tar.gz -> libtsm-4.0.2.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=40c41bd6e88d16b72338e5177fe14ff9
diff --git a/metadata/md5-cache/dev-libs/libwbxml-0.11.8 b/metadata/md5-cache/dev-libs/libwbxml-0.11.8
index 3ec99ac2ef7c..c92e8bb1f855 100644
--- a/metadata/md5-cache/dev-libs/libwbxml-0.11.8
+++ b/metadata/md5-cache/dev-libs/libwbxml-0.11.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=dev-libs/expat virtual/libiconv test? ( dev-libs/check )
 DESCRIPTION=Library and tools to parse, encode and handle WBXML documents
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/expat virtual/libiconv
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/libwbxml/libwbxml/archive/libwbxml-0.11.8.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=26d35e62752d547191a8c5fb252de7a7
diff --git a/metadata/md5-cache/dev-libs/libxlsxwriter-1.1.5-r1 b/metadata/md5-cache/dev-libs/libxlsxwriter-1.1.5-r1
index 955ec3a00c09..2709672a5652 100644
--- a/metadata/md5-cache/dev-libs/libxlsxwriter-1.1.5-r1
+++ b/metadata/md5-cache/dev-libs/libxlsxwriter-1.1.5-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=sys-libs/zlib[minizip] openssl? ( dev-libs/openssl:= )
 DESCRIPTION=C library for creating Excel XLSX files
@@ -11,5 +11,5 @@ LICENSE=BSD-2
 RDEPEND=sys-libs/zlib[minizip] openssl? ( dev-libs/openssl:= )
 SLOT=0
 SRC_URI=https://github.com/jmcnamara/libxlsxwriter/archive/RELEASE_1.1.5.tar.gz -> libxlsxwriter-1.1.5.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	plocale	950fbaec7deeba41b5bcc0572cca99b9	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	plocale	950fbaec7deeba41b5bcc0572cca99b9	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=21cb38f255d50ee3ab855fe531f1cf3e
diff --git a/metadata/md5-cache/dev-libs/libzip-1.9.2 b/metadata/md5-cache/dev-libs/libzip-1.9.2
index ab606c7218ac..c965bafe644c 100644
--- a/metadata/md5-cache/dev-libs/libzip-1.9.2
+++ b/metadata/md5-cache/dev-libs/libzip-1.9.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 setup test
 DEPEND=sys-libs/zlib bzip2? ( app-arch/bzip2:= ) lzma? ( app-arch/xz-utils ) ssl? ( gnutls? ( dev-libs/nettle:0= >=net-libs/gnutls-3.6.5:= ) !gnutls? ( mbedtls? ( net-libs/mbedtls:= ) !mbedtls? ( dev-libs/openssl:0= ) ) ) zstd? ( app-arch/zstd )
 DESCRIPTION=Library for manipulating zip archives
@@ -13,5 +13,5 @@ REQUIRED_USE=test? ( tools )
 RESTRICT=!test? ( test )
 SLOT=0/5
 SRC_URI=https://www.nih.at/libzip/libzip-1.9.2.tar.xz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=aa629ecc220a75998c1a522b630decde
diff --git a/metadata/md5-cache/dev-libs/log4cplus-2.0.7 b/metadata/md5-cache/dev-libs/log4cplus-2.0.7
index 2a0c029b3dc8..0b415f94aa6b 100644
--- a/metadata/md5-cache/dev-libs/log4cplus-2.0.7
+++ b/metadata/md5-cache/dev-libs/log4cplus-2.0.7
@@ -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=iconv? ( virtual/libiconv ) qt5? ( dev-qt/qtcore:5 )
 DESCRIPTION=C++ port of the Log for Java (log4j) logging library
@@ -12,5 +12,5 @@ RDEPEND=iconv? ( virtual/libiconv ) qt5? ( dev-qt/qtcore:5 )
 RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=mirror://sourceforge/project/log4cplus/log4cplus-stable/2.0.7/log4cplus-2.0.7.tar.bz2
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=9d44fefb22b07e5fa396aebd4fb8bca3
diff --git a/metadata/md5-cache/dev-libs/log4cxx-1.0.0 b/metadata/md5-cache/dev-libs/log4cxx-1.0.0
index 634eeff65224..95e1af01d36c 100644
--- a/metadata/md5-cache/dev-libs/log4cxx-1.0.0
+++ b/metadata/md5-cache/dev-libs/log4cxx-1.0.0
@@ -1,4 +1,4 @@
-BDEPEND=app-arch/zip test? ( app-alternatives/gzip app-arch/zip ) app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-arch/zip test? ( app-alternatives/gzip app-arch/zip ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-libs/apr:1= dev-libs/apr-util:1= dev-libs/libfmt:= odbc? ( dev-db/unixODBC ) smtp? ( net-libs/libesmtp )
 DESCRIPTION=Library of C++ classes for logging to files, syslog and other destinations
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/apr:1= dev-libs/apr-util:1= dev-libs/libfmt:= odbc? ( dev-db/un
 RESTRICT=!test? ( test )
 SLOT=0/15
 SRC_URI=mirror://apache/logging/log4cxx/1.0.0/apache-log4cxx-1.0.0.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=89716e6e76f099ecd2f7dcf09fae5d7c
diff --git a/metadata/md5-cache/dev-libs/mdns-1.4.3 b/metadata/md5-cache/dev-libs/mdns-1.4.3
index daf1e4457293..c92cbc86599e 100644
--- a/metadata/md5-cache/dev-libs/mdns-1.4.3
+++ b/metadata/md5-cache/dev-libs/mdns-1.4.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
 DESCRIPTION=Public domain mDNS/DNS-SD library in C
 EAPI=8
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ~loong ~x86
 LICENSE=Unlicense
 SLOT=0
 SRC_URI=https://github.com/mjansson/mdns/archive/1.4.3.tar.gz -> mdns-1.4.3.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=f3dd556571271ee56c69e80205fed05f
diff --git a/metadata/md5-cache/dev-libs/metee-3.2.3 b/metadata/md5-cache/dev-libs/metee-3.2.3
index 57fd79c2d020..cc1a5b0d232b 100644
--- a/metadata/md5-cache/dev-libs/metee-3.2.3
+++ b/metadata/md5-cache/dev-libs/metee-3.2.3
@@ -1,4 +1,4 @@
-BDEPEND=doc? ( app-text/doxygen ) app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=doc? ( app-text/doxygen ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Cross-platform access library for Intel CSME HECI interface
 EAPI=8
@@ -9,5 +9,5 @@ KEYWORDS=amd64
 LICENSE=Apache-2.0
 SLOT=0/3.2.3
 SRC_URI=https://github.com/intel/metee/archive/refs/tags/3.2.3.tar.gz -> metee-3.2.3.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=6016eed85c682ae9f4a1ab45b92af515
diff --git a/metadata/md5-cache/dev-libs/metee-3.2.4 b/metadata/md5-cache/dev-libs/metee-3.2.4
index e9b4b419a2cf..fc55f2e3f5c7 100644
--- a/metadata/md5-cache/dev-libs/metee-3.2.4
+++ b/metadata/md5-cache/dev-libs/metee-3.2.4
@@ -1,4 +1,4 @@
-BDEPEND=doc? ( app-text/doxygen ) app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=doc? ( app-text/doxygen ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Cross-platform access library for Intel CSME HECI interface
 EAPI=8
@@ -9,5 +9,5 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0
 SLOT=0/3.2.4
 SRC_URI=https://github.com/intel/metee/archive/refs/tags/3.2.4.tar.gz -> metee-3.2.4.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=4bfcb586bd76575920248d593f617a25
diff --git a/metadata/md5-cache/dev-libs/mimalloc-2.1.2 b/metadata/md5-cache/dev-libs/mimalloc-2.1.2
index 6975f1540516..5d1fccbd3be0 100644
--- a/metadata/md5-cache/dev-libs/mimalloc-2.1.2
+++ b/metadata/md5-cache/dev-libs/mimalloc-2.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=valgrind? ( dev-debug/valgrind )
 DESCRIPTION=A compact general purpose allocator with excellent performance
@@ -11,5 +11,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://github.com/microsoft/mimalloc/archive/refs/tags/v2.1.2.tar.gz -> mimalloc-2.1.2.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=c635e63bcd0633d5b2a34bb169c5a47e
diff --git a/metadata/md5-cache/dev-libs/miniz-2.2.0-r1 b/metadata/md5-cache/dev-libs/miniz-2.2.0-r1
index e52770675057..afcf1cf54f9a 100644
--- a/metadata/md5-cache/dev-libs/miniz-2.2.0-r1
+++ b/metadata/md5-cache/dev-libs/miniz-2.2.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
 DESCRIPTION=A lossless, high performance data compression library
 EAPI=8
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ~arm ~arm64 ~ia64 ppc ppc64 sparc x86
 LICENSE=MIT
 SLOT=0/2.2.0
 SRC_URI=https://github.com/richgel999/miniz/archive/2.2.0.tar.gz -> miniz-2.2.0.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=9cdf8df073be419bff40ffb8fdc90832
diff --git a/metadata/md5-cache/dev-libs/miniz-3.0.1 b/metadata/md5-cache/dev-libs/miniz-3.0.1
index 62a392955dde..f487286b011c 100644
--- a/metadata/md5-cache/dev-libs/miniz-3.0.1
+++ b/metadata/md5-cache/dev-libs/miniz-3.0.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
 DESCRIPTION=A lossless, high performance data compression library
 EAPI=8
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
 SLOT=0/3.0.1
 SRC_URI=https://github.com/richgel999/miniz/archive/3.0.1.tar.gz -> miniz-3.0.1.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=aa027fe52a96dd816eb3f1284be38a73
diff --git a/metadata/md5-cache/dev-libs/mmtf-cpp-1.0.0-r1 b/metadata/md5-cache/dev-libs/mmtf-cpp-1.0.0-r1
index 1c88232b4bd5..9b6334afa0fc 100644
--- a/metadata/md5-cache/dev-libs/mmtf-cpp-1.0.0-r1
+++ b/metadata/md5-cache/dev-libs/mmtf-cpp-1.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=dev-libs/msgpack
 DESCRIPTION=The pure C++ implementation of the MMTF API, decoder and encoder
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=dev-libs/msgpack
 SLOT=0
 SRC_URI=https://github.com/rcsb/mmtf-cpp/archive/v1.0.0.tar.gz -> mmtf-cpp-1.0.0.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=fd19388229b99fe598d545f115cd75a5
diff --git a/metadata/md5-cache/dev-libs/mmtf-cpp-1.1.0-r1 b/metadata/md5-cache/dev-libs/mmtf-cpp-1.1.0-r1
index 9824047cf745..e78f78df2c87 100644
--- a/metadata/md5-cache/dev-libs/mmtf-cpp-1.1.0-r1
+++ b/metadata/md5-cache/dev-libs/mmtf-cpp-1.1.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=|| ( dev-cpp/msgpack-cxx dev-libs/msgpack[cxx(-)] )
 DESCRIPTION=The pure C++ implementation of the MMTF API, decoder and encoder
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=|| ( dev-cpp/msgpack-cxx dev-libs/msgpack[cxx(-)] )
 SLOT=0
 SRC_URI=https://github.com/rcsb/mmtf-cpp/archive/v1.1.0.tar.gz -> mmtf-cpp-1.1.0.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=cf4e1e4359c94fd6560d240627cc3a22
diff --git a/metadata/md5-cache/dev-libs/mongo-c-driver-1.18.0-r1 b/metadata/md5-cache/dev-libs/mongo-c-driver-1.18.0-r1
index 9da41abbe6a7..823b671784d6 100644
--- a/metadata/md5-cache/dev-libs/mongo-c-driver-1.18.0-r1
+++ b/metadata/md5-cache/dev-libs/mongo-c-driver-1.18.0-r1
@@ -1,4 +1,4 @@
-BDEPEND=dev-python/sphinx app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=dev-python/sphinx app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=app-arch/snappy:= app-arch/zstd:= >=dev-libs/libbson-1.18.0[static-libs?] sys-libs/zlib:= icu? ( dev-libs/icu:= ) sasl? ( dev-libs/cyrus-sasl:= ) ssl? ( dev-libs/openssl:0= ) test? ( dev-db/mongodb dev-libs/libbson[static-libs] )
 DESCRIPTION=Client library written in C for MongoDB
@@ -13,5 +13,5 @@ REQUIRED_USE=test? ( static-libs )
 RESTRICT=x86? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mongodb/mongo-c-driver/releases/download/1.18.0/mongo-c-driver-1.18.0.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=00c02b7c8ff667aa9a029b41b92213a1
diff --git a/metadata/md5-cache/dev-libs/mongo-c-driver-1.24.4 b/metadata/md5-cache/dev-libs/mongo-c-driver-1.24.4
index ead62a90d78c..2e2367b33315 100644
--- a/metadata/md5-cache/dev-libs/mongo-c-driver-1.24.4
+++ b/metadata/md5-cache/dev-libs/mongo-c-driver-1.24.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=app-arch/snappy:= app-arch/zstd:= >=dev-libs/libbson-1.24.4[static-libs?] dev-python/sphinx sys-libs/zlib:= icu? ( dev-libs/icu:= ) sasl? ( dev-libs/cyrus-sasl:= ) ssl? ( dev-libs/openssl:= ) test? ( dev-db/mongodb dev-libs/libbson[static-libs] )
 DESCRIPTION=Client library written in C for MongoDB
@@ -13,5 +13,5 @@ REQUIRED_USE=test? ( static-libs )
 RESTRICT=x86? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mongodb/mongo-c-driver/releases/download/1.24.4/mongo-c-driver-1.24.4.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=fdb95e68bad5f585c59ea52951f205a9
diff --git a/metadata/md5-cache/dev-libs/msgpack-5.0.0 b/metadata/md5-cache/dev-libs/msgpack-5.0.0
index 56e752acb18d..86ca2deac564 100644
--- a/metadata/md5-cache/dev-libs/msgpack-5.0.0
+++ b/metadata/md5-cache/dev-libs/msgpack-5.0.0
@@ -1,4 +1,4 @@
-BDEPEND=doc? ( app-text/doxygen[dot] ) test? ( dev-cpp/gtest[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=doc? ( app-text/doxygen[dot] ) test? ( dev-cpp/gtest[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=MessagePack is a binary-based efficient data interchange format
 EAPI=8
@@ -10,5 +10,5 @@ LICENSE=Boost-1.0
 RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://github.com/msgpack/msgpack-c/releases/download/c-5.0.0/msgpack-c-5.0.0.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=9f2c4e0be866283a7c2c477af0a6973a
diff --git a/metadata/md5-cache/dev-libs/msgpack-6.0.0-r1 b/metadata/md5-cache/dev-libs/msgpack-6.0.0-r1
index 66aa3b8744c8..28ad93908962 100644
--- a/metadata/md5-cache/dev-libs/msgpack-6.0.0-r1
+++ b/metadata/md5-cache/dev-libs/msgpack-6.0.0-r1
@@ -1,4 +1,4 @@
-BDEPEND=doc? ( app-text/doxygen[dot] ) test? ( dev-cpp/gtest[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=doc? ( app-text/doxygen[dot] ) test? ( dev-cpp/gtest[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=MessagePack is a binary-based efficient data interchange format
 EAPI=8
@@ -10,5 +10,5 @@ LICENSE=Boost-1.0
 RESTRICT=!test? ( test )
 SLOT=0/2-c
 SRC_URI=https://github.com/msgpack/msgpack-c/releases/download/c-6.0.0/msgpack-c-6.0.0.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=57e2096bda42bf297d87b110f2356fb6
diff --git a/metadata/md5-cache/dev-libs/nanomsg-1.1.5-r1 b/metadata/md5-cache/dev-libs/nanomsg-1.1.5-r1
index d1544093e272..63fbb45e37bb 100644
--- a/metadata/md5-cache/dev-libs/nanomsg-1.1.5-r1
+++ b/metadata/md5-cache/dev-libs/nanomsg-1.1.5-r1
@@ -1,4 +1,4 @@
-BDEPEND=doc? ( dev-ruby/asciidoctor ) app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=doc? ( dev-ruby/asciidoctor ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=High-performance messaging interface for distributed applications
 EAPI=8
@@ -9,5 +9,5 @@ KEYWORDS=amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~riscv x86
 LICENSE=MIT
 SLOT=0/5.0.0
 SRC_URI=https://github.com/nanomsg/nanomsg/archive/1.1.5.tar.gz -> nanomsg-1.1.5.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=7bc7b59339f488429abfdc004db93f26
diff --git a/metadata/md5-cache/dev-libs/ncnn-20231027 b/metadata/md5-cache/dev-libs/ncnn-20231027
index 4676c7460567..4130ac272cd7 100644
--- a/metadata/md5-cache/dev-libs/ncnn-20231027
+++ b/metadata/md5-cache/dev-libs/ncnn-20231027
@@ -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=tools? ( dev-cpp/abseil-cpp:= dev-libs/protobuf:= ) vulkan? ( dev-util/glslang:= media-libs/vulkan-loader ) vulkan? ( dev-util/vulkan-headers )
 DESCRIPTION=High-performance neural network inference framework
@@ -12,5 +12,5 @@ RDEPEND=tools? ( dev-cpp/abseil-cpp:= dev-libs/protobuf:= ) vulkan? ( dev-util/g
 RESTRICT=test
 SLOT=0/20231027
 SRC_URI=https://github.com/Tencent/ncnn/archive/refs/tags/20231027.tar.gz -> ncnn-20231027.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=f30bdf90629c13fb299e288c7cbba570
diff --git a/metadata/md5-cache/dev-libs/ncnn-20240102 b/metadata/md5-cache/dev-libs/ncnn-20240102
index 22f8ee3e5644..d3b97163a393 100644
--- a/metadata/md5-cache/dev-libs/ncnn-20240102
+++ b/metadata/md5-cache/dev-libs/ncnn-20240102
@@ -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=tools? ( dev-cpp/abseil-cpp:= dev-libs/protobuf:= ) vulkan? ( dev-util/glslang:= media-libs/vulkan-loader ) vulkan? ( dev-util/vulkan-headers )
 DESCRIPTION=High-performance neural network inference framework
@@ -12,5 +12,5 @@ RDEPEND=tools? ( dev-cpp/abseil-cpp:= dev-libs/protobuf:= ) vulkan? ( dev-util/g
 RESTRICT=test
 SLOT=0/20240102
 SRC_URI=https://github.com/Tencent/ncnn/archive/refs/tags/20240102.tar.gz -> ncnn-20240102.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=913b9ce0f45c6c92e4c993734bedb641
diff --git a/metadata/md5-cache/dev-libs/nss-pem-1.1.0 b/metadata/md5-cache/dev-libs/nss-pem-1.1.0
index 547745170c5d..3aacd2748a87 100644
--- a/metadata/md5-cache/dev-libs/nss-pem-1.1.0
+++ b/metadata/md5-cache/dev-libs/nss-pem-1.1.0
@@ -1,4 +1,4 @@
-BDEPEND=dev-libs/nss virtual/pkgconfig app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=dev-libs/nss virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-libs/nss dev-libs/nspr
 DESCRIPTION=PEM file reader for Network Security Services (NSS)
@@ -11,5 +11,5 @@ LICENSE=MPL-1.1
 RDEPEND=dev-libs/nss dev-libs/nspr
 SLOT=0
 SRC_URI=https://github.com/kdudka/nss-pem/releases/download/nss-pem-1.1.0/nss-pem-1.1.0.tar.xz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=05af6bb3594db4ab290d70b64d674f4c
diff --git a/metadata/md5-cache/dev-libs/nsync-1.24.0-r1 b/metadata/md5-cache/dev-libs/nsync-1.24.0-r1
index 73b0575f9884..1674a00a6ac1 100644
--- a/metadata/md5-cache/dev-libs/nsync-1.24.0-r1
+++ b/metadata/md5-cache/dev-libs/nsync-1.24.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
 DESCRIPTION=C library that exports various synchronization primitives, such as mutexes
 EAPI=8
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/nsync/archive/1.24.0.tar.gz -> nsync-1.24.0.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=ed8788dcbf8e2a72e00c3f1f13aa5fc3
diff --git a/metadata/md5-cache/dev-libs/nsync-1.25.0 b/metadata/md5-cache/dev-libs/nsync-1.25.0
index 2b257a914ea2..d22f04aad9e7 100644
--- a/metadata/md5-cache/dev-libs/nsync-1.25.0
+++ b/metadata/md5-cache/dev-libs/nsync-1.25.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
 DESCRIPTION=C library that exports various synchronization primitives, such as mutexes
 EAPI=8
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/nsync/archive/1.25.0.tar.gz -> nsync-1.25.0.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=99bd82c43d8f244303856c87f37418ad
diff --git a/metadata/md5-cache/dev-libs/olm-3.2.15 b/metadata/md5-cache/dev-libs/olm-3.2.15
index 5b739ab435ee..f5bc4ab5f790 100644
--- a/metadata/md5-cache/dev-libs/olm-3.2.15
+++ b/metadata/md5-cache/dev-libs/olm-3.2.15
@@ -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
 DESCRIPTION=Implementation of the Double Ratchet cryptographic ratchet in C++
 EAPI=8
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://gitlab.matrix.org/matrix-org/olm/-/archive/3.2.15/olm-3.2.15.tar.bz2
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=1260579a6a08b9a576c174d42cb60cbb
diff --git a/metadata/md5-cache/dev-libs/oneDNN-3.3.3 b/metadata/md5-cache/dev-libs/oneDNN-3.3.3
index 33b28fd4bb1a..74297558e4e5 100644
--- a/metadata/md5-cache/dev-libs/oneDNN-3.3.3
+++ b/metadata/md5-cache/dev-libs/oneDNN-3.3.3
@@ -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=mkl? ( sci-libs/mkl ) cblas? ( !mkl? ( virtual/cblas ) )
 DESCRIPTION=oneAPI Deep Neural Network Library
@@ -12,5 +12,5 @@ RDEPEND=mkl? ( sci-libs/mkl ) cblas? ( !mkl? ( virtual/cblas ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/oneapi-src/oneDNN/archive/refs/tags/v3.3.3.tar.gz -> oneDNN-3.3.3.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	docs	7f3c0d47338743498c69f1887a139f57	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	docs	7f3c0d47338743498c69f1887a139f57	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=1a3f75fd3b28b72d4667262a866df0dc
diff --git a/metadata/md5-cache/dev-libs/opencl-clang-15.0.0 b/metadata/md5-cache/dev-libs/opencl-clang-15.0.0
index 9e8a0f07eca4..8ad033d87d80 100644
--- a/metadata/md5-cache/dev-libs/opencl-clang-15.0.0
+++ b/metadata/md5-cache/dev-libs/opencl-clang-15.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 setup test
 DEPEND=dev-util/spirv-llvm-translator:15= sys-devel/clang:15=[static-analyzer] sys-devel/llvm:15= !!sys-devel/llvm:0
 DESCRIPTION=OpenCL-oriented thin wrapper library around clang
@@ -10,5 +10,5 @@ LICENSE=UoI-NCSA
 RDEPEND=dev-util/spirv-llvm-translator:15= sys-devel/clang:15=[static-analyzer] sys-devel/llvm:15=
 SLOT=15
 SRC_URI=https://github.com/intel/opencl-clang/archive/refs/tags/v15.0.0.tar.gz -> opencl-clang-15.0.0.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	llvm	dcfb437a52b5672e5f39deaae6f789c3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	llvm	dcfb437a52b5672e5f39deaae6f789c3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=cb30de71fff655bdde3ef7412727cf0c
diff --git a/metadata/md5-cache/dev-libs/opencl-clang-16.0.0-r1 b/metadata/md5-cache/dev-libs/opencl-clang-16.0.0-r1
index b64b15158746..8cc5216eac56 100644
--- a/metadata/md5-cache/dev-libs/opencl-clang-16.0.0-r1
+++ b/metadata/md5-cache/dev-libs/opencl-clang-16.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 setup test
 DEPEND=dev-util/spirv-llvm-translator:16= sys-devel/clang:16=[static-analyzer] sys-devel/llvm:16= !!sys-devel/llvm:0
 DESCRIPTION=OpenCL-oriented thin wrapper library around clang
@@ -10,5 +10,5 @@ LICENSE=UoI-NCSA
 RDEPEND=dev-util/spirv-llvm-translator:16= sys-devel/clang:16=[static-analyzer] sys-devel/llvm:16=
 SLOT=16
 SRC_URI=https://github.com/intel/opencl-clang/archive/refs/tags/v16.0.0.tar.gz -> opencl-clang-16.0.0.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	llvm	dcfb437a52b5672e5f39deaae6f789c3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	llvm	dcfb437a52b5672e5f39deaae6f789c3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=42dd65bca7f3a53208d0e910f87abd92
diff --git a/metadata/md5-cache/dev-libs/opencl-icd-loader-2023.04.17 b/metadata/md5-cache/dev-libs/opencl-icd-loader-2023.04.17
index 129b38c9a25e..10ad3a4e0b70 100644
--- a/metadata/md5-cache/dev-libs/opencl-icd-loader-2023.04.17
+++ b/metadata/md5-cache/dev-libs/opencl-icd-loader-2023.04.17
@@ -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/ocl-icd >=dev-util/opencl-headers-2023.04.17
 DESCRIPTION=Official Khronos OpenCL ICD Loader
@@ -12,5 +12,5 @@ RDEPEND=!dev-libs/ocl-icd
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/KhronosGroup/OpenCL-ICD-Loader/archive/v2023.04.17.tar.gz -> opencl-icd-loader-2023.04.17.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=cfef25ea1423d440fe1573672e34cef2
diff --git a/metadata/md5-cache/dev-libs/opencl-icd-loader-2023.12.14 b/metadata/md5-cache/dev-libs/opencl-icd-loader-2023.12.14
index a98359d6f1f1..f93966a8619a 100644
--- a/metadata/md5-cache/dev-libs/opencl-icd-loader-2023.12.14
+++ b/metadata/md5-cache/dev-libs/opencl-icd-loader-2023.12.14
@@ -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/ocl-icd >=dev-util/opencl-headers-2023.12.14
 DESCRIPTION=Official Khronos OpenCL ICD Loader
@@ -12,5 +12,5 @@ RDEPEND=!dev-libs/ocl-icd
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/KhronosGroup/OpenCL-ICD-Loader/archive/v2023.12.14.tar.gz -> opencl-icd-loader-2023.12.14.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=6c227a985f28ba53f6a62b6ad500990d
diff --git a/metadata/md5-cache/dev-libs/openobex-1.7.2-r3 b/metadata/md5-cache/dev-libs/openobex-1.7.2-r3
index 569a0712c81f..588bd1e2fb34 100644
--- a/metadata/md5-cache/dev-libs/openobex-1.7.2-r3
+++ b/metadata/md5-cache/dev-libs/openobex-1.7.2-r3
@@ -1,4 +1,4 @@
-BDEPEND=doc? ( app-text/doxygen ) virtual/pkgconfig app-alternatives/ninja >=dev-util/cmake-3.20.5 virtual/pkgconfig
+BDEPEND=doc? ( app-text/doxygen ) virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5 virtual/pkgconfig
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=bluetooth? ( net-wireless/bluez:= ) usb? ( virtual/libusb:= )
 DESCRIPTION=Implementation of the OBEX protocol used for transferring data to mobile devices
@@ -11,5 +11,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=bluetooth? ( net-wireless/bluez:= ) usb? ( virtual/libusb:= )
 SLOT=0/2
 SRC_URI=mirror://sourceforge/openobex/1.7.2/openobex-1.7.2-Source.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	udev	eec0bbab06977f1cfc5597269c1fa152	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	udev	eec0bbab06977f1cfc5597269c1fa152	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=0d6a1405d800bb7e64c58bbad7f478f2
diff --git a/metadata/md5-cache/dev-libs/pegtl-2.8.3-r1 b/metadata/md5-cache/dev-libs/pegtl-2.8.3-r1
index df804478e8d7..b15fd7b9407e 100644
--- a/metadata/md5-cache/dev-libs/pegtl-2.8.3-r1
+++ b/metadata/md5-cache/dev-libs/pegtl-2.8.3-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
 DESCRIPTION=Header-only library for creating parsers according to Parsing Expression Grammar
 EAPI=7
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/taocpp/PEGTL/archive/2.8.3.tar.gz -> pegtl-2.8.3.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=b8e9d944dbd6470b50eb7e266ac5c416
diff --git a/metadata/md5-cache/dev-libs/pegtl-3.2.1 b/metadata/md5-cache/dev-libs/pegtl-3.2.1
index c313941909ba..9c9d509c23b1 100644
--- a/metadata/md5-cache/dev-libs/pegtl-3.2.1
+++ b/metadata/md5-cache/dev-libs/pegtl-3.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
 DESCRIPTION=Header-only library for creating parsers according to Parsing Expression Grammar
 EAPI=8
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/taocpp/PEGTL/archive/3.2.1.tar.gz -> pegtl-3.2.1.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=ec13f6e7ea956c89f49396ca9e82af4f
diff --git a/metadata/md5-cache/dev-libs/pegtl-3.2.5 b/metadata/md5-cache/dev-libs/pegtl-3.2.5
index 47be88b9d55d..bb148eb93456 100644
--- a/metadata/md5-cache/dev-libs/pegtl-3.2.5
+++ b/metadata/md5-cache/dev-libs/pegtl-3.2.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
 DESCRIPTION=Header-only library for creating parsers according to Parsing Expression Grammar
 EAPI=8
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ~arm ~arm64 ~riscv ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/taocpp/PEGTL/archive/3.2.5.tar.gz -> pegtl-3.2.5.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=c93663071a668dd561c00166b7f913ec
diff --git a/metadata/md5-cache/dev-libs/pegtl-3.2.7 b/metadata/md5-cache/dev-libs/pegtl-3.2.7
index b5d96846fdb9..30f0f8da897c 100644
--- a/metadata/md5-cache/dev-libs/pegtl-3.2.7
+++ b/metadata/md5-cache/dev-libs/pegtl-3.2.7
@@ -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
 DESCRIPTION=Header-only library for creating parsers according to Parsing Expression Grammar
 EAPI=8
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/taocpp/PEGTL/archive/3.2.7.tar.gz -> pegtl-3.2.7.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=072aa854f127313a389803f54c24b89b
diff --git a/metadata/md5-cache/dev-libs/plasma-wayland-protocols-1.10.0 b/metadata/md5-cache/dev-libs/plasma-wayland-protocols-1.10.0
deleted file mode 100644
index 40d264195f90..000000000000
--- a/metadata/md5-cache/dev-libs/plasma-wayland-protocols-1.10.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5 dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.82.0:*
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-qt/qtcore:5
-DESCRIPTION=Plasma Specific Protocols for Wayland
-EAPI=8
-HOMEPAGE=https://invent.kde.org/libraries/plasma-wayland-protocols
-INHERIT=ecm kde.org
-IUSE=debug
-KEYWORDS=amd64 arm arm64 ~loong ppc64 ~riscv x86
-LICENSE=LGPL-2.1
-RDEPEND=>=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=0
-SRC_URI=mirror://kde/stable/plasma-wayland-protocols/plasma-wayland-protocols-1.10.0.tar.xz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	ecm	a9d1de06ef0d5d4de7114a10dcb64daa	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	kde.org	60fcb935e4206806bf9f38e3537521a2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=2b71b8cc04b63d6aa05f1e609227f74a
diff --git a/metadata/md5-cache/dev-libs/plasma-wayland-protocols-1.11.1 b/metadata/md5-cache/dev-libs/plasma-wayland-protocols-1.11.1
deleted file mode 100644
index 67d9c388f860..000000000000
--- a/metadata/md5-cache/dev-libs/plasma-wayland-protocols-1.11.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5 dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.106.0:*
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-qt/qtcore:5
-DESCRIPTION=Plasma Specific Protocols for Wayland
-EAPI=8
-HOMEPAGE=https://invent.kde.org/libraries/plasma-wayland-protocols
-INHERIT=ecm kde.org
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=0
-SRC_URI=mirror://kde/stable/plasma-wayland-protocols/plasma-wayland-protocols-1.11.1.tar.xz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	ecm	a9d1de06ef0d5d4de7114a10dcb64daa	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	kde.org	60fcb935e4206806bf9f38e3537521a2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=0bb185c1b32024bb165d292909ba3e38
diff --git a/metadata/md5-cache/dev-libs/plasma-wayland-protocols-1.12.0 b/metadata/md5-cache/dev-libs/plasma-wayland-protocols-1.12.0
index 621190698084..ad30ca4402b8 100644
--- a/metadata/md5-cache/dev-libs/plasma-wayland-protocols-1.12.0
+++ b/metadata/md5-cache/dev-libs/plasma-wayland-protocols-1.12.0
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5 dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.106.0:*
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5 dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.106.0:*
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
 DEPEND=dev-qt/qtcore:5
 DESCRIPTION=Plasma Specific Protocols for Wayland
@@ -11,5 +11,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=0
 SRC_URI=mirror://kde/stable/plasma-wayland-protocols/plasma-wayland-protocols-1.12.0.tar.xz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	ecm	a9d1de06ef0d5d4de7114a10dcb64daa	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	kde.org	60fcb935e4206806bf9f38e3537521a2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	ecm	a9d1de06ef0d5d4de7114a10dcb64daa	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	kde.org	60fcb935e4206806bf9f38e3537521a2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=c2c71a742d8fa842b4c1b07cafe7d08e
diff --git a/metadata/md5-cache/dev-libs/pocl-4.0 b/metadata/md5-cache/dev-libs/pocl-4.0
index 96071b1183b3..529754d77ada 100644
--- a/metadata/md5-cache/dev-libs/pocl-4.0
+++ b/metadata/md5-cache/dev-libs/pocl-4.0
@@ -1,4 +1,4 @@
-BDEPEND=!cuda? ( <sys-devel/clang-17:= ) cuda? ( <sys-devel/clang-17:=[llvm_targets_NVPTX] ) virtual/pkgconfig app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=!cuda? ( <sys-devel/clang-17:= ) cuda? ( <sys-devel/clang-17:=[llvm_targets_NVPTX] ) virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-libs/libltdl <sys-devel/llvm-17:* virtual/opencl !cuda? ( <sys-devel/clang-17:= ) cuda? ( <sys-devel/clang-17:=[llvm_targets_NVPTX] ) debug? ( dev-util/lttng-ust:= ) hwloc? ( sys-apps/hwloc:=[cuda?] ) !!sys-devel/llvm:0
 DESCRIPTION=Portable Computing Language (an implementation of OpenCL)
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/libltdl <sys-devel/llvm-17:* virtual/opencl !cuda? ( <sys-devel
 RESTRICT=!test? ( test ) test
 SLOT=0
 SRC_URI=https://github.com/pocl/pocl/archive/v4.0.tar.gz -> pocl-4.0.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	llvm	dcfb437a52b5672e5f39deaae6f789c3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	llvm	dcfb437a52b5672e5f39deaae6f789c3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=1a631cf5b6548f19e5cb3bdcbd03b869
diff --git a/metadata/md5-cache/dev-libs/poco-1.11.2-r1 b/metadata/md5-cache/dev-libs/poco-1.11.2-r1
index 26235e06b9a1..2df20d674e00 100644
--- a/metadata/md5-cache/dev-libs/poco-1.11.2-r1
+++ b/metadata/md5-cache/dev-libs/poco-1.11.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=>=dev-libs/libpcre-8.42 activerecord? ( !app-arch/arc ) mysql? ( !mariadb? ( dev-db/mysql-connector-c:0= ) mariadb? ( dev-db/mariadb-connector-c:0= ) ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( dev-db/unixODBC ) ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0= ) xml? ( dev-libs/expat ) zip? ( sys-libs/zlib )
 DESCRIPTION=C++ libraries for building network-based applications
@@ -13,5 +13,5 @@ REQUIRED_USE=7z? ( xml ) file2pagecompiler? ( pagecompiler ) iodbc? ( odbc ) mon
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pocoproject/poco/archive/poco-1.11.2-release.tar.gz -> poco-1.11.2.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=59dcf9105eca4f88a3513804464eaaf4
diff --git a/metadata/md5-cache/dev-libs/poco-1.12.2-r2 b/metadata/md5-cache/dev-libs/poco-1.12.2-r2
index 9a4732283177..31652e5f26d2 100644
--- a/metadata/md5-cache/dev-libs/poco-1.12.2-r2
+++ b/metadata/md5-cache/dev-libs/poco-1.12.2-r2
@@ -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=>=dev-libs/libpcre2-10.40 activerecord? ( !app-arch/arc ) mysql? ( dev-db/mysql-connector-c:0= ) mariadb? ( dev-db/mariadb-connector-c:0= ) postgres? ( dev-db/postgresql:= ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( dev-db/unixODBC ) ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0= ) xml? ( dev-libs/expat ) zip? ( sys-libs/zlib:= )
 DESCRIPTION=C++ libraries for building network-based applications
@@ -13,5 +13,5 @@ REQUIRED_USE=7z? ( xml ) file2pagecompiler? ( pagecompiler ) iodbc? ( odbc ) jwt
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pocoproject/poco/archive/poco-1.12.2-release.tar.gz -> poco-1.12.2.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=a2835a51b987b2ccb2e370ba157418ca
diff --git a/metadata/md5-cache/dev-libs/poco-1.12.4 b/metadata/md5-cache/dev-libs/poco-1.12.4
index ba4891472a7c..93d0e4d9a8c9 100644
--- a/metadata/md5-cache/dev-libs/poco-1.12.4
+++ b/metadata/md5-cache/dev-libs/poco-1.12.4
@@ -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=>=dev-libs/libpcre2-10.40 activerecord? ( !app-arch/arc ) mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= ) postgres? ( dev-db/postgresql:= ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( dev-db/unixODBC ) ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:= ) xml? ( dev-libs/expat ) zip? ( sys-libs/zlib:= )
 DESCRIPTION=C++ libraries for building network-based applications
@@ -13,5 +13,5 @@ REQUIRED_USE=activerecord? ( util xml ) 7z? ( xml ) file2pagecompiler? ( pagecom
 RESTRICT=!test? ( test )
 SLOT=0/94
 SRC_URI=https://github.com/pocoproject/poco/archive/poco-1.12.4-release.tar.gz -> poco-1.12.4.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=33b6a4e0d34986b74afabb0782590e3f
diff --git a/metadata/md5-cache/dev-libs/protobuf-21.12 b/metadata/md5-cache/dev-libs/protobuf-21.12
index 0107f1495721..4ff9bcf9244c 100644
--- a/metadata/md5-cache/dev-libs/protobuf-21.12
+++ b/metadata/md5-cache/dev-libs/protobuf-21.12
@@ -1,4 +1,4 @@
-BDEPEND=emacs? ( app-editors/emacs:* ) app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=emacs? ( app-editors/emacs:* ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm prepare test
 DEPEND=zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) test? ( >=dev-cpp/gtest-1.9[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=Google's Protocol Buffers - Extensible mechanism for serializing structured data
@@ -12,5 +12,5 @@ RDEPEND=emacs? ( app-editors/emacs:* ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_
 RESTRICT=!test? ( test )
 SLOT=0/3.21.12.0
 SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v21.12.tar.gz -> protobuf-21.12.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	cmake-multilib	37d23064f303dcf23453353ab8c77059	elisp-common	2a0fa407d2e6363c663ccb299503b25c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	elisp-common	2a0fa407d2e6363c663ccb299503b25c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=2c48ad639b356a966ed03cc90e209ca7
diff --git a/metadata/md5-cache/dev-libs/protobuf-23.3-r2 b/metadata/md5-cache/dev-libs/protobuf-23.3-r2
index 8948b1083be2..5cab8b4cfe16 100644
--- a/metadata/md5-cache/dev-libs/protobuf-23.3-r2
+++ b/metadata/md5-cache/dev-libs/protobuf-23.3-r2
@@ -1,4 +1,4 @@
-BDEPEND=emacs? ( app-editors/emacs:* ) app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=emacs? ( app-editors/emacs:* ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm prepare test
 DEPEND=>=dev-cpp/abseil-cpp-20230125.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) test? ( >=dev-cpp/gtest-1.9[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=Google's Protocol Buffers - Extensible mechanism for serializing structured data
@@ -12,5 +12,5 @@ RDEPEND=>=dev-cpp/abseil-cpp-20230125.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_
 RESTRICT=!test? ( test )
 SLOT=0/23.3.0
 SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v23.3.tar.gz -> protobuf-23.3.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	cmake-multilib	37d23064f303dcf23453353ab8c77059	elisp-common	2a0fa407d2e6363c663ccb299503b25c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	elisp-common	2a0fa407d2e6363c663ccb299503b25c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=f09ec7ea96b698db0e195655a31d05d2
diff --git a/metadata/md5-cache/dev-libs/psimd-2020.05.17 b/metadata/md5-cache/dev-libs/psimd-2020.05.17
index fbb08fe1d1af..715dd0ca946d 100644
--- a/metadata/md5-cache/dev-libs/psimd-2020.05.17
+++ b/metadata/md5-cache/dev-libs/psimd-2020.05.17
@@ -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
 DESCRIPTION=P(ortable) SIMD
 EAPI=8
@@ -8,5 +8,5 @@ KEYWORDS=~amd64
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/Maratyszcza/psimd/archive/072586a71b55b7f8c584153d223e95687148a900.tar.gz -> psimd-2020.05.17.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=c921abb2dac0d2dd04786ac6b1ffa1e8
diff --git a/metadata/md5-cache/dev-libs/pthreadpool-2022.05.09-r1 b/metadata/md5-cache/dev-libs/pthreadpool-2022.05.09-r1
index d76e0d00545b..f37fbee55ac5 100644
--- a/metadata/md5-cache/dev-libs/pthreadpool-2022.05.09-r1
+++ b/metadata/md5-cache/dev-libs/pthreadpool-2022.05.09-r1
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-cpp/gtest ) app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=test? ( dev-cpp/gtest ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-libs/FXdiv
 DESCRIPTION=Portable and efficient thread pool implementation
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/FXdiv
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Maratyszcza/pthreadpool/archive/1787867.tar.gz -> pthreadpool-2022.05.09.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=61d9b86509915f30c2da3be938b1c214
diff --git a/metadata/md5-cache/dev-libs/pthreadpool-2023.08.29 b/metadata/md5-cache/dev-libs/pthreadpool-2023.08.29
index 7db4e94c71c9..b5019777dc0b 100644
--- a/metadata/md5-cache/dev-libs/pthreadpool-2023.08.29
+++ b/metadata/md5-cache/dev-libs/pthreadpool-2023.08.29
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-cpp/gtest ) app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=test? ( dev-cpp/gtest ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-libs/FXdiv
 DESCRIPTION=Portable and efficient thread pool implementation
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/FXdiv
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Maratyszcza/pthreadpool/archive/4fe0e1e183925bf8cfa6aae24237e724a96479b8.tar.gz -> pthreadpool-2023.08.29.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=78e632c48491c9db14007b1a2d0a6086
diff --git a/metadata/md5-cache/dev-libs/pugixml-1.13 b/metadata/md5-cache/dev-libs/pugixml-1.13
index 38080d2312c0..96f8da60dc68 100644
--- a/metadata/md5-cache/dev-libs/pugixml-1.13
+++ b/metadata/md5-cache/dev-libs/pugixml-1.13
@@ -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
 DESCRIPTION=Light-weight, simple, and fast XML parser for C++ with XPath support
 EAPI=8
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/zeux/pugixml/archive/refs/tags/v1.13.tar.gz -> pugixml-1.13.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=90bf26fc08a57a808729f0c371d724b2
diff --git a/metadata/md5-cache/dev-libs/pugixml-1.14 b/metadata/md5-cache/dev-libs/pugixml-1.14
index 1cea61aa4b60..7ce47dd1118e 100644
--- a/metadata/md5-cache/dev-libs/pugixml-1.14
+++ b/metadata/md5-cache/dev-libs/pugixml-1.14
@@ -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
 DESCRIPTION=Light-weight, simple, and fast XML parser for C++ with XPath support
 EAPI=8
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/zeux/pugixml/archive/refs/tags/v1.14.tar.gz -> pugixml-1.14.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=77a6dbeb18a4a3a45a54863f6562a567
diff --git a/metadata/md5-cache/dev-libs/pugixml-9999 b/metadata/md5-cache/dev-libs/pugixml-9999
index 2fcb460f11b8..cb2b020340d4 100644
--- a/metadata/md5-cache/dev-libs/pugixml-9999
+++ b/metadata/md5-cache/dev-libs/pugixml-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
 DESCRIPTION=Light-weight, simple, and fast XML parser for C++ with XPath support
 EAPI=8
@@ -9,5 +9,5 @@ LICENSE=MIT
 PROPERTIES=live
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=2387e8999ebba12327822a17f52e59d0
diff --git a/metadata/md5-cache/dev-libs/qcoro-0.10.0 b/metadata/md5-cache/dev-libs/qcoro-0.10.0
index 7b7df6f6316b..9354ad05b1a5 100644
--- a/metadata/md5-cache/dev-libs/qcoro-0.10.0
+++ b/metadata/md5-cache/dev-libs/qcoro-0.10.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-qt/qtbase:6[dbus?,network?] qml? ( dev-qt/qtdeclarative:6= ) websockets? ( dev-qt/qtwebsockets:6 ) examples? ( dev-qt/qtbase:6[concurrent,network,widgets] ) test? ( dev-qt/qtbase:6[concurrent] )
 DESCRIPTION=C++ Coroutine Library for Qt
@@ -13,5 +13,5 @@ REQUIRED_USE=examples? ( network )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/danvratil/qcoro/archive/refs/tags/v0.10.0.tar.gz -> qcoro-0.10.0.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=fd2ffbb5d405d9089ada065e76db1a90
diff --git a/metadata/md5-cache/dev-libs/qcoro5-0.10.0 b/metadata/md5-cache/dev-libs/qcoro5-0.10.0
index 4c3332f5b0b6..acfd846a67b1 100644
--- a/metadata/md5-cache/dev-libs/qcoro5-0.10.0
+++ b/metadata/md5-cache/dev-libs/qcoro5-0.10.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-qt/qtcore:5 dbus? ( dev-qt/qtdbus:5 ) network? ( dev-qt/qtnetwork:5 ) qml? ( dev-qt/qtdeclarative:5= ) testlib? ( dev-qt/qttest:5 ) websockets? ( dev-qt/qtwebsockets:5 ) examples? ( dev-qt/qtconcurrent:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 ) test? ( dev-qt/qtconcurrent:5 dev-qt/qttest:5 )
 DESCRIPTION=C++ Coroutine Library for Qt5
@@ -13,5 +13,5 @@ REQUIRED_USE=examples? ( network ) test? ( testlib )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/danvratil/qcoro/archive/refs/tags/v0.10.0.tar.gz -> qcoro5-0.10.0.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=f8fbc914bfcb8bb6a06523847a539878
diff --git a/metadata/md5-cache/dev-libs/qcoro5-0.9.0 b/metadata/md5-cache/dev-libs/qcoro5-0.9.0
index 8500e9cb3d59..8b6b4e026d9e 100644
--- a/metadata/md5-cache/dev-libs/qcoro5-0.9.0
+++ b/metadata/md5-cache/dev-libs/qcoro5-0.9.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-qt/qtcore:5 dbus? ( dev-qt/qtdbus:5 ) network? ( dev-qt/qtnetwork:5 ) qml? ( dev-qt/qtdeclarative:5= ) testlib? ( dev-qt/qttest:5 ) websockets? ( dev-qt/qtwebsockets:5 ) examples? ( dev-qt/qtconcurrent:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 ) test? ( dev-qt/qtconcurrent:5 dev-qt/qttest:5 )
 DESCRIPTION=C++ Coroutine Library for Qt5
@@ -13,5 +13,5 @@ REQUIRED_USE=examples? ( network ) test? ( testlib )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/danvratil/qcoro/archive/refs/tags/v0.9.0.tar.gz -> qcoro5-0.9.0.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=3e78f78b95890d6216c97792b40824bd
diff --git a/metadata/md5-cache/dev-libs/qhotkey-1.5.0 b/metadata/md5-cache/dev-libs/qhotkey-1.5.0
index f5010943ba80..7bc7ddd0db46 100644
--- a/metadata/md5-cache/dev-libs/qhotkey-1.5.0
+++ b/metadata/md5-cache/dev-libs/qhotkey-1.5.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=!qt6? ( dev-qt/qtcore:5 dev-qt/qtx11extras:5 ) qt6? ( dev-qt/qtbase:6 ) x11-libs/libX11
 DESCRIPTION=A global shortcut/hotkey library for desktop Qt applications
@@ -10,5 +10,5 @@ KEYWORDS=~amd64
 LICENSE=BSD-with-attribution
 SLOT=0
 SRC_URI=https://github.com/Skycoder42/QHotkey/archive/1.5.0.tar.gz -> qhotkey-1.5.0.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=a63fbf3fc0b491adf3bce85e0c075c72
diff --git a/metadata/md5-cache/dev-libs/qr-code-generator-1.8.0 b/metadata/md5-cache/dev-libs/qr-code-generator-1.8.0
index 2c2b2ea84161..970010a16103 100644
--- a/metadata/md5-cache/dev-libs/qr-code-generator-1.8.0
+++ b/metadata/md5-cache/dev-libs/qr-code-generator-1.8.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
 DESCRIPTION=QR Code Generator Library in Multiple Languages
 EAPI=8
@@ -8,5 +8,5 @@ KEYWORDS=~amd64
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/EasyCoding/qrcodegen-cmake/archive/v1.8.0-cmake2.tar.gz -> qr-code-generator-cmake-1.8.0.tar.gz https://github.com/nayuki/QR-Code-generator/archive/v1.8.0.tar.gz -> qr-code-generator-1.8.0.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=973b5cbff285118ebeb09ef12d788afe
diff --git a/metadata/md5-cache/dev-libs/qtkeychain-0.14.1-r1 b/metadata/md5-cache/dev-libs/qtkeychain-0.14.1-r1
index cefcee5e8fa4..ca193b2b3987 100644
--- a/metadata/md5-cache/dev-libs/qtkeychain-0.14.1-r1
+++ b/metadata/md5-cache/dev-libs/qtkeychain-0.14.1-r1
@@ -1,4 +1,4 @@
-BDEPEND=qt5? ( dev-qt/linguist-tools:5 ) qt6? ( dev-qt/qttools:6[linguist] ) app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=qt5? ( dev-qt/linguist-tools:5 ) qt6? ( dev-qt/qttools:6[linguist] ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=keyring? ( app-crypt/libsecret dev-libs/glib:2 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 ) qt6? ( dev-qt/qtbase:6[dbus] )
 DESCRIPTION=Qt API for storing passwords securely
@@ -12,5 +12,5 @@ RDEPEND=keyring? ( app-crypt/libsecret dev-libs/glib:2 ) qt5? ( dev-qt/qtcore:5
 REQUIRED_USE=|| ( qt5 qt6 )
 SLOT=0/1
 SRC_URI=https://github.com/frankosterfeld/qtkeychain/archive/refs/tags/0.14.1.tar.gz -> qtkeychain-0.14.1.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=ae472b4e28465aa6b555d2b3731088b1
diff --git a/metadata/md5-cache/dev-libs/qtkeychain-0.14.2 b/metadata/md5-cache/dev-libs/qtkeychain-0.14.2
index bea97158eecb..eb4005b30f66 100644
--- a/metadata/md5-cache/dev-libs/qtkeychain-0.14.2
+++ b/metadata/md5-cache/dev-libs/qtkeychain-0.14.2
@@ -1,4 +1,4 @@
-BDEPEND=qt5? ( dev-qt/linguist-tools:5 ) qt6? ( dev-qt/qttools:6[linguist] ) app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=qt5? ( dev-qt/linguist-tools:5 ) qt6? ( dev-qt/qttools:6[linguist] ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=keyring? ( app-crypt/libsecret dev-libs/glib:2 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 ) qt6? ( dev-qt/qtbase:6[dbus] )
 DESCRIPTION=Qt API for storing passwords securely
@@ -12,5 +12,5 @@ RDEPEND=keyring? ( app-crypt/libsecret dev-libs/glib:2 ) qt5? ( dev-qt/qtcore:5
 REQUIRED_USE=|| ( qt5 qt6 )
 SLOT=0/1
 SRC_URI=https://github.com/frankosterfeld/qtkeychain/archive/refs/tags/0.14.2.tar.gz -> qtkeychain-0.14.2.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=5a868cfd4a1d9891bbe2ca130596c05c
diff --git a/metadata/md5-cache/dev-libs/quazip-1.2 b/metadata/md5-cache/dev-libs/quazip-1.2
index ba2a69ccc4dc..8c550c787875 100644
--- a/metadata/md5-cache/dev-libs/quazip-1.2
+++ b/metadata/md5-cache/dev-libs/quazip-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=dev-qt/qtcore:5 sys-libs/zlib[minizip] test? ( dev-qt/qtnetwork:5 dev-qt/qttest:5 )
 DESCRIPTION=Simple C++ wrapper over Gilles Vollant's ZIP/UNZIP package
@@ -12,5 +12,5 @@ RDEPEND=dev-qt/qtcore:5 sys-libs/zlib[minizip] !=dev-libs/quazip-1.1-r0:1
 RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://github.com/stachenov/quazip/archive/v1.2.tar.gz -> quazip-1.2.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=bf3bfcb4a1634a063a4cb59050e9d864
diff --git a/metadata/md5-cache/dev-libs/quazip-1.3-r2 b/metadata/md5-cache/dev-libs/quazip-1.3-r2
index 3a012e0d6b12..37c508d63824 100644
--- a/metadata/md5-cache/dev-libs/quazip-1.3-r2
+++ b/metadata/md5-cache/dev-libs/quazip-1.3-r2
@@ -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 setup test
 DEPEND=qt5? ( dev-qt/qtcore:5 ) qt6? ( dev-qt/qtbase:6 ) sys-libs/zlib[minizip] test? ( qt5? ( dev-qt/qtnetwork:5 dev-qt/qttest:5 ) qt6? ( dev-qt/qtbase:6[gui,network] dev-qt/qt5compat:6 ) )
 DESCRIPTION=Simple C++ wrapper over Gilles Vollant's ZIP/UNZIP package
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( qt5 qt6 )
 RESTRICT=!test? ( test )
 SLOT=0/1.3
 SRC_URI=https://github.com/stachenov/quazip/archive/v1.3.tar.gz -> quazip-1.3.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=911e540ef459309f65adf87bd3d63f19
diff --git a/metadata/md5-cache/dev-libs/quazip-1.3-r3 b/metadata/md5-cache/dev-libs/quazip-1.3-r3
index c18cea963b76..5cafff1a492a 100644
--- a/metadata/md5-cache/dev-libs/quazip-1.3-r3
+++ b/metadata/md5-cache/dev-libs/quazip-1.3-r3
@@ -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 setup test
 DEPEND=qt5? ( dev-qt/qtcore:5 ) qt6? ( dev-qt/qtbase:6 dev-qt/qt5compat:6 ) sys-libs/zlib[minizip] test? ( qt5? ( dev-qt/qtnetwork:5 dev-qt/qttest:5 ) qt6? ( dev-qt/qtbase:6[network] ) )
 DESCRIPTION=Simple C++ wrapper over Gilles Vollant's ZIP/UNZIP package
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( qt5 qt6 )
 RESTRICT=!test? ( test )
 SLOT=0/1.3
 SRC_URI=https://github.com/stachenov/quazip/archive/v1.3.tar.gz -> quazip-1.3.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=cd853eb56a3ae59f907d3a09473f694d
diff --git a/metadata/md5-cache/dev-libs/quazip-1.4 b/metadata/md5-cache/dev-libs/quazip-1.4
index 6953c1957c07..1e929d3124c2 100644
--- a/metadata/md5-cache/dev-libs/quazip-1.4
+++ b/metadata/md5-cache/dev-libs/quazip-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 setup test
 DEPEND=bzip2? ( app-alternatives/bzip2 ) qt5? ( dev-qt/qtcore:5 ) qt6? ( dev-qt/qtbase:6 dev-qt/qt5compat:6 ) sys-libs/zlib[minizip] test? ( qt5? ( dev-qt/qtnetwork:5 dev-qt/qttest:5 ) qt6? ( dev-qt/qtbase:6[network] ) )
 DESCRIPTION=Simple C++ wrapper over Gilles Vollant's ZIP/UNZIP package
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( qt5 qt6 )
 RESTRICT=!test? ( test )
 SLOT=0/1.4
 SRC_URI=https://github.com/stachenov/quazip/archive/v1.4.tar.gz -> quazip-1.4.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=758f36ae8d545fd20cd4cfa80d1151e5
diff --git a/metadata/md5-cache/dev-libs/quazip-1.4-r1 b/metadata/md5-cache/dev-libs/quazip-1.4-r1
index 39e942569435..bbc300e6cc8a 100644
--- a/metadata/md5-cache/dev-libs/quazip-1.4-r1
+++ b/metadata/md5-cache/dev-libs/quazip-1.4-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 setup test
 DEPEND=bzip2? ( app-arch/bzip2:= ) qt5? ( dev-qt/qtcore:5 ) qt6? ( dev-qt/qtbase:6 dev-qt/qt5compat:6 ) sys-libs/zlib[minizip] test? ( qt5? ( dev-qt/qtnetwork:5 dev-qt/qttest:5 ) qt6? ( dev-qt/qtbase:6[network] ) )
 DESCRIPTION=Simple C++ wrapper over Gilles Vollant's ZIP/UNZIP package
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( qt5 qt6 )
 RESTRICT=!test? ( test )
 SLOT=0/1.4
 SRC_URI=https://github.com/stachenov/quazip/archive/v1.4.tar.gz -> quazip-1.4.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=16cc8c78b6fccc257d06292470bd3f07
diff --git a/metadata/md5-cache/dev-libs/qxlsx-1.4.6 b/metadata/md5-cache/dev-libs/qxlsx-1.4.6
index 02318319bb44..59408c4990e9 100644
--- a/metadata/md5-cache/dev-libs/qxlsx-1.4.6
+++ b/metadata/md5-cache/dev-libs/qxlsx-1.4.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 setup test
 DEPEND=qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5= ) qt6? ( dev-qt/qtbase:6=[gui] )
 DESCRIPTION=Excel file(*.xlsx) reader/writer library using Qt
@@ -12,5 +12,5 @@ RDEPEND=qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5= ) qt6? ( dev-qt/qtbase:6=[gui] )
 REQUIRED_USE=|| ( qt5 qt6 )
 SLOT=0/0.1.4.4
 SRC_URI=https://github.com/QtExcel/QXlsx/archive/v1.4.6.tar.gz -> qxlsx-1.4.6.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=88c6494faab3ee2e196f1660f8bf4279
diff --git a/metadata/md5-cache/dev-libs/qxlsx-1.4.7 b/metadata/md5-cache/dev-libs/qxlsx-1.4.7
index f99e8004a21a..f53eba21963a 100644
--- a/metadata/md5-cache/dev-libs/qxlsx-1.4.7
+++ b/metadata/md5-cache/dev-libs/qxlsx-1.4.7
@@ -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 setup test
 DEPEND=qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5= ) qt6? ( dev-qt/qtbase:6=[gui] )
 DESCRIPTION=Excel file(*.xlsx) reader/writer library using Qt
@@ -12,5 +12,5 @@ RDEPEND=qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5= ) qt6? ( dev-qt/qtbase:6=[gui] )
 REQUIRED_USE=|| ( qt5 qt6 )
 SLOT=0/0.1.4.4
 SRC_URI=https://github.com/QtExcel/QXlsx/archive/v1.4.7.tar.gz -> qxlsx-1.4.7.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=127c17726f4eea17d636fdeca184899d
diff --git a/metadata/md5-cache/dev-libs/rapidjson-1.1.0-r4 b/metadata/md5-cache/dev-libs/rapidjson-1.1.0-r4
index 6a191f8fe793..9d6b70f16b82 100644
--- a/metadata/md5-cache/dev-libs/rapidjson-1.1.0-r4
+++ b/metadata/md5-cache/dev-libs/rapidjson-1.1.0-r4
@@ -1,4 +1,4 @@
-BDEPEND=doc? ( app-text/doxygen ) test? ( dev-cpp/gtest ) app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=doc? ( app-text/doxygen ) test? ( dev-cpp/gtest ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A fast JSON parser/generator for C++ with both SAX/DOM style API
 EAPI=8
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/miloyip/rapidjson/archive/v1.1.0.tar.gz -> rapidjson-1.1.0.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=bff1715e60add12070d863f0107201ec
diff --git a/metadata/md5-cache/dev-libs/rapidjson-9999 b/metadata/md5-cache/dev-libs/rapidjson-9999
index d7d03e5078af..916afab0f8f2 100644
--- a/metadata/md5-cache/dev-libs/rapidjson-9999
+++ b/metadata/md5-cache/dev-libs/rapidjson-9999
@@ -1,4 +1,4 @@
-BDEPEND=doc? ( app-text/doxygen ) test? ( dev-cpp/gtest ) app-alternatives/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=doc? ( app-text/doxygen ) test? ( dev-cpp/gtest ) 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
 DESCRIPTION=A fast JSON parser/generator for C++ with both SAX/DOM style API
 EAPI=8
@@ -9,5 +9,5 @@ LICENSE=MIT
 PROPERTIES=live
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=ad473d1997a02f9f9a2abbc95da9f920
diff --git a/metadata/md5-cache/dev-libs/rccl-5.1.3 b/metadata/md5-cache/dev-libs/rccl-5.1.3
index 478162c8bfbd..b8dc714e5c2d 100644
--- a/metadata/md5-cache/dev-libs/rccl-5.1.3
+++ b/metadata/md5-cache/dev-libs/rccl-5.1.3
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-util/cmake-3.22 >=dev-util/rocm-cmake-5.0.2-r1 test? ( dev-cpp/gtest ) app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=>=dev-build/cmake-3.22 >=dev-build/rocm-cmake-5.0.2-r1 test? ( dev-cpp/gtest ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-util/hip dev-util/rocm-smi:0/5.1
 DESCRIPTION=ROCm Communication Collectives Library (RCCL)
@@ -12,5 +12,5 @@ RDEPEND=dev-util/hip dev-util/rocm-smi:0/5.1
 RESTRICT=!test? ( test )
 SLOT=0/5.1
 SRC_URI=https://github.com/ROCmSoftwarePlatform/rccl/archive/rocm-5.1.3.tar.gz -> rccl-5.1.3.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	rocm	32cae3278ec0889923baf0e5a632e562	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=57719c810219cffa912d3a3339326860
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	rocm	32cae3278ec0889923baf0e5a632e562	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=74d04a93a0fb3cce303058c42e2e0ee3
diff --git a/metadata/md5-cache/dev-libs/redis-ipc-0.1.0 b/metadata/md5-cache/dev-libs/redis-ipc-0.1.0
index 62e20d4af301..1330516a6b81 100644
--- a/metadata/md5-cache/dev-libs/redis-ipc-0.1.0
+++ b/metadata/md5-cache/dev-libs/redis-ipc-0.1.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/hiredis:= dev-libs/json-c
 DESCRIPTION=A (redis) client library for using redis as system IPC msg/event bus
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/hiredis:= dev-libs/json-c dev-db/redis
 RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://github.com/VCTLabs/redis-ipc/archive/v0.1.0.tar.gz -> redis-ipc-0.1.0.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=22661a2d02281021711d501c156a60fb
diff --git a/metadata/md5-cache/dev-libs/rinutils-0.10.0 b/metadata/md5-cache/dev-libs/rinutils-0.10.0
index dd9a0d27cb0e..bc1ef2a7458c 100644
--- a/metadata/md5-cache/dev-libs/rinutils-0.10.0
+++ b/metadata/md5-cache/dev-libs/rinutils-0.10.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
 DESCRIPTION=Set of C headers containing macros and static functions
 EAPI=8
@@ -8,5 +8,5 @@ KEYWORDS=amd64 arm64 ~riscv x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/shlomif/rinutils/releases/download/0.10.0/rinutils-0.10.0.tar.xz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=05e9554b1df3c0faee65304b9a475695
diff --git a/metadata/md5-cache/dev-libs/rinutils-0.10.2 b/metadata/md5-cache/dev-libs/rinutils-0.10.2
index 8c3a6ae3b7f0..8319ca19fc8b 100644
--- a/metadata/md5-cache/dev-libs/rinutils-0.10.2
+++ b/metadata/md5-cache/dev-libs/rinutils-0.10.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
 DESCRIPTION=Set of C headers containing macros and static functions
 EAPI=8
@@ -8,5 +8,5 @@ KEYWORDS=amd64 arm arm64 hppa ~loong ~mips ppc64 ~riscv ~sparc x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/shlomif/rinutils/releases/download/0.10.2/rinutils-0.10.2.tar.xz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=749ffb14000d66f0ab763b8243e3c038
diff --git a/metadata/md5-cache/dev-libs/rinutils-0.10.2-r1 b/metadata/md5-cache/dev-libs/rinutils-0.10.2-r1
index 6a2030fe7a7c..c06a7bf6aa7a 100644
--- a/metadata/md5-cache/dev-libs/rinutils-0.10.2-r1
+++ b/metadata/md5-cache/dev-libs/rinutils-0.10.2-r1
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-perl/Env-Path dev-perl/Path-Tiny dev-perl/Inline dev-perl/Inline-C dev-perl/Test-TrailingSpace dev-perl/Test-Differences dev-perl/IO-All dev-perl/Perl-Critic dev-perl/Perl-Tidy dev-perl/Test-Pod dev-perl/Test-Pod-Coverage dev-perl/Test-Trap dev-util/cmocka ) app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=test? ( dev-perl/Env-Path dev-perl/Path-Tiny dev-perl/Inline dev-perl/Inline-C dev-perl/Test-TrailingSpace dev-perl/Test-Differences dev-perl/IO-All dev-perl/Perl-Critic dev-perl/Perl-Tidy dev-perl/Test-Pod dev-perl/Test-Pod-Coverage dev-perl/Test-Trap dev-util/cmocka ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Set of C headers containing macros and static functions
 EAPI=8
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/shlomif/rinutils/releases/download/0.10.2/rinutils-0.10.2.tar.xz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=ce251ebb0b64daa9cf5a917a53f4395f
diff --git a/metadata/md5-cache/dev-libs/rocksdb-6.14.6-r2 b/metadata/md5-cache/dev-libs/rocksdb-6.14.6-r2
index 71fcc5c06a0a..3c588385b024 100644
--- a/metadata/md5-cache/dev-libs/rocksdb-6.14.6-r2
+++ b/metadata/md5-cache/dev-libs/rocksdb-6.14.6-r2
@@ -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/bzip2:= app-arch/lz4:= app-arch/snappy:= app-arch/zstd:= dev-cpp/gflags:= sys-libs/zlib:= jemalloc? ( dev-libs/jemalloc:= )
 DESCRIPTION=Embeddable, persistent key-value store for fast storage
@@ -11,5 +11,5 @@ LICENSE=GPL-2
 RDEPEND=app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= app-arch/zstd:= dev-cpp/gflags:= sys-libs/zlib:= jemalloc? ( dev-libs/jemalloc:= )
 SLOT=0
 SRC_URI=https://github.com/facebook/rocksdb/archive/v6.14.6.tar.gz -> rocksdb-6.14.6.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=63ac800e433f0133d5925433b83e352b
diff --git a/metadata/md5-cache/dev-libs/rocksdb-6.14.6-r3 b/metadata/md5-cache/dev-libs/rocksdb-6.14.6-r3
index db3e095baf61..7ef325b6e8ad 100644
--- a/metadata/md5-cache/dev-libs/rocksdb-6.14.6-r3
+++ b/metadata/md5-cache/dev-libs/rocksdb-6.14.6-r3
@@ -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/bzip2:= app-arch/lz4:= app-arch/snappy:= app-arch/zstd:= dev-cpp/gflags:= sys-libs/zlib:= sys-process/numactl jemalloc? ( dev-libs/jemalloc:= ) tbb? ( dev-cpp/tbb:= )
 DESCRIPTION=Embeddable, persistent key-value store for fast storage
@@ -12,5 +12,5 @@ RDEPEND=app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= app-arch/zstd:= dev-cp
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/facebook/rocksdb/archive/v6.14.6.tar.gz -> rocksdb-6.14.6.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=7a951976c86f555cd1b9900f5501e0df
diff --git a/metadata/md5-cache/dev-libs/rocksdb-6.15.5-r1 b/metadata/md5-cache/dev-libs/rocksdb-6.15.5-r1
index 76d48ef4f654..fe535e43d272 100644
--- a/metadata/md5-cache/dev-libs/rocksdb-6.15.5-r1
+++ b/metadata/md5-cache/dev-libs/rocksdb-6.15.5-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/bzip2:= app-arch/lz4:= app-arch/snappy:= app-arch/zstd:= dev-cpp/gflags sys-libs/zlib:= jemalloc? ( dev-libs/jemalloc:= )
 DESCRIPTION=Embeddable, persistent key-value store for fast storage
@@ -11,5 +11,5 @@ LICENSE=GPL-2
 RDEPEND=app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= app-arch/zstd:= dev-cpp/gflags sys-libs/zlib:= jemalloc? ( dev-libs/jemalloc:= )
 SLOT=0
 SRC_URI=https://github.com/facebook/rocksdb/archive/v6.15.5.tar.gz -> rocksdb-6.15.5.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=edd2622f61a84fa599ae040deab57bce
diff --git a/metadata/md5-cache/dev-libs/rocksdb-6.17.3-r1 b/metadata/md5-cache/dev-libs/rocksdb-6.17.3-r1
index f7db8bdb9607..fc14f8991e31 100644
--- a/metadata/md5-cache/dev-libs/rocksdb-6.17.3-r1
+++ b/metadata/md5-cache/dev-libs/rocksdb-6.17.3-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/bzip2:= app-arch/lz4:= app-arch/snappy:= app-arch/zstd:= dev-cpp/gflags sys-libs/zlib:= jemalloc? ( dev-libs/jemalloc:= )
 DESCRIPTION=Embeddable, persistent key-value store for fast storage
@@ -11,5 +11,5 @@ LICENSE=GPL-2
 RDEPEND=app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= app-arch/zstd:= dev-cpp/gflags sys-libs/zlib:= jemalloc? ( dev-libs/jemalloc:= )
 SLOT=0
 SRC_URI=https://github.com/facebook/rocksdb/archive/v6.17.3.tar.gz -> rocksdb-6.17.3.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=20097ffabc8c228adb8fe696abaaf25e
diff --git a/metadata/md5-cache/dev-libs/rocksdb-6.29.5 b/metadata/md5-cache/dev-libs/rocksdb-6.29.5
index 8c0fba7b7b3e..f3ec53327f24 100644
--- a/metadata/md5-cache/dev-libs/rocksdb-6.29.5
+++ b/metadata/md5-cache/dev-libs/rocksdb-6.29.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=app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= app-arch/zstd:= dev-cpp/gflags sys-libs/liburing:= sys-libs/zlib:= sys-process/numactl jemalloc? ( dev-libs/jemalloc:= ) tbb? ( dev-cpp/tbb:= )
 DESCRIPTION=Embeddable, persistent key-value store for fast storage
@@ -12,5 +12,5 @@ RDEPEND=app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= app-arch/zstd:= dev-cp
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/facebook/rocksdb/archive/v6.29.5.tar.gz -> rocksdb-6.29.5.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=b27cd9923bc7f0f082595e765c702f35
diff --git a/metadata/md5-cache/dev-libs/rocksdb-7.9.2 b/metadata/md5-cache/dev-libs/rocksdb-7.9.2
index 9e83dc6d3842..a914d207e62f 100644
--- a/metadata/md5-cache/dev-libs/rocksdb-7.9.2
+++ b/metadata/md5-cache/dev-libs/rocksdb-7.9.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=app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= app-arch/zstd:= dev-cpp/gflags:= sys-libs/liburing:= sys-libs/zlib:= jemalloc? ( dev-libs/jemalloc:= )
 DESCRIPTION=Embeddable, persistent key-value store for fast storage
@@ -11,5 +11,5 @@ LICENSE=GPL-2
 RDEPEND=app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= app-arch/zstd:= dev-cpp/gflags:= sys-libs/liburing:= sys-libs/zlib:= jemalloc? ( dev-libs/jemalloc:= )
 SLOT=0
 SRC_URI=https://github.com/facebook/rocksdb/archive/v7.9.2.tar.gz -> rocksdb-7.9.2.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=377f7698e64b9f9925ce5de1b4bc2522
diff --git a/metadata/md5-cache/dev-libs/rocksdb-7.9.2-r1 b/metadata/md5-cache/dev-libs/rocksdb-7.9.2-r1
index 0eea09a8240a..366f2b261c18 100644
--- a/metadata/md5-cache/dev-libs/rocksdb-7.9.2-r1
+++ b/metadata/md5-cache/dev-libs/rocksdb-7.9.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=app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= app-arch/zstd:= dev-cpp/gflags:= sys-libs/liburing:= sys-libs/zlib:= sys-process/numactl jemalloc? ( dev-libs/jemalloc:= ) tbb? ( dev-cpp/tbb:= )
 DESCRIPTION=Embeddable, persistent key-value store for fast storage
@@ -12,5 +12,5 @@ RDEPEND=app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= app-arch/zstd:= dev-cp
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/facebook/rocksdb/archive/v7.9.2.tar.gz -> rocksdb-7.9.2.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=21769a3628481e2c63ef559d821cb399
diff --git a/metadata/md5-cache/dev-libs/rocksdb-8.6.7 b/metadata/md5-cache/dev-libs/rocksdb-8.6.7
index d385f24ca9c1..74e3cbec4b16 100644
--- a/metadata/md5-cache/dev-libs/rocksdb-8.6.7
+++ b/metadata/md5-cache/dev-libs/rocksdb-8.6.7
@@ -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/bzip2:= app-arch/lz4:= app-arch/snappy:= app-arch/zstd:= dev-cpp/gflags:= sys-libs/liburing:= sys-libs/zlib:= sys-process/numactl jemalloc? ( dev-libs/jemalloc:= ) tbb? ( dev-cpp/tbb:= )
 DESCRIPTION=Embeddable, persistent key-value store for fast storage
@@ -12,5 +12,5 @@ RDEPEND=app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= app-arch/zstd:= dev-cp
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/facebook/rocksdb/archive/v8.6.7.tar.gz -> rocksdb-8.6.7.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=e7e41f061fa7d8556cdff7208b26e12a
diff --git a/metadata/md5-cache/dev-libs/rocksdb-8.9.1 b/metadata/md5-cache/dev-libs/rocksdb-8.9.1
index 7a9d62533908..4869a108f9b0 100644
--- a/metadata/md5-cache/dev-libs/rocksdb-8.9.1
+++ b/metadata/md5-cache/dev-libs/rocksdb-8.9.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=app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= app-arch/zstd:= dev-cpp/gflags:= sys-libs/liburing:= sys-libs/zlib:= sys-process/numactl jemalloc? ( dev-libs/jemalloc:= ) tbb? ( dev-cpp/tbb:= )
 DESCRIPTION=Embeddable, persistent key-value store for fast storage
@@ -12,5 +12,5 @@ RDEPEND=app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= app-arch/zstd:= dev-cp
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/facebook/rocksdb/archive/v8.9.1.tar.gz -> rocksdb-8.9.1.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=e7e41f061fa7d8556cdff7208b26e12a
diff --git a/metadata/md5-cache/dev-libs/rocm-comgr-5.1.3-r3 b/metadata/md5-cache/dev-libs/rocm-comgr-5.1.3-r3
index a4ba0f97b121..5e8679f56cf0 100644
--- a/metadata/md5-cache/dev-libs/rocm-comgr-5.1.3-r3
+++ b/metadata/md5-cache/dev-libs/rocm-comgr-5.1.3-r3
@@ -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 setup test
 DEPEND=>=dev-libs/rocm-device-libs-5.1.3 sys-devel/clang:15= sys-devel/clang-runtime:= sys-devel/lld:15= !!sys-devel/llvm:0
 DESCRIPTION=Radeon Open Compute Code Object Manager
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=dev-libs/rocm-device-libs-5.1.3 sys-devel/clang:15= sys-devel/clang-runtime:= sys-devel/lld:15=
 SLOT=0/5.1
 SRC_URI=https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/archive/rocm-5.1.3.tar.gz -> rocm-comgr-5.1.3.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	llvm	dcfb437a52b5672e5f39deaae6f789c3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	llvm	dcfb437a52b5672e5f39deaae6f789c3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=e1bf54859fed172751c563d8c0b0d3f4
diff --git a/metadata/md5-cache/dev-libs/rocm-comgr-5.3.3-r2 b/metadata/md5-cache/dev-libs/rocm-comgr-5.3.3-r2
index 326f1c05dba9..cb495a83ecf8 100644
--- a/metadata/md5-cache/dev-libs/rocm-comgr-5.3.3-r2
+++ b/metadata/md5-cache/dev-libs/rocm-comgr-5.3.3-r2
@@ -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 setup test
 DEPEND=>=dev-libs/rocm-device-libs-5.3.3 sys-devel/clang:15= sys-devel/clang-runtime:= sys-devel/lld:15= !!sys-devel/llvm:0
 DESCRIPTION=Radeon Open Compute Code Object Manager
@@ -12,5 +12,5 @@ RDEPEND=>=dev-libs/rocm-device-libs-5.3.3 sys-devel/clang:15= sys-devel/clang-ru
 RESTRICT=!test? ( test )
 SLOT=0/5.3
 SRC_URI=https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/archive/rocm-5.3.3.tar.gz -> rocm-comgr-5.3.3.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	llvm	dcfb437a52b5672e5f39deaae6f789c3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	llvm	dcfb437a52b5672e5f39deaae6f789c3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=abc4ea250a20c86d532b1df153e3d4da
diff --git a/metadata/md5-cache/dev-libs/rocm-comgr-5.4.3-r1 b/metadata/md5-cache/dev-libs/rocm-comgr-5.4.3-r1
index 8a1e39e8b49c..f801fd6f9ed9 100644
--- a/metadata/md5-cache/dev-libs/rocm-comgr-5.4.3-r1
+++ b/metadata/md5-cache/dev-libs/rocm-comgr-5.4.3-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 setup test
 DEPEND=>=dev-libs/rocm-device-libs-5.4.3 sys-devel/clang:15= sys-devel/clang-runtime:= sys-devel/lld:15= !!sys-devel/llvm:0
 DESCRIPTION=Radeon Open Compute Code Object Manager
@@ -12,5 +12,5 @@ RDEPEND=>=dev-libs/rocm-device-libs-5.4.3 sys-devel/clang:15= sys-devel/clang-ru
 RESTRICT=!test? ( test )
 SLOT=0/5.4
 SRC_URI=https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/archive/rocm-5.4.3.tar.gz -> rocm-comgr-5.4.3.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	llvm	dcfb437a52b5672e5f39deaae6f789c3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	llvm	dcfb437a52b5672e5f39deaae6f789c3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=9b9fe4ce8fadfc7c8572448464174b5a
diff --git a/metadata/md5-cache/dev-libs/rocm-comgr-5.5.1 b/metadata/md5-cache/dev-libs/rocm-comgr-5.5.1
index 35847d323455..6567ae16632f 100644
--- a/metadata/md5-cache/dev-libs/rocm-comgr-5.5.1
+++ b/metadata/md5-cache/dev-libs/rocm-comgr-5.5.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 setup test
 DEPEND=>=dev-libs/rocm-device-libs-5.5.1 sys-devel/clang:16= sys-devel/clang-runtime:= sys-devel/lld:16= !!sys-devel/llvm:0
 DESCRIPTION=Radeon Open Compute Code Object Manager
@@ -12,5 +12,5 @@ RDEPEND=>=dev-libs/rocm-device-libs-5.5.1 sys-devel/clang:16= sys-devel/clang-ru
 RESTRICT=!test? ( test )
 SLOT=0/5.5
 SRC_URI=https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/archive/rocm-5.5.1.tar.gz -> rocm-comgr-5.5.1.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	llvm	dcfb437a52b5672e5f39deaae6f789c3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	llvm	dcfb437a52b5672e5f39deaae6f789c3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=a36c53d388458c175fe52f5512d42f2c
diff --git a/metadata/md5-cache/dev-libs/rocm-comgr-5.7.1 b/metadata/md5-cache/dev-libs/rocm-comgr-5.7.1
index d1250992eb5e..773f5b44d9ab 100644
--- a/metadata/md5-cache/dev-libs/rocm-comgr-5.7.1
+++ b/metadata/md5-cache/dev-libs/rocm-comgr-5.7.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 setup test
 DEPEND=>=dev-libs/rocm-device-libs-5.7.1 sys-devel/clang:17= sys-devel/clang-runtime:= sys-devel/lld:17= !!sys-devel/llvm:0
 DESCRIPTION=Radeon Open Compute Code Object Manager
@@ -12,5 +12,5 @@ RDEPEND=>=dev-libs/rocm-device-libs-5.7.1 sys-devel/clang:17= sys-devel/clang-ru
 RESTRICT=!test? ( test )
 SLOT=0/5.7
 SRC_URI=https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/archive/rocm-5.7.1.tar.gz -> rocm-comgr-5.7.1.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	llvm	dcfb437a52b5672e5f39deaae6f789c3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	llvm	dcfb437a52b5672e5f39deaae6f789c3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=9e687e6cd24102a35dd71ffd71eb60b6
diff --git a/metadata/md5-cache/dev-libs/rocm-comgr-6.0.0 b/metadata/md5-cache/dev-libs/rocm-comgr-6.0.0
index d361c91b0ddd..325ae1abe7b0 100644
--- a/metadata/md5-cache/dev-libs/rocm-comgr-6.0.0
+++ b/metadata/md5-cache/dev-libs/rocm-comgr-6.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 setup test
 DEPEND=>=dev-libs/rocm-device-libs-6.0.0 sys-devel/clang:17= sys-devel/clang-runtime:= sys-devel/lld:17= !!sys-devel/llvm:0
 DESCRIPTION=Radeon Open Compute Code Object Manager
@@ -12,5 +12,5 @@ RDEPEND=>=dev-libs/rocm-device-libs-6.0.0 sys-devel/clang:17= sys-devel/clang-ru
 RESTRICT=!test? ( test )
 SLOT=0/6.0
 SRC_URI=https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/archive/rocm-6.0.0.tar.gz -> rocm-comgr-6.0.0.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	llvm	dcfb437a52b5672e5f39deaae6f789c3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	llvm	dcfb437a52b5672e5f39deaae6f789c3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=9e687e6cd24102a35dd71ffd71eb60b6
diff --git a/metadata/md5-cache/dev-libs/rocm-device-libs-5.1.3-r1 b/metadata/md5-cache/dev-libs/rocm-device-libs-5.1.3-r1
index 61448ec7eb91..d7ee1de8108b 100644
--- a/metadata/md5-cache/dev-libs/rocm-device-libs-5.1.3-r1
+++ b/metadata/md5-cache/dev-libs/rocm-device-libs-5.1.3-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 setup test
 DEPEND=sys-devel/clang:15 !!sys-devel/llvm:0
 DESCRIPTION=Radeon Open Compute Device Libraries
@@ -12,5 +12,5 @@ RDEPEND=sys-devel/clang:15
 RESTRICT=!test? ( test )
 SLOT=0/5.1
 SRC_URI=https://github.com/RadeonOpenCompute/ROCm-Device-Libs/archive/rocm-5.1.3.tar.gz -> rocm-device-libs-5.1.3.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	llvm	dcfb437a52b5672e5f39deaae6f789c3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	llvm	dcfb437a52b5672e5f39deaae6f789c3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=2e9adc58ebc3605bf5d6bf76058e4db8
diff --git a/metadata/md5-cache/dev-libs/rocm-device-libs-5.3.3 b/metadata/md5-cache/dev-libs/rocm-device-libs-5.3.3
index c1ae45150c43..ab0fd72535e9 100644
--- a/metadata/md5-cache/dev-libs/rocm-device-libs-5.3.3
+++ b/metadata/md5-cache/dev-libs/rocm-device-libs-5.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 setup test
 DEPEND=sys-devel/clang:15 !!sys-devel/llvm:0
 DESCRIPTION=Radeon Open Compute Device Libraries
@@ -12,5 +12,5 @@ RDEPEND=sys-devel/clang:15
 RESTRICT=!test? ( test )
 SLOT=0/5.3
 SRC_URI=https://github.com/RadeonOpenCompute/ROCm-Device-Libs/archive/rocm-5.3.3.tar.gz -> rocm-device-libs-5.3.3.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	llvm	dcfb437a52b5672e5f39deaae6f789c3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	llvm	dcfb437a52b5672e5f39deaae6f789c3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=2e9adc58ebc3605bf5d6bf76058e4db8
diff --git a/metadata/md5-cache/dev-libs/rocm-device-libs-5.4.3 b/metadata/md5-cache/dev-libs/rocm-device-libs-5.4.3
index c1a0fa0796e6..299da725866b 100644
--- a/metadata/md5-cache/dev-libs/rocm-device-libs-5.4.3
+++ b/metadata/md5-cache/dev-libs/rocm-device-libs-5.4.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 setup test
 DEPEND=sys-devel/clang:15 !!sys-devel/llvm:0
 DESCRIPTION=Radeon Open Compute Device Libraries
@@ -12,5 +12,5 @@ RDEPEND=sys-devel/clang:15
 RESTRICT=!test? ( test )
 SLOT=0/5.4
 SRC_URI=https://github.com/RadeonOpenCompute/ROCm-Device-Libs/archive/rocm-5.4.3.tar.gz -> rocm-device-libs-5.4.3.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	llvm	dcfb437a52b5672e5f39deaae6f789c3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	llvm	dcfb437a52b5672e5f39deaae6f789c3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=58858ca218ce47816d3effb45beadaa7
diff --git a/metadata/md5-cache/dev-libs/rocm-device-libs-5.5.1 b/metadata/md5-cache/dev-libs/rocm-device-libs-5.5.1
index 5302b1132ea1..abfcce19d974 100644
--- a/metadata/md5-cache/dev-libs/rocm-device-libs-5.5.1
+++ b/metadata/md5-cache/dev-libs/rocm-device-libs-5.5.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 setup test
 DEPEND=sys-devel/clang:16 !!sys-devel/llvm:0
 DESCRIPTION=Radeon Open Compute Device Libraries
@@ -12,5 +12,5 @@ RDEPEND=sys-devel/clang:16
 RESTRICT=!test? ( test )
 SLOT=0/5.5
 SRC_URI=https://github.com/RadeonOpenCompute/ROCm-Device-Libs/archive/rocm-5.5.1.tar.gz -> rocm-device-libs-5.5.1.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	llvm	dcfb437a52b5672e5f39deaae6f789c3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	llvm	dcfb437a52b5672e5f39deaae6f789c3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=c4157c384cae8c1c45a71c0d3423eb72
diff --git a/metadata/md5-cache/dev-libs/rocm-device-libs-5.7.1 b/metadata/md5-cache/dev-libs/rocm-device-libs-5.7.1
index cad2da3dce2c..84116d9db74c 100644
--- a/metadata/md5-cache/dev-libs/rocm-device-libs-5.7.1
+++ b/metadata/md5-cache/dev-libs/rocm-device-libs-5.7.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 setup test
 DEPEND=sys-devel/clang:17 !!sys-devel/llvm:0
 DESCRIPTION=Radeon Open Compute Device Libraries
@@ -12,5 +12,5 @@ RDEPEND=sys-devel/clang:17
 RESTRICT=!test? ( test )
 SLOT=0/5.7
 SRC_URI=https://github.com/RadeonOpenCompute/ROCm-Device-Libs/archive/rocm-5.7.1.tar.gz -> rocm-device-libs-5.7.1.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	llvm	dcfb437a52b5672e5f39deaae6f789c3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	llvm	dcfb437a52b5672e5f39deaae6f789c3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=0d5baafc043262621edc524e694b1aa8
diff --git a/metadata/md5-cache/dev-libs/rocm-device-libs-6.0.0 b/metadata/md5-cache/dev-libs/rocm-device-libs-6.0.0
index e82cfc4adab8..b2427cdca9e2 100644
--- a/metadata/md5-cache/dev-libs/rocm-device-libs-6.0.0
+++ b/metadata/md5-cache/dev-libs/rocm-device-libs-6.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 setup test
 DEPEND=sys-devel/clang:17 !!sys-devel/llvm:0
 DESCRIPTION=Radeon Open Compute Device Libraries
@@ -12,5 +12,5 @@ RDEPEND=sys-devel/clang:17
 RESTRICT=!test? ( test )
 SLOT=0/6.0
 SRC_URI=https://github.com/RadeonOpenCompute/ROCm-Device-Libs/archive/rocm-6.0.0.tar.gz -> rocm-device-libs-6.0.0.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	llvm	dcfb437a52b5672e5f39deaae6f789c3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	llvm	dcfb437a52b5672e5f39deaae6f789c3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=ca68e4ab1e83e68a2edbb3fdb6154e26
diff --git a/metadata/md5-cache/dev-libs/rocm-opencl-runtime-5.1.3 b/metadata/md5-cache/dev-libs/rocm-opencl-runtime-5.1.3
index 24f7be9019c2..7ec1f277f697 100644
--- a/metadata/md5-cache/dev-libs/rocm-opencl-runtime-5.1.3
+++ b/metadata/md5-cache/dev-libs/rocm-opencl-runtime-5.1.3
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-util/rocm-cmake-5.1.3 media-libs/glew test? ( >=x11-apps/mesa-progs-8.5.0[X] ) app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=>=dev-build/rocm-cmake-5.1.3 media-libs/glew test? ( >=x11-apps/mesa-progs-8.5.0[X] ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=dev-libs/rocr-runtime-5.1.3 >=dev-libs/rocm-comgr-5.1.3 >=dev-libs/rocm-device-libs-5.1.3 >=virtual/opencl-3 media-libs/mesa[-opencl] dev-util/opencl-headers
 DESCRIPTION=Radeon Open Compute OpenCL Compatible Runtime
@@ -12,5 +12,5 @@ RDEPEND=>=dev-libs/rocr-runtime-5.1.3 >=dev-libs/rocm-comgr-5.1.3 >=dev-libs/roc
 RESTRICT=!test? ( test )
 SLOT=0/5.1
 SRC_URI=https://github.com/ROCm-Developer-Tools/ROCclr/archive/rocm-5.1.3.tar.gz -> rocclr-5.1.3.tar.gz https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/rocm-5.1.3.tar.gz -> rocm-opencl-runtime-5.1.3.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=cde90e072e48a6b2e6da2ac031ef4479
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=dcd299f4eafdba80a3a7dd1c734d9984
diff --git a/metadata/md5-cache/dev-libs/rocm-opencl-runtime-5.3.3-r1 b/metadata/md5-cache/dev-libs/rocm-opencl-runtime-5.3.3-r1
index e8f7cfd88dde..0973d8dab668 100644
--- a/metadata/md5-cache/dev-libs/rocm-opencl-runtime-5.3.3-r1
+++ b/metadata/md5-cache/dev-libs/rocm-opencl-runtime-5.3.3-r1
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-util/rocm-cmake-5.3.3 media-libs/glew test? ( >=x11-apps/mesa-progs-8.5.0[X] ) app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=>=dev-build/rocm-cmake-5.3.3 media-libs/glew test? ( >=x11-apps/mesa-progs-8.5.0[X] ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=dev-libs/rocr-runtime-5.3.3 >=dev-libs/rocm-comgr-5.3.3 >=dev-libs/rocm-device-libs-5.3.3 >=virtual/opencl-3 media-libs/mesa[-opencl] dev-util/opencl-headers
 DESCRIPTION=Radeon Open Compute OpenCL Compatible Runtime
@@ -12,5 +12,5 @@ RDEPEND=>=dev-libs/rocr-runtime-5.3.3 >=dev-libs/rocm-comgr-5.3.3 >=dev-libs/roc
 RESTRICT=!test? ( test )
 SLOT=0/5.3
 SRC_URI=https://github.com/ROCm-Developer-Tools/ROCclr/archive/rocm-5.3.3.tar.gz -> rocclr-5.3.3.tar.gz https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/rocm-5.3.3.tar.gz -> rocm-opencl-runtime-5.3.3.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=15ae0b2c7a47daf049fb0e77b41b1edf
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=c62484ef8426a5d87eed33bdc83f84f8
diff --git a/metadata/md5-cache/dev-libs/rocm-opencl-runtime-5.4.3-r1 b/metadata/md5-cache/dev-libs/rocm-opencl-runtime-5.4.3-r1
index 1748f2cb4e77..78261af0f78b 100644
--- a/metadata/md5-cache/dev-libs/rocm-opencl-runtime-5.4.3-r1
+++ b/metadata/md5-cache/dev-libs/rocm-opencl-runtime-5.4.3-r1
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-util/rocm-cmake-5.3 test? ( >=x11-apps/mesa-progs-8.5.0[X] media-libs/glew ) app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=>=dev-build/rocm-cmake-5.3 test? ( >=x11-apps/mesa-progs-8.5.0[X] media-libs/glew ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=>=dev-libs/rocr-runtime-5.3 >=dev-libs/rocm-comgr-5.3 >=dev-libs/rocm-device-libs-5.3 >=virtual/opencl-3 media-libs/mesa[-opencl] dev-util/opencl-headers
 DESCRIPTION=Radeon Open Compute OpenCL Compatible Runtime
@@ -12,5 +12,5 @@ RDEPEND=>=dev-libs/rocr-runtime-5.3 >=dev-libs/rocm-comgr-5.3 >=dev-libs/rocm-de
 RESTRICT=!test? ( test )
 SLOT=0/5.4
 SRC_URI=https://github.com/ROCm-Developer-Tools/ROCclr/archive/rocm-5.4.3.tar.gz -> rocclr-5.4.3.tar.gz https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/rocm-5.4.3.tar.gz -> rocm-opencl-runtime-5.4.3.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=ad78af2655da3b75ea49aa2f45ea7a6d
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=42fe18b1575fb8d91a90cd0a62cb868b
diff --git a/metadata/md5-cache/dev-libs/rocm-opencl-runtime-5.5.1 b/metadata/md5-cache/dev-libs/rocm-opencl-runtime-5.5.1
index 899b542a614e..e22627c7e40e 100644
--- a/metadata/md5-cache/dev-libs/rocm-opencl-runtime-5.5.1
+++ b/metadata/md5-cache/dev-libs/rocm-opencl-runtime-5.5.1
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-util/rocm-cmake-5.3 media-libs/glew test? ( >=x11-apps/mesa-progs-8.5.0[X] ) app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=>=dev-build/rocm-cmake-5.3 media-libs/glew test? ( >=x11-apps/mesa-progs-8.5.0[X] ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=>=dev-libs/rocr-runtime-5.3 >=dev-libs/rocm-comgr-5.3 >=dev-libs/rocm-device-libs-5.3 >=virtual/opencl-3 media-libs/mesa[-opencl]
 DESCRIPTION=Radeon Open Compute OpenCL Compatible Runtime
@@ -12,5 +12,5 @@ RDEPEND=>=dev-libs/rocr-runtime-5.3 >=dev-libs/rocm-comgr-5.3 >=dev-libs/rocm-de
 RESTRICT=!test? ( test )
 SLOT=0/5.5
 SRC_URI=https://github.com/ROCm-Developer-Tools/ROCclr/archive/rocm-5.5.1.tar.gz -> rocclr-5.5.1.tar.gz https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/rocm-5.5.1.tar.gz -> rocm-opencl-runtime-5.5.1.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=8c4dc4591d73f40437b01c467b753952
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=9ee224af506cd1bc4ca3723b33c7bfd0
diff --git a/metadata/md5-cache/dev-libs/rocm-opencl-runtime-5.7.1-r1 b/metadata/md5-cache/dev-libs/rocm-opencl-runtime-5.7.1-r1
index 93c23fb3d2cf..9550ef2a353e 100644
--- a/metadata/md5-cache/dev-libs/rocm-opencl-runtime-5.7.1-r1
+++ b/metadata/md5-cache/dev-libs/rocm-opencl-runtime-5.7.1-r1
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-util/rocm-cmake-5.3 media-libs/glew test? ( >=x11-apps/mesa-progs-8.5.0[X] ) app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=>=dev-build/rocm-cmake-5.3 media-libs/glew test? ( >=x11-apps/mesa-progs-8.5.0[X] ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=>=dev-libs/rocr-runtime-5.7 >=dev-libs/rocm-comgr-5.7 >=dev-libs/rocm-device-libs-5.7 >=virtual/opencl-3 media-libs/mesa[-opencl]
 DESCRIPTION=Radeon Open Compute OpenCL Compatible Runtime
@@ -12,5 +12,5 @@ RDEPEND=>=dev-libs/rocr-runtime-5.7 >=dev-libs/rocm-comgr-5.7 >=dev-libs/rocm-de
 RESTRICT=!test? ( test )
 SLOT=0/5.7
 SRC_URI=https://github.com/ROCm-Developer-Tools/clr/archive/refs/tags/rocm-5.7.1.tar.gz -> rocm-clr-5.7.1.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	rocm	32cae3278ec0889923baf0e5a632e562	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=7c3d32ba8e53fd1db343f640552f1261
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	rocm	32cae3278ec0889923baf0e5a632e562	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=8916dfc411d0be81fabb25762f62ba29
diff --git a/metadata/md5-cache/dev-libs/rocm-opencl-runtime-6.0.0 b/metadata/md5-cache/dev-libs/rocm-opencl-runtime-6.0.0
index 00daa376860a..5655fc159cf5 100644
--- a/metadata/md5-cache/dev-libs/rocm-opencl-runtime-6.0.0
+++ b/metadata/md5-cache/dev-libs/rocm-opencl-runtime-6.0.0
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-util/rocm-cmake-5.3 media-libs/glew test? ( >=x11-apps/mesa-progs-8.5.0[X] ) app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=>=dev-build/rocm-cmake-5.3 media-libs/glew test? ( >=x11-apps/mesa-progs-8.5.0[X] ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=>=dev-libs/rocr-runtime-6.0 >=dev-libs/rocm-comgr-6.0 >=dev-libs/rocm-device-libs-6.0 >=virtual/opencl-3 media-libs/mesa[-opencl]
 DESCRIPTION=Radeon Open Compute OpenCL Compatible Runtime
@@ -12,5 +12,5 @@ RDEPEND=>=dev-libs/rocr-runtime-6.0 >=dev-libs/rocm-comgr-6.0 >=dev-libs/rocm-de
 RESTRICT=!test? ( test )
 SLOT=0/6.0
 SRC_URI=https://github.com/ROCm-Developer-Tools/clr/archive/refs/tags/rocm-6.0.0.tar.gz -> rocm-clr-6.0.0.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	rocm	32cae3278ec0889923baf0e5a632e562	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=caedec7b43d2b3634077f5bcbed82837
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	rocm	32cae3278ec0889923baf0e5a632e562	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=131bb99c2972c1a062f19e83e1c9feaf
diff --git a/metadata/md5-cache/dev-libs/rocm-opencl-runtime-9999 b/metadata/md5-cache/dev-libs/rocm-opencl-runtime-9999
index 9c8e9f8248e1..30f232eaa403 100644
--- a/metadata/md5-cache/dev-libs/rocm-opencl-runtime-9999
+++ b/metadata/md5-cache/dev-libs/rocm-opencl-runtime-9999
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-util/rocm-cmake-5.3 media-libs/glew test? ( >=x11-apps/mesa-progs-8.5.0[X] ) app-alternatives/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=>=dev-build/rocm-cmake-5.3 media-libs/glew test? ( >=x11-apps/mesa-progs-8.5.0[X] ) 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/rocr-runtime-5.3 >=dev-libs/rocm-comgr-5.3 >=dev-libs/rocm-device-libs-5.3 >=virtual/opencl-3 media-libs/mesa[-opencl] dev-util/opencl-headers
 DESCRIPTION=Radeon Open Compute OpenCL Compatible Runtime
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=>=dev-libs/rocr-runtime-5.3 >=dev-libs/rocm-comgr-5.3 >=dev-libs/rocm-device-libs-5.3 >=virtual/opencl-3 media-libs/mesa[-opencl]
 RESTRICT=!test? ( test )
 SLOT=0/9999
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=fe38b8b32506053cde11d1f84f3d9873
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=c62814c936f667d6f04b3fb00c6983ea
diff --git a/metadata/md5-cache/dev-libs/rocr-runtime-5.1.3-r1 b/metadata/md5-cache/dev-libs/rocr-runtime-5.1.3-r1
index 84fc86095e3c..bf327a1ca11c 100644
--- a/metadata/md5-cache/dev-libs/rocr-runtime-5.1.3-r1
+++ b/metadata/md5-cache/dev-libs/rocr-runtime-5.1.3-r1
@@ -1,4 +1,4 @@
-BDEPEND=app-editors/vim-core app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-editors/vim-core app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-libs/elfutils >=dev-libs/roct-thunk-interface-5.1.3 >=dev-libs/rocm-device-libs-5.1.3 sys-devel/clang sys-devel/lld !!sys-devel/llvm:0
 DESCRIPTION=Radeon Open Compute Runtime
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=dev-libs/elfutils
 SLOT=0/5.1
 SRC_URI=https://github.com/RadeonOpenCompute/ROCR-Runtime/archive/rocm-5.1.3.tar.gz -> rocr-runtime-5.1.3.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	llvm	dcfb437a52b5672e5f39deaae6f789c3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	llvm	dcfb437a52b5672e5f39deaae6f789c3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=7a2f1162f552887abd6e71c26eb4b2e3
diff --git a/metadata/md5-cache/dev-libs/rocr-runtime-5.3.3-r1 b/metadata/md5-cache/dev-libs/rocr-runtime-5.3.3-r1
index fce9acdfea84..1f2259307b50 100644
--- a/metadata/md5-cache/dev-libs/rocr-runtime-5.3.3-r1
+++ b/metadata/md5-cache/dev-libs/rocr-runtime-5.3.3-r1
@@ -1,4 +1,4 @@
-BDEPEND=app-editors/vim-core app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-editors/vim-core app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-libs/elfutils >=dev-libs/roct-thunk-interface-5.3.3 >=dev-libs/rocm-device-libs-5.3.3 sys-devel/clang sys-devel/lld !!sys-devel/llvm:0
 DESCRIPTION=Radeon Open Compute Runtime
@@ -11,5 +11,5 @@ LICENSE=MIT
 RDEPEND=dev-libs/elfutils
 SLOT=0/5.3
 SRC_URI=https://github.com/RadeonOpenCompute/ROCR-Runtime/archive/rocm-5.3.3.tar.gz -> rocr-runtime-5.3.3.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	llvm	dcfb437a52b5672e5f39deaae6f789c3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	llvm	dcfb437a52b5672e5f39deaae6f789c3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=ba1cf8de442ddf59680635bd1b4903c2
diff --git a/metadata/md5-cache/dev-libs/rocr-runtime-5.4.3-r1 b/metadata/md5-cache/dev-libs/rocr-runtime-5.4.3-r1
index 8e5492a127e5..0890089b704f 100644
--- a/metadata/md5-cache/dev-libs/rocr-runtime-5.4.3-r1
+++ b/metadata/md5-cache/dev-libs/rocr-runtime-5.4.3-r1
@@ -1,4 +1,4 @@
-BDEPEND=app-editors/vim-core app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-editors/vim-core app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-libs/elfutils >=dev-libs/roct-thunk-interface-5.4.3 >=dev-libs/rocm-device-libs-5.4.3 sys-devel/clang sys-devel/lld !!sys-devel/llvm:0
 DESCRIPTION=Radeon Open Compute Runtime
@@ -11,5 +11,5 @@ LICENSE=MIT
 RDEPEND=dev-libs/elfutils
 SLOT=0/5.4
 SRC_URI=https://github.com/RadeonOpenCompute/ROCR-Runtime/archive/rocm-5.4.3.tar.gz -> rocr-runtime-5.4.3.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	llvm	dcfb437a52b5672e5f39deaae6f789c3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	llvm	dcfb437a52b5672e5f39deaae6f789c3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=9b4c988c0ce21f29d220ef13fcec492a
diff --git a/metadata/md5-cache/dev-libs/rocr-runtime-5.5.1 b/metadata/md5-cache/dev-libs/rocr-runtime-5.5.1
index dbab6cf1f110..b2251cd380d4 100644
--- a/metadata/md5-cache/dev-libs/rocr-runtime-5.5.1
+++ b/metadata/md5-cache/dev-libs/rocr-runtime-5.5.1
@@ -1,4 +1,4 @@
-BDEPEND=app-editors/vim-core app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-editors/vim-core app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-libs/elfutils >=dev-libs/roct-thunk-interface-5.5.1 >=dev-libs/rocm-device-libs-5.5.1 sys-devel/clang sys-devel/lld !!sys-devel/llvm:0
 DESCRIPTION=Radeon Open Compute Runtime
@@ -11,5 +11,5 @@ LICENSE=MIT
 RDEPEND=dev-libs/elfutils
 SLOT=0/5.5
 SRC_URI=https://github.com/RadeonOpenCompute/ROCR-Runtime/archive/rocm-5.5.1.tar.gz -> rocr-runtime-5.5.1.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	llvm	dcfb437a52b5672e5f39deaae6f789c3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	llvm	dcfb437a52b5672e5f39deaae6f789c3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=14713c8cf3bf4b2cf9c5e2cc5524e4d1
diff --git a/metadata/md5-cache/dev-libs/rocr-runtime-5.7.1-r1 b/metadata/md5-cache/dev-libs/rocr-runtime-5.7.1-r1
index 477e5c37063f..be018ff6c1b5 100644
--- a/metadata/md5-cache/dev-libs/rocr-runtime-5.7.1-r1
+++ b/metadata/md5-cache/dev-libs/rocr-runtime-5.7.1-r1
@@ -1,4 +1,4 @@
-BDEPEND=app-editors/vim-core app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-editors/vim-core app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-libs/elfutils x11-libs/libdrm >=dev-libs/roct-thunk-interface-5.7.1 >=dev-libs/rocm-device-libs-5.7.1 sys-devel/clang sys-devel/lld !!sys-devel/llvm:0
 DESCRIPTION=Radeon Open Compute Runtime
@@ -11,5 +11,5 @@ LICENSE=MIT
 RDEPEND=dev-libs/elfutils x11-libs/libdrm >=dev-libs/roct-thunk-interface-5.7.1 >=dev-libs/rocm-device-libs-5.7.1 sys-devel/clang sys-devel/lld
 SLOT=0/5.7
 SRC_URI=https://github.com/RadeonOpenCompute/ROCR-Runtime/archive/rocm-5.7.1.tar.gz -> rocr-runtime-5.7.1.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	llvm	dcfb437a52b5672e5f39deaae6f789c3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	llvm	dcfb437a52b5672e5f39deaae6f789c3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=0cc43f6c80cf20dc63b84a0307cfade8
diff --git a/metadata/md5-cache/dev-libs/rocr-runtime-6.0.0 b/metadata/md5-cache/dev-libs/rocr-runtime-6.0.0
index 20cd32cda5d3..eb50f04bd371 100644
--- a/metadata/md5-cache/dev-libs/rocr-runtime-6.0.0
+++ b/metadata/md5-cache/dev-libs/rocr-runtime-6.0.0
@@ -1,4 +1,4 @@
-BDEPEND=app-editors/vim-core app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-editors/vim-core app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-libs/elfutils x11-libs/libdrm >=dev-libs/roct-thunk-interface-6.0.0 >=dev-libs/rocm-device-libs-6.0.0 sys-devel/clang sys-devel/lld !!sys-devel/llvm:0
 DESCRIPTION=Radeon Open Compute Runtime
@@ -11,5 +11,5 @@ LICENSE=MIT
 RDEPEND=dev-libs/elfutils x11-libs/libdrm >=dev-libs/roct-thunk-interface-6.0.0 >=dev-libs/rocm-device-libs-6.0.0 sys-devel/clang sys-devel/lld
 SLOT=0/6.0
 SRC_URI=https://github.com/RadeonOpenCompute/ROCR-Runtime/archive/rocm-6.0.0.tar.gz -> rocr-runtime-6.0.0.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	llvm	dcfb437a52b5672e5f39deaae6f789c3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	llvm	dcfb437a52b5672e5f39deaae6f789c3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=0cc43f6c80cf20dc63b84a0307cfade8
diff --git a/metadata/md5-cache/dev-libs/roct-thunk-interface-5.1.3 b/metadata/md5-cache/dev-libs/roct-thunk-interface-5.1.3
index a07d82e23f80..b6465fa08366 100644
--- a/metadata/md5-cache/dev-libs/roct-thunk-interface-5.1.3
+++ b/metadata/md5-cache/dev-libs/roct-thunk-interface-5.1.3
@@ -1,4 +1,4 @@
-BDEPEND=x11-libs/libdrm[video_cards_amdgpu] app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=x11-libs/libdrm[video_cards_amdgpu] app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=sys-process/numactl
 DESCRIPTION=Radeon Open Compute Thunk Interface
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=sys-process/numactl
 SLOT=0/5.1
 SRC_URI=https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/archive/rocm-5.1.3.tar.gz -> roct-thunk-interface-5.1.3.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=a4430921bceb8186e3f2bed893d3df24
diff --git a/metadata/md5-cache/dev-libs/roct-thunk-interface-5.3.3 b/metadata/md5-cache/dev-libs/roct-thunk-interface-5.3.3
index a033640ee1de..f1841317659f 100644
--- a/metadata/md5-cache/dev-libs/roct-thunk-interface-5.3.3
+++ b/metadata/md5-cache/dev-libs/roct-thunk-interface-5.3.3
@@ -1,4 +1,4 @@
-BDEPEND=x11-libs/libdrm[video_cards_amdgpu] app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=x11-libs/libdrm[video_cards_amdgpu] app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=sys-process/numactl
 DESCRIPTION=Radeon Open Compute Thunk Interface
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=sys-process/numactl
 SLOT=0/5.3
 SRC_URI=https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/archive/rocm-5.3.3.tar.gz -> roct-thunk-interface-5.3.3.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=a4430921bceb8186e3f2bed893d3df24
diff --git a/metadata/md5-cache/dev-libs/roct-thunk-interface-5.4.3 b/metadata/md5-cache/dev-libs/roct-thunk-interface-5.4.3
index f47ad480d505..68eafb124b1e 100644
--- a/metadata/md5-cache/dev-libs/roct-thunk-interface-5.4.3
+++ b/metadata/md5-cache/dev-libs/roct-thunk-interface-5.4.3
@@ -1,4 +1,4 @@
-BDEPEND=x11-libs/libdrm[video_cards_amdgpu] app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=x11-libs/libdrm[video_cards_amdgpu] app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=sys-process/numactl
 DESCRIPTION=Radeon Open Compute Thunk Interface
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=sys-process/numactl
 SLOT=0/5.4
 SRC_URI=https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/archive/rocm-5.4.3.tar.gz -> roct-thunk-interface-5.4.3.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=3151e7d04a7e95f6301e352bba6a4d7f
diff --git a/metadata/md5-cache/dev-libs/roct-thunk-interface-5.5.1 b/metadata/md5-cache/dev-libs/roct-thunk-interface-5.5.1
index 032200f32002..073e51bed6d4 100644
--- a/metadata/md5-cache/dev-libs/roct-thunk-interface-5.5.1
+++ b/metadata/md5-cache/dev-libs/roct-thunk-interface-5.5.1
@@ -1,4 +1,4 @@
-BDEPEND=x11-libs/libdrm[video_cards_amdgpu] app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=x11-libs/libdrm[video_cards_amdgpu] app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=sys-process/numactl
 DESCRIPTION=Radeon Open Compute Thunk Interface
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=sys-process/numactl
 SLOT=0/5.5
 SRC_URI=https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/archive/rocm-5.5.1.tar.gz -> roct-thunk-interface-5.5.1.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=3151e7d04a7e95f6301e352bba6a4d7f
diff --git a/metadata/md5-cache/dev-libs/roct-thunk-interface-5.7.1 b/metadata/md5-cache/dev-libs/roct-thunk-interface-5.7.1
index b7aea7703575..6d17376a8a4a 100644
--- a/metadata/md5-cache/dev-libs/roct-thunk-interface-5.7.1
+++ b/metadata/md5-cache/dev-libs/roct-thunk-interface-5.7.1
@@ -1,4 +1,4 @@
-BDEPEND=x11-libs/libdrm[video_cards_amdgpu] app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=x11-libs/libdrm[video_cards_amdgpu] app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=sys-process/numactl
 DESCRIPTION=Radeon Open Compute Thunk Interface
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=sys-process/numactl
 SLOT=0/5.7
 SRC_URI=https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/archive/rocm-5.7.1.tar.gz -> roct-thunk-interface-5.7.1.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=b738b660a2cec491186d34b86c444bba
diff --git a/metadata/md5-cache/dev-libs/roct-thunk-interface-6.0.0 b/metadata/md5-cache/dev-libs/roct-thunk-interface-6.0.0
index 3b6b9dcf29b2..e43779f0e37a 100644
--- a/metadata/md5-cache/dev-libs/roct-thunk-interface-6.0.0
+++ b/metadata/md5-cache/dev-libs/roct-thunk-interface-6.0.0
@@ -1,4 +1,4 @@
-BDEPEND=x11-libs/libdrm[video_cards_amdgpu] app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=x11-libs/libdrm[video_cards_amdgpu] app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=sys-process/numactl
 DESCRIPTION=Radeon Open Compute Thunk Interface
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=sys-process/numactl
 SLOT=0/6.0
 SRC_URI=https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/archive/rocm-6.0.0.tar.gz -> roct-thunk-interface-6.0.0.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=8f2d0ad590a70f99a57201fb1027db8f
diff --git a/metadata/md5-cache/dev-libs/s2n-1.0.0 b/metadata/md5-cache/dev-libs/s2n-1.0.0
index a15529039981..581fdddfa6e1 100644
--- a/metadata/md5-cache/dev-libs/s2n-1.0.0
+++ b/metadata/md5-cache/dev-libs/s2n-1.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/openssl:0=[static-libs=]
 DESCRIPTION=Simple, small, fast and secure C99 implementation of the TLS/SSL protocols
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/openssl:0=[static-libs=]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/awslabs/s2n/archive/v1.0.0.tar.gz -> s2n-1.0.0.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=541a41244f365ed78b68d477d057eff8
diff --git a/metadata/md5-cache/dev-libs/sdformat-9.10.0 b/metadata/md5-cache/dev-libs/sdformat-9.10.0
index 0854f1f0a6f7..eddc6c001189 100644
--- a/metadata/md5-cache/dev-libs/sdformat-9.10.0
+++ b/metadata/md5-cache/dev-libs/sdformat-9.10.0
@@ -1,4 +1,4 @@
-BDEPEND=dev-lang/ruby:* virtual/pkgconfig app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=dev-lang/ruby:* virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=dev-libs/urdfdom-1:= dev-libs/tinyxml dev-libs/boost:= sci-libs/ignition-math:6=
 DESCRIPTION=Simulation Description Format (SDF) parser
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-libs/urdfdom-1:= dev-libs/tinyxml dev-libs/boost:= sci-libs/ignition-math:6=
 SLOT=0/9
 SRC_URI=http://osrf-distributions.s3.amazonaws.com/sdformat/releases/sdformat-9.10.0.tar.bz2
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=649b6af7278662e4fa0bc5025fafa236
diff --git a/metadata/md5-cache/dev-libs/sentry-native-0.6.5-r1 b/metadata/md5-cache/dev-libs/sentry-native-0.6.5-r1
index 277465796b3c..fd5bb92ee96e 100644
--- a/metadata/md5-cache/dev-libs/sentry-native-0.6.5-r1
+++ b/metadata/md5-cache/dev-libs/sentry-native-0.6.5-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=breakpad? ( dev-util/breakpad virtual/pkgconfig ) curl? ( net-misc/curl )
 DESCRIPTION=Sentry SDK for C, C++ and native applications
@@ -12,5 +12,5 @@ RDEPEND=breakpad? ( dev-util/breakpad virtual/pkgconfig ) curl? ( net-misc/curl
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/getsentry/sentry-native/archive/refs/tags/0.6.5.tar.gz -> sentry-native-0.6.5.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=de170e7d3d9d6bd7be76bfcbb094089e
diff --git a/metadata/md5-cache/dev-libs/sentry-native-0.6.6 b/metadata/md5-cache/dev-libs/sentry-native-0.6.6
index 364f3418d023..228466f650a5 100644
--- a/metadata/md5-cache/dev-libs/sentry-native-0.6.6
+++ b/metadata/md5-cache/dev-libs/sentry-native-0.6.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=breakpad? ( dev-util/breakpad virtual/pkgconfig ) curl? ( net-misc/curl )
 DESCRIPTION=Sentry SDK for C, C++ and native applications
@@ -12,5 +12,5 @@ RDEPEND=breakpad? ( dev-util/breakpad virtual/pkgconfig ) curl? ( net-misc/curl
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/getsentry/sentry-native/archive/refs/tags/0.6.6.tar.gz -> sentry-native-0.6.6.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=de170e7d3d9d6bd7be76bfcbb094089e
diff --git a/metadata/md5-cache/dev-libs/sentry-native-0.6.7 b/metadata/md5-cache/dev-libs/sentry-native-0.6.7
index 063660d1076e..c17cb10b1667 100644
--- a/metadata/md5-cache/dev-libs/sentry-native-0.6.7
+++ b/metadata/md5-cache/dev-libs/sentry-native-0.6.7
@@ -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=breakpad? ( dev-util/breakpad virtual/pkgconfig ) curl? ( net-misc/curl )
 DESCRIPTION=Sentry SDK for C, C++ and native applications
@@ -12,5 +12,5 @@ RDEPEND=breakpad? ( dev-util/breakpad virtual/pkgconfig ) curl? ( net-misc/curl
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/getsentry/sentry-native/archive/refs/tags/0.6.7.tar.gz -> sentry-native-0.6.7.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=de170e7d3d9d6bd7be76bfcbb094089e
diff --git a/metadata/md5-cache/dev-libs/sexpp-0.8.6 b/metadata/md5-cache/dev-libs/sexpp-0.8.6
index 3346bb3a7678..30c4786de4b6 100644
--- a/metadata/md5-cache/dev-libs/sexpp-0.8.6
+++ b/metadata/md5-cache/dev-libs/sexpp-0.8.6
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig test? ( dev-cpp/gtest ) app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=virtual/pkgconfig test? ( dev-cpp/gtest ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=S-expressions parser and generator library in C++
 EAPI=8
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rnpgp/sexpp/archive/refs/tags/v0.8.6.tar.gz -> sexpp-0.8.6.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=1246435585c6ecf69bafdf2dbddd5da8
diff --git a/metadata/md5-cache/dev-libs/simdjson-3.2.0 b/metadata/md5-cache/dev-libs/simdjson-3.2.0
index ca7aee77566d..3734868b10d7 100644
--- a/metadata/md5-cache/dev-libs/simdjson-3.2.0
+++ b/metadata/md5-cache/dev-libs/simdjson-3.2.0
@@ -1,4 +1,4 @@
-BDEPEND=sys-apps/file sys-apps/grep virtual/pkgconfig app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=sys-apps/file sys-apps/grep virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=tools? ( <dev-libs/cxxopts-3.1:= )
 DESCRIPTION=SIMD accelerated C++ JSON library
@@ -12,5 +12,5 @@ REQUIRED_USE=test? ( tools )
 RESTRICT=!test? ( test )
 SLOT=0/16
 SRC_URI=https://github.com/simdjson/simdjson/archive/v3.2.0.tar.gz -> simdjson-3.2.0.gh.tar.gz test? ( https://github.com/simdjson/simdjson-data/archive/a5b13babe65c1bba7186b41b43d4cbdc20a5c470.tar.gz -> simdjson-data-a5b13babe65c1bba7186b41b43d4cbdc20a5c470.tar.gz )
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=9205b9bfcda4ba16c45541d606d91fd6
diff --git a/metadata/md5-cache/dev-libs/simdjson-3.2.3 b/metadata/md5-cache/dev-libs/simdjson-3.2.3
index 91c61da8e201..467829833bb8 100644
--- a/metadata/md5-cache/dev-libs/simdjson-3.2.3
+++ b/metadata/md5-cache/dev-libs/simdjson-3.2.3
@@ -1,4 +1,4 @@
-BDEPEND=sys-apps/file sys-apps/grep virtual/pkgconfig app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=sys-apps/file sys-apps/grep virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=tools? ( <dev-libs/cxxopts-3.1:= )
 DESCRIPTION=SIMD accelerated C++ JSON library
@@ -12,5 +12,5 @@ REQUIRED_USE=test? ( tools )
 RESTRICT=!test? ( test )
 SLOT=0/16
 SRC_URI=https://github.com/simdjson/simdjson/archive/v3.2.3.tar.gz -> simdjson-3.2.3.gh.tar.gz test? ( https://github.com/simdjson/simdjson-data/archive/a5b13babe65c1bba7186b41b43d4cbdc20a5c470.tar.gz -> simdjson-data-a5b13babe65c1bba7186b41b43d4cbdc20a5c470.tar.gz )
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=9f39434adf1c54497c50e3d92a0dabda
diff --git a/metadata/md5-cache/dev-libs/simdjson-3.5.0 b/metadata/md5-cache/dev-libs/simdjson-3.5.0
index 4f6eaf8e3f8f..401dfed767a4 100644
--- a/metadata/md5-cache/dev-libs/simdjson-3.5.0
+++ b/metadata/md5-cache/dev-libs/simdjson-3.5.0
@@ -1,4 +1,4 @@
-BDEPEND=sys-apps/file sys-apps/grep virtual/pkgconfig app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=sys-apps/file sys-apps/grep virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=tools? ( <dev-libs/cxxopts-3.1:= )
 DESCRIPTION=SIMD accelerated C++ JSON library
@@ -12,5 +12,5 @@ REQUIRED_USE=test? ( tools )
 RESTRICT=!test? ( test )
 SLOT=0/18
 SRC_URI=https://github.com/simdjson/simdjson/archive/v3.5.0.tar.gz -> simdjson-3.5.0.gh.tar.gz test? ( https://github.com/simdjson/simdjson-data/archive/a5b13babe65c1bba7186b41b43d4cbdc20a5c470.tar.gz -> simdjson-data-a5b13babe65c1bba7186b41b43d4cbdc20a5c470.tar.gz )
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=2db3c296f34e0f0e4b072e85b6fa909b
diff --git a/metadata/md5-cache/dev-libs/simdjson-3.6.3 b/metadata/md5-cache/dev-libs/simdjson-3.6.3
index 8ef81f0da931..1c3913b2f322 100644
--- a/metadata/md5-cache/dev-libs/simdjson-3.6.3
+++ b/metadata/md5-cache/dev-libs/simdjson-3.6.3
@@ -1,4 +1,4 @@
-BDEPEND=sys-apps/file sys-apps/grep virtual/pkgconfig app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=sys-apps/file sys-apps/grep virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=tools? ( <dev-libs/cxxopts-3.1:= )
 DESCRIPTION=SIMD accelerated C++ JSON library
@@ -12,5 +12,5 @@ REQUIRED_USE=test? ( tools )
 RESTRICT=!test? ( test )
 SLOT=0/19
 SRC_URI=https://github.com/simdjson/simdjson/archive/v3.6.3.tar.gz -> simdjson-3.6.3.gh.tar.gz test? ( https://github.com/simdjson/simdjson-data/archive/a5b13babe65c1bba7186b41b43d4cbdc20a5c470.tar.gz -> simdjson-data-a5b13babe65c1bba7186b41b43d4cbdc20a5c470.tar.gz )
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=3fa3a3bf55b1c1ec20df256989e68c12
diff --git a/metadata/md5-cache/dev-libs/sleef-3.5.1-r1 b/metadata/md5-cache/dev-libs/sleef-3.5.1-r1
index 19af6f6cb1a1..b2b7c2e2b5b0 100644
--- a/metadata/md5-cache/dev-libs/sleef-3.5.1-r1
+++ b/metadata/md5-cache/dev-libs/sleef-3.5.1-r1
@@ -1,4 +1,4 @@
-BDEPEND=test? ( >=dev-libs/mpfr-4.2 ) app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=test? ( >=dev-libs/mpfr-4.2 ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Implements vectorized versions of C standard math functions
 EAPI=8
@@ -10,5 +10,5 @@ LICENSE=Boost-1.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/shibatch/sleef/archive/refs/tags/3.5.1.tar.gz -> sleef-3.5.1.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=850bdc845c4e83998884b67eabaf75ca
diff --git a/metadata/md5-cache/dev-libs/spdlog-1.11.0-r3 b/metadata/md5-cache/dev-libs/spdlog-1.11.0-r3
index 15bc10e48b3f..d933390296d0 100644
--- a/metadata/md5-cache/dev-libs/spdlog-1.11.0-r3
+++ b/metadata/md5-cache/dev-libs/spdlog-1.11.0-r3
@@ -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=dev-libs/libfmt
 DESCRIPTION=Fast C++ logging library
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/libfmt
 RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://github.com/gabime/spdlog/archive/v1.11.0.tar.gz -> spdlog-1.11.0.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=a8186c43747915177fb1a97a0720c2bf
diff --git a/metadata/md5-cache/dev-libs/spdlog-1.12.0-r2 b/metadata/md5-cache/dev-libs/spdlog-1.12.0-r2
index 33283131b648..7d2b3dfecbed 100644
--- a/metadata/md5-cache/dev-libs/spdlog-1.12.0-r2
+++ b/metadata/md5-cache/dev-libs/spdlog-1.12.0-r2
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig test? ( >=dev-cpp/catch-3.4.0 ) app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=virtual/pkgconfig test? ( >=dev-cpp/catch-3.4.0 ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=dev-libs/libfmt-8.0.0:=
 DESCRIPTION=Fast C++ logging library
@@ -12,5 +12,5 @@ RDEPEND=>=dev-libs/libfmt-8.0.0:=
 RESTRICT=!test? ( test )
 SLOT=0/1.12
 SRC_URI=https://github.com/gabime/spdlog/archive/v1.12.0.tar.gz -> spdlog-1.12.0.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=1b7f0b2e4ca2d5550f447c3eadffa606
diff --git a/metadata/md5-cache/dev-libs/spdlog-9999 b/metadata/md5-cache/dev-libs/spdlog-9999
index c25cf2cd4c76..4af807acf0ab 100644
--- a/metadata/md5-cache/dev-libs/spdlog-9999
+++ b/metadata/md5-cache/dev-libs/spdlog-9999
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig test? ( dev-cpp/catch:0 ) app-alternatives/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=virtual/pkgconfig test? ( dev-cpp/catch:0 ) 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/libfmt-8.0.0:=
 DESCRIPTION=Fast C++ logging library
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=>=dev-libs/libfmt-8.0.0:=
 RESTRICT=!test? ( test )
 SLOT=0/9999
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=a91d31e92250596b1f61efe5dece0d2b
diff --git a/metadata/md5-cache/dev-libs/teakra-20220224 b/metadata/md5-cache/dev-libs/teakra-20220224
index 498160a198e5..a941b2b930f6 100644
--- a/metadata/md5-cache/dev-libs/teakra-20220224
+++ b/metadata/md5-cache/dev-libs/teakra-20220224
@@ -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
 DESCRIPTION=Emulator, assembler, etc for XpertTeak, the DSP used by DSi/3DS
 EAPI=8
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/wwylele/teakra/archive/01db7cdd00aabcce559a8dddce8798dabb71949b.tar.gz -> teakra-20220224.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=93bbb41c5c88417d0bc19cbbe1283748
diff --git a/metadata/md5-cache/dev-libs/thrift-0.16.0-r2 b/metadata/md5-cache/dev-libs/thrift-0.16.0-r2
index 5f8ef558d832..79cc99e37fc2 100644
--- a/metadata/md5-cache/dev-libs/thrift-0.16.0-r2
+++ b/metadata/md5-cache/dev-libs/thrift-0.16.0-r2
@@ -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/boost:=[nls] dev-libs/openssl:= libevent? ( dev-libs/libevent )
 DESCRIPTION=C++ bindings for Apache Thrift
@@ -13,5 +13,5 @@ REQUIRED_USE=test? ( ssl )
 RESTRICT=!test? ( test )
 SLOT=0/0
 SRC_URI=mirror://apache/thrift/0.16.0/thrift-0.16.0.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=102dab124b407edc0ea6ec7775d2d31d
diff --git a/metadata/md5-cache/dev-libs/thrift-0.18.1-r1 b/metadata/md5-cache/dev-libs/thrift-0.18.1-r1
index 06b72ca085b4..59c397059d23 100644
--- a/metadata/md5-cache/dev-libs/thrift-0.18.1-r1
+++ b/metadata/md5-cache/dev-libs/thrift-0.18.1-r1
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/lex app-alternatives/yacc app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-alternatives/lex app-alternatives/yacc app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-libs/boost:=[nls] dev-libs/openssl:= sys-libs/zlib:= libevent? ( dev-libs/libevent:= )
 DESCRIPTION=C++ bindings for Apache Thrift
@@ -13,5 +13,5 @@ REQUIRED_USE=test? ( ssl libevent )
 RESTRICT=!test? ( test )
 SLOT=0/0
 SRC_URI=mirror://apache/thrift/0.18.1/thrift-0.18.1.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=7da2888ca70082aea34670e4b4044dcb
diff --git a/metadata/md5-cache/dev-libs/tinyxml2-9.0.0-r1 b/metadata/md5-cache/dev-libs/tinyxml2-9.0.0-r1
index 74d67166afaa..3fa50056f38a 100644
--- a/metadata/md5-cache/dev-libs/tinyxml2-9.0.0-r1
+++ b/metadata/md5-cache/dev-libs/tinyxml2-9.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
 DESCRIPTION=A simple, small, efficient, C++ XML parser
 EAPI=8
@@ -10,5 +10,5 @@ LICENSE=ZLIB
 RESTRICT=!test? ( test )
 SLOT=0/9
 SRC_URI=https://github.com/leethomason/tinyxml2/archive/9.0.0.tar.gz -> tinyxml2-9.0.0.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=97b4baee41d97027558044f88ee0ddb7
diff --git a/metadata/md5-cache/dev-libs/tlsh-4.8.2 b/metadata/md5-cache/dev-libs/tlsh-4.8.2
index a159e2122f2a..c66e3e18dce5 100644
--- a/metadata/md5-cache/dev-libs/tlsh-4.8.2
+++ b/metadata/md5-cache/dev-libs/tlsh-4.8.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
 DESCRIPTION=Fuzzy matching library
 EAPI=8
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~ppc64 x86
 LICENSE=|| ( Apache-2.0 BSD )
 SLOT=0
 SRC_URI=https://github.com/trendmicro/tlsh/archive/4.8.2.tar.gz -> tlsh-4.8.2.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=254d578db02a65370ecee2fd1839cdf5
diff --git a/metadata/md5-cache/dev-libs/unittest++-2.0.0-r2 b/metadata/md5-cache/dev-libs/unittest++-2.0.0-r2
index 26bc8deff7ca..9d93b0425f50 100644
--- a/metadata/md5-cache/dev-libs/unittest++-2.0.0-r2
+++ b/metadata/md5-cache/dev-libs/unittest++-2.0.0-r2
@@ -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
 DESCRIPTION=A lightweight unit testing framework for C++
 EAPI=7
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/unittest-cpp/unittest-cpp/archive/v2.0.0.tar.gz -> unittest++-2.0.0.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=19cd4346a3acdf24b3101c6d42d9dd95
diff --git a/metadata/md5-cache/dev-libs/urdfdom-3.1.0 b/metadata/md5-cache/dev-libs/urdfdom-3.1.0
index cde3feae5ac7..f7145aa2b6f0 100644
--- a/metadata/md5-cache/dev-libs/urdfdom-3.1.0
+++ b/metadata/md5-cache/dev-libs/urdfdom-3.1.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/urdfdom_headers-1.0.0 >=dev-libs/console_bridge-0.3:= dev-libs/tinyxml[stl]
 DESCRIPTION=URDF (U-Robot Description Format) library
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=>=dev-libs/urdfdom_headers-1.0.0 >=dev-libs/console_bridge-0.3:= dev-libs/tinyxml[stl]
 SLOT=0/3
 SRC_URI=https://github.com/ros/urdfdom/archive/3.1.0.tar.gz -> urdfdom-3.1.0.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=15bd0b0aec54812413794934a762e490
diff --git a/metadata/md5-cache/dev-libs/urdfdom-9999 b/metadata/md5-cache/dev-libs/urdfdom-9999
index fcfe9eb246e8..092982b54904 100644
--- a/metadata/md5-cache/dev-libs/urdfdom-9999
+++ b/metadata/md5-cache/dev-libs/urdfdom-9999
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-vcs/git-1.8.2.1[curl] app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=>=dev-libs/urdfdom_headers-1.0.0 >=dev-libs/console_bridge-0.3:= dev-libs/tinyxml[stl]
 DESCRIPTION=URDF (U-Robot Description Format) library
@@ -9,5 +9,5 @@ LICENSE=BSD
 PROPERTIES=live
 RDEPEND=>=dev-libs/urdfdom_headers-1.0.0 >=dev-libs/console_bridge-0.3:= dev-libs/tinyxml[stl]
 SLOT=0/3
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=af69cbc9f45210752e22bd2a942d3a44
diff --git a/metadata/md5-cache/dev-libs/urdfdom_headers-1.1.0 b/metadata/md5-cache/dev-libs/urdfdom_headers-1.1.0
index edfbca860f26..6d398a607955 100644
--- a/metadata/md5-cache/dev-libs/urdfdom_headers-1.1.0
+++ b/metadata/md5-cache/dev-libs/urdfdom_headers-1.1.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
 DESCRIPTION=URDF (U-Robot Description Format) headers
 EAPI=7
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/ros/urdfdom_headers/archive/1.1.0.tar.gz -> urdfdom_headers-1.1.0.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=b9eec82864cb04e067acdee6ab9fd641
diff --git a/metadata/md5-cache/dev-libs/urdfdom_headers-9999 b/metadata/md5-cache/dev-libs/urdfdom_headers-9999
index 753dda209300..3e0da3c8dfb0 100644
--- a/metadata/md5-cache/dev-libs/urdfdom_headers-9999
+++ b/metadata/md5-cache/dev-libs/urdfdom_headers-9999
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-vcs/git-1.8.2.1[curl] app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test unpack
 DESCRIPTION=URDF (U-Robot Description Format) headers
 EAPI=7
@@ -7,5 +7,5 @@ INHERIT=git-r3 cmake
 LICENSE=BSD
 PROPERTIES=live
 SLOT=0
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=b9eec82864cb04e067acdee6ab9fd641
diff --git a/metadata/md5-cache/dev-libs/uriparser-0.9.7 b/metadata/md5-cache/dev-libs/uriparser-0.9.7
index 97dab3ee6b18..1fcff32c1396 100644
--- a/metadata/md5-cache/dev-libs/uriparser-0.9.7
+++ b/metadata/md5-cache/dev-libs/uriparser-0.9.7
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig doc? ( >=app-text/doxygen-1.5.8 media-gfx/graphviz qt5? ( dev-qt/qthelp:5 ) ) app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=virtual/pkgconfig doc? ( >=app-text/doxygen-1.5.8 media-gfx/graphviz qt5? ( dev-qt/qthelp:5 ) ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=test? ( >=dev-cpp/gtest-1.8.1 )
 DESCRIPTION=Strictly RFC 3986 compliant URI parsing library in C
@@ -12,5 +12,5 @@ REQUIRED_USE=qt5? ( doc ) test? ( unicode )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/uriparser/uriparser/releases/download/uriparser-0.9.7/uriparser-0.9.7.tar.bz2
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=f602b33eaff1903b21460c8af401aaf0
diff --git a/metadata/md5-cache/dev-libs/utfcpp-3.2.1 b/metadata/md5-cache/dev-libs/utfcpp-3.2.1
index dc51bf6ce122..7f66be459c12 100644
--- a/metadata/md5-cache/dev-libs/utfcpp-3.2.1
+++ b/metadata/md5-cache/dev-libs/utfcpp-3.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 unpack
 DESCRIPTION=UTF-8 C++ library
 EAPI=8
@@ -10,5 +10,5 @@ LICENSE=Boost-1.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nemtrif/utfcpp/archive/v3.2.1.tar.gz -> utfcpp-3.2.1.tar.gz test? ( https://github.com/nemtrif/ftest/archive/1e14b77c2ab8489386fc7046a8bced696c0fc4d6.tar.gz -> ftest-20211106174116.tar.gz )
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=9d3e41eb896f053d3e16074318c6ccff
diff --git a/metadata/md5-cache/dev-libs/utfcpp-9999 b/metadata/md5-cache/dev-libs/utfcpp-9999
index 97022a62329f..f6767cb61c3e 100644
--- a/metadata/md5-cache/dev-libs/utfcpp-9999
+++ b/metadata/md5-cache/dev-libs/utfcpp-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
 DESCRIPTION=UTF-8 C++ library
 EAPI=8
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 PROPERTIES=live
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=685bcc84d9c84bb20d516f5ee8c69f04
diff --git a/metadata/md5-cache/dev-libs/vc-1.4.3 b/metadata/md5-cache/dev-libs/vc-1.4.3
index 5a83e02fb868..d08d3596e7ac 100644
--- a/metadata/md5-cache/dev-libs/vc-1.4.3
+++ b/metadata/md5-cache/dev-libs/vc-1.4.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
 DESCRIPTION=SIMD Vector Class Library for C++
 EAPI=8
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/VcDevel/Vc/archive/1.4.3.tar.gz -> vc-1.4.3.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=2ae2f020db068864c847bd8489cc64de
diff --git a/metadata/md5-cache/dev-libs/vc-1.4.4 b/metadata/md5-cache/dev-libs/vc-1.4.4
index 7c6e5432bd55..c8e72c13c715 100644
--- a/metadata/md5-cache/dev-libs/vc-1.4.4
+++ b/metadata/md5-cache/dev-libs/vc-1.4.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
 DESCRIPTION=SIMD Vector Class Library for C++
 EAPI=8
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/VcDevel/Vc/archive/1.4.4.tar.gz -> vc-1.4.4.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=045e92c84aeeebe83d00a27f833b5b0f
diff --git a/metadata/md5-cache/dev-libs/vectorscan-5.4.11 b/metadata/md5-cache/dev-libs/vectorscan-5.4.11
index b816efe8c70e..5cfb9eb62527 100644
--- a/metadata/md5-cache/dev-libs/vectorscan-5.4.11
+++ b/metadata/md5-cache/dev-libs/vectorscan-5.4.11
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/ragel virtual/pkgconfig app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=dev-util/ragel virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-libs/boost:=
 DESCRIPTION=A portable fork of the high-performance regular expression matching library
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/boost:= !dev-libs/hyperscan
 REQUIRED_USE=x86? ( cpu_flags_x86_sse4_2 ) amd64? ( cpu_flags_x86_sse4_2 )
 SLOT=0/5
 SRC_URI=https://github.com/VectorCamp/vectorscan/archive/refs/tags/vectorscan/5.4.11.tar.gz -> vectorscan-5.4.11.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=6fbd689d6f15b533521c21aaf36b4608
diff --git a/metadata/md5-cache/dev-libs/xalan-c-1.12-r2 b/metadata/md5-cache/dev-libs/xalan-c-1.12-r2
index bbc027d64b3c..bec0009751e6 100644
--- a/metadata/md5-cache/dev-libs/xalan-c-1.12-r2
+++ b/metadata/md5-cache/dev-libs/xalan-c-1.12-r2
@@ -1,4 +1,4 @@
-BDEPEND=verify-sig? ( sec-keys/openpgp-keys-apache-xalan-c ) doc? ( app-text/doxygen[dot] ) app-alternatives/ninja >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-20 )
+BDEPEND=verify-sig? ( sec-keys/openpgp-keys-apache-xalan-c ) doc? ( app-text/doxygen[dot] ) app-alternatives/ninja >=dev-build/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-20 )
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=dev-libs/icu:= dev-libs/xerces-c[icu]
 DESCRIPTION=XSLT processor for transforming XML into HTML, text, or other XML types
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-libs/icu:= dev-libs/xerces-c[icu]
 SLOT=0/1.12
 SRC_URI=https://dlcdn.apache.org/xalan/xalan-c/sources/xalan_c-1.12.tar.gz verify-sig? ( https://dlcdn.apache.org/xalan/xalan-c/sources/xalan_c-1.12.tar.gz.asc )
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=a9df4c657d50c1d34d8330f21153f4ea
diff --git a/metadata/md5-cache/dev-libs/xalan-c-9999 b/metadata/md5-cache/dev-libs/xalan-c-9999
index b58c7d3fa9d6..9c271293c69b 100644
--- a/metadata/md5-cache/dev-libs/xalan-c-9999
+++ b/metadata/md5-cache/dev-libs/xalan-c-9999
@@ -1,4 +1,4 @@
-BDEPEND=doc? ( app-text/doxygen[dot] ) app-alternatives/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=doc? ( app-text/doxygen[dot] ) 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/icu:= dev-libs/xerces-c[icu]
 DESCRIPTION=XSLT processor for transforming XML into HTML, text, or other XML types
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 PROPERTIES=live
 RDEPEND=dev-libs/icu:= dev-libs/xerces-c[icu]
 SLOT=0
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=79a724eb9d043ae859352107a73bdb88
diff --git a/metadata/md5-cache/dev-libs/xerces-c-3.2.4-r2 b/metadata/md5-cache/dev-libs/xerces-c-3.2.4-r2
index 4ffb84a46182..35eb0dab4c20 100644
--- a/metadata/md5-cache/dev-libs/xerces-c-3.2.4-r2
+++ b/metadata/md5-cache/dev-libs/xerces-c-3.2.4-r2
@@ -1,4 +1,4 @@
-BDEPEND=doc? ( app-text/doxygen ) test? ( dev-lang/perl ) app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=doc? ( app-text/doxygen ) test? ( dev-lang/perl ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=curl? ( net-misc/curl ) icu? ( dev-libs/icu:0= ) virtual/libiconv
 DESCRIPTION=A validating XML parser written in a portable subset of C++
@@ -12,5 +12,5 @@ RDEPEND=curl? ( net-misc/curl ) icu? ( dev-libs/icu:0= ) virtual/libiconv
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/xerces/c/3/sources/xerces-c-3.2.4.tar.xz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=613b5c38855904d2c44ccdf1514d7c84
diff --git a/metadata/md5-cache/dev-libs/xerces-c-3.2.4-r3 b/metadata/md5-cache/dev-libs/xerces-c-3.2.4-r3
index 52f8366fb129..6397999d1820 100644
--- a/metadata/md5-cache/dev-libs/xerces-c-3.2.4-r3
+++ b/metadata/md5-cache/dev-libs/xerces-c-3.2.4-r3
@@ -1,4 +1,4 @@
-BDEPEND=doc? ( app-text/doxygen ) test? ( dev-lang/perl ) app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=doc? ( app-text/doxygen ) test? ( dev-lang/perl ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=curl? ( net-misc/curl ) icu? ( dev-libs/icu:0= ) virtual/libiconv
 DESCRIPTION=Validating XML parser written in a portable subset of C++
@@ -12,5 +12,5 @@ RDEPEND=curl? ( net-misc/curl ) icu? ( dev-libs/icu:0= ) virtual/libiconv
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/xerces/c/3/sources/xerces-c-3.2.4.tar.xz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=dee4a969b2fa196b6798f7bcf2769d0a
diff --git a/metadata/md5-cache/dev-libs/xerces-c-9999 b/metadata/md5-cache/dev-libs/xerces-c-9999
index 9c84220ad75f..b54182b86951 100644
--- a/metadata/md5-cache/dev-libs/xerces-c-9999
+++ b/metadata/md5-cache/dev-libs/xerces-c-9999
@@ -1,4 +1,4 @@
-BDEPEND=doc? ( app-text/doxygen ) test? ( dev-lang/perl ) app-alternatives/ninja >=dev-util/cmake-3.20.5 dev-vcs/subversion[http(+)] net-misc/rsync
+BDEPEND=doc? ( app-text/doxygen ) test? ( dev-lang/perl ) app-alternatives/ninja >=dev-build/cmake-3.20.5 dev-vcs/subversion[http(+)] net-misc/rsync
 DEFINED_PHASES=compile configure install preinst prepare setup test unpack
 DEPEND=curl? ( net-misc/curl ) icu? ( dev-libs/icu:0= ) virtual/libiconv
 DESCRIPTION=Validating XML parser written in a portable subset of C++
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=curl? ( net-misc/curl ) icu? ( dev-libs/icu:0= ) virtual/libiconv
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	prefix	eab3c99d77fe00506c109c8a736186f7	subversion	44c6a1cae0381c100a526e3b348622cd	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	prefix	eab3c99d77fe00506c109c8a736186f7	subversion	44c6a1cae0381c100a526e3b348622cd	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=dee4a969b2fa196b6798f7bcf2769d0a
diff --git a/metadata/md5-cache/dev-libs/yajl-2.1.0-r4 b/metadata/md5-cache/dev-libs/yajl-2.1.0-r4
index 511057b0f4e6..95f9e1a7c3fa 100644
--- a/metadata/md5-cache/dev-libs/yajl-2.1.0-r4
+++ b/metadata/md5-cache/dev-libs/yajl-2.1.0-r4
@@ -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
 DESCRIPTION=Small event-driven (SAX-style) JSON parser
 EAPI=8
@@ -9,5 +9,5 @@ KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc
 LICENSE=ISC
 SLOT=0/2
 SRC_URI=https://github.com/lloyd/yajl/archive/2.1.0.tar.gz -> yajl-2.1.0.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=2104425a76c23060dbc94a190df642ae
diff --git a/metadata/md5-cache/dev-libs/yajl-2.1.0-r5 b/metadata/md5-cache/dev-libs/yajl-2.1.0-r5
index 9f837e8b6871..0edc83b8716c 100644
--- a/metadata/md5-cache/dev-libs/yajl-2.1.0-r5
+++ b/metadata/md5-cache/dev-libs/yajl-2.1.0-r5
@@ -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
 DESCRIPTION=Small event-driven (SAX-style) JSON parser
 EAPI=8
@@ -9,5 +9,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~
 LICENSE=ISC
 SLOT=0/2
 SRC_URI=https://github.com/lloyd/yajl/archive/refs/tags/2.1.0.tar.gz -> yajl-2.1.0-r5.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=5965f5580abdc7f03fe0e582dc9c21f3
diff --git a/metadata/md5-cache/dev-libs/yyjson-0.8.0 b/metadata/md5-cache/dev-libs/yyjson-0.8.0
index 0bf20db7d78a..9e2e9311e4bd 100644
--- a/metadata/md5-cache/dev-libs/yyjson-0.8.0
+++ b/metadata/md5-cache/dev-libs/yyjson-0.8.0
@@ -1,4 +1,4 @@
-BDEPEND=doc? ( app-text/doxygen ) app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=doc? ( app-text/doxygen ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Fast JSON library in C
 EAPI=8
@@ -10,5 +10,5 @@ LICENSE=MIT test? ( BSD )
 RESTRICT=!test? ( test )
 SLOT=0/0.8.0
 SRC_URI=https://github.com/ibireme/yyjson/archive/refs/tags/0.8.0.tar.gz -> yyjson-0.8.0.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=36763839c2fa1d5354e4f0d59d81db95
diff --git a/metadata/md5-cache/dev-libs/zziplib-0.13.72-r3 b/metadata/md5-cache/dev-libs/zziplib-0.13.72-r3
index d5e835c996ae..b5c0dd3461f2 100644
--- a/metadata/md5-cache/dev-libs/zziplib-0.13.72-r3
+++ b/metadata/md5-cache/dev-libs/zziplib-0.13.72-r3
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/python:3.11[xml(+)] dev-lang/python:3.10[xml(+)] ) app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=|| ( dev-lang/python:3.11[xml(+)] dev-lang/python:3.10[xml(+)] ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=sys-libs/zlib sdl? ( >=media-libs/libsdl-1.2.6 )
 DESCRIPTION=Lightweight library for extracting data from files archived in a single zip file
@@ -11,5 +11,5 @@ LICENSE=|| ( LGPL-2.1 MPL-1.1 )
 RDEPEND=sys-libs/zlib sdl? ( >=media-libs/libsdl-1.2.6 )
 SLOT=0/13
 SRC_URI=https://github.com/gdraheim/zziplib/archive/v0.13.72.tar.gz -> zziplib-0.13.72.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=1adf8aa789efc87f01bacafab20c45be
diff --git a/metadata/md5-cache/dev-libs/zziplib-0.13.72-r4 b/metadata/md5-cache/dev-libs/zziplib-0.13.72-r4
index 63c76a15d77d..8f51c7fdb540 100644
--- a/metadata/md5-cache/dev-libs/zziplib-0.13.72-r4
+++ b/metadata/md5-cache/dev-libs/zziplib-0.13.72-r4
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/python:3.12[xml(+)] dev-lang/python:3.11[xml(+)] dev-lang/python:3.10[xml(+)] ) app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=|| ( dev-lang/python:3.12[xml(+)] dev-lang/python:3.11[xml(+)] dev-lang/python:3.10[xml(+)] ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=sys-libs/zlib sdl? ( >=media-libs/libsdl-1.2.6 )
 DESCRIPTION=Lightweight library for extracting data from files archived in a single zip file
@@ -11,5 +11,5 @@ LICENSE=|| ( LGPL-2.1 MPL-1.1 )
 RDEPEND=sys-libs/zlib sdl? ( >=media-libs/libsdl-1.2.6 )
 SLOT=0/13
 SRC_URI=https://github.com/gdraheim/zziplib/archive/v0.13.72.tar.gz -> zziplib-0.13.72.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=0ebcba7f8aacdc624e37736589e275e1
author	V3n3RiX <venerix@koprulu.sector>	2024-01-15 01:16:32 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2024-01-15 01:16:32 +0000
commit	7387c23ff485f2416512185bf64584028335b993 (patch)
tree	77f6578297f64937d732133db350b968dfe538e3 /metadata/md5-cache/dev-libs
parent	d8a50857c27d3253561374390ac9ed8c1b65d9bc (diff)