[gentoo-commits] repo/gentoo:master commit in: profiles/arch/s390/, profiles/targets/desktop/, dev-lang/rust/, dev-libs/efl/, ...

[Michał Górny]

commit:     2f9c42cb12b476a78214e2f7d5bb3f984ce05de6
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 13 20:20:19 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Jan 14 19:23:32 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f9c42cb

Move {dev-util → dev-build}/cmake

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/34792
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 app-emacs/cmake-font-lock/cmake-font-lock-0.1.13-r1.ebuild          | 2 +-
 app-emacs/cmake-mode/cmake-mode-3.28.1.ebuild                       | 2 +-
 app-i18n/ibus-rime/ibus-rime-1.5.0.ebuild                           | 4 ++--
 app-i18n/uim/uim-1.8.9-r1.ebuild                                    | 4 ++--
 app-office/gnucash/gnucash-4.13.ebuild                              | 6 +++---
 app-office/gnucash/gnucash-5.1.ebuild                               | 6 +++---
 app-office/gnucash/gnucash-5.3.ebuild                               | 6 +++---
 app-office/gnucash/gnucash-5.4-r1.ebuild                            | 6 +++---
 app-shells/starship/starship-1.15.0.ebuild                          | 4 ++--
 app-shells/starship/starship-1.16.0.ebuild                          | 4 ++--
 {dev-util => dev-build}/cmake/Manifest                              | 0
 {dev-util => dev-build}/cmake/cmake-3.26.5-r2.ebuild                | 2 +-
 {dev-util => dev-build}/cmake/cmake-3.27.7.ebuild                   | 2 +-
 {dev-util => dev-build}/cmake/cmake-3.27.9.ebuild                   | 0
 {dev-util => dev-build}/cmake/cmake-3.28.1-r1.ebuild                | 0
 {dev-util => dev-build}/cmake/cmake-3.28.1.ebuild                   | 2 +-
 {dev-util => dev-build}/cmake/cmake-9999.ebuild                     | 0
 {dev-util => dev-build}/cmake/files/50cmake-gentoo.el               | 0
 .../cmake/files/cmake-2.8.10.2-FindPythonLibs.patch                 | 0
 .../cmake/files/cmake-3.14.0_rc3-prefix-dirs.patch                  | 0
 .../cmake/files/cmake-3.16.0_rc4-darwin-bundle.patch                | 0
 {dev-util => dev-build}/cmake/files/cmake-3.17.0_rc1-FindBLAS.patch | 0
 .../cmake/files/cmake-3.18.0-filter_distcc_warning.patch            | 0
 {dev-util => dev-build}/cmake/files/cmake-3.19.1-darwin-gcc.patch   | 0
 ...-0001-Don-t-use-.so-for-modules-on-darwin-macos.-Use-.bund.patch | 0
 ...c1-0002-Set-some-proper-paths-to-make-cmake-find-our-tools.patch | 0
 .../files/cmake-3.27.0_rc1-0003-Prefer-pkgconfig-in-FindBLAS.patch  | 0
 ...-0004-Ensure-that-the-correct-version-of-Qt-is-always-used.patch | 0
 .../cmake-3.27.0_rc1-0005-Respect-Gentoo-s-Python-eclasses.patch    | 0
 ...1-0006-Filter-out-distcc-warnings-to-avoid-confusing-CMake.patch | 0
 ...-0001-FindPkgConfig-ignore-whitespace-separators-in-versio.patch | 0
 {dev-util => dev-build}/cmake/files/cmake-3.28.0-c99.patch          | 0
 {dev-util => dev-build}/cmake/files/cmake-3.5.2-FindQt4.patch       | 0
 .../cmake/files/cmake-3.9.0_rc2-FindPythonInterp.patch              | 0
 {dev-util => dev-build}/cmake/files/cmake.vim                       | 0
 {dev-util => dev-build}/cmake/metadata.xml                          | 0
 dev-db/cockroach/cockroach-19.1.1-r1.ebuild                         | 4 ++--
 dev-db/cockroach/cockroach-2.1.5-r1.ebuild                          | 4 ++--
 dev-dotnet/dotnet-sdk/dotnet-sdk-8.0.100-r1.ebuild                  | 4 ++--
 dev-lang/julia/julia-1.8.3-r4.ebuild                                | 4 ++--
 dev-lang/julia/julia-1.8.5-r1.ebuild                                | 6 +++---
 dev-lang/julia/julia-1.9.0.ebuild                                   | 6 +++---
 dev-lang/julia/julia-1.9.4.ebuild                                   | 6 +++---
 dev-lang/mono/mono-6.12.0.122.ebuild                                | 2 +-
 dev-lang/mono/mono-6.12.0.182.ebuild                                | 2 +-
 dev-lang/mono/mono-6.12.0.199-r1.ebuild                             | 2 +-
 dev-lang/mono/mono-6.12.0.199-r2.ebuild                             | 2 +-
 dev-lang/mono/mono-6.12.0.199.ebuild                                | 2 +-
 dev-lang/rust/rust-1.65.0.ebuild                                    | 2 +-
 dev-lang/rust/rust-1.66.1.ebuild                                    | 2 +-
 dev-lang/rust/rust-1.67.1-r1.ebuild                                 | 2 +-
 dev-lang/rust/rust-1.68.2.ebuild                                    | 2 +-
 dev-lang/rust/rust-1.69.0-r1.ebuild                                 | 2 +-
 dev-lang/rust/rust-1.70.0.ebuild                                    | 2 +-
 dev-lang/rust/rust-1.71.0.ebuild                                    | 2 +-
 dev-lang/rust/rust-1.71.1.ebuild                                    | 2 +-
 dev-lang/rust/rust-1.72.0-r1.ebuild                                 | 2 +-
 dev-lang/rust/rust-1.73.0.ebuild                                    | 2 +-
 dev-lang/rust/rust-1.74.1.ebuild                                    | 2 +-
 dev-libs/aws-c-common/aws-c-common-0.4.62.ebuild                    | 6 +++---
 dev-libs/aws-c-event-stream/aws-c-event-stream-0.2.5-r1.ebuild      | 6 +++---
 dev-libs/aws-c-io/aws-c-io-0.7.0-r1.ebuild                          | 6 +++---
 dev-libs/aws-checksums/aws-checksums-0.1.10.ebuild                  | 6 +++---
 dev-libs/criterion/criterion-2.4.0.ebuild                           | 6 +++---
 dev-libs/criterion/criterion-2.4.1.ebuild                           | 6 +++---
 dev-libs/efl/efl-1.27.0.ebuild                                      | 2 +-
 dev-libs/rccl/rccl-5.1.3.ebuild                                     | 2 +-
 dev-python/pivy/pivy-0.6.8.ebuild                                   | 4 ++--
 dev-python/qiskit-aer/qiskit-aer-0.12.2.ebuild                      | 4 ++--
 dev-python/qiskit-aer/qiskit-aer-0.13.1.ebuild                      | 4 ++--
 dev-python/symengine/symengine-0.11.0.ebuild                        | 4 ++--
 dev-qt/qt-creator/qt-creator-12.0.1.ebuild                          | 2 +-
 dev-qt/qt-creator/qt-creator-9999.ebuild                            | 2 +-
 dev-ruby/mini_portile2/mini_portile2-2.8.4.ebuild                   | 4 ++--
 dev-ruby/mini_portile2/mini_portile2-2.8.5.ebuild                   | 4 ++--
 dev-util/clion/clion-2022.3.2.ebuild                                | 2 +-
 dev-util/clion/clion-2023.1.4.ebuild                                | 2 +-
 dev-util/gnome-builder/gnome-builder-44.2-r1.ebuild                 | 4 ++--
 dev-util/wasmer/wasmer-0.11.0.ebuild                                | 4 ++--
 eclass/cmake.eclass                                                 | 4 ++--
 gui-apps/nm-tray/nm-tray-0.5.0-r1.ebuild                            | 4 ++--
 gui-wm/hyprland/hyprland-0.32.3.ebuild                              | 4 ++--
 gui-wm/hyprland/hyprland-0.33.1.ebuild                              | 4 ++--
 gui-wm/hyprland/hyprland-0.34.0.ebuild                              | 4 ++--
 gui-wm/hyprland/hyprland-9999.ebuild                                | 4 ++--
 media-libs/libjpeg-turbo/libjpeg-turbo-2.1.3.ebuild                 | 4 ++--
 media-sound/gogglesmm/gogglesmm-1.2.1-r2.ebuild                     | 4 ++--
 media-tv/kodi/kodi-19.5-r1.ebuild                                   | 4 ++--
 media-tv/kodi/kodi-19.9999.ebuild                                   | 4 ++--
 media-tv/kodi/kodi-9999.ebuild                                      | 4 ++--
 media-video/handbrake/handbrake-1.5.1-r1.ebuild                     | 6 +++---
 media-video/handbrake/handbrake-1.6.1.ebuild                        | 4 ++--
 media-video/handbrake/handbrake-9999.ebuild                         | 4 ++--
 media-video/vidify-audiosync/vidify-audiosync-0.3.0-r2.ebuild       | 4 ++--
 net-dns/resolv_wrapper/resolv_wrapper-1.1.8.ebuild                  | 4 ++--
 net-im/telegram-desktop/telegram-desktop-4.12.2.ebuild              | 4 ++--
 net-im/telegram-desktop/telegram-desktop-4.13.1.ebuild              | 2 +-
 net-libs/quiche/quiche-0.20.0.ebuild                                | 4 ++--
 net-libs/quiche/quiche-9999.ebuild                                  | 4 ++--
 net-p2p/retroshare/retroshare-0.6.6-r1.ebuild                       | 2 +-
 profiles/arch/alpha/package.use.mask                                | 2 +-
 profiles/arch/amd64/package.use.mask                                | 2 +-
 profiles/arch/base/package.use.mask                                 | 2 +-
 profiles/arch/hppa/package.use.mask                                 | 2 +-
 profiles/arch/hppa/package.use.stable.mask                          | 2 +-
 profiles/arch/ia64/package.use.mask                                 | 2 +-
 profiles/arch/powerpc/ppc32/package.use.mask                        | 2 +-
 profiles/arch/powerpc/ppc64/package.use.mask                        | 4 ++--
 profiles/arch/s390/package.use.mask                                 | 2 +-
 profiles/arch/sparc/package.use.mask                                | 2 +-
 profiles/features/prefix/standalone/kernel-2.6.16+/profile.bashrc   | 4 ++--
 profiles/features/prefix/standalone/profile.bashrc                  | 2 +-
 profiles/info_pkgs                                                  | 2 +-
 profiles/targets/desktop/package.use                                | 2 +-
 profiles/updates/1Q-2024                                            | 1 +
 sci-astronomy/siril/siril-1.2.0.ebuild                              | 4 ++--
 sci-astronomy/siril/siril-9999.ebuild                               | 4 ++--
 sci-libs/hipSPARSE/hipSPARSE-5.1.3-r1.ebuild                        | 2 +-
 sci-libs/hipSPARSE/hipSPARSE-5.7.1.ebuild                           | 2 +-
 sci-libs/rocFFT/rocFFT-5.1.3-r1.ebuild                              | 2 +-
 sci-libs/rocFFT/rocFFT-5.7.1-r1.ebuild                              | 2 +-
 sci-libs/rocPRIM/rocPRIM-5.1.3.ebuild                               | 2 +-
 sci-libs/rocPRIM/rocPRIM-5.7.1.ebuild                               | 2 +-
 sci-libs/rocRAND/rocRAND-5.1.3.ebuild                               | 2 +-
 sci-libs/rocRAND/rocRAND-5.6.0-r1.ebuild                            | 2 +-
 sci-libs/rocRAND/rocRAND-5.7.1.ebuild                               | 2 +-
 sci-libs/rocSOLVER/rocSOLVER-5.1.3-r1.ebuild                        | 4 ++--
 sci-libs/rocSOLVER/rocSOLVER-5.4.2.ebuild                           | 4 ++--
 sci-libs/rocSOLVER/rocSOLVER-5.7.1.ebuild                           | 4 ++--
 sci-libs/rocSPARSE/rocSPARSE-5.1.3-r1.ebuild                        | 6 +++---
 sci-libs/rocSPARSE/rocSPARSE-5.7.1-r1.ebuild                        | 6 +++---
 sci-libs/rocThrust/rocThrust-5.1.3.ebuild                           | 4 ++--
 sci-libs/rocThrust/rocThrust-5.7.1.ebuild                           | 4 ++--
 sci-mathematics/petsc/petsc-3.16.0-r1.ebuild                        | 6 +++---
 sci-mathematics/petsc/petsc-3.17.1-r1.ebuild                        | 6 +++---
 sci-mathematics/petsc/petsc-3.18.2.ebuild                           | 6 +++---
 sci-mathematics/petsc/petsc-3.19.1.ebuild                           | 6 +++---
 sci-mathematics/petsc/petsc-3.19.2.ebuild                           | 6 +++---
 sci-mathematics/petsc/petsc-3.19.4.ebuild                           | 6 +++---
 sci-mathematics/slepc/slepc-3.16.0.ebuild                           | 6 +++---
 sci-mathematics/slepc/slepc-3.17.1.ebuild                           | 6 +++---
 sci-mathematics/slepc/slepc-3.18.1.ebuild                           | 6 +++---
 sci-mathematics/slepc/slepc-3.19.0.ebuild                           | 6 +++---
 sci-mathematics/slepc/slepc-3.19.1.ebuild                           | 6 +++---
 sys-cluster/ceph/ceph-16.2.14-r1.ebuild                             | 2 +-
 sys-cluster/ceph/ceph-17.2.6-r8.ebuild                              | 2 +-
 sys-cluster/ceph/ceph-17.2.7.ebuild                                 | 2 +-
 sys-cluster/ceph/ceph-18.2.0-r2.ebuild                              | 2 +-
 www-servers/monkeyd/monkeyd-1.6.9-r2.ebuild                         | 4 ++--
 www-servers/monkeyd/monkeyd-9999.ebuild                             | 4 ++--
 x11-terms/alacritty/alacritty-0.12.3.ebuild                         | 6 +++---
 x11-terms/alacritty/alacritty-0.13.1.ebuild                         | 2 +-
 x11-terms/alacritty/alacritty-9999.ebuild                           | 4 ++--
 x11-terms/wezterm/wezterm-20230408.112425.ebuild                    | 4 ++--
 x11-terms/wezterm/wezterm-20230712.072601.ebuild                    | 4 ++--
 155 files changed, 236 insertions(+), 235 deletions(-)

diff --git a/app-emacs/cmake-font-lock/cmake-font-lock-0.1.13-r1.ebuild 
b/app-emacs/cmake-font-lock/cmake-font-lock-0.1.13-r1.ebuild
index 3a54a38e8409..4625030d159c 100644
--- a/app-emacs/cmake-font-lock/cmake-font-lock-0.1.13-r1.ebuild
+++ b/app-emacs/cmake-font-lock/cmake-font-lock-0.1.13-r1.ebuild
@@ -19,7 +19,7 @@ KEYWORDS="~amd64 ~x86"
 RDEPEND="
        || (
                app-emacs/cmake-mode
-               dev-util/cmake[emacs(-)]
+               dev-build/cmake[emacs(-)]
        )
 "
 BDEPEND="${RDEPEND}"

