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

25 files changed, 48 insertions, 48 deletions

diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 379a03e6d993..c32fce698536 100644
--- a/metadata/md5-cache/app-misc/Manifest.gz
+++ b/metadata/md5-cache/app-misc/Manifest.gz
diff --git a/metadata/md5-cache/app-misc/brewtarget-2.3.1-r1 b/metadata/md5-cache/app-misc/brewtarget-2.3.1-r1
index 88947f22c081..3ac121434a68 100644
--- a/metadata/md5-cache/app-misc/brewtarget-2.3.1-r1
+++ b/metadata/md5-cache/app-misc/brewtarget-2.3.1-r1
@@ -1,4 +1,4 @@
-BDEPEND=dev-qt/linguist-tools:5 app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=dev-qt/linguist-tools:5 app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5[sqlite] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5
 DESCRIPTION=Application to create and manage beer recipes
@@ -10,5 +10,5 @@ LICENSE=GPL-3 WTFPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5[sqlite] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5
 SLOT=0
 SRC_URI=https://github.com/Brewtarget/brewtarget/releases/download/v2.3.1/brewtarget_2.3.1.orig.tar.xz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	plocale	950fbaec7deeba41b5bcc0572cca99b9	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	plocale	950fbaec7deeba41b5bcc0572cca99b9	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=2a5a29d85165d604d8341f02472a09f8
diff --git a/metadata/md5-cache/app-misc/ckb-0.6.0-r1 b/metadata/md5-cache/app-misc/ckb-0.6.0-r1
index 4f8aaf8260ff..b1f3d598fcd5 100644
--- a/metadata/md5-cache/app-misc/ckb-0.6.0-r1
+++ b/metadata/md5-cache/app-misc/ckb-0.6.0-r1
@@ -1,4 +1,4 @@
-BDEPEND=dev-qt/linguist-tools:5 app-alternatives/ninja >=dev-util/cmake-3.20.5 virtual/pkgconfig
+BDEPEND=dev-qt/linguist-tools:5 app-alternatives/ninja >=dev-build/cmake-3.20.5 virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
 DEPEND=dev-libs/libdbusmenu-qt dev-libs/quazip:0=[qt5(+)] dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 || ( media-libs/libpulse media-sound/apulse[sdk] ) virtual/libudev:= x11-libs/libxcb:= x11-libs/xcb-util-wm
 DESCRIPTION=Corsair K65/K70/K95 Driver
@@ -12,5 +12,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libdbusmenu-qt dev-libs/quazip:0=[qt5(+)] dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 || ( media-libs/libpulse media-sound/apulse[sdk] ) virtual/libudev:= x11-libs/libxcb:= x11-libs/xcb-util-wm
 SLOT=0
 SRC_URI=https://github.com/ckb-next/ckb-next/archive/v0.6.0.tar.gz -> ckb-0.6.0.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	udev	eec0bbab06977f1cfc5597269c1fa152	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	udev	eec0bbab06977f1cfc5597269c1fa152	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=66c0f8163976274cbb2615d04972a80f
diff --git a/metadata/md5-cache/app-misc/ckb-9999 b/metadata/md5-cache/app-misc/ckb-9999
index b7ef294b3bcf..5f3c78f92089 100644
--- a/metadata/md5-cache/app-misc/ckb-9999
+++ b/metadata/md5-cache/app-misc/ckb-9999
@@ -1,4 +1,4 @@
-BDEPEND=dev-qt/linguist-tools:5 app-alternatives/ninja >=dev-util/cmake-3.20.5 virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=dev-qt/linguist-tools:5 app-alternatives/ninja >=dev-build/cmake-3.20.5 virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
 DEPEND=dev-libs/libdbusmenu-qt dev-libs/quazip:0=[qt5(+)] dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 || ( media-libs/libpulse media-sound/apulse[sdk] ) virtual/libudev:= x11-libs/libxcb:= x11-libs/xcb-util-wm
 DESCRIPTION=Corsair K65/K70/K95 Driver
