2024-01-14 19:33:58 UTC

29 files changed, 58 insertions, 58 deletions

diff --git a/metadata/md5-cache/sci-electronics/Stage-4.3.0-r1 b/metadata/md5-cache/sci-electronics/Stage-4.3.0-r1
index 7e6e4c52119c..3d48e82e4469 100644
--- a/metadata/md5-cache/sci-electronics/Stage-4.3.0-r1
+++ b/metadata/md5-cache/sci-electronics/Stage-4.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 prepare test
 DEPEND=dev-libs/libltdl:0 media-libs/libpng:0= sys-libs/zlib:0= x11-libs/fltk[opengl] virtual/glu virtual/jpeg:0 virtual/opengl
 DESCRIPTION=The Stage Robot Simulator
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libltdl:0 media-libs/libpng:0= sys-libs/zlib:0= x11-libs/fltk[opengl] virtual/glu virtual/jpeg:0 virtual/opengl
 SLOT=0/4.3
 SRC_URI=https://github.com/rtv/Stage/archive/v4.3.0.tar.gz -> Stage-4.3.0.tar.gz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c
 _md5_=d8f136297c0aec65c3df0220ce8bc73b
diff --git a/metadata/md5-cache/sci-electronics/gazebo-11.13.0 b/metadata/md5-cache/sci-electronics/gazebo-11.13.0
index d925f17f09ca..cb61c9e8dbfb 100644
--- a/metadata/md5-cache/sci-electronics/gazebo-11.13.0
+++ b/metadata/md5-cache/sci-electronics/gazebo-11.13.0
@@ -1,4 +1,4 @@
-BDEPEND=app-text/ronn-ng app-arch/gzip virtual/pkgconfig app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-text/ronn-ng app-arch/gzip virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=dev-libs/protobuf-2:= virtual/opengl media-libs/openal net-misc/curl dev-libs/tinyxml >=dev-libs/tinyxml2-6:= dev-libs/libtar dev-cpp/tbb:= >=dev-games/ogre-1.7.4:=[freeimage] <dev-games/ogre-1.10 >=media-libs/freeimage-3.15.4[png] sci-libs/libccd >=media-video/ffmpeg-2.6:0= sci-libs/gts >=sci-physics/bullet-2.82:= >=dev-libs/sdformat-9.8:= dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-libs/boost:= sci-libs/gdal:= virtual/libusb:1 dev-libs/libspnav media-libs/freeimage sci-libs/hdf5:=[cxx] sys-apps/util-linux >=media-gfx/graphviz-4 net-libs/ignition-msgs:5= sci-libs/ignition-math:6= net-libs/ignition-transport:8= sci-libs/ignition-common:3= sci-libs/ignition-fuel-tools:4= x11-libs/qwt:6=[qt5(+)] dev-qt/qttest:5 x11-apps/mesa-progs test? ( dev-libs/libxslt )
 DESCRIPTION=A 3D multiple robot simulator with dynamics
@@ -12,5 +12,5 @@ RDEPEND=>=dev-libs/protobuf-2:= virtual/opengl media-libs/openal net-misc/curl d
 RESTRICT=!test? ( test )
 SLOT=0/11
 SRC_URI=https://osrf-distributions.s3.amazonaws.com/gazebo/releases/gazebo-11.13.0.tar.bz2
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c
 _md5_=0cd3261bae6f59d2655320c50b07492d
diff --git a/metadata/md5-cache/sci-electronics/gazebo-11.14.0 b/metadata/md5-cache/sci-electronics/gazebo-11.14.0
index e7983041f98f..141e61072082 100644
--- a/metadata/md5-cache/sci-electronics/gazebo-11.14.0
+++ b/metadata/md5-cache/sci-electronics/gazebo-11.14.0
@@ -1,4 +1,4 @@
-BDEPEND=app-text/ronn-ng app-arch/gzip virtual/pkgconfig app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-text/ronn-ng app-arch/gzip virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=dev-libs/protobuf-2:= virtual/opengl media-libs/openal net-misc/curl dev-libs/tinyxml >=dev-libs/tinyxml2-6:= dev-libs/libtar dev-cpp/tbb:= >=dev-games/ogre-1.7.4:=[freeimage] <dev-games/ogre-1.10 >=media-libs/freeimage-3.15.4[png] sci-libs/libccd >=media-video/ffmpeg-2.6:0= sci-libs/gts >=sci-physics/bullet-2.82:= >=dev-libs/sdformat-9.8:= dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-libs/boost:= sci-libs/gdal:= virtual/libusb:1 dev-libs/libspnav media-libs/freeimage sci-libs/hdf5:=[cxx] sys-apps/util-linux >=media-gfx/graphviz-4 net-libs/ignition-msgs:5= sci-libs/ignition-math:6= net-libs/ignition-transport:8= sci-libs/ignition-common:3= sci-libs/ignition-fuel-tools:4= x11-libs/qwt:6=[qt5(+)] dev-qt/qttest:5 x11-apps/mesa-progs test? ( dev-libs/libxslt )
 DESCRIPTION=A 3D multiple robot simulator with dynamics