diff --git a/app-emacs/cmake-mode/cmake-mode-3.28.1.ebuild 
b/app-emacs/cmake-mode/cmake-mode-3.28.1.ebuild
index 5cc983bc2a23..465b611ba606 100644
--- a/app-emacs/cmake-mode/cmake-mode-3.28.1.ebuild
+++ b/app-emacs/cmake-mode/cmake-mode-3.28.1.ebuild
@@ -17,7 +17,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos 
~x64-solaris"
 
-RDEPEND="!dev-util/cmake[emacs(-)]"
+RDEPEND="!dev-build/cmake[emacs(-)]"
 
 DOCS=()
 

diff --git a/app-i18n/ibus-rime/ibus-rime-1.5.0.ebuild 
b/app-i18n/ibus-rime/ibus-rime-1.5.0.ebuild
index e566d42112b8..4f8d7fb41dd3 100644
--- a/app-i18n/ibus-rime/ibus-rime-1.5.0.ebuild
+++ b/app-i18n/ibus-rime/ibus-rime-1.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ RDEPEND="
        x11-libs/libnotify"
 DEPEND="${RDEPEND}"
 BDEPEND="
-       dev-util/cmake
+       dev-build/cmake
        virtual/pkgconfig"
 
 src_prepare() {

diff --git a/app-i18n/uim/uim-1.8.9-r1.ebuild b/app-i18n/uim/uim-1.8.9-r1.ebuild
index 947365eaf6f5..ff48ee2259e3 100644
--- a/app-i18n/uim/uim-1.8.9-r1.ebuild
+++ b/app-i18n/uim/uim-1.8.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
@@ -80,7 +80,7 @@ RDEPEND="${CDEPEND}
 BDEPEND="gnome-base/librsvg
        sys-devel/gettext
        virtual/pkgconfig
-       kde? ( dev-util/cmake )
+       kde? ( dev-build/cmake )
        nls? ( dev-util/intltool )"
 
 PATCHES=(

diff --git a/app-office/gnucash/gnucash-4.13.ebuild 
b/app-office/gnucash/gnucash-4.13.ebuild
index 61dd25b006c9..267ae382aa8b 100644
--- a/app-office/gnucash/gnucash-4.13.ebuild
+++ b/app-office/gnucash/gnucash-4.13.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 # Please bump with app-doc/gnucash-docs
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 
 inherit cmake gnome2-utils python-single-r1 xdg-utils
 
@@ -88,7 +88,7 @@ DEPEND="
 "
 BDEPEND="
        dev-lang/swig
-       >=dev-util/cmake-3.10
+       >=dev-build/cmake-3.10
        virtual/pkgconfig
 "
 PDEPEND="

diff --git a/app-office/gnucash/gnucash-5.1.ebuild 
b/app-office/gnucash/gnucash-5.1.ebuild
index cdfba0b0536b..5783d70da717 100644
--- a/app-office/gnucash/gnucash-5.1.ebuild
+++ b/app-office/gnucash/gnucash-5.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 # Please bump with app-doc/gnucash-docs
 
-PYTHON_COMPAT=( python3_{9..12} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit cmake gnome2-utils python-single-r1
 
@@ -88,7 +88,7 @@ DEPEND="
 "
 BDEPEND="
        dev-lang/swig
-       >=dev-util/cmake-3.10
+       >=dev-build/cmake-3.10
        virtual/pkgconfig
 "
 PDEPEND="

diff --git a/app-office/gnucash/gnucash-5.3.ebuild 
b/app-office/gnucash/gnucash-5.3.ebuild
index cb0d6819a793..6e1498a9d04d 100644
--- a/app-office/gnucash/gnucash-5.3.ebuild
+++ b/app-office/gnucash/gnucash-5.3.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 # Please bump with app-doc/gnucash-docs
 
-PYTHON_COMPAT=( python3_{9..12} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit cmake gnome2-utils python-single-r1
 
@@ -88,7 +88,7 @@ DEPEND="
 "
 BDEPEND="
        dev-lang/swig
-       >=dev-util/cmake-3.10
+       >=dev-build/cmake-3.10
        virtual/pkgconfig
 "
 

diff --git a/app-office/gnucash/gnucash-5.4-r1.ebuild 
b/app-office/gnucash/gnucash-5.4-r1.ebuild
index f3e77efe5302..b31789cbf228 100644
--- a/app-office/gnucash/gnucash-5.4-r1.ebuild
+++ b/app-office/gnucash/gnucash-5.4-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..12} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit cmake gnome2-utils python-single-r1
 
@@ -93,7 +93,7 @@ DEPEND="
 # distutils is not available in python3.12, but it is still in setuptools
 BDEPEND="
        dev-lang/swig
-       >=dev-util/cmake-3.10
+       >=dev-build/cmake-3.10
        virtual/pkgconfig
        python? (
                $(python_gen_cond_dep '

diff --git a/app-shells/starship/starship-1.15.0.ebuild 
b/app-shells/starship/starship-1.15.0.ebuild
index 7f38b35989cf..f51e53b5b587 100644
--- a/app-shells/starship/starship-1.15.0.ebuild
+++ b/app-shells/starship/starship-1.15.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -404,7 +404,7 @@ LICENSE="0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions 
BSD BSD-2 Boost-1.0 CC0
 SLOT="0"
 KEYWORDS="amd64 ~arm64"
 
-BDEPEND="dev-util/cmake
+BDEPEND="dev-build/cmake
        >=virtual/rust-1.65"
 
 PATCHES=(

diff --git a/app-shells/starship/starship-1.16.0.ebuild 
b/app-shells/starship/starship-1.16.0.ebuild
index a051ccdb852b..c95afac02bf6 100644
--- a/app-shells/starship/starship-1.16.0.ebuild
+++ b/app-shells/starship/starship-1.16.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -400,7 +400,7 @@ LICENSE="0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions 
BSD BSD-2 Boost-1.0 CC0
 SLOT="0"
 KEYWORDS="amd64 ~arm64"
 
-BDEPEND="dev-util/cmake
+BDEPEND="dev-build/cmake
        >=virtual/rust-1.65"
 
 PATCHES=(

diff --git a/dev-util/cmake/Manifest b/dev-build/cmake/Manifest
similarity index 100%
rename from dev-util/cmake/Manifest
rename to dev-build/cmake/Manifest

diff --git a/dev-util/cmake/cmake-3.26.5-r2.ebuild 
b/dev-build/cmake/cmake-3.26.5-r2.ebuild
similarity index 99%
rename from dev-util/cmake/cmake-3.26.5-r2.ebuild
rename to dev-build/cmake/cmake-3.26.5-r2.ebuild
index 0a5b408b8ee0..dbadb3e177da 100644
--- a/dev-util/cmake/cmake-3.26.5-r2.ebuild
+++ b/dev-build/cmake/cmake-3.26.5-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8

diff --git a/dev-util/cmake/cmake-3.27.7.ebuild 
b/dev-build/cmake/cmake-3.27.7.ebuild
similarity index 99%
rename from dev-util/cmake/cmake-3.27.7.ebuild
rename to dev-build/cmake/cmake-3.27.7.ebuild
index 46ec02b1d625..4ca92ca579cc 100644
--- a/dev-util/cmake/cmake-3.27.7.ebuild
+++ b/dev-build/cmake/cmake-3.27.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8

diff --git a/dev-util/cmake/cmake-3.27.9.ebuild 
b/dev-build/cmake/cmake-3.27.9.ebuild
similarity index 100%
rename from dev-util/cmake/cmake-3.27.9.ebuild
rename to dev-build/cmake/cmake-3.27.9.ebuild

diff --git a/dev-util/cmake/cmake-3.28.1-r1.ebuild 
b/dev-build/cmake/cmake-3.28.1-r1.ebuild
similarity index 100%
rename from dev-util/cmake/cmake-3.28.1-r1.ebuild
rename to dev-build/cmake/cmake-3.28.1-r1.ebuild

diff --git a/dev-util/cmake/cmake-3.28.1.ebuild 
b/dev-build/cmake/cmake-3.28.1.ebuild
similarity index 99%
rename from dev-util/cmake/cmake-3.28.1.ebuild
rename to dev-build/cmake/cmake-3.28.1.ebuild
index 9554c4047fc1..6204d925e2c0 100644
--- a/dev-util/cmake/cmake-3.28.1.ebuild
+++ b/dev-build/cmake/cmake-3.28.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8

diff --git a/dev-util/cmake/cmake-9999.ebuild 
b/dev-build/cmake/cmake-9999.ebuild
similarity index 100%
rename from dev-util/cmake/cmake-9999.ebuild
rename to dev-build/cmake/cmake-9999.ebuild

diff --git a/dev-util/cmake/files/50cmake-gentoo.el 
b/dev-build/cmake/files/50cmake-gentoo.el
similarity index 100%
rename from dev-util/cmake/files/50cmake-gentoo.el
rename to dev-build/cmake/files/50cmake-gentoo.el

diff --git a/dev-util/cmake/files/cmake-2.8.10.2-FindPythonLibs.patch 
b/dev-build/cmake/files/cmake-2.8.10.2-FindPythonLibs.patch
similarity index 100%
rename from dev-util/cmake/files/cmake-2.8.10.2-FindPythonLibs.patch
rename to dev-build/cmake/files/cmake-2.8.10.2-FindPythonLibs.patch

diff --git a/dev-util/cmake/files/cmake-3.14.0_rc3-prefix-dirs.patch 
b/dev-build/cmake/files/cmake-3.14.0_rc3-prefix-dirs.patch
similarity index 100%
rename from dev-util/cmake/files/cmake-3.14.0_rc3-prefix-dirs.patch
rename to dev-build/cmake/files/cmake-3.14.0_rc3-prefix-dirs.patch

diff --git a/dev-util/cmake/files/cmake-3.16.0_rc4-darwin-bundle.patch 
b/dev-build/cmake/files/cmake-3.16.0_rc4-darwin-bundle.patch
similarity index 100%
rename from dev-util/cmake/files/cmake-3.16.0_rc4-darwin-bundle.patch
rename to dev-build/cmake/files/cmake-3.16.0_rc4-darwin-bundle.patch

diff --git a/dev-util/cmake/files/cmake-3.17.0_rc1-FindBLAS.patch 
b/dev-build/cmake/files/cmake-3.17.0_rc1-FindBLAS.patch
similarity index 100%
rename from dev-util/cmake/files/cmake-3.17.0_rc1-FindBLAS.patch
rename to dev-build/cmake/files/cmake-3.17.0_rc1-FindBLAS.patch

diff --git a/dev-util/cmake/files/cmake-3.18.0-filter_distcc_warning.patch 
b/dev-build/cmake/files/cmake-3.18.0-filter_distcc_warning.patch
similarity index 100%
rename from dev-util/cmake/files/cmake-3.18.0-filter_distcc_warning.patch
rename to dev-build/cmake/files/cmake-3.18.0-filter_distcc_warning.patch

diff --git a/dev-util/cmake/files/cmake-3.19.1-darwin-gcc.patch 
b/dev-build/cmake/files/cmake-3.19.1-darwin-gcc.patch
similarity index 100%
rename from dev-util/cmake/files/cmake-3.19.1-darwin-gcc.patch
rename to dev-build/cmake/files/cmake-3.19.1-darwin-gcc.patch

diff --git 
a/dev-util/cmake/files/cmake-3.27.0_rc1-0001-Don-t-use-.so-for-modules-on-darwin-macos.-Use-.bund.patch
 
b/dev-build/cmake/files/cmake-3.27.0_rc1-0001-Don-t-use-.so-for-modules-on-darwin-macos.-Use-.bund.patch
similarity index 100%
rename from 
dev-util/cmake/files/cmake-3.27.0_rc1-0001-Don-t-use-.so-for-modules-on-darwin-macos.-Use-.bund.patch
rename to 
dev-build/cmake/files/cmake-3.27.0_rc1-0001-Don-t-use-.so-for-modules-on-darwin-macos.-Use-.bund.patch

diff --git 
a/dev-util/cmake/files/cmake-3.27.0_rc1-0002-Set-some-proper-paths-to-make-cmake-find-our-tools.patch
 
b/dev-build/cmake/files/cmake-3.27.0_rc1-0002-Set-some-proper-paths-to-make-cmake-find-our-tools.patch
similarity index 100%
rename from 
dev-util/cmake/files/cmake-3.27.0_rc1-0002-Set-some-proper-paths-to-make-cmake-find-our-tools.patch
rename to 
dev-build/cmake/files/cmake-3.27.0_rc1-0002-Set-some-proper-paths-to-make-cmake-find-our-tools.patch

diff --git 
a/dev-util/cmake/files/cmake-3.27.0_rc1-0003-Prefer-pkgconfig-in-FindBLAS.patch 
b/dev-build/cmake/files/cmake-3.27.0_rc1-0003-Prefer-pkgconfig-in-FindBLAS.patch
similarity index 100%
rename from 
dev-util/cmake/files/cmake-3.27.0_rc1-0003-Prefer-pkgconfig-in-FindBLAS.patch
rename to 
dev-build/cmake/files/cmake-3.27.0_rc1-0003-Prefer-pkgconfig-in-FindBLAS.patch

diff --git 
a/dev-util/cmake/files/cmake-3.27.0_rc1-0004-Ensure-that-the-correct-version-of-Qt-is-always-used.patch
 
b/dev-build/cmake/files/cmake-3.27.0_rc1-0004-Ensure-that-the-correct-version-of-Qt-is-always-used.patch
similarity index 100%
rename from 
dev-util/cmake/files/cmake-3.27.0_rc1-0004-Ensure-that-the-correct-version-of-Qt-is-always-used.patch
rename to 
dev-build/cmake/files/cmake-3.27.0_rc1-0004-Ensure-that-the-correct-version-of-Qt-is-always-used.patch

diff --git 
a/dev-util/cmake/files/cmake-3.27.0_rc1-0005-Respect-Gentoo-s-Python-eclasses.patch
 
b/dev-build/cmake/files/cmake-3.27.0_rc1-0005-Respect-Gentoo-s-Python-eclasses.patch
similarity index 100%
rename from 
dev-util/cmake/files/cmake-3.27.0_rc1-0005-Respect-Gentoo-s-Python-eclasses.patch
rename to 
dev-build/cmake/files/cmake-3.27.0_rc1-0005-Respect-Gentoo-s-Python-eclasses.patch

diff --git 
a/dev-util/cmake/files/cmake-3.27.0_rc1-0006-Filter-out-distcc-warnings-to-avoid-confusing-CMake.patch
 
b/dev-build/cmake/files/cmake-3.27.0_rc1-0006-Filter-out-distcc-warnings-to-avoid-confusing-CMake.patch
similarity index 100%
rename from 
dev-util/cmake/files/cmake-3.27.0_rc1-0006-Filter-out-distcc-warnings-to-avoid-confusing-CMake.patch
rename to 
dev-build/cmake/files/cmake-3.27.0_rc1-0006-Filter-out-distcc-warnings-to-avoid-confusing-CMake.patch

diff --git 
a/dev-util/cmake/files/cmake-3.27.4-0001-FindPkgConfig-ignore-whitespace-separators-in-versio.patch
 
b/dev-build/cmake/files/cmake-3.27.4-0001-FindPkgConfig-ignore-whitespace-separators-in-versio.patch
similarity index 100%
rename from 
dev-util/cmake/files/cmake-3.27.4-0001-FindPkgConfig-ignore-whitespace-separators-in-versio.patch
rename to 
dev-build/cmake/files/cmake-3.27.4-0001-FindPkgConfig-ignore-whitespace-separators-in-versio.patch

diff --git a/dev-util/cmake/files/cmake-3.28.0-c99.patch 
b/dev-build/cmake/files/cmake-3.28.0-c99.patch
similarity index 100%
rename from dev-util/cmake/files/cmake-3.28.0-c99.patch
rename to dev-build/cmake/files/cmake-3.28.0-c99.patch

diff --git a/dev-util/cmake/files/cmake-3.5.2-FindQt4.patch 
b/dev-build/cmake/files/cmake-3.5.2-FindQt4.patch
similarity index 100%
rename from dev-util/cmake/files/cmake-3.5.2-FindQt4.patch
rename to dev-build/cmake/files/cmake-3.5.2-FindQt4.patch

diff --git a/dev-util/cmake/files/cmake-3.9.0_rc2-FindPythonInterp.patch 
b/dev-build/cmake/files/cmake-3.9.0_rc2-FindPythonInterp.patch
similarity index 100%
rename from dev-util/cmake/files/cmake-3.9.0_rc2-FindPythonInterp.patch
rename to dev-build/cmake/files/cmake-3.9.0_rc2-FindPythonInterp.patch

diff --git a/dev-util/cmake/files/cmake.vim b/dev-build/cmake/files/cmake.vim
similarity index 100%
rename from dev-util/cmake/files/cmake.vim
rename to dev-build/cmake/files/cmake.vim

diff --git a/dev-util/cmake/metadata.xml b/dev-build/cmake/metadata.xml
similarity index 100%
rename from dev-util/cmake/metadata.xml
rename to dev-build/cmake/metadata.xml

diff --git a/dev-db/cockroach/cockroach-19.1.1-r1.ebuild 
b/dev-db/cockroach/cockroach-19.1.1-r1.ebuild
index aae348a5ea02..8d796276a335 100644
--- a/dev-db/cockroach/cockroach-19.1.1-r1.ebuild
+++ b/dev-db/cockroach/cockroach-19.1.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -25,7 +25,7 @@ DEPEND="
        ${RDEPEND}
        >=app-arch/xz-utils-5.2.3
        >=dev-lang/go-1.8.3
-       >=dev-util/cmake-3.8.1
+       >=dev-build/cmake-3.8.1
 "
 
 QA_EXECSTACK="usr/bin/cockroach"

diff --git a/dev-db/cockroach/cockroach-2.1.5-r1.ebuild 
b/dev-db/cockroach/cockroach-2.1.5-r1.ebuild
index aae348a5ea02..8d796276a335 100644
--- a/dev-db/cockroach/cockroach-2.1.5-r1.ebuild
+++ b/dev-db/cockroach/cockroach-2.1.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -25,7 +25,7 @@ DEPEND="
        ${RDEPEND}
        >=app-arch/xz-utils-5.2.3
        >=dev-lang/go-1.8.3
-       >=dev-util/cmake-3.8.1
+       >=dev-build/cmake-3.8.1
 "
 
 QA_EXECSTACK="usr/bin/cockroach"

diff --git a/dev-dotnet/dotnet-sdk/dotnet-sdk-8.0.100-r1.ebuild 
b/dev-dotnet/dotnet-sdk/dotnet-sdk-8.0.100-r1.ebuild
index 82a0daec3c76..afef70ed8d0d 100644
--- a/dev-dotnet/dotnet-sdk/dotnet-sdk-8.0.100-r1.ebuild
+++ b/dev-dotnet/dotnet-sdk/dotnet-sdk-8.0.100-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Build the tarball:
@@ -63,7 +63,7 @@ RDEPEND="
 BDEPEND="
        ${PYTHON_DEPS}
        <sys-devel/clang-$(( LLVM_MAX_SLOT + 1 ))
-       dev-util/cmake
+       dev-build/cmake
        dev-vcs/git
 "
 IDEPEND="

diff --git a/dev-lang/julia/julia-1.8.3-r4.ebuild 
b/dev-lang/julia/julia-1.8.3-r4.ebuild
index a7496a13dbbd..c21a564cc460 100644
--- a/dev-lang/julia/julia-1.8.3-r4.ebuild
+++ b/dev-lang/julia/julia-1.8.3-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # correct versions for stdlibs are in deps/checksums
@@ -48,7 +48,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
-       dev-util/cmake
+       dev-build/cmake
        virtual/pkgconfig
 "
 

diff --git a/dev-lang/julia/julia-1.8.5-r1.ebuild 
b/dev-lang/julia/julia-1.8.5-r1.ebuild
index fbe4522110f4..c38278524dae 100644
--- a/dev-lang/julia/julia-1.8.5-r1.ebuild
+++ b/dev-lang/julia/julia-1.8.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # correct versions for stdlibs are in deps/checksums
@@ -9,7 +9,7 @@ EAPI=8
 # >=1.8.2 still sits on LLVM 13, bug: https://bugs.gentoo.org/876184
 MY_LLVM_V=13.0.1
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 
 inherit check-reqs flag-o-matic optfeature pax-utils python-any-r1 
toolchain-funcs
 
@@ -59,7 +59,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="
        ${PYTHON_DEPS}
-       dev-util/cmake
+       dev-build/cmake
        virtual/pkgconfig
 "
 

diff --git a/dev-lang/julia/julia-1.9.0.ebuild 
b/dev-lang/julia/julia-1.9.0.ebuild
index 302f4215540c..6dfef422bd55 100644
--- a/dev-lang/julia/julia-1.9.0.ebuild
+++ b/dev-lang/julia/julia-1.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # correct versions for stdlibs are in deps/checksums
@@ -8,7 +8,7 @@ EAPI=8
 
 MY_LLVM_V=14.0.6
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 
 inherit check-reqs flag-o-matic optfeature pax-utils python-any-r1 
toolchain-funcs
 
@@ -55,7 +55,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="
        ${PYTHON_DEPS}
-       dev-util/cmake
+       dev-build/cmake
        virtual/pkgconfig
 "
 

diff --git a/dev-lang/julia/julia-1.9.4.ebuild 
b/dev-lang/julia/julia-1.9.4.ebuild
index b0105c0e508f..82e0fb7987d9 100644
--- a/dev-lang/julia/julia-1.9.4.ebuild
+++ b/dev-lang/julia/julia-1.9.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # correct versions for stdlibs are in deps/checksums
@@ -8,7 +8,7 @@ EAPI=8
 
 MY_LLVM_V=14.0.6
 
-PYTHON_COMPAT=( python3_{9..12} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit check-reqs flag-o-matic optfeature pax-utils python-any-r1 
toolchain-funcs
 
@@ -54,7 +54,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="
        ${PYTHON_DEPS}
-       dev-util/cmake
+       dev-build/cmake
        virtual/pkgconfig
 "
 

diff --git a/dev-lang/mono/mono-6.12.0.122.ebuild 
b/dev-lang/mono/mono-6.12.0.122.ebuild
index 743b96a02c63..3d5515f9d05a 100644
--- a/dev-lang/mono/mono-6.12.0.122.ebuild
+++ b/dev-lang/mono/mono-6.12.0.122.ebuild
@@ -31,7 +31,7 @@ RDEPEND="
 "
 # CMake is used for bundled deps
 BDEPEND="
-       dev-util/cmake
+       dev-build/cmake
        app-alternatives/bc
        app-alternatives/yacc
        pax-kernel? ( sys-apps/elfix )

diff --git a/dev-lang/mono/mono-6.12.0.182.ebuild 
b/dev-lang/mono/mono-6.12.0.182.ebuild
index 0641b48b5bc1..65b7e97c46ec 100644
--- a/dev-lang/mono/mono-6.12.0.182.ebuild
+++ b/dev-lang/mono/mono-6.12.0.182.ebuild
@@ -31,7 +31,7 @@ RDEPEND="
 "
 # CMake is used for bundled deps
 BDEPEND="
-       dev-util/cmake
+       dev-build/cmake
        app-alternatives/bc
        app-alternatives/yacc
        pax-kernel? ( sys-apps/elfix )

diff --git a/dev-lang/mono/mono-6.12.0.199-r1.ebuild 
b/dev-lang/mono/mono-6.12.0.199-r1.ebuild
index 8a3656979102..a7c6af775271 100644
--- a/dev-lang/mono/mono-6.12.0.199-r1.ebuild
+++ b/dev-lang/mono/mono-6.12.0.199-r1.ebuild
@@ -31,7 +31,7 @@ RDEPEND="
 "
 # CMake is used for bundled deps
 BDEPEND="
-       dev-util/cmake
+       dev-build/cmake
        app-alternatives/bc
        app-alternatives/yacc
        pax-kernel? ( sys-apps/elfix )

diff --git a/dev-lang/mono/mono-6.12.0.199-r2.ebuild 
b/dev-lang/mono/mono-6.12.0.199-r2.ebuild
index 97082284fc0c..77fe33df7cd8 100644
--- a/dev-lang/mono/mono-6.12.0.199-r2.ebuild
+++ b/dev-lang/mono/mono-6.12.0.199-r2.ebuild
@@ -31,7 +31,7 @@ RDEPEND="
 "
 # CMake is used for bundled deps
 BDEPEND="
-       dev-util/cmake
+       dev-build/cmake
        app-alternatives/bc
        app-alternatives/yacc
        pax-kernel? ( sys-apps/elfix )

diff --git a/dev-lang/mono/mono-6.12.0.199.ebuild 
b/dev-lang/mono/mono-6.12.0.199.ebuild
index 49e4c7536d2d..a256d411e02c 100644
--- a/dev-lang/mono/mono-6.12.0.199.ebuild
+++ b/dev-lang/mono/mono-6.12.0.199.ebuild
@@ -31,7 +31,7 @@ RDEPEND="
 "
 # CMake is used for bundled deps
 BDEPEND="
-       dev-util/cmake
+       dev-build/cmake
        app-alternatives/bc
        app-alternatives/yacc
        pax-kernel? ( sys-apps/elfix )

diff --git a/dev-lang/rust/rust-1.65.0.ebuild b/dev-lang/rust/rust-1.65.0.ebuild
index ce0870c0fcd2..b12ab0d6de08 100644
--- a/dev-lang/rust/rust-1.65.0.ebuild
+++ b/dev-lang/rust/rust-1.65.0.ebuild
@@ -93,7 +93,7 @@ BDEPEND="${PYTHON_DEPS}
        )
        system-bootstrap? ( ${BOOTSTRAP_DEPEND} )
        !system-llvm? (
-               >=dev-util/cmake-3.13.4
+               >=dev-build/cmake-3.13.4
                app-alternatives/ninja
        )
        test? ( dev-debug/gdb )

diff --git a/dev-lang/rust/rust-1.66.1.ebuild b/dev-lang/rust/rust-1.66.1.ebuild
index 41c0c5939250..34c13db52dcf 100644
--- a/dev-lang/rust/rust-1.66.1.ebuild
+++ b/dev-lang/rust/rust-1.66.1.ebuild
@@ -93,7 +93,7 @@ BDEPEND="${PYTHON_DEPS}
        )
        system-bootstrap? ( ${BOOTSTRAP_DEPEND} )
        !system-llvm? (
-               >=dev-util/cmake-3.13.4
+               >=dev-build/cmake-3.13.4
                app-alternatives/ninja
        )
        test? ( dev-debug/gdb )

diff --git a/dev-lang/rust/rust-1.67.1-r1.ebuild 
b/dev-lang/rust/rust-1.67.1-r1.ebuild
index 0c98ca1df404..c887478cbeda 100644
--- a/dev-lang/rust/rust-1.67.1-r1.ebuild
+++ b/dev-lang/rust/rust-1.67.1-r1.ebuild
@@ -93,7 +93,7 @@ BDEPEND="${PYTHON_DEPS}
        )
        system-bootstrap? ( ${BOOTSTRAP_DEPEND} )
        !system-llvm? (
-               >=dev-util/cmake-3.13.4
+               >=dev-build/cmake-3.13.4
                app-alternatives/ninja
        )
        test? ( dev-debug/gdb )

diff --git a/dev-lang/rust/rust-1.68.2.ebuild b/dev-lang/rust/rust-1.68.2.ebuild
index 044e3b37f10b..70aaa2ddd1e6 100644
--- a/dev-lang/rust/rust-1.68.2.ebuild
+++ b/dev-lang/rust/rust-1.68.2.ebuild
@@ -93,7 +93,7 @@ BDEPEND="${PYTHON_DEPS}
        )
        system-bootstrap? ( ${BOOTSTRAP_DEPEND} )
        !system-llvm? (
-               >=dev-util/cmake-3.13.4
+               >=dev-build/cmake-3.13.4
                app-alternatives/ninja
        )
        test? ( dev-debug/gdb )

diff --git a/dev-lang/rust/rust-1.69.0-r1.ebuild 
b/dev-lang/rust/rust-1.69.0-r1.ebuild
index 0cdbbbd94d91..4fdb4ca0f359 100644
--- a/dev-lang/rust/rust-1.69.0-r1.ebuild
+++ b/dev-lang/rust/rust-1.69.0-r1.ebuild
@@ -93,7 +93,7 @@ BDEPEND="${PYTHON_DEPS}
        )
        system-bootstrap? ( ${BOOTSTRAP_DEPEND} )
        !system-llvm? (
-               >=dev-util/cmake-3.13.4
+               >=dev-build/cmake-3.13.4
                app-alternatives/ninja
        )
        test? ( dev-debug/gdb )

diff --git a/dev-lang/rust/rust-1.70.0.ebuild b/dev-lang/rust/rust-1.70.0.ebuild
index ea2d52be54aa..02c6210203cc 100644
--- a/dev-lang/rust/rust-1.70.0.ebuild
+++ b/dev-lang/rust/rust-1.70.0.ebuild
@@ -93,7 +93,7 @@ BDEPEND="${PYTHON_DEPS}
        )
        system-bootstrap? ( ${BOOTSTRAP_DEPEND} )
        !system-llvm? (
-               >=dev-util/cmake-3.13.4
+               >=dev-build/cmake-3.13.4
                app-alternatives/ninja
        )
        test? ( dev-debug/gdb )

diff --git a/dev-lang/rust/rust-1.71.0.ebuild b/dev-lang/rust/rust-1.71.0.ebuild
index c11252d7920e..57547f28681f 100644
--- a/dev-lang/rust/rust-1.71.0.ebuild
+++ b/dev-lang/rust/rust-1.71.0.ebuild
@@ -93,7 +93,7 @@ BDEPEND="${PYTHON_DEPS}
        )
        system-bootstrap? ( ${BOOTSTRAP_DEPEND} )
        !system-llvm? (
-               >=dev-util/cmake-3.13.4
+               >=dev-build/cmake-3.13.4
                app-alternatives/ninja
        )
        test? ( dev-debug/gdb )

diff --git a/dev-lang/rust/rust-1.71.1.ebuild b/dev-lang/rust/rust-1.71.1.ebuild
index 31c61f2d0344..c9773385d9c4 100644
--- a/dev-lang/rust/rust-1.71.1.ebuild
+++ b/dev-lang/rust/rust-1.71.1.ebuild
@@ -93,7 +93,7 @@ BDEPEND="${PYTHON_DEPS}
        )
        system-bootstrap? ( ${BOOTSTRAP_DEPEND} )
        !system-llvm? (
-               >=dev-util/cmake-3.13.4
+               >=dev-build/cmake-3.13.4
                app-alternatives/ninja
        )
        test? ( dev-debug/gdb )