@@ -11,5 +11,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=dev-libs/libdbusmenu-qt dev-libs/quazip:0=[qt5(+)] dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 || ( media-libs/libpulse media-sound/apulse[sdk] ) virtual/libudev:= x11-libs/libxcb:= x11-libs/xcb-util-wm
 SLOT=0
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	udev	eec0bbab06977f1cfc5597269c1fa152	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	udev	eec0bbab06977f1cfc5597269c1fa152	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=4a88f4f0286f9584baaeb3beed9169c4
diff --git a/metadata/md5-cache/app-misc/cmatrix-2.0-r4 b/metadata/md5-cache/app-misc/cmatrix-2.0-r4
index 2c76229b2c28..c1707d2b712a 100644
--- a/metadata/md5-cache/app-misc/cmatrix-2.0-r4
+++ b/metadata/md5-cache/app-misc/cmatrix-2.0-r4
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
 DEPEND=sys-libs/ncurses:=[unicode(+)?]
 DESCRIPTION=An ncurses based app to show a scrolling screen from the Matrix
@@ -11,5 +11,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:=[unicode(+)?]
 SLOT=0
 SRC_URI=https://github.com/abishekvashok/cmatrix/archive/v2.0.tar.gz -> cmatrix-2.0.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	font	aa113a3df9cd0a9693a1c1ee7c34a6eb	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	font	aa113a3df9cd0a9693a1c1ee7c34a6eb	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=bb9c2695c53309e9c123b7a27c56d185
diff --git a/metadata/md5-cache/app-misc/ddate-0.2.2_p20160627-r1 b/metadata/md5-cache/app-misc/ddate-0.2.2_p20160627-r1
index a98cfff89d6e..18fa09d9e193 100644
--- a/metadata/md5-cache/app-misc/ddate-0.2.2_p20160627-r1
+++ b/metadata/md5-cache/app-misc/ddate-0.2.2_p20160627-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=Perpetual date converter from gregorian to poee calendar
 EAPI=8
@@ -8,5 +8,5 @@ KEYWORDS=amd64 arm arm64 ~riscv x86
 LICENSE=public-domain
 SLOT=0
 SRC_URI=https://github.com/bo0ts/ddate/archive/899ca665a0cb725990c33415dc3c0261dac7fe46.tar.gz -> ddate-0.2.2_p20160627.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_=193d96afe68265b7170eb87d6234d07a
diff --git a/metadata/md5-cache/app-misc/ddcui-0.2.1-r1 b/metadata/md5-cache/app-misc/ddcui-0.2.1-r1
index ec7c9e37cedd..4c54fd99d799 100644
--- a/metadata/md5-cache/app-misc/ddcui-0.2.1-r1
+++ b/metadata/md5-cache/app-misc/ddcui-0.2.1-r1
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
 DEPEND=dev-libs/glib >=app-misc/ddcutil-1.2.0:0/4 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5
 DESCRIPTION=Graphical user interface for ddcutil - control monitor settings
@@ -11,5 +11,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-libs/glib >=app-misc/ddcutil-1.2.0:0/4 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5
 SLOT=0
 SRC_URI=https://github.com/rockowitz/ddcui/archive/v0.2.1.tar.gz -> ddcui-0.2.1.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=e717dd6ce3a0400ccbec8af30202569c
diff --git a/metadata/md5-cache/app-misc/ddcui-0.3.0-r1 b/metadata/md5-cache/app-misc/ddcui-0.3.0-r1
index d800a1adc9e2..6fa4a77e725a 100644
--- a/metadata/md5-cache/app-misc/ddcui-0.3.0-r1
+++ b/metadata/md5-cache/app-misc/ddcui-0.3.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 postinst postrm preinst prepare test
 DEPEND=dev-libs/glib >=app-misc/ddcutil-1.3.0:0/4 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5
 DESCRIPTION=Graphical user interface for ddcutil - control monitor settings
