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-cpp
parent: d8a50857c27d3253561374390ac9ed8c1b65d9bc (diff)
117 files changed, 232 insertions, 232 deletions
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index edf367873094..051db04ce40f 100644
--- a/metadata/md5-cache/dev-cpp/Manifest.gz
+++ b/metadata/md5-cache/dev-cpp/Manifest.gz
diff --git a/metadata/md5-cache/dev-cpp/abseil-cpp-20211102.0-r2 b/metadata/md5-cache/dev-cpp/abseil-cpp-20211102.0-r2
index 8a96f34a04b3..5ffd54e86728 100644
--- a/metadata/md5-cache/dev-cpp/abseil-cpp-20211102.0-r2
+++ b/metadata/md5-cache/dev-cpp/abseil-cpp-20211102.0-r2
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/python:3.11 dev-lang/python:3.10 ) test? ( sys-libs/timezone-data ) app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=|| ( dev-lang/python:3.11 dev-lang/python:3.10 ) test? ( sys-libs/timezone-data ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
 DESCRIPTION=Abseil Common Libraries (C++), LTS Branch
 EAPI=8
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0 test? ( BSD )
 RESTRICT=!test? ( test )
 SLOT=0/20211102
 SRC_URI=https://github.com/abseil/abseil-cpp/archive/20211102.0.tar.gz -> abseil-cpp-20211102.0.tar.gz test? ( https://github.com/google/googletest/archive/1b18723e874b256c1e39378c6774a90701d70f7a.tar.gz -> gtest-1b18723e874b256c1e39378c6774a90701d70f7a.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_=e93aae3dcc335a9d7d67344cb3c201bd
diff --git a/metadata/md5-cache/dev-cpp/abseil-cpp-20220623.1 b/metadata/md5-cache/dev-cpp/abseil-cpp-20220623.1
index e91335a16258..03e07ada19c8 100644
--- a/metadata/md5-cache/dev-cpp/abseil-cpp-20220623.1
+++ b/metadata/md5-cache/dev-cpp/abseil-cpp-20220623.1
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/python:3.11 dev-lang/python:3.10 ) test? ( sys-libs/timezone-data ) app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=|| ( dev-lang/python:3.11 dev-lang/python:3.10 ) test? ( sys-libs/timezone-data ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
 DESCRIPTION=Abseil Common Libraries (C++), LTS Branch
 EAPI=8
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0 test? ( BSD )
 RESTRICT=!test? ( test )
 SLOT=0/20220623
 SRC_URI=https://github.com/abseil/abseil-cpp/archive/20220623.1.tar.gz -> abseil-cpp-20220623.1.tar.gz test? ( https://github.com/google/googletest/archive/e68764c147ea0dac1e8811925c531d937396878e.tar.gz -> gtest-e68764c147ea0dac1e8811925c531d937396878e.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_=e49cd7cebdf8c66980363e03cd91bb78
diff --git a/metadata/md5-cache/dev-cpp/abseil-cpp-20230125.2 b/metadata/md5-cache/dev-cpp/abseil-cpp-20230125.2
index 7cc8e269a53f..62afdd4c96f5 100644
--- a/metadata/md5-cache/dev-cpp/abseil-cpp-20230125.2
+++ b/metadata/md5-cache/dev-cpp/abseil-cpp-20230125.2
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/python:3.11 dev-lang/python:3.10 ) test? ( sys-libs/timezone-data ) app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=|| ( dev-lang/python:3.11 dev-lang/python:3.10 ) test? ( sys-libs/timezone-data ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
 DESCRIPTION=Abseil Common Libraries (C++), LTS Branch
 EAPI=8
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0 test? ( BSD )
 RESTRICT=!test? ( test )
 SLOT=0/20230125
 SRC_URI=https://github.com/abseil/abseil-cpp/archive/20230125.2.tar.gz -> abseil-cpp-20230125.2.tar.gz test? ( https://github.com/google/googletest/archive/v1.13.0.tar.gz -> gtest-1.13.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	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	042f4cc53680245bf99a84669b94155a	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	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=dbb86c211033fbff14e33b9322d82d2c
diff --git a/metadata/md5-cache/dev-cpp/abseil-cpp-20230125.3-r1 b/metadata/md5-cache/dev-cpp/abseil-cpp-20230125.3-r1
index 10e3028cf4e2..c3ae325bb9f2 100644
--- a/metadata/md5-cache/dev-cpp/abseil-cpp-20230125.3-r1
+++ b/metadata/md5-cache/dev-cpp/abseil-cpp-20230125.3-r1
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) test? ( >=dev-cpp/gtest-1.13.0 sys-libs/timezone-data ) 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 ) test? ( >=dev-cpp/gtest-1.13.0 sys-libs/timezone-data ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
 DESCRIPTION=Abseil Common Libraries (C++), LTS Branch
 EAPI=8
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RESTRICT=!test? ( test )
 SLOT=0/20230125.0
 SRC_URI=https://github.com/abseil/abseil-cpp/archive/20230125.3.tar.gz -> abseil-cpp-20230125.3.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	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	042f4cc53680245bf99a84669b94155a	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	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=d0009d2df3c843ccdc7aa342ad69e36e
diff --git a/metadata/md5-cache/dev-cpp/abseil-cpp-20230802.0 b/metadata/md5-cache/dev-cpp/abseil-cpp-20230802.0
index dbb1f369e0e9..2d7118996fa3 100644
--- a/metadata/md5-cache/dev-cpp/abseil-cpp-20230802.0
+++ b/metadata/md5-cache/dev-cpp/abseil-cpp-20230802.0
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) test? ( >=dev-cpp/gtest-1.13.0 sys-libs/timezone-data ) 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 ) test? ( >=dev-cpp/gtest-1.13.0 sys-libs/timezone-data ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
 DESCRIPTION=Abseil Common Libraries (C++), LTS Branch
 EAPI=8
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RESTRICT=!test? ( test )
 SLOT=0/20230802
 SRC_URI=https://github.com/abseil/abseil-cpp/archive/20230802.0.tar.gz -> abseil-cpp-20230802.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	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	042f4cc53680245bf99a84669b94155a	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	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=56f119af9798235336ecd33d40ae9563
diff --git a/metadata/md5-cache/dev-cpp/aixlog-1.5.0 b/metadata/md5-cache/dev-cpp/aixlog-1.5.0
index fac306ff0046..848f0c8ac64a 100644
--- a/metadata/md5-cache/dev-cpp/aixlog-1.5.0
+++ b/metadata/md5-cache/dev-cpp/aixlog-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=Header-only C++ logging library
 EAPI=7
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ~arm ppc ppc64 ~riscv x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/badaix/aixlog/archive/v1.5.0.tar.gz -> aixlog-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_=479780ece96f90f85721c8a408bdfa64
diff --git a/metadata/md5-cache/dev-cpp/aixlog-9999 b/metadata/md5-cache/dev-cpp/aixlog-9999
index f255104b8c2d..6c3dbb9b5c4b 100644
--- a/metadata/md5-cache/dev-cpp/aixlog-9999
+++ b/metadata/md5-cache/dev-cpp/aixlog-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=Header-only C++ logging library
 EAPI=7
@@ -7,5 +7,5 @@ INHERIT=cmake git-r3
 LICENSE=MIT
 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_=824a030df81dd9319ac12c5875cb3dc7
diff --git a/metadata/md5-cache/dev-cpp/amqp-cpp-4.3.18 b/metadata/md5-cache/dev-cpp/amqp-cpp-4.3.18
index 1bf8ccc18f80..2443ce1ae6d0 100644
--- a/metadata/md5-cache/dev-cpp/amqp-cpp-4.3.18
+++ b/metadata/md5-cache/dev-cpp/amqp-cpp-4.3.18
@@ -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=AMQP-CPP is a C++ library for communicating with a RabbitMQ message broker
 EAPI=8
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/CopernicaMarketingSoftware/AMQP-CPP/archive/v4.3.18.tar.gz -> AMQP-CPP-4.3.18.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_=14b45a91747b1384ae27d03d2597eed8
diff --git a/metadata/md5-cache/dev-cpp/antlr-cpp-4.11.1 b/metadata/md5-cache/dev-cpp/antlr-cpp-4.11.1
index 7969f6999ffb..e1138919cfec 100644
--- a/metadata/md5-cache/dev-cpp/antlr-cpp-4.11.1
+++ b/metadata/md5-cache/dev-cpp/antlr-cpp-4.11.1
@@ -1,4 +1,4 @@
-BDEPEND=app-arch/unzip app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-arch/unzip app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=test? ( dev-cpp/gtest )
 DESCRIPTION=The ANTLR 4 C++ Runtime
@@ -11,5 +11,5 @@ LICENSE=BSD
 RESTRICT=!test? ( test )
 SLOT=4
 SRC_URI=https://www.antlr.org/download/antlr4-cpp-runtime-4.11.1-source.zip -> antlr-cpp-4.11.1.zip
-_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_=e301f51543ff67d7e989aa56c0eb2d5c
diff --git a/metadata/md5-cache/dev-cpp/argparse-2.9 b/metadata/md5-cache/dev-cpp/argparse-2.9
index b20d614ff78e..43cec28c43c2 100644
--- a/metadata/md5-cache/dev-cpp/argparse-2.9
+++ b/metadata/md5-cache/dev-cpp/argparse-2.9
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Argument Parser for Modern C++
 EAPI=8
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/p-ranav/argparse/archive/v2.9.tar.gz -> argparse-2.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_=c2892910faf2784f26084d2ae47c7b28
diff --git a/metadata/md5-cache/dev-cpp/benchmark-1.8.2 b/metadata/md5-cache/dev-cpp/benchmark-1.8.2
index 18cfa0ae9672..e0b241c6984d 100644
--- a/metadata/md5-cache/dev-cpp/benchmark-1.8.2
+++ b/metadata/md5-cache/dev-cpp/benchmark-1.8.2
@@ -1,4 +1,4 @@
-BDEPEND=doc? ( app-text/doxygen ) test? ( >=dev-cpp/gtest-1.11.0 ) app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=doc? ( app-text/doxygen ) test? ( >=dev-cpp/gtest-1.11.0 ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A microbenchmark support library
 EAPI=8
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/benchmark/archive/v1.8.2.tar.gz -> benchmark-1.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_=9e4c86e54020c56ff745221d4ba3b48e
diff --git a/metadata/md5-cache/dev-cpp/benchmark-1.8.3 b/metadata/md5-cache/dev-cpp/benchmark-1.8.3
index 5dd0f672232c..fde15237d5b3 100644
--- a/metadata/md5-cache/dev-cpp/benchmark-1.8.3
+++ b/metadata/md5-cache/dev-cpp/benchmark-1.8.3
@@ -1,4 +1,4 @@
-BDEPEND=doc? ( app-text/doxygen ) test? ( >=dev-cpp/gtest-1.11.0 ) app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=doc? ( app-text/doxygen ) test? ( >=dev-cpp/gtest-1.11.0 ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A microbenchmark support library
 EAPI=8
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/benchmark/archive/v1.8.3.tar.gz -> benchmark-1.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_=42336ea7baffc062a024e2271863e31c
diff --git a/metadata/md5-cache/dev-cpp/catch-1.12.2-r2 b/metadata/md5-cache/dev-cpp/catch-1.12.2-r2
index 94c569c09dec..a80d1c71a6d2 100644
--- a/metadata/md5-cache/dev-cpp/catch-1.12.2-r2
+++ b/metadata/md5-cache/dev-cpp/catch-1.12.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
 DESCRIPTION=Modern C++ header-only framework for unit-tests
 EAPI=8
@@ -10,5 +10,5 @@ LICENSE=Boost-1.0
 RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=https://github.com/catchorg/Catch2/archive/v1.12.2.tar.gz -> Catch-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_=bb2fbdf57794a799d4ad7837f26deb05
diff --git a/metadata/md5-cache/dev-cpp/catch-1.9999 b/metadata/md5-cache/dev-cpp/catch-1.9999
index 08d21149b62d..fa681c01e5dd 100644
--- a/metadata/md5-cache/dev-cpp/catch-1.9999
+++ b/metadata/md5-cache/dev-cpp/catch-1.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=Modern C++ header-only framework for unit-tests
 EAPI=8
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 PROPERTIES=live
 RESTRICT=!test? ( test )
 SLOT=1
-_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_=974998cecf9987f58f14464e8b746251
diff --git a/metadata/md5-cache/dev-cpp/catch-2.13.8 b/metadata/md5-cache/dev-cpp/catch-2.13.8
index 8acfcf06288f..04837f40f24f 100644
--- a/metadata/md5-cache/dev-cpp/catch-2.13.8
+++ b/metadata/md5-cache/dev-cpp/catch-2.13.8
@@ -1,4 +1,4 @@
-BDEPEND=test? ( || ( 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-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
 DESCRIPTION=Modern C++ header-only framework for unit-tests
 EAPI=8
@@ -10,5 +10,5 @@ LICENSE=Boost-1.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/catchorg/Catch2/archive/v2.13.8.tar.gz -> Catch2-2.13.8.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_=7032362f74d6701505adca6396fae2c5
diff --git a/metadata/md5-cache/dev-cpp/catch-3.4.0 b/metadata/md5-cache/dev-cpp/catch-3.4.0
index f3faecd9eed8..e7dcc1c57f01 100644
--- a/metadata/md5-cache/dev-cpp/catch-3.4.0
+++ b/metadata/md5-cache/dev-cpp/catch-3.4.0
@@ -1,4 +1,4 @@
-BDEPEND=test? ( || ( 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-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
 DESCRIPTION=Modern C++ header-only framework for unit-tests
 EAPI=8
@@ -10,5 +10,5 @@ LICENSE=Boost-1.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/catchorg/Catch2/archive/v3.4.0.tar.gz -> Catch2-3.4.0.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_=63aa71d5882acf92ab046bd485aede77
diff --git a/metadata/md5-cache/dev-cpp/catch-3.5.1 b/metadata/md5-cache/dev-cpp/catch-3.5.1
index 651379a35ad0..0fe02628f3ed 100644
--- a/metadata/md5-cache/dev-cpp/catch-3.5.1
+++ b/metadata/md5-cache/dev-cpp/catch-3.5.1
@@ -1,4 +1,4 @@
-BDEPEND=test? ( || ( 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-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
 DESCRIPTION=Modern C++ header-only framework for unit-tests
 EAPI=8
@@ -10,5 +10,5 @@ LICENSE=Boost-1.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/catchorg/Catch2/archive/v3.5.1.tar.gz -> Catch2-3.5.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_=887d495701b1a1800076fd6039ca32a4
diff --git a/metadata/md5-cache/dev-cpp/catch-9999 b/metadata/md5-cache/dev-cpp/catch-9999
index 70e91976a700..1db99b2c6012 100644
--- a/metadata/md5-cache/dev-cpp/catch-9999
+++ b/metadata/md5-cache/dev-cpp/catch-9999
@@ -1,4 +1,4 @@
-BDEPEND=test? ( || ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) ) app-alternatives/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=test? ( || ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) ) 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
 DESCRIPTION=Modern C++ header-only framework for unit-tests
 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	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=976c822bf0de78d335cfc733378b4f3a
diff --git a/metadata/md5-cache/dev-cpp/cctz-2.3_p20230228 b/metadata/md5-cache/dev-cpp/cctz-2.3_p20230228
index 6a786057ad42..ba93fcf584c3 100644
--- a/metadata/md5-cache/dev-cpp/cctz-2.3_p20230228
+++ b/metadata/md5-cache/dev-cpp/cctz-2.3_p20230228
@@ -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=C++ library for dealing with time zones and time conversion
 EAPI=8
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/cctz/archive/3803b96130934f48b1fc1d47c5da5f542949c4b0.tar.gz -> cctz-2.3_p20230228.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_=1cd56469ebc89a70763c5189bc29469a
diff --git a/metadata/md5-cache/dev-cpp/clhpp-2023.04.17 b/metadata/md5-cache/dev-cpp/clhpp-2023.04.17
index bb41b9c4b894..f29d0caa7688 100644
--- a/metadata/md5-cache/dev-cpp/clhpp-2023.04.17
+++ b/metadata/md5-cache/dev-cpp/clhpp-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=virtual/opencl >=dev-util/opencl-headers-2023.04.17
 DESCRIPTION=Khronos OpenCL C++ bindings
@@ -12,5 +12,5 @@ RDEPEND=virtual/opencl
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/KhronosGroup/OpenCL-CLHPP/archive/refs/tags/v2023.04.17.tar.gz -> clhpp-2023.04.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_=d1749859be5e585c6595037df1f3b3ee
diff --git a/metadata/md5-cache/dev-cpp/clhpp-2023.12.14 b/metadata/md5-cache/dev-cpp/clhpp-2023.12.14
index 2ccfcd3a2570..e82f2c2d17d9 100644
--- a/metadata/md5-cache/dev-cpp/clhpp-2023.12.14
+++ b/metadata/md5-cache/dev-cpp/clhpp-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=virtual/opencl >=dev-util/opencl-headers-2023.12.14
 DESCRIPTION=Khronos OpenCL C++ bindings
@@ -12,5 +12,5 @@ RDEPEND=virtual/opencl
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/KhronosGroup/OpenCL-CLHPP/archive/refs/tags/v2023.12.14.tar.gz -> clhpp-2023.12.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_=a0b6a218f7f7f218f08285476844bf5d
diff --git a/metadata/md5-cache/dev-cpp/cli11-2.3.2 b/metadata/md5-cache/dev-cpp/cli11-2.3.2
index 0468d41a9072..45f29583e01b 100644
--- a/metadata/md5-cache/dev-cpp/cli11-2.3.2
+++ b/metadata/md5-cache/dev-cpp/cli11-2.3.2
@@ -1,4 +1,4 @@
-BDEPEND=doc? ( app-text/doxygen media-gfx/graphviz ) app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=doc? ( app-text/doxygen media-gfx/graphviz ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=test? ( =dev-cpp/catch-2*:0 dev-libs/boost )
 DESCRIPTION=Command line parser for C++11
@@ -11,5 +11,5 @@ LICENSE=BSD
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/CLIUtils/CLI11/archive/refs/tags/v2.3.2.tar.gz -> cli11-2.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_=211478b751bbcd8dbc8be992c1b9ecb8
diff --git a/metadata/md5-cache/dev-cpp/clucene-2.3.3.4-r9 b/metadata/md5-cache/dev-cpp/clucene-2.3.3.4-r9
index e5bd7f25af61..f5b140345ce1 100644
--- a/metadata/md5-cache/dev-cpp/clucene-2.3.3.4-r9
+++ b/metadata/md5-cache/dev-cpp/clucene-2.3.3.4-r9
@@ -1,4 +1,4 @@
-BDEPEND=doc? ( >=app-text/doxygen-1.4.2 ) app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=doc? ( >=app-text/doxygen-1.4.2 ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=High-performance, full-featured text search engine based off of lucene in C++
 EAPI=8
@@ -10,5 +10,5 @@ LICENSE=|| ( Apache-2.0 LGPL-2.1 )
 RESTRICT=test
 SLOT=1
 SRC_URI=mirror://sourceforge/clucene/clucene-core-2.3.3.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_=0f7f23cc1c12bc651c05c43b8d495beb
diff --git a/metadata/md5-cache/dev-cpp/cpp-hocon-0.3.0-r1 b/metadata/md5-cache/dev-cpp/cpp-hocon-0.3.0-r1
index fb100e6c2341..00a9574de46b 100644
--- a/metadata/md5-cache/dev-cpp/cpp-hocon-0.3.0-r1
+++ b/metadata/md5-cache/dev-cpp/cpp-hocon-0.3.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=test? ( dev-cpp/catch:1 )
 DESCRIPTION=Provides C++ support for the HOCON configuration file format
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/boost:=[nls] >=dev-libs/leatherman-0.9.3:=
 RESTRICT=!test? ( test )
 SLOT=0/0.3.0
 SRC_URI=https://github.com/puppetlabs/cpp-hocon/archive/0.3.0.tar.gz -> cpp-hocon-0.3.0.tar.gz
-_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_=a246a565526a96d8c3f0af92d1725d36
diff --git a/metadata/md5-cache/dev-cpp/cpp-httplib-0.14.1-r1 b/metadata/md5-cache/dev-cpp/cpp-httplib-0.14.1-r1
index fa744b6caba9..e91a229075fb 100644
--- a/metadata/md5-cache/dev-cpp/cpp-httplib-0.14.1-r1
+++ b/metadata/md5-cache/dev-cpp/cpp-httplib-0.14.1-r1
@@ -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=brotli? ( app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( dev-libs/openssl:=[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(-)?] )
 DESCRIPTION=C++ HTTP/HTTPS server and client library
@@ -13,5 +13,5 @@ REQUIRED_USE=test? ( brotli ssl zlib )
 RESTRICT=!test? ( test )
 SLOT=0/0.14
 SRC_URI=https://github.com/yhirose/cpp-httplib/archive/v0.14.1.tar.gz -> cpp-httplib-0.14.1.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	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	042f4cc53680245bf99a84669b94155a	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	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=2f12e9bdd4f43610a7c6e4393c707c36
diff --git a/metadata/md5-cache/dev-cpp/cpp-httplib-0.14.2 b/metadata/md5-cache/dev-cpp/cpp-httplib-0.14.2
index db1a1685dc30..a8cbd112b15a 100644
--- a/metadata/md5-cache/dev-cpp/cpp-httplib-0.14.2
+++ b/metadata/md5-cache/dev-cpp/cpp-httplib-0.14.2
@@ -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=brotli? ( app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( dev-libs/openssl:=[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(-)?] )
 DESCRIPTION=C++ HTTP/HTTPS server and client library
@@ -13,5 +13,5 @@ REQUIRED_USE=test? ( brotli ssl zlib )
 RESTRICT=!test? ( test )
 SLOT=0/0.14
 SRC_URI=https://github.com/yhirose/cpp-httplib/archive/v0.14.2.tar.gz -> cpp-httplib-0.14.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	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	042f4cc53680245bf99a84669b94155a	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	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=fcfb18ddb6ac7ea0e5294bfb40b4e1c0
diff --git a/metadata/md5-cache/dev-cpp/cpp-httplib-0.14.3 b/metadata/md5-cache/dev-cpp/cpp-httplib-0.14.3
index 76f4509f870d..2b46440aedc4 100644
--- a/metadata/md5-cache/dev-cpp/cpp-httplib-0.14.3
+++ b/metadata/md5-cache/dev-cpp/cpp-httplib-0.14.3
@@ -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=brotli? ( app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( dev-libs/openssl:=[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(-)?] )
 DESCRIPTION=C++ HTTP/HTTPS server and client library
@@ -13,5 +13,5 @@ REQUIRED_USE=test? ( brotli ssl zlib )
 RESTRICT=!test? ( test )
 SLOT=0/0.14
 SRC_URI=https://github.com/yhirose/cpp-httplib/archive/v0.14.3.tar.gz -> cpp-httplib-0.14.3.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	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	042f4cc53680245bf99a84669b94155a	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	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=fcfb18ddb6ac7ea0e5294bfb40b4e1c0
diff --git a/metadata/md5-cache/dev-cpp/cppdap-0_pre20230605-r1 b/metadata/md5-cache/dev-cpp/cppdap-0_pre20230605-r1
index 115afc1990df..c3d661440ab1 100644
--- a/metadata/md5-cache/dev-cpp/cppdap-0_pre20230605-r1
+++ b/metadata/md5-cache/dev-cpp/cppdap-0_pre20230605-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/nlohmann_json
 DESCRIPTION=C++ library for the Debug Adapter Protocol
@@ -12,5 +12,5 @@ RDEPEND=dev-cpp/nlohmann_json
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/cppdap/archive/252b56807b532533ea7362a4d949758dcb481d2b.tar.gz -> cppdap-0_pre20230605.tar.gz test? ( https://github.com/google/googletest/archive/0a03480824b4fc7883255dbd2fd8940c9f81e22e.tar.gz -> cppdap-gtest-0a03480824b4fc7883255dbd2fd8940c9f81e22e.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_=874fc9fae5538bc44def24bc84d51bcf
diff --git a/metadata/md5-cache/dev-cpp/cppgir-0_p20230701 b/metadata/md5-cache/dev-cpp/cppgir-0_p20230701
index 1083bfe01c17..e10d276c34ea 100644
--- a/metadata/md5-cache/dev-cpp/cppgir-0_p20230701
+++ b/metadata/md5-cache/dev-cpp/cppgir-0_p20230701
@@ -1,4 +1,4 @@
-BDEPEND=doc? ( app-text/ronn-ng ) test? ( dev-libs/glib ) app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=doc? ( app-text/ronn-ng ) test? ( dev-libs/glib ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-libs/boost:= dev-libs/libfmt:= dev-cpp/expected-lite
 DESCRIPTION=GObject-Introspection C++ binding wrapper generator
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/boost:= dev-libs/libfmt:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://gitlab.com/mnauw/cppgir/-/archive/ada922a260479da27c989e39ed47e17a36cc2969/cppgir-ada922a260479da27c989e39ed47e17a36cc2969.tar.bz2 -> cppgir-0_p20230701.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_=14fa1a900ed5227f3d1b39c79b454bd7
diff --git a/metadata/md5-cache/dev-cpp/cppgir-0_p20230926 b/metadata/md5-cache/dev-cpp/cppgir-0_p20230926
index b141b5500f34..a2db31173be0 100644
--- a/metadata/md5-cache/dev-cpp/cppgir-0_p20230926
+++ b/metadata/md5-cache/dev-cpp/cppgir-0_p20230926
@@ -1,4 +1,4 @@
-BDEPEND=doc? ( app-text/ronn-ng ) test? ( dev-libs/glib ) app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=doc? ( app-text/ronn-ng ) test? ( dev-libs/glib ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-libs/boost:= dev-libs/libfmt:= dev-cpp/expected-lite
 DESCRIPTION=GObject-Introspection C++ binding wrapper generator
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/boost:= dev-libs/libfmt:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://gitlab.com/mnauw/cppgir/-/archive/4c16bffe646af52b7112785cda8112d761f95860/cppgir-4c16bffe646af52b7112785cda8112d761f95860.tar.bz2 -> cppgir-0_p20230926.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_=6d6f99fa2d7c6f481aec06bced306fde
diff --git a/metadata/md5-cache/dev-cpp/curlpp-0.8.1 b/metadata/md5-cache/dev-cpp/curlpp-0.8.1
index c167d935ad53..beacc5c836a3 100644
--- a/metadata/md5-cache/dev-cpp/curlpp-0.8.1
+++ b/metadata/md5-cache/dev-cpp/curlpp-0.8.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=net-misc/curl
 DESCRIPTION=C++ wrapper for libcURL
@@ -11,5 +11,5 @@ LICENSE=MIT
 RDEPEND=net-misc/curl
 SLOT=0
 SRC_URI=https://github.com/jpbarrette/curlpp/archive/v0.8.1.tar.gz -> curlpp-0.8.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_=84bfb8faf930a54123b9086dbf8a89e0
diff --git a/metadata/md5-cache/dev-cpp/doctest-2.4.11 b/metadata/md5-cache/dev-cpp/doctest-2.4.11
index 41a0729ed6da..36a7d9b55603 100644
--- a/metadata/md5-cache/dev-cpp/doctest-2.4.11
+++ b/metadata/md5-cache/dev-cpp/doctest-2.4.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
 DESCRIPTION=The fastest feature-rich C++11/14/17/20 single-header testing framework
 EAPI=8
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/doctest/doctest/archive/v2.4.11.tar.gz -> doctest-2.4.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_=9881545e2c8e34ada8b889c5a1546340
diff --git a/metadata/md5-cache/dev-cpp/edencommon-2023.06.19.00 b/metadata/md5-cache/dev-cpp/edencommon-2023.06.19.00
index 46f48b546658..4d7f4e746807 100644
--- a/metadata/md5-cache/dev-cpp/edencommon-2023.06.19.00
+++ b/metadata/md5-cache/dev-cpp/edencommon-2023.06.19.00
@@ -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/gflags:= dev-cpp/glog:=[gflags] dev-cpp/folly:= llvm-libunwind? ( sys-libs/llvm-libunwind:= ) !llvm-libunwind? ( sys-libs/libunwind:= ) dev-cpp/gtest
 DESCRIPTION=Shared library for Watchman and Eden projects
@@ -11,5 +11,5 @@ LICENSE=MIT
 RDEPEND=dev-cpp/gflags:= dev-cpp/glog:=[gflags] dev-cpp/folly:= llvm-libunwind? ( sys-libs/llvm-libunwind:= ) !llvm-libunwind? ( sys-libs/libunwind:= )
 SLOT=0/2023.06.19.00
 SRC_URI=https://github.com/facebookexperimental/edencommon/archive/refs/tags/v2023.06.19.00.tar.gz -> edencommon-2023.06.19.00.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_=436113a47e1b15abd66bf91c56f19d96
diff --git a/metadata/md5-cache/dev-cpp/eigen-3.4.0-r1 b/metadata/md5-cache/dev-cpp/eigen-3.4.0-r1
index 9fd1aef4c99e..ee0e04de81f2 100644
--- a/metadata/md5-cache/dev-cpp/eigen-3.4.0-r1
+++ b/metadata/md5-cache/dev-cpp/eigen-3.4.0-r1
@@ -1,4 +1,4 @@
-BDEPEND=doc? ( app-text/doxygen[dot] dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) test? ( virtual/pkgconfig ) app-alternatives/ninja >=dev-util/cmake-3.20.5 test? ( virtual/fortran )
+BDEPEND=doc? ( app-text/doxygen[dot] dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) test? ( virtual/pkgconfig ) app-alternatives/ninja >=dev-build/cmake-3.20.5 test? ( virtual/fortran )
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=cuda? ( dev-util/nvidia-cuda-toolkit ) test? ( dev-libs/gmp:0 dev-libs/mpfr:0 media-libs/freeglut media-libs/glew sci-libs/adolc[sparse] sci-libs/cholmod sci-libs/fftw:3.0 sci-libs/pastix sci-libs/scotch sci-libs/spqr sci-libs/superlu sci-libs/umfpack virtual/opengl )
 DESCRIPTION=C++ template library for linear algebra
@@ -11,5 +11,5 @@ LICENSE=MPL-2.0
 RESTRICT=!test? ( test ) test
 SLOT=3
 SRC_URI=https://gitlab.com/libeigen/eigen/-/archive/3.4.0/eigen-3.4.0.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	cuda	283d0f298f6c196c755a0f8d50daca85	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cuda	283d0f298f6c196c755a0f8d50daca85	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=0043b0d7360b64b25a79e817b3eb8849
diff --git a/metadata/md5-cache/dev-cpp/elfio-3.12 b/metadata/md5-cache/dev-cpp/elfio-3.12
index d7ea37cdfe01..8c2758f74b06 100644
--- a/metadata/md5-cache/dev-cpp/elfio-3.12
+++ b/metadata/md5-cache/dev-cpp/elfio-3.12
@@ -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=test? ( dev-cpp/gtest )
 DESCRIPTION=ELF reader/producer header-only C++ library
@@ -11,5 +11,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/serge1/elfio/archive/Release_3.12.tar.gz -> elfio-3.12.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_=8220f51fa7fdeaaaba0634107f938ea3
diff --git a/metadata/md5-cache/dev-cpp/expected-lite-0.6.3 b/metadata/md5-cache/dev-cpp/expected-lite-0.6.3
index b8200fa3c9db..e53c1eecfca7 100644
--- a/metadata/md5-cache/dev-cpp/expected-lite-0.6.3
+++ b/metadata/md5-cache/dev-cpp/expected-lite-0.6.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=Expected objects in C++11 and later in a single-file header-only library
 EAPI=8
@@ -10,5 +10,5 @@ LICENSE=Boost-1.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/martinmoene/expected-lite/archive/refs/tags/v0.6.3.tar.gz -> expected-lite-0.6.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_=4467d8c3e8e1c3339857926019b002ce
diff --git a/metadata/md5-cache/dev-cpp/folly-2023.06.19.00 b/metadata/md5-cache/dev-cpp/folly-2023.06.19.00
index 8f83b012e4a7..81b6c61e18a6 100644
--- a/metadata/md5-cache/dev-cpp/folly-2023.06.19.00
+++ b/metadata/md5-cache/dev-cpp/folly-2023.06.19.00
@@ -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
 DEPEND=app-arch/bzip2 app-arch/lz4:= app-arch/snappy:= app-arch/xz-utils app-arch/zstd:= dev-cpp/gflags:= dev-cpp/glog:=[gflags] dev-libs/boost:=[context] dev-libs/double-conversion:= dev-libs/libaio dev-libs/libevent:= dev-libs/libfmt:= dev-libs/libsodium:= dev-libs/openssl:= >=sys-libs/liburing-2.3:= sys-libs/zlib llvm-libunwind? ( sys-libs/llvm-libunwind:= ) !llvm-libunwind? ( sys-libs/libunwind:= ) sys-libs/binutils-libs test? ( dev-cpp/gtest )
 DESCRIPTION=An open-source C++ library developed and used at Facebook
@@ -12,5 +12,5 @@ RDEPEND=app-arch/bzip2 app-arch/lz4:= app-arch/snappy:= app-arch/xz-utils app-ar
 RESTRICT=!test? ( test )
 SLOT=0/2023.06.19.00
 SRC_URI=https://github.com/facebook/folly/releases/download/v2023.06.19.00/folly-v2023.06.19.00.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_=46f7594d1c887d5b1417c4fad81a0978
diff --git a/metadata/md5-cache/dev-cpp/gemmlowp-2021.12.20 b/metadata/md5-cache/dev-cpp/gemmlowp-2021.12.20
index f665ee667f19..5197f6013664 100644
--- a/metadata/md5-cache/dev-cpp/gemmlowp-2021.12.20
+++ b/metadata/md5-cache/dev-cpp/gemmlowp-2021.12.20
@@ -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=Low-precision matrix multiplication
 EAPI=8
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/gemmlowp/archive/e844ffd17118c1e17d94e1ba4354c075a4577b88.tar.gz -> gemmlowp-2021.12.20.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_=846263a1677ecb02ce87f7f3b4108f07
diff --git a/metadata/md5-cache/dev-cpp/gflags-2.2.2-r1 b/metadata/md5-cache/dev-cpp/gflags-2.2.2-r1
index 0092be26dac9..2160fa859b0b 100644
--- a/metadata/md5-cache/dev-cpp/gflags-2.2.2-r1
+++ b/metadata/md5-cache/dev-cpp/gflags-2.2.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
 DESCRIPTION=Google's C++ argument parsing library
 EAPI=8
@@ -10,5 +10,5 @@ LICENSE=BSD
 RESTRICT=!test? ( test )
 SLOT=0/2.2
 SRC_URI=https://github.com/gflags/gflags/archive/v2.2.2.tar.gz -> gflags-2.2.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_=a8fbd050e6c092e965f3d1598a5d8a26
diff --git a/metadata/md5-cache/dev-cpp/gflags-9999 b/metadata/md5-cache/dev-cpp/gflags-9999
index 420720094105..271f9798c716 100644
--- a/metadata/md5-cache/dev-cpp/gflags-9999
+++ b/metadata/md5-cache/dev-cpp/gflags-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=Google's C++ argument parsing library
 EAPI=8
@@ -9,5 +9,5 @@ LICENSE=BSD
 PROPERTIES=live
 RESTRICT=!test? ( test )
 SLOT=0/2.2
-_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_=ce1b6721391035442c0716da76158b36
diff --git a/metadata/md5-cache/dev-cpp/glog-0.5.0 b/metadata/md5-cache/dev-cpp/glog-0.5.0
index c8fb1932bb56..17b9eecbaeb4 100644
--- a/metadata/md5-cache/dev-cpp/glog-0.5.0
+++ b/metadata/md5-cache/dev-cpp/glog-0.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=gflags? ( dev-cpp/gflags: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(-)?] ) libunwind? ( llvm-libunwind? ( sys-libs/llvm-libunwind: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(-)?] ) !llvm-libunwind? ( sys-libs/libunwind: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(-)?] ) ) test? ( >=dev-cpp/gtest-1.8.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=Google Logging library
@@ -12,5 +12,5 @@ RDEPEND=gflags? ( dev-cpp/gflags:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/glog/archive/v0.5.0.tar.gz -> glog-0.5.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_=7c34ff1e1cf82841f54f0cc3dfb94037
diff --git a/metadata/md5-cache/dev-cpp/glog-0.6.0 b/metadata/md5-cache/dev-cpp/glog-0.6.0
index a61310e0c2b8..beb6f69900fc 100644
--- a/metadata/md5-cache/dev-cpp/glog-0.6.0
+++ b/metadata/md5-cache/dev-cpp/glog-0.6.0
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=gflags? ( dev-cpp/gflags: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(-)?] ) libunwind? ( llvm-libunwind? ( sys-libs/llvm-libunwind: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(-)?] ) !llvm-libunwind? ( sys-libs/libunwind: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(-)?] ) ) test? ( >=dev-cpp/gtest-1.8.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=Google Logging library
@@ -12,5 +12,5 @@ RDEPEND=gflags? ( dev-cpp/gflags:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)
 RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://github.com/google/glog/archive/v0.6.0.tar.gz -> glog-0.6.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_=5184f50421035663f26e190bac97932e
diff --git a/metadata/md5-cache/dev-cpp/gtest-1.13.0 b/metadata/md5-cache/dev-cpp/gtest-1.13.0
index 7e2ca5f2112c..8703e0f932d6 100644
--- a/metadata/md5-cache/dev-cpp/gtest-1.13.0
+++ b/metadata/md5-cache/dev-cpp/gtest-1.13.0
@@ -1,4 +1,4 @@
-BDEPEND=test? ( || ( dev-lang/python:3.11 dev-lang/python:3.10 ) ) app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=test? ( || ( 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
 DESCRIPTION=Google C++ Testing Framework
 EAPI=8
@@ -10,5 +10,5 @@ LICENSE=BSD
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/googletest/archive/refs/tags/v1.13.0.tar.gz -> gtest-1.13.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	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	042f4cc53680245bf99a84669b94155a	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	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=ca177e268835106cde9d8565896d384b
diff --git a/metadata/md5-cache/dev-cpp/gtest-1.14.0 b/metadata/md5-cache/dev-cpp/gtest-1.14.0
index ef4cecba04c4..aae6d9455ab6 100644
--- a/metadata/md5-cache/dev-cpp/gtest-1.14.0
+++ b/metadata/md5-cache/dev-cpp/gtest-1.14.0
@@ -1,4 +1,4 @@
-BDEPEND=test? ( || ( 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-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
 DESCRIPTION=Google C++ Testing Framework
 EAPI=8
@@ -10,5 +10,5 @@ LICENSE=BSD
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/googletest/archive/refs/tags/v1.14.0.tar.gz -> gtest-1.14.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	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	042f4cc53680245bf99a84669b94155a	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	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=10f7630992b5fe49e68bbfd1f44667e1
diff --git a/metadata/md5-cache/dev-cpp/gtest-9999 b/metadata/md5-cache/dev-cpp/gtest-9999
index 940911ba0de9..f7bccda3dace 100644
--- a/metadata/md5-cache/dev-cpp/gtest-9999
+++ b/metadata/md5-cache/dev-cpp/gtest-9999
@@ -1,4 +1,4 @@
-BDEPEND=test? ( || ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) ) app-alternatives/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=test? ( || ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) ) 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
 DESCRIPTION=Google C++ Testing Framework
 EAPI=8
@@ -9,5 +9,5 @@ LICENSE=BSD
 PROPERTIES=live
 RESTRICT=!test? ( test )
 SLOT=0
-_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	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	042f4cc53680245bf99a84669b94155a	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	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=10f7630992b5fe49e68bbfd1f44667e1
diff --git a/metadata/md5-cache/dev-cpp/gulrak-filesystem-1.5.12 b/metadata/md5-cache/dev-cpp/gulrak-filesystem-1.5.12
index c307db5b0d82..e7c350356d7f 100644
--- a/metadata/md5-cache/dev-cpp/gulrak-filesystem-1.5.12
+++ b/metadata/md5-cache/dev-cpp/gulrak-filesystem-1.5.12
@@ -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 single-file std::filesystem compatible helper library
 EAPI=8
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/gulrak/filesystem/archive/v1.5.12.tar.gz -> gulrak-filesystem-1.5.12.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_=f6945788334ae744f0aaae1eeca8bc5e
diff --git a/metadata/md5-cache/dev-cpp/gulrak-filesystem-1.5.14 b/metadata/md5-cache/dev-cpp/gulrak-filesystem-1.5.14
index db4cee0f5956..8c6d423600ae 100644
--- a/metadata/md5-cache/dev-cpp/gulrak-filesystem-1.5.14
+++ b/metadata/md5-cache/dev-cpp/gulrak-filesystem-1.5.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=Header-only single-file std::filesystem compatible helper library
 EAPI=8
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/gulrak/filesystem/archive/v1.5.14.tar.gz -> gulrak-filesystem-1.5.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_=903c07a9bf12569d14e6df41ddb73e3c
diff --git a/metadata/md5-cache/dev-cpp/highway-1.0.1-r1 b/metadata/md5-cache/dev-cpp/highway-1.0.1-r1
index c2f86ab3a272..070c90acfb3d 100644
--- a/metadata/md5-cache/dev-cpp/highway-1.0.1-r1
+++ b/metadata/md5-cache/dev-cpp/highway-1.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=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(-)?] )
 DESCRIPTION=Performance-portable, length-agnostic SIMD with runtime dispatch
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/highway/archive/refs/tags/1.0.1.tar.gz -> highway-1.0.1.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_=0d321500d4cfbca026351cbf34b68448
diff --git a/metadata/md5-cache/dev-cpp/highway-1.0.3 b/metadata/md5-cache/dev-cpp/highway-1.0.3
index 02c48a045567..f9f6e18ec10b 100644
--- a/metadata/md5-cache/dev-cpp/highway-1.0.3
+++ b/metadata/md5-cache/dev-cpp/highway-1.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=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(-)?] )
 DESCRIPTION=Performance-portable, length-agnostic SIMD with runtime dispatch
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/highway/archive/refs/tags/1.0.3.tar.gz -> highway-1.0.3.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_=154afc8002e8465021d08bc41b75deb2
diff --git a/metadata/md5-cache/dev-cpp/highway-1.0.3-r1 b/metadata/md5-cache/dev-cpp/highway-1.0.3-r1
index 73de91fb9f43..4d06ca526e49 100644
--- a/metadata/md5-cache/dev-cpp/highway-1.0.3-r1
+++ b/metadata/md5-cache/dev-cpp/highway-1.0.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=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(-)?] )
 DESCRIPTION=Performance-portable, length-agnostic SIMD with runtime dispatch
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/highway/archive/refs/tags/1.0.3.tar.gz -> highway-1.0.3.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_=2a17e5c6313139b21fa8413f34fbe562
diff --git a/metadata/md5-cache/dev-cpp/highway-1.0.5 b/metadata/md5-cache/dev-cpp/highway-1.0.5
index d26c621fbf28..b1967e2a205a 100644
--- a/metadata/md5-cache/dev-cpp/highway-1.0.5
+++ b/metadata/md5-cache/dev-cpp/highway-1.0.5
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=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(-)?] )
 DESCRIPTION=Performance-portable, length-agnostic SIMD with runtime dispatch
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/highway/archive/refs/tags/1.0.5.tar.gz -> highway-1.0.5.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_=c885f959e95a50fc2d6deccf7dd3b45b
diff --git a/metadata/md5-cache/dev-cpp/highway-1.0.7 b/metadata/md5-cache/dev-cpp/highway-1.0.7
index 684382b3f3f3..1b559be58765 100644
--- a/metadata/md5-cache/dev-cpp/highway-1.0.7
+++ b/metadata/md5-cache/dev-cpp/highway-1.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=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(-)?] )
 DESCRIPTION=Performance-portable, length-agnostic SIMD with runtime dispatch
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/highway/archive/refs/tags/1.0.7.tar.gz -> highway-1.0.7.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_=c885f959e95a50fc2d6deccf7dd3b45b
diff --git a/metadata/md5-cache/dev-cpp/highway-9999 b/metadata/md5-cache/dev-cpp/highway-9999
index fbf8a1bc7a6f..c33d4da3aa2d 100644
--- a/metadata/md5-cache/dev-cpp/highway-9999
+++ b/metadata/md5-cache/dev-cpp/highway-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=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(-)?] )
 DESCRIPTION=Performance-portable, length-agnostic SIMD with runtime dispatch
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 PROPERTIES=live
 RESTRICT=!test? ( test )
 SLOT=0
-_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_=c897b1b82f3952aade5b88e52dbf7262
diff --git a/metadata/md5-cache/dev-cpp/json11-1.0.0-r1 b/metadata/md5-cache/dev-cpp/json11-1.0.0-r1
index 3f9c50ceca57..050ed336817b 100644
--- a/metadata/md5-cache/dev-cpp/json11-1.0.0-r1
+++ b/metadata/md5-cache/dev-cpp/json11-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
 DESCRIPTION=A tiny JSON library for C++11
 EAPI=8
@@ -8,5 +8,5 @@ KEYWORDS=amd64 x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/dropbox/json11/archive/refs/tags/v1.0.0.tar.gz -> json11-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_=1ed05809fe58ce6e93213a29667ccb72
diff --git a/metadata/md5-cache/dev-cpp/jwt-cpp-0.6.0 b/metadata/md5-cache/dev-cpp/jwt-cpp-0.6.0
index 96698cf51c22..9a7df4f02cf9 100644
--- a/metadata/md5-cache/dev-cpp/jwt-cpp-0.6.0
+++ b/metadata/md5-cache/dev-cpp/jwt-cpp-0.6.0
@@ -1,4 +1,4 @@
-BDEPEND=doc? ( app-text/doxygen[dot] ) test? ( dev-cpp/gtest ) app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=doc? ( app-text/doxygen[dot] ) test? ( dev-cpp/gtest ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-cpp/nlohmann_json dev-libs/openssl picojson? ( dev-cpp/picojson )
 DESCRIPTION=header only library for creating and validating JSON Web Tokens in C++11
@@ -12,5 +12,5 @@ RDEPEND=dev-cpp/nlohmann_json dev-libs/openssl picojson? ( dev-cpp/picojson )
 RESTRICT=!picojson? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Thalhammer/jwt-cpp/archive/refs/tags/v0.6.0.tar.gz -> jwt-cpp-0.6.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_=e2fae4cbdce96b559c3f321172e10121
diff --git a/metadata/md5-cache/dev-cpp/kokkos-4.0.1 b/metadata/md5-cache/dev-cpp/kokkos-4.0.1
index 992706b56991..11d7cb1ffaa7 100644
--- a/metadata/md5-cache/dev-cpp/kokkos-4.0.1
+++ b/metadata/md5-cache/dev-cpp/kokkos-4.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 pretend setup test
 DEPEND=sys-apps/hwloc:=
 DESCRIPTION=C++ Performance Portability Programming EcoSystem
@@ -12,5 +12,5 @@ RDEPEND=sys-apps/hwloc:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/kokkos/kokkos/archive/refs/tags/4.0.01.tar.gz -> kokkos-4.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_=0f64df58bbf6cdf11b383f33919d2203
diff --git a/metadata/md5-cache/dev-cpp/libjson-rpc-cpp-1.4.0 b/metadata/md5-cache/dev-cpp/libjson-rpc-cpp-1.4.0
index 0bcce8bbc608..7e25cb9150e3 100644
--- a/metadata/md5-cache/dev-cpp/libjson-rpc-cpp-1.4.0
+++ b/metadata/md5-cache/dev-cpp/libjson-rpc-cpp-1.4.0
@@ -1,4 +1,4 @@
-BDEPEND=test? ( <dev-cpp/catch-3 ) app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=test? ( <dev-cpp/catch-3 ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-libs/jsoncpp:= http-client? ( net-misc/curl:= ) http-server? ( net-libs/libmicrohttpd:= ) redis-client? ( dev-libs/hiredis:= ) redis-server? ( dev-libs/hiredis:= ) stubgen? ( dev-libs/argtable:= )
 DESCRIPTION=JSON-RPC (1.0 & 2.0) framework for C++
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/jsoncpp:= http-client? ( net-misc/curl:= ) http-server? ( net-l
 RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://github.com/cinemast/libjson-rpc-cpp/archive/v1.4.0.tar.gz -> libjson-rpc-cpp-1.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_=1a353ab62dfb7346668756fb072b2be5
diff --git a/metadata/md5-cache/dev-cpp/lucene++-3.0.7-r3 b/metadata/md5-cache/dev-cpp/lucene++-3.0.7-r3
index ae4ef3e901cc..3d7bdaa292bd 100644
--- a/metadata/md5-cache/dev-cpp/lucene++-3.0.7-r3
+++ b/metadata/md5-cache/dev-cpp/lucene++-3.0.7-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-libs/boost:=[zlib]
 DESCRIPTION=C++ port of Lucene library, a high-performance, full-featured text search engine
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/boost:=[zlib]
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/luceneplusplus/LucenePlusPlus/archive/rel_3.0.7.tar.gz -> lucene++-3.0.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_=981b51a5c72411c331a7e123c3f85033
diff --git a/metadata/md5-cache/dev-cpp/magic_enum-0.8.2 b/metadata/md5-cache/dev-cpp/magic_enum-0.8.2
index 9abd2fe0fe09..1dcf07544b4d 100644
--- a/metadata/md5-cache/dev-cpp/magic_enum-0.8.2
+++ b/metadata/md5-cache/dev-cpp/magic_enum-0.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=Static reflection for enums in header-only C++
 EAPI=8
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test ) test
 SLOT=0
 SRC_URI=https://github.com/Neargye/magic_enum/archive/refs/tags/v0.8.2.tar.gz -> magic_enum-0.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_=ded7ebf3d9c4ae931d87489535261a05
diff --git a/metadata/md5-cache/dev-cpp/magic_enum-0.9.5 b/metadata/md5-cache/dev-cpp/magic_enum-0.9.5
index 271a7352a440..eb234da87a8f 100644
--- a/metadata/md5-cache/dev-cpp/magic_enum-0.9.5
+++ b/metadata/md5-cache/dev-cpp/magic_enum-0.9.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=Static reflection for enums in header-only C++
 EAPI=8
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Neargye/magic_enum/archive/refs/tags/v0.9.5.tar.gz -> magic_enum-0.9.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_=c2eb27ad9ea61fbf994da56b96e7f8fd
diff --git a/metadata/md5-cache/dev-cpp/ms-gsl-4.0.0 b/metadata/md5-cache/dev-cpp/ms-gsl-4.0.0
index 31c6093370ae..cabefd2ef617 100644
--- a/metadata/md5-cache/dev-cpp/ms-gsl-4.0.0
+++ b/metadata/md5-cache/dev-cpp/ms-gsl-4.0.0
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=test? ( >=dev-cpp/gtest-1.9.0_pre20190607 )
 DESCRIPTION=Guideline Support Library implementation by Microsoft
@@ -11,5 +11,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Microsoft/GSL/archive/v4.0.0.tar.gz -> ms-gsl-4.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_=a783dc08a65492798bc7eb7a6c8b6ce6
diff --git a/metadata/md5-cache/dev-cpp/ms-gsl-9999 b/metadata/md5-cache/dev-cpp/ms-gsl-9999
index 1e14a1427293..04c649842825 100644
--- a/metadata/md5-cache/dev-cpp/ms-gsl-9999
+++ b/metadata/md5-cache/dev-cpp/ms-gsl-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=test? ( >=dev-cpp/gtest-1.9.0_pre20190607 )
 DESCRIPTION=Guideline Support Library implementation by Microsoft
@@ -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_=df08dac91dddf6f4c64ce606ab70b1c1
diff --git a/metadata/md5-cache/dev-cpp/msgpack-cxx-5.0.0 b/metadata/md5-cache/dev-cpp/msgpack-cxx-5.0.0
index 793770ec97c2..1743207cf91c 100644
--- a/metadata/md5-cache/dev-cpp/msgpack-cxx-5.0.0
+++ b/metadata/md5-cache/dev-cpp/msgpack-cxx-5.0.0
@@ -1,4 +1,4 @@
-BDEPEND=doc? ( app-text/doxygen[dot] ) test? ( sys-libs/zlib ) app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=doc? ( app-text/doxygen[dot] ) test? ( sys-libs/zlib ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=boost? ( dev-libs/boost[context] ) !<dev-libs/msgpack-5.0.0
 DESCRIPTION=MessagePack for C++
@@ -13,5 +13,5 @@ REQUIRED_USE=test? ( boost )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/msgpack/msgpack-c/releases/download/cpp-5.0.0/msgpack-cxx-5.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_=4a75993f36b602aabfa0afc9977ae11b
diff --git a/metadata/md5-cache/dev-cpp/msgpack-cxx-6.0.0 b/metadata/md5-cache/dev-cpp/msgpack-cxx-6.0.0
index c44295a9cfbd..56ff0c5aedf1 100644
--- a/metadata/md5-cache/dev-cpp/msgpack-cxx-6.0.0
+++ b/metadata/md5-cache/dev-cpp/msgpack-cxx-6.0.0
@@ -1,4 +1,4 @@
-BDEPEND=doc? ( app-text/doxygen[dot] ) test? ( sys-libs/zlib ) app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=doc? ( app-text/doxygen[dot] ) test? ( sys-libs/zlib ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=boost? ( dev-libs/boost[context] ) !<dev-libs/msgpack-5.0.0
 DESCRIPTION=MessagePack for C++
@@ -13,5 +13,5 @@ REQUIRED_USE=test? ( boost )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/msgpack/msgpack-c/releases/download/cpp-6.0.0/msgpack-cxx-6.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_=0e175cec50ba7df0f62ee3151c1810fc
diff --git a/metadata/md5-cache/dev-cpp/msgpack-cxx-6.1.0 b/metadata/md5-cache/dev-cpp/msgpack-cxx-6.1.0
index 81750be1596a..e67fd281f6fb 100644
--- a/metadata/md5-cache/dev-cpp/msgpack-cxx-6.1.0
+++ b/metadata/md5-cache/dev-cpp/msgpack-cxx-6.1.0
@@ -1,4 +1,4 @@
-BDEPEND=doc? ( app-text/doxygen[dot] ) test? ( sys-libs/zlib ) app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=doc? ( app-text/doxygen[dot] ) test? ( sys-libs/zlib ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=boost? ( dev-libs/boost[context] ) !<dev-libs/msgpack-5.0.0
 DESCRIPTION=MessagePack for C++
@@ -13,5 +13,5 @@ REQUIRED_USE=test? ( boost )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/msgpack/msgpack-c/releases/download/cpp-6.1.0/msgpack-cxx-6.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_=4a75993f36b602aabfa0afc9977ae11b
diff --git a/metadata/md5-cache/dev-cpp/muParser-2.3.3-r2 b/metadata/md5-cache/dev-cpp/muParser-2.3.3-r2
index aca167f20c0f..95053ead383c 100644
--- a/metadata/md5-cache/dev-cpp/muParser-2.3.3-r2
+++ b/metadata/md5-cache/dev-cpp/muParser-2.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 pretend setup test
 DESCRIPTION=Library for parsing mathematical expressions
 EAPI=8
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/beltoforion/muparser/archive/refs/tags/v2.3.3-1.tar.gz -> muParser-2.3.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_=5048eb07df7560dfffa069cbf3fe24f3
diff --git a/metadata/md5-cache/dev-cpp/muParser-2.3.4-r1 b/metadata/md5-cache/dev-cpp/muParser-2.3.4-r1
index 13c0a17a7c31..c956fad5ea71 100644
--- a/metadata/md5-cache/dev-cpp/muParser-2.3.4-r1
+++ b/metadata/md5-cache/dev-cpp/muParser-2.3.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 pretend setup test
 DESCRIPTION=Library for parsing mathematical expressions
 EAPI=8
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/beltoforion/muparser/archive/refs/tags/v2.3.4.tar.gz -> muParser-2.3.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_=806e285a256fe0a6421f203bddfe4042
diff --git a/metadata/md5-cache/dev-cpp/muParserX-4.0.11 b/metadata/md5-cache/dev-cpp/muParserX-4.0.11
index e0bd17eebda7..89dde073dcbc 100644
--- a/metadata/md5-cache/dev-cpp/muParserX-4.0.11
+++ b/metadata/md5-cache/dev-cpp/muParserX-4.0.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
 DESCRIPTION=Parsing Expressions with Strings, Complex Numbers, Vectors, Matrices and more
 EAPI=8
@@ -8,5 +8,5 @@ KEYWORDS=~amd64
 LICENSE=BSD-2
 SLOT=0
 SRC_URI=https://github.com/beltoforion/muparserx/archive/refs/tags/v4.0.11.tar.gz -> muParserX-4.0.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_=f918031061d8b92e87820473740c8252
diff --git a/metadata/md5-cache/dev-cpp/nlohmann_json-3.10.2 b/metadata/md5-cache/dev-cpp/nlohmann_json-3.10.2
index 3a8407b1412a..564632f95ad0 100644
--- a/metadata/md5-cache/dev-cpp/nlohmann_json-3.10.2
+++ b/metadata/md5-cache/dev-cpp/nlohmann_json-3.10.2
@@ -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=JSON for Modern C++
 EAPI=8
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/nlohmann/json/archive/v3.10.2.tar.gz -> nlohmann_json-3.10.2.tar.gz test? ( https://github.com/nlohmann/json_test_data/archive/v3.0.0.tar.gz -> nlohmann_json-testdata-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_=fd722eac6476f2f03b56637bc492040c
diff --git a/metadata/md5-cache/dev-cpp/nlohmann_json-3.11.2 b/metadata/md5-cache/dev-cpp/nlohmann_json-3.11.2
index 7411c01eef34..89c168f74396 100644
--- a/metadata/md5-cache/dev-cpp/nlohmann_json-3.11.2
+++ b/metadata/md5-cache/dev-cpp/nlohmann_json-3.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
 DESCRIPTION=JSON for Modern C++
 EAPI=8
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nlohmann/json/archive/v3.11.2.tar.gz -> nlohmann_json-3.11.2.tar.gz test? ( https://github.com/nlohmann/json_test_data/archive/v3.1.0.tar.gz -> nlohmann_json-testdata-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_=2dc9cd24da9042cc68fe137ebb8cb349
diff --git a/metadata/md5-cache/dev-cpp/nlohmann_json-3.11.2-r1 b/metadata/md5-cache/dev-cpp/nlohmann_json-3.11.2-r1
index 8f5359ccd14e..c3cd7fc869eb 100644
--- a/metadata/md5-cache/dev-cpp/nlohmann_json-3.11.2-r1
+++ b/metadata/md5-cache/dev-cpp/nlohmann_json-3.11.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
 DESCRIPTION=JSON for Modern C++
 EAPI=8
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nlohmann/json/archive/v3.11.2.tar.gz -> nlohmann_json-3.11.2.tar.gz test? ( https://github.com/nlohmann/json_test_data/archive/v3.1.0.tar.gz -> nlohmann_json-testdata-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_=4626ece6ead777bb55ee574e30a78637
diff --git a/metadata/md5-cache/dev-cpp/nlohmann_json-3.11.3 b/metadata/md5-cache/dev-cpp/nlohmann_json-3.11.3
index fb09da40c4d0..8ce6f005f27e 100644
--- a/metadata/md5-cache/dev-cpp/nlohmann_json-3.11.3
+++ b/metadata/md5-cache/dev-cpp/nlohmann_json-3.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
 DESCRIPTION=JSON for Modern C++
 EAPI=8
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nlohmann/json/archive/v3.11.3.tar.gz -> nlohmann_json-3.11.3.tar.gz test? ( https://github.com/nlohmann/json_test_data/archive/v3.1.0.tar.gz -> nlohmann_json-testdata-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_=bfd22aab414d1a1ce4b5366913f52b58
diff --git a/metadata/md5-cache/dev-cpp/notcurses-3.0.5-r1 b/metadata/md5-cache/dev-cpp/notcurses-3.0.5-r1
index 1eb5cc2aefe4..f56a66c5c0a8 100644
--- a/metadata/md5-cache/dev-cpp/notcurses-3.0.5-r1
+++ b/metadata/md5-cache/dev-cpp/notcurses-3.0.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=dev-libs/libunistring:= media-video/ffmpeg:= sys-libs/gpm sys-libs/ncurses:=
 DESCRIPTION=Blingful TUIs and character graphics
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-libs/libunistring:= media-video/ffmpeg:= sys-libs/gpm sys-libs/ncurses:=
 SLOT=0
 SRC_URI=https://github.com/dankamongmen/notcurses/archive/v3.0.5.tar.gz -> notcurses-3.0.5.tar.gz https://github.com/dankamongmen/notcurses/releases/download/v3.0.5/notcurses-doc-3.0.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_=0277bebe060b9e89720136d621b8a138
diff --git a/metadata/md5-cache/dev-cpp/notcurses-3.0.8 b/metadata/md5-cache/dev-cpp/notcurses-3.0.8
index fa4dd467e93a..44006691e046 100644
--- a/metadata/md5-cache/dev-cpp/notcurses-3.0.8
+++ b/metadata/md5-cache/dev-cpp/notcurses-3.0.8
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-libs/libunistring:= media-video/ffmpeg:= sys-libs/gpm sys-libs/ncurses:=
 DESCRIPTION=Blingful TUIs and character graphics
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/libunistring:= media-video/ffmpeg:= sys-libs/gpm sys-libs/ncurs
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/dankamongmen/notcurses/archive/v3.0.8.tar.gz -> notcurses-3.0.8.tar.gz https://github.com/dankamongmen/notcurses/releases/download/v3.0.8/notcurses-doc-3.0.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_=5389d702cc7dc0d53186b22466569c2e
diff --git a/metadata/md5-cache/dev-cpp/opentelemetry-cpp-1.3.0-r2 b/metadata/md5-cache/dev-cpp/opentelemetry-cpp-1.3.0-r2
index 884df64e6223..302a46cae229 100644
--- a/metadata/md5-cache/dev-cpp/opentelemetry-cpp-1.3.0-r2
+++ b/metadata/md5-cache/dev-cpp/opentelemetry-cpp-1.3.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=net-misc/curl:= dev-libs/thrift:= dev-libs/boost:= test? ( dev-cpp/gtest dev-cpp/benchmark )
 DESCRIPTION=The OpenTelemetry C++ Client
@@ -12,5 +12,5 @@ RDEPEND=net-misc/curl:= dev-libs/thrift:= dev-libs/boost:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/open-telemetry/opentelemetry-cpp/archive/refs/tags/v1.3.0.tar.gz -> opentelemetry-cpp-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_=d4614d573b00a871520588092511c9ae
diff --git a/metadata/md5-cache/dev-cpp/opentelemetry-cpp-1.4.0 b/metadata/md5-cache/dev-cpp/opentelemetry-cpp-1.4.0
index 59dbc8edc242..801292012297 100644
--- a/metadata/md5-cache/dev-cpp/opentelemetry-cpp-1.4.0
+++ b/metadata/md5-cache/dev-cpp/opentelemetry-cpp-1.4.0
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=net-misc/curl:= dev-libs/thrift:= dev-libs/boost:= test? ( dev-cpp/gtest dev-cpp/benchmark )
 DESCRIPTION=The OpenTelemetry C++ Client
@@ -12,5 +12,5 @@ RDEPEND=net-misc/curl:= dev-libs/thrift:= dev-libs/boost:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/open-telemetry/opentelemetry-cpp/archive/refs/tags/v1.4.0.tar.gz -> opentelemetry-cpp-1.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_=d4614d573b00a871520588092511c9ae
diff --git a/metadata/md5-cache/dev-cpp/opentelemetry-cpp-1.6.0 b/metadata/md5-cache/dev-cpp/opentelemetry-cpp-1.6.0
index 3e0c676f7dc4..4641e01b8781 100644
--- a/metadata/md5-cache/dev-cpp/opentelemetry-cpp-1.6.0
+++ b/metadata/md5-cache/dev-cpp/opentelemetry-cpp-1.6.0
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=net-misc/curl:= dev-libs/thrift:= dev-libs/boost:= test? ( dev-cpp/gtest dev-cpp/benchmark )
 DESCRIPTION=The OpenTelemetry C++ Client
@@ -12,5 +12,5 @@ RDEPEND=net-misc/curl:= dev-libs/thrift:= dev-libs/boost:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/open-telemetry/opentelemetry-cpp/archive/refs/tags/v1.6.0.tar.gz -> opentelemetry-cpp-1.6.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_=f6baaa8dd7de4b2770307397f3e40e4f
diff --git a/metadata/md5-cache/dev-cpp/popl-1.2.0 b/metadata/md5-cache/dev-cpp/popl-1.2.0
index e37a6b3de38f..a53483ca90bd 100644
--- a/metadata/md5-cache/dev-cpp/popl-1.2.0
+++ b/metadata/md5-cache/dev-cpp/popl-1.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=Header-only C++ program options parser library
 EAPI=7
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ~arm ppc ppc64 ~riscv x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/badaix/popl/archive/v1.2.0.tar.gz -> popl-1.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_=8fcf6baf498d44c16bba183b9e0c3dce
diff --git a/metadata/md5-cache/dev-cpp/popl-9999 b/metadata/md5-cache/dev-cpp/popl-9999
index 86c8bf58115e..35f234e79021 100644
--- a/metadata/md5-cache/dev-cpp/popl-9999
+++ b/metadata/md5-cache/dev-cpp/popl-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=Header-only C++ program options parser library
 EAPI=7
@@ -7,5 +7,5 @@ INHERIT=cmake git-r3
 LICENSE=MIT
 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_=76fe1f20e141c55cf3992e293604903b
diff --git a/metadata/md5-cache/dev-cpp/prometheus-cpp-1.1.0 b/metadata/md5-cache/dev-cpp/prometheus-cpp-1.1.0
index e69552ca7b34..e6b437570f18 100644
--- a/metadata/md5-cache/dev-cpp/prometheus-cpp-1.1.0
+++ b/metadata/md5-cache/dev-cpp/prometheus-cpp-1.1.0
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=net-misc/curl sys-libs/zlib www-servers/civetweb[cxx] test? ( dev-cpp/benchmark dev-cpp/gtest )
 DESCRIPTION=Prometheus Client Library for Modern C++
@@ -12,5 +12,5 @@ RDEPEND=net-misc/curl sys-libs/zlib www-servers/civetweb[cxx]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jupp0r/prometheus-cpp/archive/v1.1.0.tar.gz -> prometheus-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_=1d39c627b360f11c7b1d0b2262c04c48
diff --git a/metadata/md5-cache/dev-cpp/pystring-1.1.3-r1 b/metadata/md5-cache/dev-cpp/pystring-1.1.3-r1
index 270c604e4b8d..5a79181a5f5a 100644
--- a/metadata/md5-cache/dev-cpp/pystring-1.1.3-r1
+++ b/metadata/md5-cache/dev-cpp/pystring-1.1.3-r1
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/libtool app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=sys-devel/libtool app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=C++ functions matching the interface and behavior of python string methods
 EAPI=7
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/imageworks/pystring/archive/v1.1.3.tar.gz -> pystring-1.1.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_=253ae52846deec6eb5450fe73d697f0e
diff --git a/metadata/md5-cache/dev-cpp/range-v3-0.12.0 b/metadata/md5-cache/dev-cpp/range-v3-0.12.0
index d58ba5a46980..1cde98ffc408 100644
--- a/metadata/md5-cache/dev-cpp/range-v3-0.12.0
+++ b/metadata/md5-cache/dev-cpp/range-v3-0.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
 DESCRIPTION=Range library for C++14/17/20, basis for C++20's std::ranges
 EAPI=8
@@ -10,5 +10,5 @@ LICENSE=Boost-1.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ericniebler/range-v3/archive/0.12.0.tar.gz -> range-v3-0.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_=f92b12659fa1a61bf6eb383820e65cd8
diff --git a/metadata/md5-cache/dev-cpp/rapidfuzz-cpp-2.2.3 b/metadata/md5-cache/dev-cpp/rapidfuzz-cpp-2.2.3
index e2c5bc3c0de1..6ff2021c5840 100644
--- a/metadata/md5-cache/dev-cpp/rapidfuzz-cpp-2.2.3
+++ b/metadata/md5-cache/dev-cpp/rapidfuzz-cpp-2.2.3
@@ -1,4 +1,4 @@
-BDEPEND=test? ( >=dev-cpp/catch-3 ) app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=test? ( >=dev-cpp/catch-3 ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Rapid fuzzy string matching in C++
 EAPI=8
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/maxbachmann/rapidfuzz-cpp/archive/v2.2.3.tar.gz -> rapidfuzz-cpp-2.2.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_=cf91ce0d9df037b3d202a8dc34e0d427
diff --git a/metadata/md5-cache/dev-cpp/rapidfuzz-cpp-3.0.0 b/metadata/md5-cache/dev-cpp/rapidfuzz-cpp-3.0.0
index fe36d8370802..edcefe7fd70a 100644
--- a/metadata/md5-cache/dev-cpp/rapidfuzz-cpp-3.0.0
+++ b/metadata/md5-cache/dev-cpp/rapidfuzz-cpp-3.0.0
@@ -1,4 +1,4 @@
-BDEPEND=test? ( >=dev-cpp/catch-3 ) app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=test? ( >=dev-cpp/catch-3 ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Rapid fuzzy string matching in C++
 EAPI=8
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/maxbachmann/rapidfuzz-cpp/archive/v3.0.0.tar.gz -> rapidfuzz-cpp-3.0.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_=9c03e81845183ac54561d26e81bfd7f9
diff --git a/metadata/md5-cache/dev-cpp/rapidyaml-0.5.0 b/metadata/md5-cache/dev-cpp/rapidyaml-0.5.0
index 4beff05cbc7f..40c54eba7b64 100644
--- a/metadata/md5-cache/dev-cpp/rapidyaml-0.5.0
+++ b/metadata/md5-cache/dev-cpp/rapidyaml-0.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=test? ( dev-cpp/gtest )
 DESCRIPTION=Library to parse and emit YAML, and do it fast
@@ -11,5 +11,5 @@ LICENSE=MIT Boost-1.0 BSD
 RESTRICT=!test? ( test )
 SLOT=0/0.5.0
 SRC_URI=https://github.com/biojppm/rapidyaml/releases/download/v0.5.0/rapidyaml-0.5.0-src.tgz test? ( https://github.com/biojppm/c4fs/archive/0130061b804ae2af0d6cd5919275d552eb1f2414.tar.gz -> rapidyaml-c4fs-0130061b804ae2af0d6cd5919275d552eb1f2414.tar.gz https://github.com/biojppm/c4log/archive/00066ad7f624556f066f3d60766a2c33aeb3c6f0.tar.gz -> rapidyaml-c4log-00066ad7f624556f066f3d60766a2c33aeb3c6f0.tar.gz https://github.com/yaml/yaml-test-suite/archive/6e6c296ae9c9d2d5c4134b4b64d01b29ac19ff6f.tar.gz -> rapidyaml-yaml-test-suite-6e6c296ae9c9d2d5c4134b4b64d01b29ac19ff6f.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_=43043dc78038435c9234811e786c3bc9
diff --git a/metadata/md5-cache/dev-cpp/robin-hood-hashing-3.11.5-r1 b/metadata/md5-cache/dev-cpp/robin-hood-hashing-3.11.5-r1
index 88800dcc7f02..0a912ceac4fa 100644
--- a/metadata/md5-cache/dev-cpp/robin-hood-hashing-3.11.5-r1
+++ b/metadata/md5-cache/dev-cpp/robin-hood-hashing-3.11.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
 DESCRIPTION=Fast & memory efficient hashtable based on robin hood hashing for C++11/14/17/20
 EAPI=7
@@ -8,5 +8,5 @@ KEYWORDS=amd64 arm arm64 ~loong ppc ppc64 ~riscv x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/martinus/robin-hood-hashing/archive/3.11.5.tar.gz -> robin-hood-hashing-3.11.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_=96f6fcd2a1580b269eb18a56ff27231c
diff --git a/metadata/md5-cache/dev-cpp/robin-map-0.6.3 b/metadata/md5-cache/dev-cpp/robin-map-0.6.3
index ffa09f5b38cf..21e0e0b176c2 100644
--- a/metadata/md5-cache/dev-cpp/robin-map-0.6.3
+++ b/metadata/md5-cache/dev-cpp/robin-map-0.6.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=C++ fast hash map and hash set using robin hood hashing
 EAPI=7
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/Tessil/robin-map/archive/v0.6.3.tar.gz -> robin-map-0.6.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_=a389a91447dd32acba03d071c378ea70
diff --git a/metadata/md5-cache/dev-cpp/robin-map-9999 b/metadata/md5-cache/dev-cpp/robin-map-9999
index d064a49f79ac..a1f257c7471c 100644
--- a/metadata/md5-cache/dev-cpp/robin-map-9999
+++ b/metadata/md5-cache/dev-cpp/robin-map-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=C++ fast hash map and hash set using robin hood hashing
 EAPI=7
@@ -7,5 +7,5 @@ INHERIT=cmake git-r3
 LICENSE=MIT
 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_=e37c7a3b91e68626bf606c0be0c99504
diff --git a/metadata/md5-cache/dev-cpp/scitokens-cpp-1.0.2-r1 b/metadata/md5-cache/dev-cpp/scitokens-cpp-1.0.2-r1
index 9f2d6a8bcf24..88a226042ab3 100644
--- a/metadata/md5-cache/dev-cpp/scitokens-cpp-1.0.2-r1
+++ b/metadata/md5-cache/dev-cpp/scitokens-cpp-1.0.2-r1
@@ -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
 DEPEND=dev-cpp/jwt-cpp[picojson] dev-db/sqlite dev-libs/openssl:0= net-misc/curl:0= kernel_linux? ( sys-apps/util-linux )
 DESCRIPTION=C++ implementation of the SciTokens library with a C library interface
@@ -12,5 +12,5 @@ RDEPEND=dev-cpp/jwt-cpp[picojson] dev-db/sqlite dev-libs/openssl:0= net-misc/cur
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/scitokens/scitokens-cpp/archive/refs/tags/v1.0.2.tar.gz -> scitokens-cpp-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_=a11c7940e17b9610b37173ddc5a98a80
diff --git a/metadata/md5-cache/dev-cpp/scitokens-cpp-1.1.0 b/metadata/md5-cache/dev-cpp/scitokens-cpp-1.1.0
index 0f774f6823b7..e1c81867a6c6 100644
--- a/metadata/md5-cache/dev-cpp/scitokens-cpp-1.1.0
+++ b/metadata/md5-cache/dev-cpp/scitokens-cpp-1.1.0
@@ -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
 DEPEND=dev-cpp/jwt-cpp[picojson] dev-db/sqlite dev-libs/openssl:0= net-misc/curl:0= kernel_linux? ( sys-apps/util-linux )
 DESCRIPTION=C++ implementation of the SciTokens library with a C library interface
@@ -12,5 +12,5 @@ RDEPEND=dev-cpp/jwt-cpp[picojson] dev-db/sqlite dev-libs/openssl:0= net-misc/cur
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/scitokens/scitokens-cpp/archive/refs/tags/v1.1.0.tar.gz -> scitokens-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_=06a11f44e1eb4b48ebc4ac86e4e72679
diff --git a/metadata/md5-cache/dev-cpp/sdbus-c++-1.4.0 b/metadata/md5-cache/dev-cpp/sdbus-c++-1.4.0
index ffd43d1bd4c6..4a885d6a1826 100644
--- a/metadata/md5-cache/dev-cpp/sdbus-c++-1.4.0
+++ b/metadata/md5-cache/dev-cpp/sdbus-c++-1.4.0
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig doc? ( app-text/doxygen[dot] ) >=dev-build/meson-1.2.1 app-alternatives/ninja dev-build/meson-format-array app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=virtual/pkgconfig doc? ( app-text/doxygen[dot] ) >=dev-build/meson-1.2.1 app-alternatives/ninja dev-build/meson-format-array app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=elogind? ( >=sys-auth/elogind-236 ) systemd? ( >=sys-apps/systemd-236:= ) tools? ( dev-libs/expat ) test? ( >=dev-cpp/gtest-1.10.0 )
 DESCRIPTION=High-level C++ D-Bus library
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( elogind systemd )
 RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://github.com/Kistler-Group/sdbus-cpp/archive/refs/tags/v1.4.0.tar.gz -> sdbus-c++-1.4.0.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	meson	e322276188f86eacb29ae081ba5485c8	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	meson	e322276188f86eacb29ae081ba5485c8	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=45c3ff45b1dd654fc1963f0bcd52d72c
diff --git a/metadata/md5-cache/dev-cpp/sol2-3.3.1 b/metadata/md5-cache/dev-cpp/sol2-3.3.1
index bc638192f5fb..05bcecb8ed2b 100644
--- a/metadata/md5-cache/dev-cpp/sol2-3.3.1
+++ b/metadata/md5-cache/dev-cpp/sol2-3.3.1
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) lua_targets_lua5-4? ( dev-lang/lua:5.4 ) test? ( >=dev-cpp/catch-3 )
 DESCRIPTION=Header-only C++ <-> Lua API wrapper
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-3 lua_t
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ThePhD/sol2/archive/refs/tags/v3.3.1.tar.gz -> sol2-3.3.1.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	lua	8f9406bfff123a92ad04e4ace3e7f89b	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	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	lua	8f9406bfff123a92ad04e4ace3e7f89b	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=2f19aec04a235d5041738d137d1b9d56
diff --git a/metadata/md5-cache/dev-cpp/string-theory-3.5 b/metadata/md5-cache/dev-cpp/string-theory-3.5
index deb569e9ee2b..d019dada0645 100644
--- a/metadata/md5-cache/dev-cpp/string-theory-3.5
+++ b/metadata/md5-cache/dev-cpp/string-theory-3.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=A flexible modern C++ library for string manipulation and storage
 EAPI=8
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/zrax/string_theory/archive/3.5.tar.gz -> string-theory-3.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_=1232bc65d0ae7043e488ad5acf86e77a
diff --git a/metadata/md5-cache/dev-cpp/string-theory-3.6 b/metadata/md5-cache/dev-cpp/string-theory-3.6
index b3c6ddd419da..d12dab83cd1b 100644
--- a/metadata/md5-cache/dev-cpp/string-theory-3.6
+++ b/metadata/md5-cache/dev-cpp/string-theory-3.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
 DESCRIPTION=A flexible modern C++ library for string manipulation and storage
 EAPI=8
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/zrax/string_theory/archive/3.6.tar.gz -> string-theory-3.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_=1232bc65d0ae7043e488ad5acf86e77a
diff --git a/metadata/md5-cache/dev-cpp/taskflow-3.3.0 b/metadata/md5-cache/dev-cpp/taskflow-3.3.0
index 48bdff698fed..272cd26d8180 100644
--- a/metadata/md5-cache/dev-cpp/taskflow-3.3.0
+++ b/metadata/md5-cache/dev-cpp/taskflow-3.3.0
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=test? ( dev-cpp/doctest )
 DESCRIPTION=Modern C++ Parallel Task Programming
@@ -11,5 +11,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/taskflow/taskflow/archive/v3.3.0.tar.gz -> taskflow-3.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_=725a59a6daf6c50672f50d8cedf8750b
diff --git a/metadata/md5-cache/dev-cpp/taskflow-3.4.0 b/metadata/md5-cache/dev-cpp/taskflow-3.4.0
index 524cecf5d325..adfc21fe45b1 100644
--- a/metadata/md5-cache/dev-cpp/taskflow-3.4.0
+++ b/metadata/md5-cache/dev-cpp/taskflow-3.4.0
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=test? ( dev-cpp/doctest )
 DESCRIPTION=Modern C++ Parallel Task Programming
@@ -11,5 +11,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/taskflow/taskflow/archive/v3.4.0.tar.gz -> taskflow-3.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_=2f77137797bac5a233e43a7c961cbd55
diff --git a/metadata/md5-cache/dev-cpp/taskflow-3.6.0 b/metadata/md5-cache/dev-cpp/taskflow-3.6.0
index ea42df0a4c27..b50f74296fc4 100644
--- a/metadata/md5-cache/dev-cpp/taskflow-3.6.0
+++ b/metadata/md5-cache/dev-cpp/taskflow-3.6.0
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=test? ( dev-cpp/doctest )
 DESCRIPTION=Modern C++ Parallel Task Programming
@@ -11,5 +11,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/taskflow/taskflow/archive/v3.6.0.tar.gz -> taskflow-3.6.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_=314852b5e50c2987c0ba86125a426283
diff --git a/metadata/md5-cache/dev-cpp/taskflow-9999 b/metadata/md5-cache/dev-cpp/taskflow-9999
index 251327603635..e4283a323d6e 100644
--- a/metadata/md5-cache/dev-cpp/taskflow-9999
+++ b/metadata/md5-cache/dev-cpp/taskflow-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=test? ( dev-cpp/doctest )
 DESCRIPTION=Modern C++ Parallel Task Programming
@@ -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_=344528529a1a930c9ba8e48c5b775679
diff --git a/metadata/md5-cache/dev-cpp/tbb-2021.10.0 b/metadata/md5-cache/dev-cpp/tbb-2021.10.0
index 9149611ef6c1..0c3281492ebc 100644
--- a/metadata/md5-cache/dev-cpp/tbb-2021.10.0
+++ b/metadata/md5-cache/dev-cpp/tbb-2021.10.0
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=!kernel_Darwin? ( sys-apps/hwloc:= )
 DESCRIPTION=High level abstract threading library
@@ -12,5 +12,5 @@ RDEPEND=!kernel_Darwin? ( sys-apps/hwloc:= )
 RESTRICT=!test? ( test )
 SLOT=0/12.5-2.5-3.5
 SRC_URI=https://github.com/oneapi-src/oneTBB/archive/refs/tags/v2021.10.0.tar.gz -> tbb-2021.10.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_=22ebc76fdba0a1d36a5bc58064f60a19
diff --git a/metadata/md5-cache/dev-cpp/tbb-2021.11.0 b/metadata/md5-cache/dev-cpp/tbb-2021.11.0
index 034125a56341..409b0e7b3071 100644
--- a/metadata/md5-cache/dev-cpp/tbb-2021.11.0
+++ b/metadata/md5-cache/dev-cpp/tbb-2021.11.0
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=!kernel_Darwin? ( sys-apps/hwloc:= )
 DESCRIPTION=High level abstract threading library
@@ -12,5 +12,5 @@ RDEPEND=!kernel_Darwin? ( sys-apps/hwloc:= )
 RESTRICT=!test? ( test )
 SLOT=0/12.5-2.5-3.5
 SRC_URI=https://github.com/oneapi-src/oneTBB/archive/refs/tags/v2021.11.0.tar.gz -> tbb-2021.11.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_=22ebc76fdba0a1d36a5bc58064f60a19
diff --git a/metadata/md5-cache/dev-cpp/tbb-2021.5.0-r1 b/metadata/md5-cache/dev-cpp/tbb-2021.5.0-r1
index 7bd3b2b200bc..48888a361ea0 100644
--- a/metadata/md5-cache/dev-cpp/tbb-2021.5.0-r1
+++ b/metadata/md5-cache/dev-cpp/tbb-2021.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=!kernel_Darwin? ( sys-apps/hwloc:= )
 DESCRIPTION=High level abstract threading library
@@ -12,5 +12,5 @@ RDEPEND=!kernel_Darwin? ( sys-apps/hwloc:= )
 RESTRICT=!test? ( test )
 SLOT=0/12.5-2.5-3.5
 SRC_URI=https://github.com/oneapi-src/oneTBB/archive/refs/tags/v2021.5.0.tar.gz -> tbb-2021.5.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_=74f80dcf278fdc42df207a77b204ca11
diff --git a/metadata/md5-cache/dev-cpp/tbb-2021.7.0 b/metadata/md5-cache/dev-cpp/tbb-2021.7.0
index 1bd24fa7bc77..9266236023fc 100644
--- a/metadata/md5-cache/dev-cpp/tbb-2021.7.0
+++ b/metadata/md5-cache/dev-cpp/tbb-2021.7.0
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=!kernel_Darwin? ( sys-apps/hwloc:= )
 DESCRIPTION=High level abstract threading library
@@ -12,5 +12,5 @@ RDEPEND=!kernel_Darwin? ( sys-apps/hwloc:= )
 RESTRICT=!test? ( test )
 SLOT=0/12.5-2.5-3.5
 SRC_URI=https://github.com/oneapi-src/oneTBB/archive/refs/tags/v2021.7.0.tar.gz -> tbb-2021.7.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_=620d3effd27fbfb5292f0b41c9a9afef
diff --git a/metadata/md5-cache/dev-cpp/tbb-2021.7.0-r1 b/metadata/md5-cache/dev-cpp/tbb-2021.7.0-r1
index 7679ce69edc8..fdc474b5ede3 100644
--- a/metadata/md5-cache/dev-cpp/tbb-2021.7.0-r1
+++ b/metadata/md5-cache/dev-cpp/tbb-2021.7.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=!kernel_Darwin? ( sys-apps/hwloc:= )
 DESCRIPTION=High level abstract threading library
@@ -12,5 +12,5 @@ RDEPEND=!kernel_Darwin? ( sys-apps/hwloc:= )
 RESTRICT=!test? ( test )
 SLOT=0/12.5-2.5-3.5
 SRC_URI=https://github.com/oneapi-src/oneTBB/archive/refs/tags/v2021.7.0.tar.gz -> tbb-2021.7.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_=f5dc01dc378b43a69e97208361623f38
diff --git a/metadata/md5-cache/dev-cpp/tbb-2021.8.0 b/metadata/md5-cache/dev-cpp/tbb-2021.8.0
index 59cf0ed512de..8eacde1b0ed7 100644
--- a/metadata/md5-cache/dev-cpp/tbb-2021.8.0
+++ b/metadata/md5-cache/dev-cpp/tbb-2021.8.0
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=!kernel_Darwin? ( sys-apps/hwloc:= )
 DESCRIPTION=High level abstract threading library
@@ -12,5 +12,5 @@ RDEPEND=!kernel_Darwin? ( sys-apps/hwloc:= )
 RESTRICT=!test? ( test )
 SLOT=0/12.5-2.5-3.5
 SRC_URI=https://github.com/oneapi-src/oneTBB/archive/refs/tags/v2021.8.0.tar.gz -> tbb-2021.8.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_=1a26d96a3e43da5cddf2453866e1d1d6
diff --git a/metadata/md5-cache/dev-cpp/tbb-2021.9.0 b/metadata/md5-cache/dev-cpp/tbb-2021.9.0
index a2690b581708..24b8fcb39014 100644
--- a/metadata/md5-cache/dev-cpp/tbb-2021.9.0
+++ b/metadata/md5-cache/dev-cpp/tbb-2021.9.0
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=!kernel_Darwin? ( sys-apps/hwloc:= )
 DESCRIPTION=High level abstract threading library
@@ -12,5 +12,5 @@ RDEPEND=!kernel_Darwin? ( sys-apps/hwloc:= )
 RESTRICT=!test? ( test )
 SLOT=0/12.5-2.5-3.5
 SRC_URI=https://github.com/oneapi-src/oneTBB/archive/refs/tags/v2021.9.0.tar.gz -> tbb-2021.9.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_=f326e79e14024168977ff3aa084ebf32
diff --git a/metadata/md5-cache/dev-cpp/termcolor-2.1.0 b/metadata/md5-cache/dev-cpp/termcolor-2.1.0
index 2b7d993172a2..17342ae2f70f 100644
--- a/metadata/md5-cache/dev-cpp/termcolor-2.1.0
+++ b/metadata/md5-cache/dev-cpp/termcolor-2.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=A header-only C++ library for printing colored messages to the terminal
 EAPI=8
@@ -10,5 +10,5 @@ LICENSE=BSD
 RESTRICT=!test? ( test ) test
 SLOT=0
 SRC_URI=https://github.com/ikalnytskyi/termcolor/archive/v2.1.0.tar.gz -> termcolor-2.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_=2015d4213b42f655699acd7ead9b1e97
diff --git a/metadata/md5-cache/dev-cpp/valijson-1.0 b/metadata/md5-cache/dev-cpp/valijson-1.0
index 2b8eac192396..a203bd4ab83f 100644
--- a/metadata/md5-cache/dev-cpp/valijson-1.0
+++ b/metadata/md5-cache/dev-cpp/valijson-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=Header-only C++ library for JSON Schema validation
 EAPI=8
@@ -9,5 +9,5 @@ LICENSE=BSD-2 Boost-1.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/tristanpenman/valijson/archive/v1.0.tar.gz -> valijson-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_=0f619f34a4aadd98a49b843be72719ee
diff --git a/metadata/md5-cache/dev-cpp/waylandpp-1.0.0 b/metadata/md5-cache/dev-cpp/waylandpp-1.0.0
index 36f622a66e8f..fea7ad9d0176 100644
--- a/metadata/md5-cache/dev-cpp/waylandpp-1.0.0
+++ b/metadata/md5-cache/dev-cpp/waylandpp-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/wayland-1.11.0 media-libs/mesa[wayland] >=dev-libs/pugixml-1.9-r1 doc? ( app-text/doxygen media-gfx/graphviz )
 DESCRIPTION=Wayland C++ bindings
@@ -11,5 +11,5 @@ LICENSE=MIT
 RDEPEND=>=dev-libs/wayland-1.11.0 media-libs/mesa[wayland] >=dev-libs/pugixml-1.9-r1
 SLOT=0/1.0
 SRC_URI=https://github.com/NilsBrause/waylandpp/archive/1.0.0.tar.gz -> waylandpp-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_=9d184b5341e4f72ff6b6e138f3e5fb4a
diff --git a/metadata/md5-cache/dev-cpp/waylandpp-1.0.0-r1 b/metadata/md5-cache/dev-cpp/waylandpp-1.0.0-r1
index 379aa5beef85..6767c70c1bb2 100644
--- a/metadata/md5-cache/dev-cpp/waylandpp-1.0.0-r1
+++ b/metadata/md5-cache/dev-cpp/waylandpp-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/wayland-1.11.0 media-libs/mesa[wayland] >=dev-libs/pugixml-1.9-r1 doc? ( app-text/doxygen media-gfx/graphviz )
 DESCRIPTION=Wayland C++ bindings
@@ -11,5 +11,5 @@ LICENSE=MIT
 RDEPEND=>=dev-libs/wayland-1.11.0 media-libs/mesa[wayland] >=dev-libs/pugixml-1.9-r1
 SLOT=0/1.0
 SRC_URI=https://github.com/NilsBrause/waylandpp/archive/1.0.0.tar.gz -> waylandpp-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_=13ae0080e0d327c085c8d207b8fe92b9
diff --git a/metadata/md5-cache/dev-cpp/waylandpp-9999 b/metadata/md5-cache/dev-cpp/waylandpp-9999
index 9bcb1ea4a3ce..94110111edfa 100644
--- a/metadata/md5-cache/dev-cpp/waylandpp-9999
+++ b/metadata/md5-cache/dev-cpp/waylandpp-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/wayland-1.11.0 media-libs/mesa[wayland] >=dev-libs/pugixml-1.9-r1 doc? ( app-text/doxygen media-gfx/graphviz )
 DESCRIPTION=Wayland C++ bindings
@@ -10,5 +10,5 @@ LICENSE=MIT
 PROPERTIES=live
 RDEPEND=>=dev-libs/wayland-1.11.0 media-libs/mesa[wayland] >=dev-libs/pugixml-1.9-r1
 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_=4cbd7d99ea56f26c779f69bebc37eb8f
diff --git a/metadata/md5-cache/dev-cpp/websocketpp-0.8.2 b/metadata/md5-cache/dev-cpp/websocketpp-0.8.2
index fea153dbe1bd..8f8a1e68a77a 100644
--- a/metadata/md5-cache/dev-cpp/websocketpp-0.8.2
+++ b/metadata/md5-cache/dev-cpp/websocketpp-0.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
 DEPEND=test? ( dev-libs/boost )
 DESCRIPTION=C++/Boost Asio based websocket client/server library
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/boost
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/zaphoyd/websocketpp/archive/0.8.2.tar.gz -> websocketpp-0.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_=d5eb54e4b6d5549bdd10e15bdf80d5b7
diff --git a/metadata/md5-cache/dev-cpp/xsimd-11.1.0 b/metadata/md5-cache/dev-cpp/xsimd-11.1.0
index e1b45a0abd06..e44fffddf6ad 100644
--- a/metadata/md5-cache/dev-cpp/xsimd-11.1.0
+++ b/metadata/md5-cache/dev-cpp/xsimd-11.1.0
@@ -1,4 +1,4 @@
-BDEPEND=doc? ( app-text/doxygen dev-python/breathe dev-python/sphinx dev-python/sphinx-rtd-theme ) test? ( dev-cpp/doctest ) app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=doc? ( app-text/doxygen dev-python/breathe dev-python/sphinx dev-python/sphinx-rtd-theme ) test? ( dev-cpp/doctest ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=C++ wrappers for SIMD intrinsics
 EAPI=8
@@ -10,5 +10,5 @@ LICENSE=BSD
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/xtensor-stack/xsimd/archive/refs/tags/11.1.0.tar.gz -> xsimd-11.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_=7c86c8b66ea282ddc343fc76e601b09a
diff --git a/metadata/md5-cache/dev-cpp/xsimd-11.1.0-r1 b/metadata/md5-cache/dev-cpp/xsimd-11.1.0-r1
index a981aeea1130..cd31b6699701 100644
--- a/metadata/md5-cache/dev-cpp/xsimd-11.1.0-r1
+++ b/metadata/md5-cache/dev-cpp/xsimd-11.1.0-r1
@@ -1,4 +1,4 @@
-BDEPEND=doc? ( app-text/doxygen dev-python/breathe dev-python/sphinx dev-python/sphinx-rtd-theme ) test? ( dev-cpp/doctest ) app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=doc? ( app-text/doxygen dev-python/breathe dev-python/sphinx dev-python/sphinx-rtd-theme ) test? ( dev-cpp/doctest ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=C++ wrappers for SIMD intrinsics
 EAPI=8
@@ -10,5 +10,5 @@ LICENSE=BSD
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/xtensor-stack/xsimd/archive/refs/tags/11.1.0.tar.gz -> xsimd-11.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_=90f20058d703067e9fd469c4c31634f5
diff --git a/metadata/md5-cache/dev-cpp/xsimd-12.1.1 b/metadata/md5-cache/dev-cpp/xsimd-12.1.1
index fe19fb10788e..9ced00faeb4d 100644
--- a/metadata/md5-cache/dev-cpp/xsimd-12.1.1
+++ b/metadata/md5-cache/dev-cpp/xsimd-12.1.1
@@ -1,4 +1,4 @@
-BDEPEND=doc? ( app-text/doxygen dev-python/breathe dev-python/sphinx dev-python/sphinx-rtd-theme ) test? ( dev-cpp/doctest ) app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=doc? ( app-text/doxygen dev-python/breathe dev-python/sphinx dev-python/sphinx-rtd-theme ) test? ( dev-cpp/doctest ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=C++ wrappers for SIMD intrinsics
 EAPI=8
@@ -10,5 +10,5 @@ LICENSE=BSD
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/xtensor-stack/xsimd/archive/refs/tags/12.1.1.tar.gz -> xsimd-12.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_=e616e0894fac223a0e20de2682b45c05
diff --git a/metadata/md5-cache/dev-cpp/yaml-cpp-0.7.0-r2 b/metadata/md5-cache/dev-cpp/yaml-cpp-0.7.0-r2
index 6b03621754bb..660908412cec 100644
--- a/metadata/md5-cache/dev-cpp/yaml-cpp-0.7.0-r2
+++ b/metadata/md5-cache/dev-cpp/yaml-cpp-0.7.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=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(-)?] )
 DESCRIPTION=YAML parser and emitter in C++
@@ -11,5 +11,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0/0.7
 SRC_URI=https://github.com/jbeder/yaml-cpp/archive/yaml-cpp-0.7.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_=c39550b989366c72b50a8479c94f01d7
diff --git a/metadata/md5-cache/dev-cpp/yaml-cpp-0.8.0 b/metadata/md5-cache/dev-cpp/yaml-cpp-0.8.0
index e877c2eb37d5..05792dc6223f 100644
--- a/metadata/md5-cache/dev-cpp/yaml-cpp-0.8.0
+++ b/metadata/md5-cache/dev-cpp/yaml-cpp-0.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
 DEPEND=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(-)?] )
 DESCRIPTION=YAML parser and emitter in C++
@@ -11,5 +11,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0/0.8
 SRC_URI=https://github.com/jbeder/yaml-cpp/archive/refs/tags/0.8.0.tar.gz -> yaml-cpp-0.8.0.gh.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_=8d6405a2ba806f75e183871399597d75
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-cpp
parent	d8a50857c27d3253561374390ac9ed8c1b65d9bc (diff)