diff --git a/dev-lang/rust/rust-1.72.0-r1.ebuild 
b/dev-lang/rust/rust-1.72.0-r1.ebuild
index a05b40f0528a..eae036887f67 100644
--- a/dev-lang/rust/rust-1.72.0-r1.ebuild
+++ b/dev-lang/rust/rust-1.72.0-r1.ebuild
@@ -95,7 +95,7 @@ BDEPEND="${PYTHON_DEPS}
        )
        system-bootstrap? ( ${BOOTSTRAP_DEPEND} )
        !system-llvm? (
-               >=dev-util/cmake-3.13.4
+               >=dev-build/cmake-3.13.4
                app-alternatives/ninja
        )
        test? ( dev-debug/gdb )

diff --git a/dev-lang/rust/rust-1.73.0.ebuild b/dev-lang/rust/rust-1.73.0.ebuild
index 045d69a9233a..f442f3a9deff 100644
--- a/dev-lang/rust/rust-1.73.0.ebuild
+++ b/dev-lang/rust/rust-1.73.0.ebuild
@@ -94,7 +94,7 @@ BDEPEND="${PYTHON_DEPS}
        )
        system-bootstrap? ( ${BOOTSTRAP_DEPEND} )
        !system-llvm? (
-               >=dev-util/cmake-3.13.4
+               >=dev-build/cmake-3.13.4
                app-alternatives/ninja
        )
        test? ( dev-debug/gdb )