@@ -11,5 +11,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-libs/glib >=app-misc/ddcutil-1.3.0:0/4 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5
 SLOT=0
 SRC_URI=https://github.com/rockowitz/ddcui/archive/v0.3.0.tar.gz -> ddcui-0.3.0.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=d4442a03deac5dea90ce1f05606de65e
diff --git a/metadata/md5-cache/app-misc/ddcui-0.4.2 b/metadata/md5-cache/app-misc/ddcui-0.4.2
index b935e31e4207..7f4fd62607e9 100644
--- a/metadata/md5-cache/app-misc/ddcui-0.4.2
+++ b/metadata/md5-cache/app-misc/ddcui-0.4.2
@@ -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 postinst postrm preinst prepare test
 DEPEND=dev-libs/glib >=app-misc/ddcutil-2.0.0:0/5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5
 DESCRIPTION=Graphical user interface for ddcutil - control monitor settings
@@ -11,5 +11,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-libs/glib >=app-misc/ddcutil-2.0.0:0/5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5
 SLOT=0
 SRC_URI=https://github.com/rockowitz/ddcui/archive/v0.4.2.tar.gz -> ddcui-0.4.2.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=4e5f88d2ed76076a0838a459d2ae8d7e
diff --git a/metadata/md5-cache/app-misc/fastfetch-0.1.9999 b/metadata/md5-cache/app-misc/fastfetch-0.1.9999
index 44ee295d9f9d..6976800fa621 100644
--- a/metadata/md5-cache/app-misc/fastfetch-0.1.9999
+++ b/metadata/md5-cache/app-misc/fastfetch-0.1.9999
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=>=dev-libs/yyjson-0.8.0:= sys-libs/zlib X? ( x11-libs/libX11 ) chafa? ( media-gfx/chafa ) dbus? ( sys-apps/dbus ) ddcutil? ( app-misc/ddcutil:= ) drm? ( x11-libs/libdrm ) gnome? ( dev-libs/glib gnome-base/dconf ) imagemagick? ( media-gfx/imagemagick:= ) networkmanager? ( net-misc/networkmanager ) opencl? ( virtual/opencl ) opengl? ( media-libs/libglvnd[X] ) osmesa? ( media-libs/mesa[osmesa] ) pci? ( sys-apps/pciutils ) pulseaudio? ( media-libs/libpulse ) sqlite? ( dev-db/sqlite:3 ) vulkan? ( media-libs/vulkan-loader sys-apps/pciutils ) wayland? ( dev-libs/wayland ) xcb? ( x11-libs/libxcb ) xfce? ( xfce-base/xfconf ) xrandr? ( x11-libs/libXrandr )
 DESCRIPTION=Fast neofetch-like system information tool