@@ -12,5 +12,5 @@ RDEPEND=>=dev-libs/protobuf-2:= virtual/opengl media-libs/openal net-misc/curl d
 RESTRICT=!test? ( test )
 SLOT=0/11
 SRC_URI=https://osrf-distributions.s3.amazonaws.com/gazebo/releases/gazebo-11.14.0.tar.bz2
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c
 _md5_=35dfc606452868ea7e2e8895f1bc324f
diff --git a/metadata/md5-cache/sci-electronics/kicad-7.0.7 b/metadata/md5-cache/sci-electronics/kicad-7.0.7
index a10c942abde0..b97b5a507433 100644
--- a/metadata/md5-cache/sci-electronics/kicad-7.0.7
+++ b/metadata/md5-cache/sci-electronics/kicad-7.0.7
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-lang/swig-4.0 doc? ( app-text/doxygen ) app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=>=dev-lang/swig-4.0 doc? ( app-text/doxygen ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
 DEPEND=dev-db/unixODBC dev-libs/boost:=[context,nls] media-libs/freeglut media-libs/glew:0= >=media-libs/glm-0.9.9.1 media-libs/mesa[X(+)] net-misc/curl >=sci-libs/opencascade-7.3.0:0= >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 >sci-electronics/ngspice-27[shared] sys-libs/zlib >=x11-libs/wxGTK-3.2.2.1-r3:3.2-gtk3[X,opengl] python_single_target_python3_10? ( dev-libs/boost:=[context,nls,python,python_targets_python3_10(-)] ~dev-python/wxpython-4.2.0:*[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-libs/boost:=[context,nls,python,python_targets_python3_11(-)] ~dev-python/wxpython-4.2.0:*[python_targets_python3_11(-)] ) python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) nls? ( sys-devel/gettext )
 DESCRIPTION=Electronic Schematic and PCB design tools
@@ -12,5 +12,5 @@ RDEPEND=dev-db/unixODBC dev-libs/boost:=[context,nls] media-libs/freeglut media-
 REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 )
 SLOT=0
 SRC_URI=https://gitlab.com/kicad/code/kicad/-/archive/7.0.7/kicad-7.0.7.tar.bz2 -> kicad-7.0.7.tar.bz2
-_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	python-utils-r1	042f4cc53680245bf99a84669b94155a	python-single-r1	75118e916668a74c660a13b0ecb22562	wxwidgets	9a707a3f9f1ea7aa703b1e46552291e5
+_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	python-utils-r1	042f4cc53680245bf99a84669b94155a	python-single-r1	75118e916668a74c660a13b0ecb22562	wxwidgets	9a707a3f9f1ea7aa703b1e46552291e5
 _md5_=2856cb7d487d92f34cb324e39fa2e3a9