diff --git a/dev-lang/rust/rust-1.74.1.ebuild b/dev-lang/rust/rust-1.74.1.ebuild
index 0f37c5bb1b80..fb96d627f31d 100644
--- a/dev-lang/rust/rust-1.74.1.ebuild
+++ b/dev-lang/rust/rust-1.74.1.ebuild
@@ -94,7 +94,7 @@ BDEPEND="${PYTHON_DEPS}
        )
        system-bootstrap? ( ${BOOTSTRAP_DEPEND} )
        !system-llvm? (
-               >=dev-util/cmake-3.13.4
+               >=dev-build/cmake-3.13.4
                app-alternatives/ninja
        )
        test? ( dev-debug/gdb )

diff --git a/dev-libs/aws-c-common/aws-c-common-0.4.62.ebuild 
b/dev-libs/aws-c-common/aws-c-common-0.4.62.ebuild
index 7f1ab8b2b7e7..4301c1e50ee7 100644
--- a/dev-libs/aws-c-common/aws-c-common-0.4.62.ebuild
+++ b/dev-libs/aws-c-common/aws-c-common-0.4.62.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,8 +18,8 @@ RESTRICT="!test? ( test )"
 
 BDEPEND="
        || (
-               >dev-util/cmake-3.19.1
-               <dev-util/cmake-3.19.0
+               >dev-build/cmake-3.19.1
+               <dev-build/cmake-3.19.0
        )
 "
 

diff --git a/dev-libs/aws-c-event-stream/aws-c-event-stream-0.2.5-r1.ebuild 
b/dev-libs/aws-c-event-stream/aws-c-event-stream-0.2.5-r1.ebuild
index 229b574ddd78..b74da3e1e090 100644
--- a/dev-libs/aws-c-event-stream/aws-c-event-stream-0.2.5-r1.ebuild
+++ b/dev-libs/aws-c-event-stream/aws-c-event-stream-0.2.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,8 +18,8 @@ RESTRICT="!test? ( test )"
 
 BDEPEND="
        || (
-               >dev-util/cmake-3.19.1
-               <dev-util/cmake-3.19.0
+               >dev-build/cmake-3.19.1
+               <dev-build/cmake-3.19.0
        )
 "
 

diff --git a/dev-libs/aws-c-io/aws-c-io-0.7.0-r1.ebuild 
b/dev-libs/aws-c-io/aws-c-io-0.7.0-r1.ebuild
index 3bae4a9f0357..27947e20ab2e 100644
--- a/dev-libs/aws-c-io/aws-c-io-0.7.0-r1.ebuild
+++ b/dev-libs/aws-c-io/aws-c-io-0.7.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,8 +18,8 @@ RESTRICT="!test? ( test )"
 
 BDEPEND="
        || (
-               >dev-util/cmake-3.19.1
-               <dev-util/cmake-3.19.0
+               >dev-build/cmake-3.19.1
+               <dev-build/cmake-3.19.0
        )
 "
 

diff --git a/dev-libs/aws-checksums/aws-checksums-0.1.10.ebuild 
b/dev-libs/aws-checksums/aws-checksums-0.1.10.ebuild
index 61375a3de8b2..e456f93cb20f 100644
--- a/dev-libs/aws-checksums/aws-checksums-0.1.10.ebuild
+++ b/dev-libs/aws-checksums/aws-checksums-0.1.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,8 +18,8 @@ RESTRICT="!test? ( test )"
 
 BDEPEND="
        || (
-               >dev-util/cmake-3.19.1
-               <dev-util/cmake-3.19.0
+               >dev-build/cmake-3.19.1
+               <dev-build/cmake-3.19.0
        )
 "
 

diff --git a/dev-libs/criterion/criterion-2.4.0.ebuild 
b/dev-libs/criterion/criterion-2.4.0.ebuild
index 49faed7a545b..b1bb4480889a 100644
--- a/dev-libs/criterion/criterion-2.4.0.ebuild
+++ b/dev-libs/criterion/criterion-2.4.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 
 inherit meson python-any-r1
 
@@ -32,7 +32,7 @@ DEPEND="${RDEPEND}
        test? (
                $(python_gen_any_dep 'dev-util/cram[${PYTHON_USEDEP}]')
        )"
-BDEPEND="dev-util/cmake
+BDEPEND="dev-build/cmake
        virtual/pkgconfig"
 
 S="${WORKDIR}/Criterion-${PV}"

diff --git a/dev-libs/criterion/criterion-2.4.1.ebuild 
b/dev-libs/criterion/criterion-2.4.1.ebuild
index f3384d089938..d23e55dd8cb0 100644
--- a/dev-libs/criterion/criterion-2.4.1.ebuild
+++ b/dev-libs/criterion/criterion-2.4.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 
 inherit meson python-any-r1
 
@@ -32,7 +32,7 @@ DEPEND="${RDEPEND}
        test? (
                $(python_gen_any_dep 'dev-util/cram[${PYTHON_USEDEP}]')
        )"
-BDEPEND="dev-util/cmake
+BDEPEND="dev-build/cmake
        virtual/pkgconfig"
 
 S="${WORKDIR}/Criterion-${PV}"

diff --git a/dev-libs/efl/efl-1.27.0.ebuild b/dev-libs/efl/efl-1.27.0.ebuild
index c7cf07dc33f4..896084aa5924 100644
--- a/dev-libs/efl/efl-1.27.0.ebuild
+++ b/dev-libs/efl/efl-1.27.0.ebuild
@@ -126,7 +126,7 @@ BDEPEND="${PYTHON_DEPS}
        virtual/pkgconfig
        doc? ( app-text/doxygen )
        examples? ( sys-devel/gettext )
-       mono? ( dev-util/cmake )
+       mono? ( dev-build/cmake )
        nls? ( sys-devel/gettext )
        wayland? ( dev-util/wayland-scanner )"
 

diff --git a/dev-libs/rccl/rccl-5.1.3.ebuild b/dev-libs/rccl/rccl-5.1.3.ebuild
index 1695cbfad734..92092f7946cf 100644
--- a/dev-libs/rccl/rccl-5.1.3.ebuild
+++ b/dev-libs/rccl/rccl-5.1.3.ebuild
@@ -19,7 +19,7 @@ IUSE="test"
 RDEPEND="dev-util/hip
 dev-util/rocm-smi:${SLOT}"
 DEPEND="${RDEPEND}"
-BDEPEND=">=dev-util/cmake-3.22
+BDEPEND=">=dev-build/cmake-3.22
        >=dev-build/rocm-cmake-5.0.2-r1
        test? ( dev-cpp/gtest )"
 

diff --git a/dev-python/pivy/pivy-0.6.8.ebuild 
b/dev-python/pivy/pivy-0.6.8.ebuild
index 014e40cb9cbc..73dc11cf83dd 100644
--- a/dev-python/pivy/pivy-0.6.8.ebuild
+++ b/dev-python/pivy/pivy-0.6.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -40,8 +40,8 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
+       dev-build/cmake
        dev-lang/swig
-       dev-util/cmake
        test? ( ${RDEPEND} )
 "
 

diff --git a/dev-python/qiskit-aer/qiskit-aer-0.12.2.ebuild 
b/dev-python/qiskit-aer/qiskit-aer-0.12.2.ebuild
index 9224a7dcb613..c4d33f2a130b 100644
--- a/dev-python/qiskit-aer/qiskit-aer-0.12.2.ebuild
+++ b/dev-python/qiskit-aer/qiskit-aer-0.12.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -45,7 +45,7 @@ RDEPEND="
        >=dev-python/scipy-1.0[${PYTHON_USEDEP}]
 "
 BDEPEND="