@@ -12,5 +12,5 @@ RDEPEND=>=dev-libs/yyjson-0.8.0:= sys-libs/zlib X? ( x11-libs/libX11 ) chafa? (
 REQUIRED_USE=xrandr? ( X ) chafa? ( imagemagick )
 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_=259fb65fcf3136b015801ce728b927be
diff --git a/metadata/md5-cache/app-misc/fastfetch-0.2.9999 b/metadata/md5-cache/app-misc/fastfetch-0.2.9999
index 2d49c572dd06..381a8cbbf337 100644
--- a/metadata/md5-cache/app-misc/fastfetch-0.2.9999
+++ b/metadata/md5-cache/app-misc/fastfetch-0.2.9999
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=>=dev-libs/yyjson-0.8.0:= sys-libs/zlib X? ( x11-libs/libX11 ) chafa? ( media-gfx/chafa ) dbus? ( sys-apps/dbus ) ddcutil? ( app-misc/ddcutil:= ) drm? ( x11-libs/libdrm ) gnome? ( dev-libs/glib gnome-base/dconf ) imagemagick? ( media-gfx/imagemagick:= ) networkmanager? ( net-misc/networkmanager ) opencl? ( virtual/opencl ) opengl? ( media-libs/libglvnd[X] ) osmesa? ( media-libs/mesa[osmesa] ) pci? ( sys-apps/pciutils ) pulseaudio? ( media-libs/libpulse ) sqlite? ( dev-db/sqlite:3 ) vulkan? ( media-libs/vulkan-loader sys-apps/pciutils ) wayland? ( dev-libs/wayland ) xcb? ( x11-libs/libxcb ) xfce? ( xfce-base/xfconf ) xrandr? ( x11-libs/libXrandr ) vulkan? ( dev-util/vulkan-headers )
 DESCRIPTION=Fast neofetch-like system information tool
@@ -12,5 +12,5 @@ RDEPEND=>=dev-libs/yyjson-0.8.0:= sys-libs/zlib X? ( x11-libs/libX11 ) chafa? (
 REQUIRED_USE=xrandr? ( X ) chafa? ( imagemagick )
 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_=2d0274dd3224a1c2b7cb82ef714d3337
diff --git a/metadata/md5-cache/app-misc/fastfetch-2.2.3-r1 b/metadata/md5-cache/app-misc/fastfetch-2.2.3-r1
index 7387c901a6a5..2d9c624fbc8b 100644
--- a/metadata/md5-cache/app-misc/fastfetch-2.2.3-r1
+++ b/metadata/md5-cache/app-misc/fastfetch-2.2.3-r1
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=dev-libs/yyjson-0.8.0:= sys-libs/zlib X? ( x11-libs/libX11 ) chafa? ( media-gfx/chafa ) dbus? ( sys-apps/dbus ) ddcutil? ( app-misc/ddcutil:= ) gnome? ( dev-libs/glib gnome-base/dconf ) imagemagick? ( media-gfx/imagemagick:= ) networkmanager? ( net-misc/networkmanager ) opencl? ( virtual/opencl ) opengl? ( media-libs/libglvnd[X] ) osmesa? ( media-libs/mesa[osmesa] ) pci? ( sys-apps/pciutils ) pulseaudio? ( media-libs/libpulse ) sqlite? ( dev-db/sqlite:3 ) vulkan? ( media-libs/vulkan-loader sys-apps/pciutils ) wayland? ( dev-libs/wayland ) xcb? ( x11-libs/libxcb ) xfce? ( xfce-base/xfconf ) xrandr? ( x11-libs/libXrandr ) vulkan? ( dev-util/vulkan-headers )
 DESCRIPTION=Fast neofetch-like system information tool
@@ -13,5 +13,5 @@ REQUIRED_USE=xrandr? ( X ) chafa? ( imagemagick )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/fastfetch-cli/fastfetch/archive/refs/tags/2.2.3.tar.gz -> fastfetch-2.2.3.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=6d51c9b772c182c37b82b213a59c2523
diff --git a/metadata/md5-cache/app-misc/fastfetch-2.5.0 b/metadata/md5-cache/app-misc/fastfetch-2.5.0
index acb0458bc6ab..f8bd8ef3c79d 100644
--- a/metadata/md5-cache/app-misc/fastfetch-2.5.0
+++ b/metadata/md5-cache/app-misc/fastfetch-2.5.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=>=dev-libs/yyjson-0.8.0:= sys-libs/zlib X? ( x11-libs/libX11 ) chafa? ( media-gfx/chafa ) dbus? ( sys-apps/dbus ) ddcutil? ( app-misc/ddcutil:= ) drm? ( x11-libs/libdrm ) gnome? ( dev-libs/glib gnome-base/dconf ) imagemagick? ( media-gfx/imagemagick:= ) networkmanager? ( net-misc/networkmanager ) opencl? ( virtual/opencl ) opengl? ( media-libs/libglvnd[X] ) osmesa? ( media-libs/mesa[osmesa] ) pci? ( sys-apps/pciutils ) pulseaudio? ( media-libs/libpulse ) sqlite? ( dev-db/sqlite:3 ) vulkan? ( media-libs/vulkan-loader sys-apps/pciutils ) wayland? ( dev-libs/wayland ) xcb? ( x11-libs/libxcb ) xfce? ( xfce-base/xfconf ) xrandr? ( x11-libs/libXrandr ) vulkan? ( dev-util/vulkan-headers )
 DESCRIPTION=Fast neofetch-like system information tool
@@ -13,5 +13,5 @@ REQUIRED_USE=xrandr? ( X ) chafa? ( imagemagick )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/fastfetch-cli/fastfetch/archive/refs/tags/2.5.0.tar.gz -> fastfetch-2.5.0.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=25f53d2fc84e83a21a00c6859ca563f9
diff --git a/metadata/md5-cache/app-misc/i2bits-0.1.0-r1 b/metadata/md5-cache/app-misc/i2bits-0.1.0-r1
index 8911bc58196b..204b6dfb3fa1 100644
--- a/metadata/md5-cache/app-misc/i2bits-0.1.0-r1
+++ b/metadata/md5-cache/app-misc/i2bits-0.1.0-r1
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Utility to convert hex or dec to binary format
 EAPI=8
@@ -8,5 +8,5 @@ KEYWORDS=amd64 x86
 LICENSE=WTFPL-2
 SLOT=0
 SRC_URI=http://unixdev.ru/src/i2bits-0.1.0.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=a75a16e4750020a9dfcc371bd0171fb2
diff --git a/metadata/md5-cache/app-misc/logiops-0.3.3 b/metadata/md5-cache/app-misc/logiops-0.3.3
index e1ac83534b50..42ecda36525c 100644
--- a/metadata/md5-cache/app-misc/logiops-0.3.3
+++ b/metadata/md5-cache/app-misc/logiops-0.3.3
@@ -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 postinst prepare pretend setup test
 DEPEND=dev-libs/glib dev-libs/libconfig:=[cxx] dev-libs/libevdev sys-apps/dbus virtual/libudev systemd? ( sys-apps/systemd )
 DESCRIPTION=An unofficial userspace driver for HID++ Logitech devices
@@ -11,5 +11,5 @@ LICENSE=GPL-3+
 RDEPEND=dev-libs/glib dev-libs/libconfig:=[cxx] dev-libs/libevdev sys-apps/dbus virtual/libudev systemd? ( sys-apps/systemd )
 SLOT=0
 SRC_URI=https://github.com/PixlOne/logiops/releases/download/v0.3.3/logiops-v0.3.3.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=f210add81bd734b622fd1aa01734bd87
diff --git a/metadata/md5-cache/app-misc/qtxdg-tools-3.11.0 b/metadata/md5-cache/app-misc/qtxdg-tools-3.11.0
index 187b354afcce..d6c13295dfa2 100644
--- a/metadata/md5-cache/app-misc/qtxdg-tools-3.11.0
+++ b/metadata/md5-cache/app-misc/qtxdg-tools-3.11.0
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-util/lxqt-build-tools-0.13.0 app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=>=dev-util/lxqt-build-tools-0.13.0 app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=dev-libs/libqtxdg-3.11.0 >=dev-qt/qtcore-5.15:5
 DESCRIPTION=User Tools from libqtxdg
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/libqtxdg-3.11.0 >=dev-qt/qtcore-5.15:5
 SLOT=0
 SRC_URI=https://github.com/lxqt/qtxdg-tools/releases/download/3.11.0/qtxdg-tools-3.11.0.tar.xz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=9a6bffabb99195204ac1ca3f1af0e9c1
diff --git a/metadata/md5-cache/app-misc/qtxdg-tools-3.12.0 b/metadata/md5-cache/app-misc/qtxdg-tools-3.12.0
index fea972b4db4d..05c37d907f30 100644
--- a/metadata/md5-cache/app-misc/qtxdg-tools-3.12.0
+++ b/metadata/md5-cache/app-misc/qtxdg-tools-3.12.0
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-util/lxqt-build-tools-0.13.0 app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=>=dev-util/lxqt-build-tools-0.13.0 app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=dev-libs/libqtxdg-3.12.0 >=dev-qt/qtcore-5.15:5
 DESCRIPTION=User Tools from libqtxdg
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/libqtxdg-3.12.0 >=dev-qt/qtcore-5.15:5
 SLOT=0
 SRC_URI=https://github.com/lxqt/qtxdg-tools/releases/download/3.12.0/qtxdg-tools-3.12.0.tar.xz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=a2c09892dde4dc4898695170fa6f3ad3
diff --git a/metadata/md5-cache/app-misc/rbutil-1.5.1-r1 b/metadata/md5-cache/app-misc/rbutil-1.5.1-r1
index bee98c99bc06..3e1569b2ba3e 100644
--- a/metadata/md5-cache/app-misc/rbutil-1.5.1-r1
+++ b/metadata/md5-cache/app-misc/rbutil-1.5.1-r1
@@ -1,4 +1,4 @@
-BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
 DEPEND=app-arch/bzip2:= >=dev-libs/quazip-1.2:=[qt5(+)] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 media-libs/speex media-libs/speexdsp virtual/libusb:1 dev-qt/qttest:5
 DESCRIPTION=Rockbox open source firmware manager for music players
@@ -11,5 +11,5 @@ LICENSE=GPL-2
 RDEPEND=app-arch/bzip2:= >=dev-libs/quazip-1.2:=[qt5(+)] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 media-libs/speex media-libs/speexdsp virtual/libusb:1
 SLOT=0
 SRC_URI=https://download.rockbox.org/rbutil/source/RockboxUtility-v1.5.1-src.tar.bz2
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=d0d116bd5a3d5d1359b9f4bf89fe0a87
diff --git a/metadata/md5-cache/app-misc/task-2.6.2 b/metadata/md5-cache/app-misc/task-2.6.2
index d9c9d6d191bf..519234a8f412 100644
--- a/metadata/md5-cache/app-misc/task-2.6.2
+++ b/metadata/md5-cache/app-misc/task-2.6.2
@@ -1,4 +1,4 @@
-BDEPEND=dev-build/make >=dev-util/cmake-3.20.5
+BDEPEND=dev-build/make >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=sync? ( net-libs/gnutls )
 DESCRIPTION=Taskwarrior is a command-line todo list manager
@@ -11,5 +11,5 @@ LICENSE=MIT
 RDEPEND=sync? ( net-libs/gnutls )
 SLOT=0
 SRC_URI=https://github.com/GothenburgBitFactory/taskwarrior/releases/download/v2.6.2/task-2.6.2.tar.gz https://github.com/GothenburgBitFactory/taskwarrior/releases/download/v2.6.2/tests-2.6.2.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=2cf99eb39b119098958325fc90bcb799
diff --git a/metadata/md5-cache/app-misc/taskd-1.1.0-r3 b/metadata/md5-cache/app-misc/taskd-1.1.0-r3
index 71fad2b98c28..94ce633dee52 100644
--- a/metadata/md5-cache/app-misc/taskd-1.1.0-r3
+++ b/metadata/md5-cache/app-misc/taskd-1.1.0-r3
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5 virtual/pkgconfig
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5 virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst prepare test
 DEPEND=net-libs/gnutls:= sys-apps/util-linux sys-libs/readline:0=
 DESCRIPTION=Server part of Taskwarrior, a command-line todo list manager
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=net-libs/gnutls:= sys-apps/util-linux sys-libs/readline:0= acct-group/taskd acct-user/taskd
 SLOT=0
 SRC_URI=https://taskwarrior.org/download/taskd-1.1.0.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=566cd2e9d8251ddbb39126f01a784446
diff --git a/metadata/md5-cache/app-misc/timew-1.4.3-r1 b/metadata/md5-cache/app-misc/timew-1.4.3-r1
index ffe50365f25f..710a787001f7 100644
--- a/metadata/md5-cache/app-misc/timew-1.4.3-r1
+++ b/metadata/md5-cache/app-misc/timew-1.4.3-r1
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst prepare test
 DESCRIPTION=Tracks your time from the command line, and generates reports
 EAPI=7
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/GothenburgBitFactory/timewarrior/releases/download/v1.4.3/timew-1.4.3.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=377dd40972440829516c8dacdaea729f
diff --git a/metadata/md5-cache/app-misc/tmux-mem-cpu-load-3.5.1 b/metadata/md5-cache/app-misc/tmux-mem-cpu-load-3.5.1
index 014fbfd3dc20..2fac37ecfd9c 100644
--- a/metadata/md5-cache/app-misc/tmux-mem-cpu-load-3.5.1
+++ b/metadata/md5-cache/app-misc/tmux-mem-cpu-load-3.5.1
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=CPU, RAM memory, and load monitor for use with tmux
 EAPI=8
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv x86
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/thewtex/tmux-mem-cpu-load/archive/v3.5.1.tar.gz -> tmux-mem-cpu-load-3.5.1.tar.gz
-_eclasses_=cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=da4309b01e7109f871da0f299b1ff412
diff --git a/metadata/md5-cache/app-misc/tmux-mem-cpu-load-3.7.0 b/metadata/md5-cache/app-misc/tmux-mem-cpu-load-3.7.0
index 2dc079d04749..d124c3036997 100644
--- a/metadata/md5-cache/app-misc/tmux-mem-cpu-load-3.7.0
+++ b/metadata/md5-cache/app-misc/tmux-mem-cpu-load-3.7.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=CPU, RAM memory, and load monitor for use with tmux
 EAPI=8
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ~arm64 ppc64 ~riscv x86
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/thewtex/tmux-mem-cpu-load/archive/v3.7.0.tar.gz -> tmux-mem-cpu-load-3.7.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_=826c48483a3eb19b9b200970592ad6a6
diff --git a/metadata/md5-cache/app-misc/tmux-mem-cpu-load-9999 b/metadata/md5-cache/app-misc/tmux-mem-cpu-load-9999
index f429e6e2c682..6a4bce6d3120 100644
--- a/metadata/md5-cache/app-misc/tmux-mem-cpu-load-9999
+++ b/metadata/md5-cache/app-misc/tmux-mem-cpu-load-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=CPU, RAM memory, and load monitor for use with tmux
 EAPI=8
@@ -7,5 +7,5 @@ INHERIT=cmake git-r3
 LICENSE=Apache-2.0
 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_=8e033c97e09deacfcef01ee18c9d15ad
diff --git a/metadata/md5-cache/app-misc/vcontrold-0.98.11 b/metadata/md5-cache/app-misc/vcontrold-0.98.11
index 9ffa854abdf0..2eecc5cb8e68 100644
--- a/metadata/md5-cache/app-misc/vcontrold-0.98.11
+++ b/metadata/md5-cache/app-misc/vcontrold-0.98.11
@@ -1,4 +1,4 @@
-BDEPEND=man? ( dev-python/docutils ) app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=man? ( dev-python/docutils ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-libs/libxml2:2
 DESCRIPTION=Daemon for communication with Viessmann Vito heatings
@@ -11,5 +11,5 @@ LICENSE=GPL-3+
 RDEPEND=dev-libs/libxml2:2
 SLOT=0
 SRC_URI=https://github.com/openv/vcontrold/archive/v0.98.11.tar.gz -> vcontrold-0.98.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_=2a1df5461a44766dfb2785894f2011b4