diff --git a/metadata/md5-cache/sci-electronics/kicad-7.0.8-r1 b/metadata/md5-cache/sci-electronics/kicad-7.0.8-r1
index 89e36a19afd2..6a24bc8b4705 100644
--- a/metadata/md5-cache/sci-electronics/kicad-7.0.8-r1
+++ b/metadata/md5-cache/sci-electronics/kicad-7.0.8-r1
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-lang/swig-4.0 doc? ( app-text/doxygen ) app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=>=dev-lang/swig-4.0 doc? ( app-text/doxygen ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
 DEPEND=dev-db/unixODBC dev-libs/boost:=[context,nls] media-libs/freeglut media-libs/glew:0= >=media-libs/glm-0.9.9.1 media-libs/mesa[X(+)] net-misc/curl >=sci-libs/opencascade-7.3.0:0= >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 >sci-electronics/ngspice-27[shared] sys-libs/zlib >=x11-libs/wxGTK-3.2.2.1-r3:3.2-gtk3[X,opengl] python_single_target_python3_10? ( dev-libs/boost:=[context,nls,python,python_targets_python3_10(-)] >=dev-python/wxpython-4.2.0:*[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-libs/boost:=[context,nls,python,python_targets_python3_11(-)] >=dev-python/wxpython-4.2.0:*[python_targets_python3_11(-)] ) python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) nls? ( sys-devel/gettext )
 DESCRIPTION=Electronic Schematic and PCB design tools
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_1
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://gitlab.com/kicad/code/kicad/-/archive/7.0.8/kicad-7.0.8.tar.bz2 -> kicad-7.0.8.tar.bz2
-_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	python-utils-r1	042f4cc53680245bf99a84669b94155a	python-single-r1	75118e916668a74c660a13b0ecb22562	wxwidgets	9a707a3f9f1ea7aa703b1e46552291e5
+_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	python-utils-r1	042f4cc53680245bf99a84669b94155a	python-single-r1	75118e916668a74c660a13b0ecb22562	wxwidgets	9a707a3f9f1ea7aa703b1e46552291e5
 _md5_=7ee1db6acdef6f1b4be709d693987e7d
diff --git a/metadata/md5-cache/sci-electronics/kicad-7.0.9 b/metadata/md5-cache/sci-electronics/kicad-7.0.9
index 1caf11123a26..53596f210924 100644
--- a/metadata/md5-cache/sci-electronics/kicad-7.0.9
+++ b/metadata/md5-cache/sci-electronics/kicad-7.0.9
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-lang/swig-4.0 doc? ( app-text/doxygen ) app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=>=dev-lang/swig-4.0 doc? ( app-text/doxygen ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
 DEPEND=dev-db/unixODBC dev-libs/boost:=[context,nls] media-libs/freeglut media-libs/glew:0= >=media-libs/glm-0.9.9.1 media-libs/mesa[X(+)] net-misc/curl >=sci-libs/opencascade-7.3.0:0= >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 >sci-electronics/ngspice-27[shared] sys-libs/zlib >=x11-libs/wxGTK-3.2.2.1-r3:3.2-gtk3[X,opengl] python_single_target_python3_10? ( dev-libs/boost:=[context,nls,python,python_targets_python3_10(-)] >=dev-python/wxpython-4.2.0:*[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-libs/boost:=[context,nls,python,python_targets_python3_11(-)] >=dev-python/wxpython-4.2.0:*[python_targets_python3_11(-)] ) python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) nls? ( sys-devel/gettext )
 DESCRIPTION=Electronic Schematic and PCB design tools
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_1
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://gitlab.com/kicad/code/kicad/-/archive/7.0.9/kicad-7.0.9.tar.bz2 -> kicad-7.0.9.tar.bz2
-_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	python-utils-r1	042f4cc53680245bf99a84669b94155a	python-single-r1	75118e916668a74c660a13b0ecb22562	wxwidgets	9a707a3f9f1ea7aa703b1e46552291e5
+_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	python-utils-r1	042f4cc53680245bf99a84669b94155a	python-single-r1	75118e916668a74c660a13b0ecb22562	wxwidgets	9a707a3f9f1ea7aa703b1e46552291e5
 _md5_=7ee1db6acdef6f1b4be709d693987e7d
diff --git a/metadata/md5-cache/sci-electronics/kicad-9999 b/metadata/md5-cache/sci-electronics/kicad-9999
index 80705ffbd867..67223ccdbbd4 100644
--- a/metadata/md5-cache/sci-electronics/kicad-9999
+++ b/metadata/md5-cache/sci-electronics/kicad-9999
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-lang/swig-4.0 doc? ( app-text/doxygen ) >=x11-misc/util-macros-1.18 app-alternatives/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=>=dev-lang/swig-4.0 doc? ( app-text/doxygen ) >=x11-misc/util-macros-1.18 app-alternatives/ninja >=dev-build/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
 DEPEND=dev-db/unixODBC dev-libs/boost:=[context,nls] dev-libs/libgit2 media-libs/freeglut media-libs/glew:0= >=media-libs/glm-0.9.9.1 media-libs/mesa[X(+)] net-misc/curl >=sci-libs/opencascade-7.3.0:0= >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 >sci-electronics/ngspice-27[shared] sys-libs/zlib >=x11-libs/wxGTK-3.2.2.1-r3:3.2-gtk3[X,opengl] python_single_target_python3_10? ( dev-libs/boost:=[context,nls,python,python_targets_python3_10(-)] >=dev-python/wxpython-4.2.0:*[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-libs/boost:=[context,nls,python,python_targets_python3_11(-)] >=dev-python/wxpython-4.2.0:*[python_targets_python3_11(-)] ) python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) nls? ( sys-devel/gettext )
 DESCRIPTION=Electronic Schematic and PCB design tools
@@ -12,5 +12,5 @@ RDEPEND=dev-db/unixODBC dev-libs/boost:=[context,nls] dev-libs/libgit2 media-lib
 REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	python-utils-r1	042f4cc53680245bf99a84669b94155a	python-single-r1	75118e916668a74c660a13b0ecb22562	wxwidgets	9a707a3f9f1ea7aa703b1e46552291e5	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
+_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	python-utils-r1	042f4cc53680245bf99a84669b94155a	python-single-r1	75118e916668a74c660a13b0ecb22562	wxwidgets	9a707a3f9f1ea7aa703b1e46552291e5	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
 _md5_=e324da6399b529229364922e3db72015
diff --git a/metadata/md5-cache/sci-electronics/kicad-footprints-7.0.7 b/metadata/md5-cache/sci-electronics/kicad-footprints-7.0.7
index 90208554f085..7851b210898b 100644
--- a/metadata/md5-cache/sci-electronics/kicad-footprints-7.0.7
+++ b/metadata/md5-cache/sci-electronics/kicad-footprints-7.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
 DESCRIPTION=Electronic Schematic and PCB design tools footprint libraries
 EAPI=8
@@ -9,5 +9,5 @@ LICENSE=CC-BY-SA-4.0
 RDEPEND=>=sci-electronics/kicad-7.0.0
 SLOT=0
 SRC_URI=https://gitlab.com/kicad/libraries/kicad-footprints/-/archive/7.0.7/kicad-footprints-7.0.7.tar.bz2
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c
 _md5_=b85aecdd0a0bdf6c915acd5fb0c4b167
diff --git a/metadata/md5-cache/sci-electronics/kicad-footprints-7.0.8 b/metadata/md5-cache/sci-electronics/kicad-footprints-7.0.8
index 11dba8676d32..addededbbee0 100644
--- a/metadata/md5-cache/sci-electronics/kicad-footprints-7.0.8
+++ b/metadata/md5-cache/sci-electronics/kicad-footprints-7.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
 DESCRIPTION=Electronic Schematic and PCB design tools footprint libraries
 EAPI=8
@@ -9,5 +9,5 @@ LICENSE=CC-BY-SA-4.0
 RDEPEND=>=sci-electronics/kicad-7.0.0
 SLOT=0
 SRC_URI=https://gitlab.com/kicad/libraries/kicad-footprints/-/archive/7.0.8/kicad-footprints-7.0.8.tar.bz2
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c
 _md5_=152785b97e9e6d7aec8becf6fe9025d4
diff --git a/metadata/md5-cache/sci-electronics/kicad-footprints-7.0.9 b/metadata/md5-cache/sci-electronics/kicad-footprints-7.0.9
index 19bd96f9dc5a..8281648f379a 100644
--- a/metadata/md5-cache/sci-electronics/kicad-footprints-7.0.9
+++ b/metadata/md5-cache/sci-electronics/kicad-footprints-7.0.9
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Electronic Schematic and PCB design tools footprint libraries
 EAPI=8
@@ -9,5 +9,5 @@ LICENSE=CC-BY-SA-4.0
 RDEPEND=>=sci-electronics/kicad-7.0.0
 SLOT=0
 SRC_URI=https://gitlab.com/kicad/libraries/kicad-footprints/-/archive/7.0.9/kicad-footprints-7.0.9.tar.bz2
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c
 _md5_=152785b97e9e6d7aec8becf6fe9025d4
diff --git a/metadata/md5-cache/sci-electronics/kicad-footprints-9999 b/metadata/md5-cache/sci-electronics/kicad-footprints-9999
index f2dc52769465..0dbd4f77afec 100644
--- a/metadata/md5-cache/sci-electronics/kicad-footprints-9999
+++ b/metadata/md5-cache/sci-electronics/kicad-footprints-9999
@@ -1,4 +1,4 @@
-BDEPEND=>=x11-misc/util-macros-1.18 app-alternatives/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=>=x11-misc/util-macros-1.18 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=Electronic Schematic and PCB design tools footprint libraries
 EAPI=8
@@ -8,5 +8,5 @@ LICENSE=CC-BY-SA-4.0
 PROPERTIES=live
 RDEPEND=>=sci-electronics/kicad-6.0.0
 SLOT=0
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
 _md5_=e9cb569771c26ad43395336f29496052
diff --git a/metadata/md5-cache/sci-electronics/kicad-packages3d-7.0.7 b/metadata/md5-cache/sci-electronics/kicad-packages3d-7.0.7
index bd581b7b478c..b7b624a0a396 100644
--- a/metadata/md5-cache/sci-electronics/kicad-packages3d-7.0.7
+++ b/metadata/md5-cache/sci-electronics/kicad-packages3d-7.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 pretend setup test
 DESCRIPTION=Electronic Schematic and PCB design tools 3D package libraries
 EAPI=8
@@ -9,5 +9,5 @@ LICENSE=CC-BY-SA-4.0
 RDEPEND=>=sci-electronics/kicad-7.0.0
 SLOT=0
 SRC_URI=https://gitlab.com/kicad/libraries/kicad-packages3D/-/archive/7.0.7/kicad-packages3D-7.0.7.tar.bz2 -> kicad-packages3d-7.0.7.tar.bz2
-_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0
+_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c
 _md5_=58e3beecbe226c160ffd728c4b19941e
diff --git a/metadata/md5-cache/sci-electronics/kicad-packages3d-7.0.8 b/metadata/md5-cache/sci-electronics/kicad-packages3d-7.0.8
index 0eff27bfc60a..d35e09c94d89 100644
--- a/metadata/md5-cache/sci-electronics/kicad-packages3d-7.0.8
+++ b/metadata/md5-cache/sci-electronics/kicad-packages3d-7.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 pretend setup test
 DESCRIPTION=Electronic Schematic and PCB design tools 3D package libraries
 EAPI=8
@@ -9,5 +9,5 @@ LICENSE=CC-BY-SA-4.0
 RDEPEND=>=sci-electronics/kicad-7.0.0
 SLOT=0
 SRC_URI=https://gitlab.com/kicad/libraries/kicad-packages3D/-/archive/7.0.8/kicad-packages3D-7.0.8.tar.bz2 -> kicad-packages3d-7.0.8.tar.bz2
-_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0
+_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c
 _md5_=ae356807f63c6e8e3081ae52d7bbc29d
diff --git a/metadata/md5-cache/sci-electronics/kicad-packages3d-7.0.9 b/metadata/md5-cache/sci-electronics/kicad-packages3d-7.0.9
index 3f0dd870311b..2bf9771d8e9d 100644
--- a/metadata/md5-cache/sci-electronics/kicad-packages3d-7.0.9
+++ b/metadata/md5-cache/sci-electronics/kicad-packages3d-7.0.9
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare pretend setup test
 DESCRIPTION=Electronic Schematic and PCB design tools 3D package libraries
 EAPI=8
@@ -9,5 +9,5 @@ LICENSE=CC-BY-SA-4.0
 RDEPEND=>=sci-electronics/kicad-7.0.0
 SLOT=0
 SRC_URI=https://gitlab.com/kicad/libraries/kicad-packages3D/-/archive/7.0.9/kicad-packages3D-7.0.9.tar.bz2 -> kicad-packages3d-7.0.9.tar.bz2
-_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0
+_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c
 _md5_=ae356807f63c6e8e3081ae52d7bbc29d
diff --git a/metadata/md5-cache/sci-electronics/kicad-packages3d-9999 b/metadata/md5-cache/sci-electronics/kicad-packages3d-9999
index 7a40b3dde1c2..8d8d04fd1864 100644
--- a/metadata/md5-cache/sci-electronics/kicad-packages3d-9999
+++ b/metadata/md5-cache/sci-electronics/kicad-packages3d-9999
@@ -1,4 +1,4 @@
-BDEPEND=>=x11-misc/util-macros-1.18 app-alternatives/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=>=x11-misc/util-macros-1.18 app-alternatives/ninja >=dev-build/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare pretend setup test unpack
 DESCRIPTION=Electronic Schematic and PCB design tools 3D package libraries
 EAPI=8
@@ -8,5 +8,5 @@ LICENSE=CC-BY-SA-4.0
 PROPERTIES=live
 RDEPEND=>=sci-electronics/kicad-7.0.0
 SLOT=0
-_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
+_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
 _md5_=ae356807f63c6e8e3081ae52d7bbc29d
diff --git a/metadata/md5-cache/sci-electronics/kicad-symbols-7.0.7 b/metadata/md5-cache/sci-electronics/kicad-symbols-7.0.7
index b67e439f2fd0..d019bffbfd28 100644
--- a/metadata/md5-cache/sci-electronics/kicad-symbols-7.0.7
+++ b/metadata/md5-cache/sci-electronics/kicad-symbols-7.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
 DESCRIPTION=Electronic Schematic and PCB design tools symbol libraries
 EAPI=8
@@ -9,5 +9,5 @@ LICENSE=CC-BY-SA-4.0
 RDEPEND=>=sci-electronics/kicad-7.0.0
 SLOT=0
 SRC_URI=https://gitlab.com/kicad/libraries/kicad-symbols/-/archive/7.0.7/kicad-symbols-7.0.7.tar.bz2
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c
 _md5_=66f72651c12b465e5e0ce66cfe57e9d6
diff --git a/metadata/md5-cache/sci-electronics/kicad-symbols-7.0.8 b/metadata/md5-cache/sci-electronics/kicad-symbols-7.0.8
index 4fbc1a18a2f6..1e9738528187 100644
--- a/metadata/md5-cache/sci-electronics/kicad-symbols-7.0.8
+++ b/metadata/md5-cache/sci-electronics/kicad-symbols-7.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
 DESCRIPTION=Electronic Schematic and PCB design tools symbol libraries
 EAPI=8
@@ -9,5 +9,5 @@ LICENSE=CC-BY-SA-4.0
 RDEPEND=>=sci-electronics/kicad-7.0.0
 SLOT=0
 SRC_URI=https://gitlab.com/kicad/libraries/kicad-symbols/-/archive/7.0.8/kicad-symbols-7.0.8.tar.bz2
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c
 _md5_=bab79a631f2c0b7594d88f8cb58ddada
diff --git a/metadata/md5-cache/sci-electronics/kicad-symbols-7.0.9 b/metadata/md5-cache/sci-electronics/kicad-symbols-7.0.9
index b4846c5548ff..7938db25b436 100644
--- a/metadata/md5-cache/sci-electronics/kicad-symbols-7.0.9
+++ b/metadata/md5-cache/sci-electronics/kicad-symbols-7.0.9
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Electronic Schematic and PCB design tools symbol libraries
 EAPI=8
@@ -9,5 +9,5 @@ LICENSE=CC-BY-SA-4.0
 RDEPEND=>=sci-electronics/kicad-7.0.0
 SLOT=0
 SRC_URI=https://gitlab.com/kicad/libraries/kicad-symbols/-/archive/7.0.9/kicad-symbols-7.0.9.tar.bz2
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c
 _md5_=bab79a631f2c0b7594d88f8cb58ddada
diff --git a/metadata/md5-cache/sci-electronics/kicad-symbols-9999 b/metadata/md5-cache/sci-electronics/kicad-symbols-9999
index 0ffbf6c4c04a..96f3bc45e80c 100644
--- a/metadata/md5-cache/sci-electronics/kicad-symbols-9999
+++ b/metadata/md5-cache/sci-electronics/kicad-symbols-9999
@@ -1,4 +1,4 @@
-BDEPEND=>=x11-misc/util-macros-1.18 app-alternatives/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=>=x11-misc/util-macros-1.18 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=Electronic Schematic and PCB design tools symbol libraries
 EAPI=8
@@ -8,5 +8,5 @@ LICENSE=CC-BY-SA-4.0
 PROPERTIES=live
 RDEPEND=>=sci-electronics/kicad-6.0.0
 SLOT=0
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
 _md5_=abe5e8d23217f9d10882918673a032fe
diff --git a/metadata/md5-cache/sci-electronics/kicad-templates-7.0.7 b/metadata/md5-cache/sci-electronics/kicad-templates-7.0.7
index 76626d5bf101..ee1cd3f73898 100644
--- a/metadata/md5-cache/sci-electronics/kicad-templates-7.0.7
+++ b/metadata/md5-cache/sci-electronics/kicad-templates-7.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
 DESCRIPTION=Electronic Schematic and PCB design tools project templates
 EAPI=8
@@ -9,5 +9,5 @@ LICENSE=CC-BY-SA-4.0
 RDEPEND=>=sci-electronics/kicad-7.0.0
 SLOT=0
 SRC_URI=https://gitlab.com/kicad/libraries/kicad-templates/-/archive/7.0.7/kicad-templates-7.0.7.tar.bz2
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c
 _md5_=37946eb8fcb433bcc1b7cca90ee83e52
diff --git a/metadata/md5-cache/sci-electronics/kicad-templates-7.0.8 b/metadata/md5-cache/sci-electronics/kicad-templates-7.0.8
index 98783bb438b3..15fed17c2c91 100644
--- a/metadata/md5-cache/sci-electronics/kicad-templates-7.0.8
+++ b/metadata/md5-cache/sci-electronics/kicad-templates-7.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
 DESCRIPTION=Electronic Schematic and PCB design tools project templates
 EAPI=8
@@ -9,5 +9,5 @@ LICENSE=CC-BY-SA-4.0
 RDEPEND=>=sci-electronics/kicad-7.0.0
 SLOT=0
 SRC_URI=https://gitlab.com/kicad/libraries/kicad-templates/-/archive/7.0.8/kicad-templates-7.0.8.tar.bz2
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c
 _md5_=1bed559adb1a0c2f3379bf573fffabcd
diff --git a/metadata/md5-cache/sci-electronics/kicad-templates-7.0.9 b/metadata/md5-cache/sci-electronics/kicad-templates-7.0.9
index 9ad2406904ef..81f341b17dec 100644
--- a/metadata/md5-cache/sci-electronics/kicad-templates-7.0.9
+++ b/metadata/md5-cache/sci-electronics/kicad-templates-7.0.9
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Electronic Schematic and PCB design tools project templates
 EAPI=8
@@ -9,5 +9,5 @@ LICENSE=CC-BY-SA-4.0
 RDEPEND=>=sci-electronics/kicad-7.0.0
 SLOT=0
 SRC_URI=https://gitlab.com/kicad/libraries/kicad-templates/-/archive/7.0.9/kicad-templates-7.0.9.tar.bz2
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c
 _md5_=1bed559adb1a0c2f3379bf573fffabcd
diff --git a/metadata/md5-cache/sci-electronics/kicad-templates-9999 b/metadata/md5-cache/sci-electronics/kicad-templates-9999
index aa55e20ae580..7c7f180dbcb5 100644
--- a/metadata/md5-cache/sci-electronics/kicad-templates-9999
+++ b/metadata/md5-cache/sci-electronics/kicad-templates-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=Electronic Schematic and PCB design tools project templates
 EAPI=8
@@ -8,5 +8,5 @@ LICENSE=CC-BY-SA-4.0
 PROPERTIES=live
 RDEPEND=>=sci-electronics/kicad-6.0.0
 SLOT=0
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
 _md5_=7c32b150e1c96c622cdd9173fd5ca89f
diff --git a/metadata/md5-cache/sci-electronics/ktechlab-0.51.0 b/metadata/md5-cache/sci-electronics/ktechlab-0.51.0
index ee7f2022e4c4..d64c43b57e4c 100644
--- a/metadata/md5-cache/sci-electronics/ktechlab-0.51.0
+++ b/metadata/md5-cache/sci-electronics/ktechlab-0.51.0
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5 handbook? ( >=kde-frameworks/kdoctools-5.82.0:5 ) dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.82.0:*
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5 handbook? ( >=kde-frameworks/kdoctools-5.82.0:5 ) dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.82.0:*
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
 DEPEND=>=dev-qt/qtdbus-5.15.5:5 >=dev-qt/qtgui-5.15.5:5 >=dev-qt/qtprintsupport-5.15.5:5 >=dev-qt/qtserialport-5.15.5:5 >=dev-qt/qtwidgets-5.15.5:5 >=dev-qt/qtxml-5.15.5:5 >=kde-frameworks/kcompletion-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kiconthemes-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/kjobwidgets-5.82.0:5 >=kde-frameworks/kparts-5.82.0:5 >=kde-frameworks/ktexteditor-5.82.0:5 >=kde-frameworks/ktextwidgets-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kwindowsystem-5.82.0:5 >=kde-frameworks/kxmlgui-5.82.0:5 gpsim? ( dev-embedded/gpsim ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
 DESCRIPTION=IDE for microcontrollers and electronics
@@ -13,5 +13,5 @@ RDEPEND=>=dev-qt/qtdbus-5.15.5:5 >=dev-qt/qtgui-5.15.5:5 >=dev-qt/qtprintsupport
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/unstable/ktechlab/ktechlab-0.51.0.tar.xz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	ecm	a9d1de06ef0d5d4de7114a10dcb64daa	kde.org	60fcb935e4206806bf9f38e3537521a2
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	ecm	a9d1de06ef0d5d4de7114a10dcb64daa	kde.org	60fcb935e4206806bf9f38e3537521a2
 _md5_=0575e5170fbdfdab9657a0f64e9a3f42
diff --git a/metadata/md5-cache/sci-electronics/librepcb-0.1.7 b/metadata/md5-cache/sci-electronics/librepcb-0.1.7
index bd2dd586738a..a54c64459cbc 100644
--- a/metadata/md5-cache/sci-electronics/librepcb-0.1.7
+++ b/metadata/md5-cache/sci-electronics/librepcb-0.1.7
@@ -1,4 +1,4 @@
-BDEPEND=app-arch/unzip dev-qt/linguist-tools:5 app-alternatives/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+BDEPEND=app-arch/unzip dev-qt/linguist-tools:5 app-alternatives/ninja >=dev-build/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
 DEPEND=dev-cpp/muParser:= dev-libs/quazip:=[qt5(+)] dev-qt/qtcore:5 dev-qt/qtconcurrent:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-libs/zlib dev-qt/qttest:5
 DESCRIPTION=Free EDA software to develop printed circuit boards
@@ -13,5 +13,5 @@ RDEPEND=dev-cpp/muParser:= dev-libs/quazip:=[qt5(+)] dev-qt/qtcore:5 dev-qt/qtco
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://download.librepcb.org/releases/0.1.7/librepcb-0.1.7-source.zip
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e
 _md5_=64c54bcec6418cadead245f94bab1c5d
diff --git a/metadata/md5-cache/sci-electronics/librepcb-1.0.0-r2 b/metadata/md5-cache/sci-electronics/librepcb-1.0.0-r2
index 8277e49adb6a..e89b0fe46563 100644
--- a/metadata/md5-cache/sci-electronics/librepcb-1.0.0-r2
+++ b/metadata/md5-cache/sci-electronics/librepcb-1.0.0-r2
@@ -1,4 +1,4 @@
-BDEPEND=app-arch/unzip dev-qt/linguist-tools:5 app-alternatives/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+BDEPEND=app-arch/unzip dev-qt/linguist-tools:5 app-alternatives/ninja >=dev-build/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
 DEPEND=dev-cpp/muParser:= dev-libs/quazip:=[qt5(+)] dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtquickcontrols2:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 opencascade? ( sci-libs/opencascade:= ) sys-libs/zlib virtual/opengl dev-qt/qttest:5
 DESCRIPTION=Free EDA software to develop printed circuit boards
@@ -13,5 +13,5 @@ RDEPEND=dev-cpp/muParser:= dev-libs/quazip:=[qt5(+)] dev-qt/qtconcurrent:5 dev-q
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://download.librepcb.org/releases/1.0.0/librepcb-1.0.0-source.zip
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e
 _md5_=81b3ecf884021647acb02bd69e29586f
diff --git a/metadata/md5-cache/sci-electronics/osqoop-1.2.0_pre20170131 b/metadata/md5-cache/sci-electronics/osqoop-1.2.0_pre20170131
index b9dd26228ebb..6b740f499a3e 100644
--- a/metadata/md5-cache/sci-electronics/osqoop-1.2.0_pre20170131
+++ b/metadata/md5-cache/sci-electronics/osqoop-1.2.0_pre20170131
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 sci-libs/fftw:3.0 virtual/libusb:0 x11-libs/libXtst
 DESCRIPTION=Multi-platform open source software oscilloscope based on Qt
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 sci-libs/fftw:3.0 virtual/libusb:0 x11-libs/libXtst
 SLOT=0
 SRC_URI=https://github.com/sandsmark/osqoop/archive/b5bd459dd5c2a180a9a3e5a706ed5039159d7286.tar.gz -> osqoop-1.2.0_pre20170131.tar.gz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c
 _md5_=c756ba429b28b15dc263a2db8f81ee9b
diff --git a/metadata/md5-cache/sci-electronics/pulseview-0.4.2-r1 b/metadata/md5-cache/sci-electronics/pulseview-0.4.2-r1
index 55f2f1466a69..76ae4ac55b90 100644
--- a/metadata/md5-cache/sci-electronics/pulseview-0.4.2-r1
+++ b/metadata/md5-cache/sci-electronics/pulseview-0.4.2-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 prepare test
 DEPEND=>=dev-cpp/glibmm-2.28.0:2 dev-libs/boost:= >=dev-libs/glib-2.28.0:2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 >=sci-libs/libsigrok-0.5.1:=[cxx] decode? ( >=sci-libs/libsigrokdecode-0.5.2:= )
 DESCRIPTION=Qt based logic analyzer GUI for sigrok
@@ -11,5 +11,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-cpp/glibmm-2.28.0:2 dev-libs/boost:= >=dev-libs/glib-2.28.0:2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 >=sci-libs/libsigrok-0.5.1:=[cxx] decode? ( >=sci-libs/libsigrokdecode-0.5.2:= )
 SLOT=0
 SRC_URI=https://sigrok.org/download/source/pulseview/pulseview-0.4.2.tar.gz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c
 _md5_=0d2c7fb282febef5225496d2542a15b3
diff --git a/metadata/md5-cache/sci-electronics/pulseview-9999 b/metadata/md5-cache/sci-electronics/pulseview-9999
index 03cf7bf167b4..b99258562d1f 100644
--- a/metadata/md5-cache/sci-electronics/pulseview-9999
+++ b/metadata/md5-cache/sci-electronics/pulseview-9999
@@ -1,4 +1,4 @@
-BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig app-alternatives/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
 DEPEND=>=dev-cpp/glibmm-2.28.0:2 dev-libs/boost:= >=dev-libs/glib-2.28.0:2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 >=sci-libs/libsigrok-0.6.0:=[cxx] decode? ( >=sci-libs/libsigrokdecode-0.6.0:= )
 DESCRIPTION=Qt based logic analyzer GUI for sigrok
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 PROPERTIES=live
 RDEPEND=>=dev-cpp/glibmm-2.28.0:2 dev-libs/boost:= >=dev-libs/glib-2.28.0:2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 >=sci-libs/libsigrok-0.6.0:=[cxx] decode? ( >=sci-libs/libsigrokdecode-0.6.0:= )
 SLOT=0
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
 _md5_=3470d8ea5833b73cc1d415a24f1692d3