-       >=dev-util/cmake-3.17
+       >=dev-build/cmake-3.17
        >=dev-python/scikit-build-0.11.0[${PYTHON_USEDEP}]
        >=dev-python/pybind11-2.6[${PYTHON_USEDEP}]
        test? (

diff --git a/dev-python/qiskit-aer/qiskit-aer-0.13.1.ebuild 
b/dev-python/qiskit-aer/qiskit-aer-0.13.1.ebuild
index 9001a0058e12..9a7a45047d78 100644
--- a/dev-python/qiskit-aer/qiskit-aer-0.13.1.ebuild
+++ b/dev-python/qiskit-aer/qiskit-aer-0.13.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -46,7 +46,7 @@ RDEPEND="
        >=dev-python/scipy-1.0[${PYTHON_USEDEP}]
 "
 BDEPEND="
-       >=dev-util/cmake-3.17
+       >=dev-build/cmake-3.17
        >=dev-python/scikit-build-0.11.0[${PYTHON_USEDEP}]
        >=dev-python/pybind11-2.6[${PYTHON_USEDEP}]
        test? (

diff --git a/dev-python/symengine/symengine-0.11.0.ebuild 
b/dev-python/symengine/symengine-0.11.0.ebuild
index 9cd04af29e6e..6f1e47a9786b 100644
--- a/dev-python/symengine/symengine-0.11.0.ebuild
+++ b/dev-python/symengine/symengine-0.11.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -26,7 +26,7 @@ SLOT="0"
 KEYWORDS="amd64 ~arm arm64 ~loong ~riscv ~x86"
 
 BDEPEND="
-       dev-util/cmake
+       dev-build/cmake
        dev-python/cython[${PYTHON_USEDEP}]
        test? (
                dev-python/sympy[${PYTHON_USEDEP}]

diff --git a/dev-qt/qt-creator/qt-creator-12.0.1.ebuild 
b/dev-qt/qt-creator/qt-creator-12.0.1.ebuild
index da9e91badcb9..362b77f6691a 100644
--- a/dev-qt/qt-creator/qt-creator-12.0.1.ebuild
+++ b/dev-qt/qt-creator/qt-creator-12.0.1.ebuild
@@ -195,7 +195,7 @@ dev-qt/qt-docs:6 with USE=\"examples qch\" is notably 
recommended, or
 else the example tab will be empty alongside missing documentation.
 
 Build Systems:
-- CMakeProjectManager (dev-util/cmake)
+- CMakeProjectManager (dev-build/cmake)
 - MesonProjectManager (dev-build/meson)
 - QbsProjectManager (dev-util/qbs)
 

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild 
b/dev-qt/qt-creator/qt-creator-9999.ebuild
index c487c38bfaac..a2c7444d9223 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -195,7 +195,7 @@ dev-qt/qt-docs:6 with USE=\"examples qch\" is notably 
recommended, or
 else the example tab will be empty alongside missing documentation.
 
 Build Systems:
-- CMakeProjectManager (dev-util/cmake)
+- CMakeProjectManager (dev-build/cmake)
 - MesonProjectManager (dev-build/meson)
 - QbsProjectManager (dev-util/qbs)
 

diff --git a/dev-ruby/mini_portile2/mini_portile2-2.8.4.ebuild 
b/dev-ruby/mini_portile2/mini_portile2-2.8.4.ebuild
index 3fa9433b4cae..5b9425a057f2 100644
--- a/dev-ruby/mini_portile2/mini_portile2-2.8.4.ebuild
+++ b/dev-ruby/mini_portile2/mini_portile2-2.8.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,7 @@ SLOT="$(ver_cut 1-2)"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 
sparc x86 ~arm64-macos"
 IUSE=""
 
-BDEPEND="test? ( dev-util/cmake )"
+BDEPEND="test? ( dev-build/cmake )"
 
 ruby_add_bdepend "test? (
        dev-ruby/minitar

diff --git a/dev-ruby/mini_portile2/mini_portile2-2.8.5.ebuild 
b/dev-ruby/mini_portile2/mini_portile2-2.8.5.ebuild
index 0a5cb4b4b315..9c63cf6e21e6 100644
--- a/dev-ruby/mini_portile2/mini_portile2-2.8.5.ebuild
+++ b/dev-ruby/mini_portile2/mini_portile2-2.8.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,7 @@ SLOT="$(ver_cut 1-2)"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~arm64-macos"
 IUSE=""
 
-BDEPEND="test? ( dev-util/cmake )"
+BDEPEND="test? ( dev-build/cmake )"
 
 ruby_add_bdepend "test? (
        dev-ruby/minitar

diff --git a/dev-util/clion/clion-2022.3.2.ebuild 
b/dev-util/clion/clion-2022.3.2.ebuild
index 57260de50ef0..71560f1fbf0d 100644
--- a/dev-util/clion/clion-2022.3.2.ebuild
+++ b/dev-util/clion/clion-2022.3.2.ebuild
@@ -27,7 +27,7 @@ RDEPEND="
        dev-libs/nspr
        dev-libs/nss
        dev-libs/wayland
-       dev-util/cmake
+       dev-build/cmake
        app-alternatives/ninja
        media-libs/alsa-lib
        media-libs/freetype:2

diff --git a/dev-util/clion/clion-2023.1.4.ebuild 
b/dev-util/clion/clion-2023.1.4.ebuild
index 57260de50ef0..71560f1fbf0d 100644
--- a/dev-util/clion/clion-2023.1.4.ebuild
+++ b/dev-util/clion/clion-2023.1.4.ebuild
@@ -27,7 +27,7 @@ RDEPEND="
        dev-libs/nspr
        dev-libs/nss
        dev-libs/wayland
-       dev-util/cmake
+       dev-build/cmake
        app-alternatives/ninja
        media-libs/alsa-lib
        media-libs/freetype:2

diff --git a/dev-util/gnome-builder/gnome-builder-44.2-r1.ebuild 
b/dev-util/gnome-builder/gnome-builder-44.2-r1.ebuild
index aa54cb1857d8..9c72f2d08841 100644
--- a/dev-util/gnome-builder/gnome-builder-44.2-r1.ebuild
+++ b/dev-util/gnome-builder/gnome-builder-44.2-r1.ebuild
@@ -113,7 +113,7 @@ that are currently available with packages include:
 * dev-debug/valgrind for integration with valgrind.
 * dev-build/meson for integration with the Meson build system.
 * virtual/rust for integration with the Rust Cargo build system.
-* dev-util/cmake for integration with the CMake build system.
+* dev-build/cmake for integration with the CMake build system.
 * net-libs/nodejs[npm] for integration with the NPM package system.
 '
 # FIXME: Package codespell and mention here
@@ -267,7 +267,7 @@ pkg_postinst() {
 
        optfeature_header "Language support"
        optfeature "Rust's Cargo build system" virtual/rust
-       optfeature "CMake" dev-util/cmake
+       optfeature "CMake" dev-build/cmake
        optfeature "Java Maven build system" dev-java/maven-bin
        optfeature "Meson Build system" dev-build/meson
 }

diff --git a/dev-util/wasmer/wasmer-0.11.0.ebuild 
b/dev-util/wasmer/wasmer-0.11.0.ebuild
index 336e379622d8..abbcc40ab8bf 100644
--- a/dev-util/wasmer/wasmer-0.11.0.ebuild
+++ b/dev-util/wasmer/wasmer-0.11.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2017-2019 Gentoo Authors
+# Copyright 2017-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -181,7 +181,7 @@ KEYWORDS="~amd64"
 IUSE=""
 
 BDEPEND="
-       dev-util/cmake
+       dev-build/cmake
        >=virtual/rust-1.37.0
 "
 

diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass
index f403a19b28af..908e2356ead2 100644
--- a/eclass/cmake.eclass
+++ b/eclass/cmake.eclass
@@ -130,7 +130,7 @@ fi
 # @DESCRIPTION:
 # Array of tests that should be skipped when running CTest.
 
-[[ ${CMAKE_MIN_VERSION} ]] && die "CMAKE_MIN_VERSION is banned; if necessary, 
set BDEPEND=\">=dev-util/cmake-${CMAKE_MIN_VERSION}\" directly"
+[[ ${CMAKE_MIN_VERSION} ]] && die "CMAKE_MIN_VERSION is banned; if necessary, 
set BDEPEND=\">=dev-build/cmake-${CMAKE_MIN_VERSION}\" directly"
 [[ ${CMAKE_BUILD_DIR} ]] && die "The ebuild must be migrated to BUILD_DIR"
 [[ ${CMAKE_REMOVE_MODULES} ]] && die "CMAKE_REMOVE_MODULES is banned, set 
CMAKE_REMOVE_MODULES_LIST array instead"
 [[ ${CMAKE_UTILS_QA_SRC_DIR_READONLY} ]] && die "Use CMAKE_QA_SRC_DIR_READONLY 
instead"
@@ -151,7 +151,7 @@ case ${CMAKE_MAKEFILE_GENERATOR} in
 esac
 
 if [[ ${PN} != cmake ]]; then
-       BDEPEND+=" >=dev-util/cmake-3.20.5"
+       BDEPEND+=" >=dev-build/cmake-3.20.5"
 fi
 
 # @FUNCTION: cmake_run_in

diff --git a/gui-apps/nm-tray/nm-tray-0.5.0-r1.ebuild 
b/gui-apps/nm-tray/nm-tray-0.5.0-r1.ebuild
index f9ed92fff950..983e7a8d4c7f 100644
--- a/gui-apps/nm-tray/nm-tray-0.5.0-r1.ebuild
+++ b/gui-apps/nm-tray/nm-tray-0.5.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ IUSE=""
 
 BDEPEND="
        dev-qt/linguist-tools:5
-       >=dev-util/cmake-3.10
+       >=dev-build/cmake-3.10
 "
 RDEPEND="
        dev-qt/qtcore:5

diff --git a/gui-wm/hyprland/hyprland-0.32.3.ebuild 
b/gui-wm/hyprland/hyprland-0.32.3.ebuild
index 4389d96f9daa..5341f4ae2f59 100644
--- a/gui-wm/hyprland/hyprland-0.32.3.ebuild
+++ b/gui-wm/hyprland/hyprland-0.32.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2023 Gentoo Authors
+# Copyright 2023-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -72,7 +72,7 @@ BDEPEND="
        ${WLROOTS_BDEPEND}
        || ( >=sys-devel/gcc-13:* >=sys-devel/clang-16:* )
        app-misc/jq
-       dev-util/cmake
+       dev-build/cmake
        dev-util/wayland-scanner
        virtual/pkgconfig
 "

diff --git a/gui-wm/hyprland/hyprland-0.33.1.ebuild 
b/gui-wm/hyprland/hyprland-0.33.1.ebuild
index 5c3cf3abef5f..a64b498c3634 100644
--- a/gui-wm/hyprland/hyprland-0.33.1.ebuild
+++ b/gui-wm/hyprland/hyprland-0.33.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2023 Gentoo Authors
+# Copyright 2023-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -72,7 +72,7 @@ BDEPEND="
        ${WLROOTS_BDEPEND}
        || ( >=sys-devel/gcc-13:* >=sys-devel/clang-16:* )
        app-misc/jq
-       dev-util/cmake
+       dev-build/cmake
        dev-util/wayland-scanner
        virtual/pkgconfig
 "

diff --git a/gui-wm/hyprland/hyprland-0.34.0.ebuild 
b/gui-wm/hyprland/hyprland-0.34.0.ebuild
index 48241d2e6d23..07abbd7d7e90 100644
--- a/gui-wm/hyprland/hyprland-0.34.0.ebuild
+++ b/gui-wm/hyprland/hyprland-0.34.0.ebuild
@@ -26,7 +26,7 @@ IUSE="X legacy-renderer systemd"
 # so that it can clone, compile and install plugins.
 HYPRPM_RDEPEND="
        app-alternatives/ninja
-       dev-util/cmake
+       dev-build/cmake
        dev-build/meson
        dev-vcs/git
        sys-auth/polkit
@@ -89,7 +89,7 @@ BDEPEND="
        ${WLROOTS_BDEPEND}
        || ( >=sys-devel/gcc-13:* >=sys-devel/clang-16:* )
        app-misc/jq
-       dev-util/cmake
+       dev-build/cmake
        dev-util/wayland-scanner
        virtual/pkgconfig
 "

diff --git a/gui-wm/hyprland/hyprland-9999.ebuild 
b/gui-wm/hyprland/hyprland-9999.ebuild
index db7f709d65b6..14c7837e3e21 100644
--- a/gui-wm/hyprland/hyprland-9999.ebuild
+++ b/gui-wm/hyprland/hyprland-9999.ebuild
@@ -26,7 +26,7 @@ IUSE="X legacy-renderer systemd"
 # so that it can clone, compile and install plugins.
 HYPRPM_RDEPEND="
        app-alternatives/ninja
-       dev-util/cmake
+       dev-build/cmake
        dev-build/meson
        dev-vcs/git
        sys-auth/polkit
@@ -89,7 +89,7 @@ BDEPEND="
        ${WLROOTS_BDEPEND}
        || ( >=sys-devel/gcc-13:* >=sys-devel/clang-16:* )
        app-misc/jq
-       dev-util/cmake
+       dev-build/cmake
        dev-util/wayland-scanner
        virtual/pkgconfig
 "

diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.3.ebuild 
b/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.3.ebuild
index ff6f4ccbe385..e708ac1f5770 100644
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.3.ebuild
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -22,7 +22,7 @@ ASM_DEPEND="|| ( dev-lang/nasm dev-lang/yasm )"
 COMMON_DEPEND="!media-libs/jpeg:0
        !media-libs/jpeg:62"
 
-BDEPEND=">=dev-util/cmake-3.16.5
+BDEPEND=">=dev-build/cmake-3.16.5
        amd64? ( ${ASM_DEPEND} )
        x86? ( ${ASM_DEPEND} )
        amd64-linux? ( ${ASM_DEPEND} )

diff --git a/media-sound/gogglesmm/gogglesmm-1.2.1-r2.ebuild 
b/media-sound/gogglesmm/gogglesmm-1.2.1-r2.ebuild
index 8fe6b920c28c..a7082b3d01f7 100644
--- a/media-sound/gogglesmm/gogglesmm-1.2.1-r2.ebuild
+++ b/media-sound/gogglesmm/gogglesmm-1.2.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -30,7 +30,7 @@ RDEPEND="x11-libs/fox:1.7
        aac? ( media-libs/faad2 )
        pulseaudio? ( media-sound/pulseaudio )
        opengl? ( media-libs/libepoxy virtual/glu )"
-DEPEND="dev-util/cmake ${RDEPEND}"
+DEPEND="dev-build/cmake ${RDEPEND}"
 
 PATCHES=( "${FILESDIR}"/"${P}"-use-fox-1.7.67.patch )
 

diff --git a/media-tv/kodi/kodi-19.5-r1.ebuild 
b/media-tv/kodi/kodi-19.5-r1.ebuild
index 3b704862e6d4..9e334ac98605 100644
--- a/media-tv/kodi/kodi-19.5-r1.ebuild
+++ b/media-tv/kodi/kodi-19.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -173,8 +173,8 @@ DEPEND="${COMMON_DEPEND} ${COMMON_TARGET_DEPEND}
        test? ( >=dev-cpp/gtest-1.10.0 )
 "
 BDEPEND="${COMMON_DEPEND}
+       dev-build/cmake
        dev-lang/swig
-       dev-util/cmake
        media-libs/giflib
        >=dev-libs/flatbuffers-1.11.0
        >=media-libs/libjpeg-turbo-2.0.4:=

diff --git a/media-tv/kodi/kodi-19.9999.ebuild 
b/media-tv/kodi/kodi-19.9999.ebuild
index d681aed3210c..a0a2b98fb73a 100644
--- a/media-tv/kodi/kodi-19.9999.ebuild
+++ b/media-tv/kodi/kodi-19.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -173,8 +173,8 @@ DEPEND="${COMMON_DEPEND} ${COMMON_TARGET_DEPEND}
        test? ( >=dev-cpp/gtest-1.10.0 )
 "
 BDEPEND="${COMMON_DEPEND}
+       dev-build/cmake
        dev-lang/swig
-       dev-util/cmake
        media-libs/giflib
        >=dev-libs/flatbuffers-1.11.0
        >=media-libs/libjpeg-turbo-2.0.4:=

diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild
index 835a3e47c418..3c0e0c77affa 100644
--- a/media-tv/kodi/kodi-9999.ebuild
+++ b/media-tv/kodi/kodi-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -173,8 +173,8 @@ DEPEND="${COMMON_DEPEND} ${COMMON_TARGET_DEPEND}
        test? ( >=dev-cpp/gtest-1.10.0 )
 "
 BDEPEND="${COMMON_DEPEND}
+       dev-build/cmake
        dev-lang/swig
-       dev-util/cmake
        media-libs/giflib
        >=dev-libs/flatbuffers-1.11.0
        >=media-libs/libjpeg-turbo-2.0.4:=

diff --git a/media-video/handbrake/handbrake-1.5.1-r1.ebuild 
b/media-video/handbrake/handbrake-1.5.1-r1.ebuild
index 7c9e08992e02..9c9c548d9e32 100644
--- a/media-video/handbrake/handbrake-1.5.1-r1.ebuild
+++ b/media-video/handbrake/handbrake-1.5.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 
 inherit autotools python-any-r1 toolchain-funcs xdg
 
@@ -78,8 +78,8 @@ DEPEND="${RDEPEND}"
 # cmake needed for custom script: bug #852701
 BDEPEND="
        ${PYTHON_DEPS}
+       dev-build/cmake
        dev-lang/nasm
-       dev-util/cmake
 "
 
 PATCHES=(

diff --git a/media-video/handbrake/handbrake-1.6.1.ebuild 
b/media-video/handbrake/handbrake-1.6.1.ebuild
index f829de7ac8f3..7be693401ffa 100644
--- a/media-video/handbrake/handbrake-1.6.1.ebuild
+++ b/media-video/handbrake/handbrake-1.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -81,8 +81,8 @@ DEPEND="${RDEPEND}"
 # cmake needed for custom script: bug #852701
 BDEPEND="
        ${PYTHON_DEPS}
+       dev-build/cmake
        dev-lang/nasm
-       dev-util/cmake
 "
 
 PATCHES=(

diff --git a/media-video/handbrake/handbrake-9999.ebuild 
b/media-video/handbrake/handbrake-9999.ebuild
index 41a2061311b8..0201e9e8dd27 100644
--- a/media-video/handbrake/handbrake-9999.ebuild
+++ b/media-video/handbrake/handbrake-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -81,8 +81,8 @@ DEPEND="${RDEPEND}"
 # cmake needed for custom script: bug #852701
 BDEPEND="
        ${PYTHON_DEPS}
+       dev-build/cmake
        dev-lang/nasm
-       dev-util/cmake
 "
 
 PATCHES=(

diff --git a/media-video/vidify-audiosync/vidify-audiosync-0.3.0-r2.ebuild 
b/media-video/vidify-audiosync/vidify-audiosync-0.3.0-r2.ebuild
index d5671742498d..ab4c4f67e7ec 100644
--- a/media-video/vidify-audiosync/vidify-audiosync-0.3.0-r2.ebuild
+++ b/media-video/vidify-audiosync/vidify-audiosync-0.3.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -26,7 +26,7 @@ RDEPEND="
        sci-libs/fftw
        debug? ( sci-visualization/gnuplot )
 "
-BDEPEND="test? ( dev-util/cmake )"
+BDEPEND="test? ( dev-build/cmake )"
 
 S="${WORKDIR}/old-audiosync-${PV}"
 

diff --git a/net-dns/resolv_wrapper/resolv_wrapper-1.1.8.ebuild 
b/net-dns/resolv_wrapper/resolv_wrapper-1.1.8.ebuild
index 6d82949054c5..7f5091771e60 100644
--- a/net-dns/resolv_wrapper/resolv_wrapper-1.1.8.ebuild
+++ b/net-dns/resolv_wrapper/resolv_wrapper-1.1.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -20,7 +20,7 @@ BDEPEND="test? (
                net-libs/socket_wrapper
        )"
 
-# Work around a problem with >=dev-util/cmake-3.3.0 (bug #558340)
+# Work around a problem with >=dev-build/cmake-3.3.0 (bug #558340)
 # Because of this we cannot use cmake-multilib_src_configure() here.
 multilib_src_configure() {
        local mycmakeargs=(

diff --git a/net-im/telegram-desktop/telegram-desktop-4.12.2.ebuild 
b/net-im/telegram-desktop/telegram-desktop-4.12.2.ebuild
index 1173997980e4..d51a41aaf8a2 100644
--- a/net-im/telegram-desktop/telegram-desktop-4.12.2.ebuild
+++ b/net-im/telegram-desktop/telegram-desktop-4.12.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2023 Gentoo Authors
+# Copyright 2020-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -89,8 +89,8 @@ DEPEND="${CDEPEND}
 "
 BDEPEND="
        ${PYTHON_DEPS}
+       >=dev-build/cmake-3.16
        >=dev-cpp/cppgir-0_p20230926
-       >=dev-util/cmake-3.16
        dev-util/gdbus-codegen
        virtual/pkgconfig
        wayland? ( dev-util/wayland-scanner )

diff --git a/net-im/telegram-desktop/telegram-desktop-4.13.1.ebuild 
b/net-im/telegram-desktop/telegram-desktop-4.13.1.ebuild
index 0d903b5eaadb..26cb048d9f91 100644
--- a/net-im/telegram-desktop/telegram-desktop-4.13.1.ebuild
+++ b/net-im/telegram-desktop/telegram-desktop-4.13.1.ebuild
@@ -89,8 +89,8 @@ DEPEND="${CDEPEND}
 "
 BDEPEND="
        ${PYTHON_DEPS}
+       >=dev-build/cmake-3.16
        >=dev-cpp/cppgir-0_p20230926
-       >=dev-util/cmake-3.16
        dev-util/gdbus-codegen
        virtual/pkgconfig
        wayland? ( dev-util/wayland-scanner )

diff --git a/net-libs/quiche/quiche-0.20.0.ebuild 
b/net-libs/quiche/quiche-0.20.0.ebuild
index 60cfe2d21df3..d680e172437f 100644
--- a/net-libs/quiche/quiche-0.20.0.ebuild
+++ b/net-libs/quiche/quiche-0.20.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -212,7 +212,7 @@ DOCS=( COPYING README.md )
 
 BDEPEND="
        >=virtual/rust-1.66.0[${MULTILIB_USEDEP}]
-       dev-util/cmake
+       dev-build/cmake
 "
 DEPEND=""
 RDEPEND=""

diff --git a/net-libs/quiche/quiche-9999.ebuild 
b/net-libs/quiche/quiche-9999.ebuild
index 1098e285918d..e4700654066c 100644
--- a/net-libs/quiche/quiche-9999.ebuild
+++ b/net-libs/quiche/quiche-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -212,7 +212,7 @@ DOCS=( COPYING README.md )
 
 BDEPEND="
        >=virtual/rust-1.66.0[${MULTILIB_USEDEP}]
-       dev-util/cmake
+       dev-build/cmake
 "
 DEPEND=""
 RDEPEND=""

diff --git a/net-p2p/retroshare/retroshare-0.6.6-r1.ebuild 
b/net-p2p/retroshare/retroshare-0.6.6-r1.ebuild
index 9e7a39650b1d..2d5b75c038d1 100644
--- a/net-p2p/retroshare/retroshare-0.6.6-r1.ebuild
+++ b/net-p2p/retroshare/retroshare-0.6.6-r1.ebuild
@@ -49,7 +49,7 @@ DEPEND="${RDEPEND}
        dev-qt/qtcore:5
        gui? ( dev-qt/designer:5 )"
 
-BDEPEND="dev-util/cmake
+BDEPEND="dev-build/cmake
        virtual/pkgconfig
        jsonapi? ( app-text/doxygen )"
 

diff --git a/profiles/arch/alpha/package.use.mask 
b/profiles/arch/alpha/package.use.mask
index 6099f2df38d5..17d95fde6aba 100644
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -20,7 +20,7 @@ dev-perl/DBD-mysql mysql
 # matoro <matoro_gen...@matoro.tk> (2023-11-01)
 # Qt 6 not keyworded here.
 app-text/doxygen gui
-dev-util/cmake gui
+dev-build/cmake gui
 
 # Violet Purcell <vimpro...@inventati.org> (2023-10-12)
 # dev-build/samurai is not keyworded here.

diff --git a/profiles/arch/amd64/package.use.mask 
b/profiles/arch/amd64/package.use.mask
index e150a87519db..cde94fbd99ae 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -87,7 +87,7 @@ net-misc/curl -nghttp3
 
 # Sam James <s...@gentoo.org> (2023-07-18)
 # dev-cpp/cppdap is not keyworded in most places
-dev-util/cmake -dap
+dev-build/cmake -dap
 
 # Marek Szuba <mare...@gentoo.org> (2023-06-29)
 # Now that we globally unmask USE=qt6 for amd64, the mask set

diff --git a/profiles/arch/base/package.use.mask 
b/profiles/arch/base/package.use.mask
index 62e83683950a..ed5692624192 100644
--- a/profiles/arch/base/package.use.mask
+++ b/profiles/arch/base/package.use.mask
@@ -53,7 +53,7 @@ media-video/pipewire roc
 
 # Sam James <s...@gentoo.org> (2023-07-18)
 # dev-cpp/cppdap is not keyworded in most places
-dev-util/cmake dap
+dev-build/cmake dap
 
 # Sam James <s...@gentoo.org> (2023-07-09)
 # sys-libs/libhugetlbfs is broken w/ newer glibc, bug #806079

diff --git a/profiles/arch/hppa/package.use.mask 
b/profiles/arch/hppa/package.use.mask
index db4ce9e90e09..4b607081a632 100644
--- a/profiles/arch/hppa/package.use.mask
+++ b/profiles/arch/hppa/package.use.mask
@@ -44,7 +44,7 @@ app-text/doxygen gui
 
 # Sam James <s...@gentoo.org> (2023-09-22)
 # Qt 6 not keyworded here.
-dev-util/cmake gui
+dev-build/cmake gui
 
 # Sam James <s...@gentoo.org> (2023-09-18)
 # x11-libs/gtksourceview:4 not keyworded here

diff --git a/profiles/arch/hppa/package.use.stable.mask 
b/profiles/arch/hppa/package.use.stable.mask
index e9e8113acd7c..ccbecff2e469 100644
--- a/profiles/arch/hppa/package.use.stable.mask
+++ b/profiles/arch/hppa/package.use.stable.mask
@@ -168,7 +168,7 @@ dev-python/twisted test
 dev-tcltk/bwidget test
 dev-tcltk/snack test
 dev-tcltk/tcllib test
-dev-util/cmake test
+dev-build/cmake test
 sys-apps/dbus test
 
 # Rolf Eike Beer <e...@sf-mail.de> (2020-12-14)

diff --git a/profiles/arch/ia64/package.use.mask 
b/profiles/arch/ia64/package.use.mask
index cf2c7474c9fb..c18de78a3314 100644
--- a/profiles/arch/ia64/package.use.mask
+++ b/profiles/arch/ia64/package.use.mask
@@ -39,7 +39,7 @@ app-text/doxygen gui
 
 # Sam James <s...@gentoo.org> (2023-09-22)
 # Qt 6 not keyworded here.
-dev-util/cmake gui
+dev-build/cmake gui
 
 # Rich Freeman <ri...@gentoo.org> (2023-09-13)
 # Tests require shellcheck which is not currently available

diff --git a/profiles/arch/powerpc/ppc32/package.use.mask 
b/profiles/arch/powerpc/ppc32/package.use.mask
index a31cdc07a54a..e78219c307fe 100644
--- a/profiles/arch/powerpc/ppc32/package.use.mask
+++ b/profiles/arch/powerpc/ppc32/package.use.mask
@@ -23,7 +23,7 @@ dev-perl/DBD-mysql mysql
 
 # Sam James <s...@gentoo.org> (2023-09-22)
 # Qt 6 not keyworded here.
-dev-util/cmake gui
+dev-build/cmake gui
 
 # Sam James <s...@gentoo.org> (2023-09-22)
 # sys-apps/flatpak is not keyworded here

diff --git a/profiles/arch/powerpc/ppc64/package.use.mask 
b/profiles/arch/powerpc/ppc64/package.use.mask
index 705cdeb43627..c1d907fe1c86 100644
--- a/profiles/arch/powerpc/ppc64/package.use.mask
+++ b/profiles/arch/powerpc/ppc64/package.use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Ionen Wolkens <io...@gentoo.org> (2023-10-09)
@@ -7,7 +7,7 @@ media-libs/libplacebo -shaderc
 
 # Sam James <s...@gentoo.org> (2023-09-22)
 # Qt 6 not keyworded here.
-dev-util/cmake gui
+dev-build/cmake gui
 
 # Joonas Niilola <juip...@gentoo.org> (2023-08-24)
 # media-video/libva-utils is masked on ppc64, so hwaccel on Firefox

diff --git a/profiles/arch/s390/package.use.mask 
b/profiles/arch/s390/package.use.mask
index dd06dd907f21..ed4e9afb401b 100644
--- a/profiles/arch/s390/package.use.mask
+++ b/profiles/arch/s390/package.use.mask
@@ -37,7 +37,7 @@ app-text/doxygen gui
 
 # Sam James <s...@gentoo.org> (2023-09-22)
 # Qt 6 not keyworded here.
-dev-util/cmake gui
+dev-build/cmake gui
 
 # Sam James <s...@gentoo.org> (2023-06-18)
 # Qt 5 not keyworded here

diff --git a/profiles/arch/sparc/package.use.mask 
b/profiles/arch/sparc/package.use.mask
index eb1f8de33578..9fd8b2de8235 100644
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@@ -64,7 +64,7 @@ sys-apps/openrc s6
 
 # Sam James <s...@gentoo.org> (2023-09-22)
 # Qt 6 not keyworded here.
-dev-util/cmake gui
+dev-build/cmake gui
 
 # Rich Freeman <ri...@gentoo.org> (2023-09-13)
 # Tests require shellcheck which is not currently available

diff --git a/profiles/features/prefix/standalone/kernel-2.6.16+/profile.bashrc 
b/profiles/features/prefix/standalone/kernel-2.6.16+/profile.bashrc
index daf95e971573..caee13cd8cf1 100644
--- a/profiles/features/prefix/standalone/kernel-2.6.16+/profile.bashrc
+++ b/profiles/features/prefix/standalone/kernel-2.6.16+/profile.bashrc
@@ -1,9 +1,9 @@
-# Copyright 2018-2020 Gentoo Authors
+# Copyright 2018-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # tricks to circumvent false positive checks of old kernel
 
-if [[ ${CATEGORY}/${PN} == dev-util/cmake && ${EBUILD_PHASE} == configure ]]; 
then
+if [[ ${CATEGORY}/${PN} == dev-build/cmake && ${EBUILD_PHASE} == configure ]]; 
then
     einfo "Removing utimensat outputs..."
     sed -e '/UTIMENSAT=/d' -i "${S}"/Source/kwsys/CMakeLists.txt || die
 elif [[ ${CATEGORY}/${PN} == dev-libs/libuv && ${EBUILD_PHASE} == prepare ]]; 
then

diff --git a/profiles/features/prefix/standalone/profile.bashrc 
b/profiles/features/prefix/standalone/profile.bashrc
index 56d55959e8ad..6dba1b9ff713 100644
--- a/profiles/features/prefix/standalone/profile.bashrc
+++ b/profiles/features/prefix/standalone/profile.bashrc
@@ -57,7 +57,7 @@ elif [[ ${CATEGORY}/${PN} == dev-lang/php && ${EBUILD_PHASE} 
== prepare ]]; then
     ebegin "Prefixifying ext/iconv/config.m4 paths"
     sed -i -r "/for i in/s,(/usr(/local|)),${EPREFIX}\1,g" 
"${S}"/ext/iconv/config.m4
     eend $?
-elif [[ ${CATEGORY}/${PN} == dev-util/cmake && ${EBUILD_PHASE} == prepare ]]; 
then
+elif [[ ${CATEGORY}/${PN} == dev-build/cmake && ${EBUILD_PHASE} == prepare ]]; 
then
     einfo "Removing Debian magic..."
     for f in 
Modules/{CMakeFindPackageMode,FindPkgConfig,GNUInstallDirs,Platform/{GNU,Linux}}.cmake;
 do
        ebegin "  Updating $f"

diff --git a/profiles/info_pkgs b/profiles/info_pkgs
index 4fdd47b2093c..d73d46d82471 100644
--- a/profiles/info_pkgs
+++ b/profiles/info_pkgs
@@ -28,7 +28,7 @@ sys-devel/lld
 sys-devel/gcc
 sys-devel/gcc-config
 dev-java/java-config
-dev-util/cmake
+dev-build/cmake
 dev-build/meson
 # NOTE: portage no longer list /etc/gentoo-release,
 # so this is not redundant

diff --git a/profiles/targets/desktop/package.use 
b/profiles/targets/desktop/package.use
index fb40cc967f28..64368f304e8b 100644
--- a/profiles/targets/desktop/package.use
+++ b/profiles/targets/desktop/package.use
@@ -16,7 +16,7 @@ dev-qt/qtgui:5 accessibility egl libinput
 # on desktop profiles and CMake is unavoidable, it feels a shame to drag in
 # Qt 6 just for something people are unlikely to want. Plus, it avoids a
 # circular dependency out of the box.
-dev-util/cmake -gui -qt5 -qt6
+dev-build/cmake -gui -qt5 -qt6
 
 # Andreas Sturmlechner <ast...@gentoo.org> (2023-07-29)
 # Required by dev-python/PyQt5[multimedia]

diff --git a/profiles/updates/1Q-2024 b/profiles/updates/1Q-2024
index a8ca6ab46768..61c3e0552ef4 100644
--- a/profiles/updates/1Q-2024
+++ b/profiles/updates/1Q-2024
@@ -23,3 +23,4 @@ move dev-util/cmake-fedora dev-build/cmake-fedora
 move dev-util/ignition-cmake dev-build/ignition-cmake
 move dev-util/rocm-cmake dev-build/rocm-cmake
 move dev-util/tinycmmc dev-build/tinycmmc
+move dev-util/cmake dev-build/cmake

diff --git a/sci-astronomy/siril/siril-1.2.0.ebuild 
b/sci-astronomy/siril/siril-1.2.0.ebuild
index ab0ce6b7f6d2..70a659136663 100644
--- a/sci-astronomy/siril/siril-1.2.0.ebuild
+++ b/sci-astronomy/siril/siril-1.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -47,7 +47,7 @@ DEPEND="
 RDEPEND="
        ${DEPEND}
 "
-BDEPEND="dev-util/cmake
+BDEPEND="dev-build/cmake
        x11-base/xorg-proto"
 
 PATCHES=(

diff --git a/sci-astronomy/siril/siril-9999.ebuild 
b/sci-astronomy/siril/siril-9999.ebuild
index 1f9d03614a4d..f230b3469ec6 100644
--- a/sci-astronomy/siril/siril-9999.ebuild
+++ b/sci-astronomy/siril/siril-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -47,7 +47,7 @@ DEPEND="
 RDEPEND="
        ${DEPEND}
 "
-BDEPEND="dev-util/cmake
+BDEPEND="dev-build/cmake
        x11-base/xorg-proto"
 
 PATCHES=(

diff --git a/sci-libs/hipSPARSE/hipSPARSE-5.1.3-r1.ebuild 
b/sci-libs/hipSPARSE/hipSPARSE-5.1.3-r1.ebuild
index 5d1f5f1b59e2..d0d519b18ce6 100644
--- a/sci-libs/hipSPARSE/hipSPARSE-5.1.3-r1.ebuild
+++ b/sci-libs/hipSPARSE/hipSPARSE-5.1.3-r1.ebuild
@@ -46,7 +46,7 @@ RDEPEND="dev-util/rocminfo
                sci-libs/rocSPARSE:${SLOT}[${ROCM_USEDEP}]"
 DEPEND="${RDEPEND}"
 BDEPEND="dev-build/rocm-cmake
-       >=dev-util/cmake-3.22
+       >=dev-build/cmake-3.22
        test? ( dev-cpp/gtest )"
 
 S="${WORKDIR}/hipSPARSE-rocm-${PV}"

diff --git a/sci-libs/hipSPARSE/hipSPARSE-5.7.1.ebuild 
b/sci-libs/hipSPARSE/hipSPARSE-5.7.1.ebuild
index 45c92c36c51f..b3aa027c2624 100644
--- a/sci-libs/hipSPARSE/hipSPARSE-5.7.1.ebuild
+++ b/sci-libs/hipSPARSE/hipSPARSE-5.7.1.ebuild
@@ -46,7 +46,7 @@ RDEPEND="dev-util/rocminfo
                sci-libs/rocSPARSE:${SLOT}[${ROCM_USEDEP}]"
 DEPEND="${RDEPEND}"
 BDEPEND="dev-build/rocm-cmake
-       >=dev-util/cmake-3.22
+       >=dev-build/cmake-3.22
        test? ( dev-cpp/gtest )"
 
 S="${WORKDIR}/hipSPARSE-rocm-${PV}"

diff --git a/sci-libs/rocFFT/rocFFT-5.1.3-r1.ebuild 
b/sci-libs/rocFFT/rocFFT-5.1.3-r1.ebuild
index b4cef333669a..60110fcd62fc 100644
--- a/sci-libs/rocFFT/rocFFT-5.1.3-r1.ebuild
+++ b/sci-libs/rocFFT/rocFFT-5.1.3-r1.ebuild
@@ -35,7 +35,7 @@ DEPEND="dev-util/hip
 BDEPEND="
        test? ( dev-cpp/gtest dev-libs/boost
        >=sci-libs/fftw-3 sys-libs/libomp )
-       >=dev-util/cmake-3.22
+       >=dev-build/cmake-3.22
        dev-build/rocm-cmake
 "
 

diff --git a/sci-libs/rocFFT/rocFFT-5.7.1-r1.ebuild 
b/sci-libs/rocFFT/rocFFT-5.7.1-r1.ebuild
index b909e54736fe..0fba2a7508a3 100644
--- a/sci-libs/rocFFT/rocFFT-5.7.1-r1.ebuild
+++ b/sci-libs/rocFFT/rocFFT-5.7.1-r1.ebuild
@@ -40,7 +40,7 @@ BDEPEND="
                sys-libs/libomp
                sci-libs/hipRAND:${SLOT}[${ROCM_USEDEP}]
        )
-       >=dev-util/cmake-3.22
+       >=dev-build/cmake-3.22
        dev-build/rocm-cmake
        dev-db/sqlite
 "

diff --git a/sci-libs/rocPRIM/rocPRIM-5.1.3.ebuild 
b/sci-libs/rocPRIM/rocPRIM-5.1.3.ebuild
index df4cabdd0310..b95730533189 100644
--- a/sci-libs/rocPRIM/rocPRIM-5.1.3.ebuild
+++ b/sci-libs/rocPRIM/rocPRIM-5.1.3.ebuild
@@ -20,7 +20,7 @@ RDEPEND="dev-util/hip
        benchmark? ( dev-cpp/benchmark )
        test? ( dev-cpp/gtest )"
 BDEPEND="dev-build/rocm-cmake
-       >=dev-util/cmake-3.22"
+       >=dev-build/cmake-3.22"
 DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/rocPRIM-rocm-${PV}"

diff --git a/sci-libs/rocPRIM/rocPRIM-5.7.1.ebuild 
b/sci-libs/rocPRIM/rocPRIM-5.7.1.ebuild
index 482e1fc30e78..34c46c1b401d 100644
--- a/sci-libs/rocPRIM/rocPRIM-5.7.1.ebuild
+++ b/sci-libs/rocPRIM/rocPRIM-5.7.1.ebuild
@@ -20,7 +20,7 @@ RDEPEND="dev-util/hip
        benchmark? ( dev-cpp/benchmark )
        test? ( dev-cpp/gtest )"
 BDEPEND="dev-build/rocm-cmake
-       >=dev-util/cmake-3.22"
+       >=dev-build/cmake-3.22"
 DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/rocPRIM-rocm-${PV}"

diff --git a/sci-libs/rocRAND/rocRAND-5.1.3.ebuild 
b/sci-libs/rocRAND/rocRAND-5.1.3.ebuild
index 310a8c03c01c..bb518842e253 100644
--- a/sci-libs/rocRAND/rocRAND-5.1.3.ebuild
+++ b/sci-libs/rocRAND/rocRAND-5.1.3.ebuild
@@ -28,7 +28,7 @@ DEPEND="${RDEPEND}
 dev-build/rocm-cmake
 test? ( dev-cpp/gtest )"
 BDEPEND="dev-build/rocm-cmake
->=dev-util/cmake-3.22"
+>=dev-build/cmake-3.22"
 
 S="${WORKDIR}/rocRAND-rocm-${PV}"
 

diff --git a/sci-libs/rocRAND/rocRAND-5.6.0-r1.ebuild 
b/sci-libs/rocRAND/rocRAND-5.6.0-r1.ebuild
index c26133da34af..cadf2c863445 100644
--- a/sci-libs/rocRAND/rocRAND-5.6.0-r1.ebuild
+++ b/sci-libs/rocRAND/rocRAND-5.6.0-r1.ebuild
@@ -26,7 +26,7 @@ DEPEND="${RDEPEND}
        benchmark? ( dev-cpp/benchmark )
        test? ( dev-cpp/gtest )"
 BDEPEND="dev-build/rocm-cmake
-       >=dev-util/cmake-3.22"
+       >=dev-build/cmake-3.22"
 
 S="${WORKDIR}/rocRAND-rocm-${PV}"
 

diff --git a/sci-libs/rocRAND/rocRAND-5.7.1.ebuild 
b/sci-libs/rocRAND/rocRAND-5.7.1.ebuild
index 6da9f75c961c..262215396fe3 100644
--- a/sci-libs/rocRAND/rocRAND-5.7.1.ebuild
+++ b/sci-libs/rocRAND/rocRAND-5.7.1.ebuild
@@ -30,7 +30,7 @@ DEPEND="${RDEPEND}
        benchmark? ( dev-cpp/benchmark )
        test? ( dev-cpp/gtest )"
 BDEPEND="dev-build/rocm-cmake
-       >=dev-util/cmake-3.22"
+       >=dev-build/cmake-3.22"
 
 S="${WORKDIR}/rocRAND-rocm-${PV}"
 

diff --git a/sci-libs/rocSOLVER/rocSOLVER-5.1.3-r1.ebuild 
b/sci-libs/rocSOLVER/rocSOLVER-5.1.3-r1.ebuild
index 11cedfb8deff..7af286e20569 100644
--- a/sci-libs/rocSOLVER/rocSOLVER-5.1.3-r1.ebuild
+++ b/sci-libs/rocSOLVER/rocSOLVER-5.1.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -24,7 +24,7 @@ RDEPEND="dev-util/hip
        benchmark? ( virtual/blas )"
 DEPEND="${RDEPEND}"
 BDEPEND="test? ( dev-cpp/gtest
-       >=dev-util/cmake-3.22
+       >=dev-build/cmake-3.22
        virtual/blas )"
 
 PATCHES=(

diff --git a/sci-libs/rocSOLVER/rocSOLVER-5.4.2.ebuild 
b/sci-libs/rocSOLVER/rocSOLVER-5.4.2.ebuild
index 8088b8523a68..10fb52f40af2 100644
--- a/sci-libs/rocSOLVER/rocSOLVER-5.4.2.ebuild
+++ b/sci-libs/rocSOLVER/rocSOLVER-5.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -24,7 +24,7 @@ RDEPEND="dev-util/hip
        benchmark? ( virtual/blas )"
 DEPEND="${RDEPEND}"
 BDEPEND="test? ( dev-cpp/gtest
-       >=dev-util/cmake-3.22
+       >=dev-build/cmake-3.22
        virtual/blas )"
 
 PATCHES=( "${FILESDIR}"/${PN}-5.4.2-libfmt9.patch )

diff --git a/sci-libs/rocSOLVER/rocSOLVER-5.7.1.ebuild 
b/sci-libs/rocSOLVER/rocSOLVER-5.7.1.ebuild
index a5e339aa71ab..5d8141a88c15 100644
--- a/sci-libs/rocSOLVER/rocSOLVER-5.7.1.ebuild
+++ b/sci-libs/rocSOLVER/rocSOLVER-5.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -25,7 +25,7 @@ RDEPEND="dev-util/hip
        benchmark? ( virtual/blas )"
 DEPEND="${RDEPEND}"
 BDEPEND="test? ( dev-cpp/gtest
-       >=dev-util/cmake-3.22
+       >=dev-build/cmake-3.22
        virtual/blas )"
 
 RESTRICT="!test? ( test )"

diff --git a/sci-libs/rocSPARSE/rocSPARSE-5.1.3-r1.ebuild 
b/sci-libs/rocSPARSE/rocSPARSE-5.1.3-r1.ebuild
index 3c16b15085ac..31d07cee0a08 100644
--- a/sci-libs/rocSPARSE/rocSPARSE-5.1.3-r1.ebuild
+++ b/sci-libs/rocSPARSE/rocSPARSE-5.1.3-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 ROCM_VERSION=${PV}
 
 inherit cmake edo python-any-r1 toolchain-funcs rocm
@@ -50,7 +50,7 @@ RDEPEND="dev-util/hip
 DEPEND="${RDEPEND}"
 BDEPEND="test? (
        dev-cpp/gtest
-       >=dev-util/cmake-3.22
+       >=dev-build/cmake-3.22
        $(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
 )
 benchmark? ( app-admin/chrpath )

diff --git a/sci-libs/rocSPARSE/rocSPARSE-5.7.1-r1.ebuild 
b/sci-libs/rocSPARSE/rocSPARSE-5.7.1-r1.ebuild
index 72ab49658a90..d9b2859cad9c 100644
--- a/sci-libs/rocSPARSE/rocSPARSE-5.7.1-r1.ebuild
+++ b/sci-libs/rocSPARSE/rocSPARSE-5.7.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..12} )
+PYTHON_COMPAT=( python3_{10..12} )
 ROCM_VERSION=${PV}
 
 inherit cmake edo python-any-r1 toolchain-funcs rocm
@@ -50,7 +50,7 @@ RDEPEND="dev-util/hip
 DEPEND="${RDEPEND}"
 BDEPEND="test? (
        dev-cpp/gtest
-       >=dev-util/cmake-3.22
+       >=dev-build/cmake-3.22
        $(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
 )
 benchmark? ( app-admin/chrpath )

diff --git a/sci-libs/rocThrust/rocThrust-5.1.3.ebuild 
b/sci-libs/rocThrust/rocThrust-5.1.3.ebuild
index c7ef0e87fa4a..6fa60fff62dc 100644
--- a/sci-libs/rocThrust/rocThrust-5.1.3.ebuild
+++ b/sci-libs/rocThrust/rocThrust-5.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -23,7 +23,7 @@ RDEPEND="dev-util/hip
        sci-libs/rocPRIM:${SLOT}[${ROCM_USEDEP}]
        test? ( dev-cpp/gtest )"
 DEPEND="${RDEPEND}"
-BDEPEND=">=dev-util/cmake-3.22"
+BDEPEND=">=dev-build/cmake-3.22"
 
 S="${WORKDIR}/rocThrust-rocm-${PV}"
 

diff --git a/sci-libs/rocThrust/rocThrust-5.7.1.ebuild 
b/sci-libs/rocThrust/rocThrust-5.7.1.ebuild
index 68d0b7198b14..ca9648708282 100644
--- a/sci-libs/rocThrust/rocThrust-5.7.1.ebuild
+++ b/sci-libs/rocThrust/rocThrust-5.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -23,7 +23,7 @@ RDEPEND="dev-util/hip
        sci-libs/rocPRIM:${SLOT}[${ROCM_USEDEP}]
        test? ( dev-cpp/gtest )"
 DEPEND="${RDEPEND}"
-BDEPEND=">=dev-util/cmake-3.22"
+BDEPEND=">=dev-build/cmake-3.22"
 
 S="${WORKDIR}/rocThrust-rocm-${PV}"
 

diff --git a/sci-mathematics/petsc/petsc-3.16.0-r1.ebuild 
b/sci-mathematics/petsc/petsc-3.16.0-r1.ebuild
index 6fb38f147f14..743b36c54912 100644
--- a/sci-mathematics/petsc/petsc-3.16.0-r1.ebuild
+++ b/sci-mathematics/petsc/petsc-3.16.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_10 )
 
 inherit flag-o-matic fortran-2 python-any-r1 toolchain-funcs
 
@@ -50,7 +50,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
        ${PYTHON_DEPS}
        virtual/pkgconfig
-       dev-util/cmake
+       dev-build/cmake
        sys-apps/which
 "
 

diff --git a/sci-mathematics/petsc/petsc-3.17.1-r1.ebuild 
b/sci-mathematics/petsc/petsc-3.17.1-r1.ebuild
index c38d34317074..5caa2d8578da 100644
--- a/sci-mathematics/petsc/petsc-3.17.1-r1.ebuild
+++ b/sci-mathematics/petsc/petsc-3.17.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} pypy3 )
+PYTHON_COMPAT=( python3_10 pypy3 )
 
 inherit flag-o-matic fortran-2 python-any-r1 toolchain-funcs
 
@@ -41,7 +41,7 @@ DEPEND="
        ${PYTHON_DEPS}
 "
 BDEPEND="
-       dev-util/cmake
+       dev-build/cmake
        sys-apps/which
        virtual/pkgconfig
 "

diff --git a/sci-mathematics/petsc/petsc-3.18.2.ebuild 
b/sci-mathematics/petsc/petsc-3.18.2.ebuild
index f57281175844..27e8a71e87ea 100644
--- a/sci-mathematics/petsc/petsc-3.18.2.ebuild
+++ b/sci-mathematics/petsc/petsc-3.18.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
+PYTHON_COMPAT=( python3_{10..11} pypy3 )
 
 inherit flag-o-matic fortran-2 python-any-r1 toolchain-funcs
 
@@ -41,7 +41,7 @@ DEPEND="
        ${PYTHON_DEPS}
 "
 BDEPEND="
-       dev-util/cmake
+       dev-build/cmake
        sys-apps/which
        virtual/pkgconfig
 "

diff --git a/sci-mathematics/petsc/petsc-3.19.1.ebuild 
b/sci-mathematics/petsc/petsc-3.19.1.ebuild
index f57281175844..27e8a71e87ea 100644
--- a/sci-mathematics/petsc/petsc-3.19.1.ebuild
+++ b/sci-mathematics/petsc/petsc-3.19.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
+PYTHON_COMPAT=( python3_{10..11} pypy3 )
 
 inherit flag-o-matic fortran-2 python-any-r1 toolchain-funcs
 
@@ -41,7 +41,7 @@ DEPEND="
        ${PYTHON_DEPS}
 "
 BDEPEND="
-       dev-util/cmake
+       dev-build/cmake
        sys-apps/which
        virtual/pkgconfig
 "

diff --git a/sci-mathematics/petsc/petsc-3.19.2.ebuild 
b/sci-mathematics/petsc/petsc-3.19.2.ebuild
index f57281175844..27e8a71e87ea 100644
--- a/sci-mathematics/petsc/petsc-3.19.2.ebuild
+++ b/sci-mathematics/petsc/petsc-3.19.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
+PYTHON_COMPAT=( python3_{10..11} pypy3 )
 
 inherit flag-o-matic fortran-2 python-any-r1 toolchain-funcs
 
@@ -41,7 +41,7 @@ DEPEND="
        ${PYTHON_DEPS}
 "
 BDEPEND="
-       dev-util/cmake
+       dev-build/cmake
        sys-apps/which
        virtual/pkgconfig
 "

diff --git a/sci-mathematics/petsc/petsc-3.19.4.ebuild 
b/sci-mathematics/petsc/petsc-3.19.4.ebuild
index f57281175844..27e8a71e87ea 100644
--- a/sci-mathematics/petsc/petsc-3.19.4.ebuild
+++ b/sci-mathematics/petsc/petsc-3.19.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
+PYTHON_COMPAT=( python3_{10..11} pypy3 )
 
 inherit flag-o-matic fortran-2 python-any-r1 toolchain-funcs
 
@@ -41,7 +41,7 @@ DEPEND="
        ${PYTHON_DEPS}
 "
 BDEPEND="
-       dev-util/cmake
+       dev-build/cmake
        sys-apps/which
        virtual/pkgconfig
 "

diff --git a/sci-mathematics/slepc/slepc-3.16.0.ebuild 
b/sci-mathematics/slepc/slepc-3.16.0.ebuild
index d429df0ac74e..398991839815 100644
--- a/sci-mathematics/slepc/slepc-3.16.0.ebuild
+++ b/sci-mathematics/slepc/slepc-3.16.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_10 )
 
 inherit flag-o-matic python-any-r1 toolchain-funcs
 
@@ -25,7 +25,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
        ${PYTHON_DEPS}
        virtual/pkgconfig
-       dev-util/cmake
+       dev-build/cmake
 "
 
 MAKEOPTS="${MAKEOPTS} V=1"

diff --git a/sci-mathematics/slepc/slepc-3.17.1.ebuild 
b/sci-mathematics/slepc/slepc-3.17.1.ebuild
index 3b88dcc35b7f..32dcd9642922 100644
--- a/sci-mathematics/slepc/slepc-3.17.1.ebuild
+++ b/sci-mathematics/slepc/slepc-3.17.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_10 )
 
 inherit flag-o-matic python-any-r1 toolchain-funcs
 
@@ -25,7 +25,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
        ${PYTHON_DEPS}
        virtual/pkgconfig
-       dev-util/cmake
+       dev-build/cmake
 "
 
 MAKEOPTS="${MAKEOPTS} V=1"

diff --git a/sci-mathematics/slepc/slepc-3.18.1.ebuild 
b/sci-mathematics/slepc/slepc-3.18.1.ebuild
index dacebd229f02..77193abacfff 100644
--- a/sci-mathematics/slepc/slepc-3.18.1.ebuild
+++ b/sci-mathematics/slepc/slepc-3.18.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 
 inherit python-any-r1
 
@@ -27,7 +27,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
        ${PYTHON_DEPS}
        virtual/pkgconfig
-       dev-util/cmake
+       dev-build/cmake
 "
 
 MAKEOPTS="${MAKEOPTS} V=1"

diff --git a/sci-mathematics/slepc/slepc-3.19.0.ebuild 
b/sci-mathematics/slepc/slepc-3.19.0.ebuild
index 3622655a7bd1..3d9a5e16f6f6 100644
--- a/sci-mathematics/slepc/slepc-3.19.0.ebuild
+++ b/sci-mathematics/slepc/slepc-3.19.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 
 inherit python-any-r1
 
@@ -29,7 +29,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
        ${PYTHON_DEPS}
        virtual/pkgconfig
-       dev-util/cmake
+       dev-build/cmake
 "
 
 MAKEOPTS="${MAKEOPTS} V=1"

diff --git a/sci-mathematics/slepc/slepc-3.19.1.ebuild 
b/sci-mathematics/slepc/slepc-3.19.1.ebuild
index 3622655a7bd1..3d9a5e16f6f6 100644
--- a/sci-mathematics/slepc/slepc-3.19.1.ebuild
+++ b/sci-mathematics/slepc/slepc-3.19.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 
 inherit python-any-r1
 
@@ -29,7 +29,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
        ${PYTHON_DEPS}
        virtual/pkgconfig
-       dev-util/cmake
+       dev-build/cmake
 "
 
 MAKEOPTS="${MAKEOPTS} V=1"

diff --git a/sys-cluster/ceph/ceph-16.2.14-r1.ebuild 
b/sys-cluster/ceph/ceph-16.2.14-r1.ebuild
index 08fc7ebf06a8..9f334bb302cd 100644
--- a/sys-cluster/ceph/ceph-16.2.14-r1.ebuild
+++ b/sys-cluster/ceph/ceph-16.2.14-r1.ebuild
@@ -103,7 +103,7 @@ BDEPEND="
        x86? ( dev-lang/yasm )
        app-alternatives/cpio
        dev-debug/valgrind
-       >=dev-util/cmake-3.5.0
+       >=dev-build/cmake-3.5.0
        dev-python/cython[${PYTHON_USEDEP}]
        dev-python/setuptools[${PYTHON_USEDEP}]
        dev-python/sphinx

diff --git a/sys-cluster/ceph/ceph-17.2.6-r8.ebuild 
b/sys-cluster/ceph/ceph-17.2.6-r8.ebuild
index 635ee0061ac4..b30fbd6be9a9 100644
--- a/sys-cluster/ceph/ceph-17.2.6-r8.ebuild
+++ b/sys-cluster/ceph/ceph-17.2.6-r8.ebuild
@@ -110,7 +110,7 @@ BDEPEND="
        x86? ( dev-lang/yasm )
        app-alternatives/cpio
        dev-debug/valgrind
-       >=dev-util/cmake-3.5.0
+       >=dev-build/cmake-3.5.0
        dev-python/cython[${PYTHON_USEDEP}]
        dev-python/setuptools[${PYTHON_USEDEP}]
        dev-python/sphinx

diff --git a/sys-cluster/ceph/ceph-17.2.7.ebuild 
b/sys-cluster/ceph/ceph-17.2.7.ebuild
index 27b8b4297e7a..5b8e6c36cdc6 100644
--- a/sys-cluster/ceph/ceph-17.2.7.ebuild
+++ b/sys-cluster/ceph/ceph-17.2.7.ebuild
@@ -110,7 +110,7 @@ BDEPEND="
        x86? ( dev-lang/yasm )
        app-alternatives/cpio
        dev-debug/valgrind
-       >=dev-util/cmake-3.5.0
+       >=dev-build/cmake-3.5.0
        dev-python/cython[${PYTHON_USEDEP}]
        dev-python/setuptools[${PYTHON_USEDEP}]
        dev-python/sphinx

diff --git a/sys-cluster/ceph/ceph-18.2.0-r2.ebuild 
b/sys-cluster/ceph/ceph-18.2.0-r2.ebuild
index 80a19ee5afb0..e4eee27edc16 100644
--- a/sys-cluster/ceph/ceph-18.2.0-r2.ebuild
+++ b/sys-cluster/ceph/ceph-18.2.0-r2.ebuild
@@ -112,7 +112,7 @@ BDEPEND="
        x86? ( dev-lang/yasm )
        app-alternatives/cpio
        dev-debug/valgrind
-       >=dev-util/cmake-3.5.0
+       >=dev-build/cmake-3.5.0
        dev-python/cython[${PYTHON_USEDEP}]
        dev-python/setuptools[${PYTHON_USEDEP}]
        dev-python/sphinx

diff --git a/www-servers/monkeyd/monkeyd-1.6.9-r2.ebuild 
b/www-servers/monkeyd/monkeyd-1.6.9-r2.ebuild
index 574514f722de..1d194afb20c4 100644
--- a/www-servers/monkeyd/monkeyd-1.6.9-r2.ebuild
+++ b/www-servers/monkeyd/monkeyd-1.6.9-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -31,7 +31,7 @@ REQUIRED_USE="
 
 #DEPEND="jemalloc? ( >=dev-libs/jemalloc-3.3.1 )"
 DEPEND="
-       dev-util/cmake
+       dev-build/cmake
        monkeyd_plugins_tls? ( net-libs/mbedtls:= )"
 RDEPEND="
        acct-group/monkeyd

diff --git a/www-servers/monkeyd/monkeyd-9999.ebuild 
b/www-servers/monkeyd/monkeyd-9999.ebuild
index a0b187211a62..09c054059b22 100644
--- a/www-servers/monkeyd/monkeyd-9999.ebuild
+++ b/www-servers/monkeyd/monkeyd-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -31,7 +31,7 @@ REQUIRED_USE="
 
 #DEPEND="jemalloc? ( >=dev-libs/jemalloc-3.3.1 )"
 DEPEND="
-       dev-util/cmake
+       dev-build/cmake
        monkeyd_plugins_tls? ( net-libs/mbedtls:= )"
 RDEPEND="
        acct-group/monkeyd

diff --git a/x11-terms/alacritty/alacritty-0.12.3.ebuild 
b/x11-terms/alacritty/alacritty-0.12.3.ebuild
index 67872fb0057b..a1a07a3d4499 100644
--- a/x11-terms/alacritty/alacritty-0.12.3.ebuild
+++ b/x11-terms/alacritty/alacritty-0.12.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2017-2023 Gentoo Authors
+# Copyright 2017-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -240,7 +240,7 @@ CRATES="
 
 MY_PV="${PV//_rc/-rc}"
 # https://bugs.gentoo.org/725962
-PYTHON_COMPAT=( python3_{9..12} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit bash-completion-r1 cargo desktop python-any-r1
 
@@ -287,7 +287,7 @@ RDEPEND="${COMMON_DEPEND}
 "
 
 BDEPEND="
-       dev-util/cmake
+       dev-build/cmake
        >=virtual/rust-1.57.0
 "
 

diff --git a/x11-terms/alacritty/alacritty-0.13.1.ebuild 
b/x11-terms/alacritty/alacritty-0.13.1.ebuild
index f735668b1b2c..b9c1811192ed 100644
--- a/x11-terms/alacritty/alacritty-0.13.1.ebuild
+++ b/x11-terms/alacritty/alacritty-0.13.1.ebuild
@@ -311,7 +311,7 @@ RDEPEND="${COMMON_DEPEND}
 "
 
 BDEPEND="
-       dev-util/cmake
+       dev-build/cmake
        >=virtual/rust-1.70.0
        app-text/scdoc
 "

diff --git a/x11-terms/alacritty/alacritty-9999.ebuild 
b/x11-terms/alacritty/alacritty-9999.ebuild
index 6bdfbfe42e1a..80b205f702c2 100644
--- a/x11-terms/alacritty/alacritty-9999.ebuild
+++ b/x11-terms/alacritty/alacritty-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2017-2023 Gentoo Authors
+# Copyright 2017-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -57,7 +57,7 @@ RDEPEND="${COMMON_DEPEND}
 "
 
 BDEPEND="
-       dev-util/cmake
+       dev-build/cmake
        >=virtual/rust-1.70.0
        app-text/scdoc
 "

diff --git a/x11-terms/wezterm/wezterm-20230408.112425.ebuild 
b/x11-terms/wezterm/wezterm-20230408.112425.ebuild
index f4745ae8dd6b..3d8f29296ae5 100644
--- a/x11-terms/wezterm/wezterm-20230408.112425.ebuild
+++ b/x11-terms/wezterm/wezterm-20230408.112425.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Auto-Generated by cargo-ebuild 0.5.4
@@ -657,7 +657,7 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 BDEPEND="
-       dev-util/cmake
+       dev-build/cmake
        dev-vcs/git
        virtual/pkgconfig
        virtual/rust

diff --git a/x11-terms/wezterm/wezterm-20230712.072601.ebuild 
b/x11-terms/wezterm/wezterm-20230712.072601.ebuild
index 006717f9520f..d8d07f9fe953 100644
--- a/x11-terms/wezterm/wezterm-20230712.072601.ebuild
+++ b/x11-terms/wezterm/wezterm-20230712.072601.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Auto-Generated by cargo-ebuild 0.5.4
@@ -664,7 +664,7 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 BDEPEND="
-       dev-util/cmake
+       dev-build/cmake
        dev-vcs/git
        virtual/pkgconfig
        virtual/rust