2024-01-14 19:33:58 UTC

43 files changed, 86 insertions, 86 deletions

diff --git a/metadata/md5-cache/dev-db/cockroach-19.1.1-r1 b/metadata/md5-cache/dev-db/cockroach-19.1.1-r1
index e0468299dbac..060baf5088f0 100644
--- a/metadata/md5-cache/dev-db/cockroach-19.1.1-r1
+++ b/metadata/md5-cache/dev-db/cockroach-19.1.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install pretend setup
-DEPEND=acct-group/cockroach acct-user/cockroach >=app-arch/xz-utils-5.2.3 >=dev-lang/go-1.8.3 >=dev-util/cmake-3.8.1
+DEPEND=acct-group/cockroach acct-user/cockroach >=app-arch/xz-utils-5.2.3 >=dev-lang/go-1.8.3 >=dev-build/cmake-3.8.1
 DESCRIPTION=open source database for building cloud services
 EAPI=7
 HOMEPAGE=https://www.cockroachlabs.com
@@ -10,4 +10,4 @@ RDEPEND=acct-group/cockroach acct-user/cockroach
 SLOT=0
 SRC_URI=https://binaries.cockroachdb.com/cockroach-v19.1.1.src.tgz
 _eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0
-_md5_=61317de576ab9f80cb4449b590edb2fa
+_md5_=3159e8dc664277f2831a0a184203aa09
diff --git a/metadata/md5-cache/dev-db/cockroach-2.1.5-r1 b/metadata/md5-cache/dev-db/cockroach-2.1.5-r1
index 431446540ae5..7ed6751b6bc2 100644
--- a/metadata/md5-cache/dev-db/cockroach-2.1.5-r1
+++ b/metadata/md5-cache/dev-db/cockroach-2.1.5-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install pretend setup
-DEPEND=acct-group/cockroach acct-user/cockroach >=app-arch/xz-utils-5.2.3 >=dev-lang/go-1.8.3 >=dev-util/cmake-3.8.1
+DEPEND=acct-group/cockroach acct-user/cockroach >=app-arch/xz-utils-5.2.3 >=dev-lang/go-1.8.3 >=dev-build/cmake-3.8.1
 DESCRIPTION=open source database for building cloud services
 EAPI=7
 HOMEPAGE=https://www.cockroachlabs.com
@@ -10,4 +10,4 @@ RDEPEND=acct-group/cockroach acct-user/cockroach
 SLOT=0
 SRC_URI=https://binaries.cockroachdb.com/cockroach-v2.1.5.src.tgz
 _eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0
-_md5_=61317de576ab9f80cb4449b590edb2fa
+_md5_=3159e8dc664277f2831a0a184203aa09
diff --git a/metadata/md5-cache/dev-db/futuresql5-0.1.1 b/metadata/md5-cache/dev-db/futuresql5-0.1.1
index 83bc79a9d30b..6aff63c27eb2 100644
--- a/metadata/md5-cache/dev-db/futuresql5-0.1.1
+++ b/metadata/md5-cache/dev-db/futuresql5-0.1.1
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5 dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.106.0:*
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5 dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.106.0:*
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
 DEPEND=dev-qt/qtsql:5 examples? ( dev-libs/qcoro5 ) test? ( dev-libs/qcoro5 ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
 DESCRIPTION=Non-blocking Qt database framework
@@ -13,5 +13,5 @@ RDEPEND=dev-qt/qtsql:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://kde/stable/futuresql/futuresql-0.1.1.tar.xz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	ecm	a9d1de06ef0d5d4de7114a10dcb64daa	kde.org	60fcb935e4206806bf9f38e3537521a2
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	ecm	a9d1de06ef0d5d4de7114a10dcb64daa	kde.org	60fcb935e4206806bf9f38e3537521a2
 _md5_=791803ac33a3ebbbc2af6791483aedd0
diff --git a/metadata/md5-cache/dev-db/kdb-3.2.0-r2 b/metadata/md5-cache/dev-db/kdb-3.2.0-r2
index 666109a2fce4..7779719d0f85 100644
--- a/metadata/md5-cache/dev-db/kdb-3.2.0-r2
+++ b/metadata/md5-cache/dev-db/kdb-3.2.0-r2
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/python:3.11 dev-lang/python:3.10 ) dev-qt/linguist-tools:5 app-alternatives/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-text/doxygen-1.8.13-r1 ) doc? ( dev-qt/qthelp:5 ) dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.82.0:*
+BDEPEND=|| ( dev-lang/python:3.11 dev-lang/python:3.10 ) dev-qt/linguist-tools:5 app-alternatives/ninja >=dev-build/cmake-3.20.5 doc? ( >=app-text/doxygen-1.8.13-r1 ) doc? ( dev-qt/qthelp:5 ) dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.82.0:*
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
 DEPEND=dev-libs/icu:= >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcoreaddons-5.82.0:5 mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:* >=dev-qt/qtnetwork-5.15.2:5 ) sqlite? ( dev-db/sqlite:3 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 DESCRIPTION=Database connectivity and creation framework for various vendors
@@ -13,5 +13,5 @@ RDEPEND=dev-libs/icu:= >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev
 RESTRICT=!test? ( test )
 SLOT=5/4
 SRC_URI=mirror://kde/stable/kdb/src/kdb-3.2.0.tar.xz https://dev.gentoo.org/~asturm/distfiles/kdb-3.2.0-patches.tar.xz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	ecm	a9d1de06ef0d5d4de7114a10dcb64daa	kde.org	60fcb935e4206806bf9f38e3537521a2	python-utils-r1	042f4cc53680245bf99a84669b94155a	python-any-r1	f5169813d1619761b459800587005fd2
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	ecm	a9d1de06ef0d5d4de7114a10dcb64daa	kde.org	60fcb935e4206806bf9f38e3537521a2	python-utils-r1	042f4cc53680245bf99a84669b94155a	python-any-r1	f5169813d1619761b459800587005fd2
 _md5_=fa777234fbad2bf7bad7a9c79ad0f2ec
diff --git a/metadata/md5-cache/dev-db/mariadb-10.11.5 b/metadata/md5-cache/dev-db/mariadb-10.11.5
index deacf6c823ec..a8c4eddf9ebf 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.11.5
+++ b/metadata/md5-cache/dev-db/mariadb-10.11.5
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/yacc virtual/pkgconfig app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-alternatives/yacc virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile config configure install postinst preinst prepare setup test unpack
 DEPEND=dev-libs/libfmt:= >=dev-libs/libpcre2-10.34:= >=sys-apps/texinfo-4.7-r1 sys-libs/ncurses:0= >=sys-libs/zlib-1.2.3:0= virtual/libcrypt:= !bindist? ( sys-libs/binutils-libs:0= >=sys-libs/readline-4.1:0= ) jemalloc? ( dev-libs/jemalloc:0= ) kerberos? ( virtual/krb5 ) kernel_linux? ( dev-libs/libaio:0= sys-libs/liburing:= sys-process/procps:0= ) server? ( app-arch/bzip2 app-arch/xz-utils backup? ( app-arch/libarchive:0= ) columnstore? ( app-arch/snappy:= dev-libs/boost:= dev-libs/libxml2:2= ) cracklib? ( sys-libs/cracklib:0= ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) ) innodb-lz4? ( app-arch/lz4 ) innodb-lzo? ( dev-libs/lzo ) innodb-snappy? ( app-arch/snappy:= ) mroonga? ( app-text/groonga-normalizer-mysql >=app-text/groonga-7.0.4 ) numa? ( sys-process/numactl ) oqgraph? ( dev-libs/boost:= dev-libs/judy:0= ) pam? ( sys-libs/pam:0= ) s3? ( net-misc/curl ) systemd? ( sys-apps/systemd:= ) ) systemtap? ( >=dev-util/systemtap-1.3:0= ) tcmalloc? ( dev-util/google-perftools:0= ) yassl? ( net-libs/gnutls:0= ) !yassl? ( >=dev-libs/openssl-1.0.0:0= ) server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.8 ) ) test? ( acct-group/mysql acct-user/mysql ) ) static? ( sys-libs/ncurses[static-libs] ) jdbc? ( >=dev-java/java-config-2.2.0-r3 )
 DESCRIPTION=An enhanced, drop-in replacement for MySQL
@@ -14,5 +14,5 @@ REQUIRED_USE=jdbc? ( extraengine server !static ) ?? ( tcmalloc jemalloc ) stati
 RESTRICT=!bindist? ( bindist ) !test? ( test )
 SLOT=10.11/18
 SRC_URI=mirror://mariadb/mariadb-10.11.5/source/mariadb-10.11.5.tar.gz https://github.com/hydrapolic/gentoo-dist/raw/master/mariadb/mariadb-10.11.3-patches-01.tar.xz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	prefix	eab3c99d77fe00506c109c8a736186f7	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	java-utils-2	0fd5b6616cd66c8099a941608e2e0242	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	prefix	eab3c99d77fe00506c109c8a736186f7	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	java-utils-2	0fd5b6616cd66c8099a941608e2e0242	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c
 _md5_=0d18f0c864ff1403435b4b5065136022
diff --git a/metadata/md5-cache/dev-db/mariadb-10.11.5-r1 b/metadata/md5-cache/dev-db/mariadb-10.11.5-r1
index c50233810ef6..ea0078902c7e 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.11.5-r1
+++ b/metadata/md5-cache/dev-db/mariadb-10.11.5-r1
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/yacc virtual/pkgconfig app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-alternatives/yacc virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile config configure install postinst preinst prepare setup test unpack
 DEPEND=dev-libs/libfmt:= >=dev-libs/libpcre2-10.34:= >=sys-apps/texinfo-4.7-r1 sys-libs/ncurses:0= >=sys-libs/zlib-1.2.3:0= virtual/libcrypt:= !bindist? ( sys-libs/binutils-libs:0= >=sys-libs/readline-4.1:0= ) jemalloc? ( dev-libs/jemalloc:0= ) kerberos? ( virtual/krb5 ) kernel_linux? ( dev-libs/libaio:0= sys-libs/liburing:= sys-process/procps:0= ) server? ( app-arch/bzip2 app-arch/xz-utils backup? ( app-arch/libarchive:0= ) columnstore? ( app-arch/snappy:= dev-libs/boost:= dev-libs/libxml2:2= ) cracklib? ( sys-libs/cracklib:0= ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) ) innodb-lz4? ( app-arch/lz4 ) innodb-lzo? ( dev-libs/lzo ) innodb-snappy? ( app-arch/snappy:= ) mroonga? ( app-text/groonga-normalizer-mysql >=app-text/groonga-7.0.4 ) numa? ( sys-process/numactl ) oqgraph? ( dev-libs/boost:= dev-libs/judy:0= ) pam? ( sys-libs/pam:0= ) s3? ( net-misc/curl ) systemd? ( sys-apps/systemd:= ) ) systemtap? ( >=dev-util/systemtap-1.3:0= ) tcmalloc? ( dev-util/google-perftools:0= ) yassl? ( net-libs/gnutls:0= ) !yassl? ( >=dev-libs/openssl-1.0.0:0= ) server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.8 ) ) test? ( acct-group/mysql acct-user/mysql ) ) static? ( sys-libs/ncurses[static-libs] ) jdbc? ( >=dev-java/java-config-2.2.0-r3 )
 DESCRIPTION=An enhanced, drop-in replacement for MySQL
@@ -14,5 +14,5 @@ REQUIRED_USE=jdbc? ( extraengine server !static ) ?? ( tcmalloc jemalloc ) stati
 RESTRICT=!bindist? ( bindist ) !test? ( test )
 SLOT=10.11/18
 SRC_URI=mirror://mariadb/mariadb-10.11.5/source/mariadb-10.11.5.tar.gz https://github.com/hydrapolic/gentoo-dist/raw/master/mariadb/mariadb-10.11.3-patches-01.tar.xz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	prefix	eab3c99d77fe00506c109c8a736186f7	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	java-utils-2	0fd5b6616cd66c8099a941608e2e0242	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	prefix	eab3c99d77fe00506c109c8a736186f7	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	java-utils-2	0fd5b6616cd66c8099a941608e2e0242	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c
 _md5_=529d2c5c1690842c785d493c8f7132b5
diff --git a/metadata/md5-cache/dev-db/mariadb-10.6.14 b/metadata/md5-cache/dev-db/mariadb-10.6.14
index f3317d554c53..77a9a6c945f1 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.6.14
+++ b/metadata/md5-cache/dev-db/mariadb-10.6.14
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/yacc virtual/pkgconfig app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-alternatives/yacc virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile config configure install postinst preinst prepare setup test unpack
 DEPEND=>=dev-libs/libpcre2-10.34:= >=sys-apps/texinfo-4.7-r1 sys-libs/ncurses:0= >=sys-libs/zlib-1.2.3:0= virtual/libcrypt:= !bindist? ( sys-libs/binutils-libs:0= >=sys-libs/readline-4.1:0= ) jemalloc? ( dev-libs/jemalloc:0= ) kerberos? ( virtual/krb5 ) kernel_linux? ( dev-libs/libaio:0= sys-libs/liburing:= sys-process/procps:0= ) server? ( app-arch/bzip2 app-arch/xz-utils backup? ( app-arch/libarchive:0= ) columnstore? ( app-arch/snappy:= dev-libs/boost:= dev-libs/libxml2:2= ) cracklib? ( sys-libs/cracklib:0= ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) ) innodb-lz4? ( app-arch/lz4 ) innodb-lzo? ( dev-libs/lzo ) innodb-snappy? ( app-arch/snappy:= ) mroonga? ( app-text/groonga-normalizer-mysql >=app-text/groonga-7.0.4 ) numa? ( sys-process/numactl ) oqgraph? ( dev-libs/boost:= dev-libs/judy:0= ) pam? ( sys-libs/pam:0= ) s3? ( net-misc/curl ) systemd? ( sys-apps/systemd:= ) ) systemtap? ( >=dev-util/systemtap-1.3:0= ) tcmalloc? ( dev-util/google-perftools:0= ) yassl? ( net-libs/gnutls:0= ) !yassl? ( >=dev-libs/openssl-1.0.0:0= ) server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.8 ) ) test? ( acct-group/mysql acct-user/mysql ) ) static? ( sys-libs/ncurses[static-libs] ) jdbc? ( >=dev-java/java-config-2.2.0-r3 )
 DESCRIPTION=An enhanced, drop-in replacement for MySQL
@@ -14,5 +14,5 @@ REQUIRED_USE=jdbc? ( extraengine server !static ) ?? ( tcmalloc jemalloc ) stati
 RESTRICT=!bindist? ( bindist ) !test? ( test )
 SLOT=10.6/18
 SRC_URI=mirror://mariadb/mariadb-10.6.14/source/mariadb-10.6.14.tar.gz https://github.com/hydrapolic/gentoo-dist/raw/master/mariadb/mariadb-10.6.13-patches-01.tar.xz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	prefix	eab3c99d77fe00506c109c8a736186f7	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	java-utils-2	0fd5b6616cd66c8099a941608e2e0242	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	prefix	eab3c99d77fe00506c109c8a736186f7	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	java-utils-2	0fd5b6616cd66c8099a941608e2e0242	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c
 _md5_=7b27aed90e25ee9b17919d9251b340c4
diff --git a/metadata/md5-cache/dev-db/mariadb-10.6.15 b/metadata/md5-cache/dev-db/mariadb-10.6.15
index 6ffeb3f470cc..bcaaa5631f8c 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.6.15
+++ b/metadata/md5-cache/dev-db/mariadb-10.6.15
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/yacc virtual/pkgconfig app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-alternatives/yacc virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile config configure install postinst preinst prepare setup test unpack
 DEPEND=>=dev-libs/libpcre2-10.34:= >=sys-apps/texinfo-4.7-r1 sys-libs/ncurses:0= >=sys-libs/zlib-1.2.3:0= virtual/libcrypt:= !bindist? ( sys-libs/binutils-libs:0= >=sys-libs/readline-4.1:0= ) jemalloc? ( dev-libs/jemalloc:0= ) kerberos? ( virtual/krb5 ) kernel_linux? ( dev-libs/libaio:0= sys-libs/liburing:= sys-process/procps:0= ) server? ( app-arch/bzip2 app-arch/xz-utils backup? ( app-arch/libarchive:0= ) columnstore? ( app-arch/snappy:= dev-libs/boost:= dev-libs/libxml2:2= ) cracklib? ( sys-libs/cracklib:0= ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) ) innodb-lz4? ( app-arch/lz4 ) innodb-lzo? ( dev-libs/lzo ) innodb-snappy? ( app-arch/snappy:= ) mroonga? ( app-text/groonga-normalizer-mysql >=app-text/groonga-7.0.4 ) numa? ( sys-process/numactl ) oqgraph? ( dev-libs/boost:= dev-libs/judy:0= ) pam? ( sys-libs/pam:0= ) s3? ( net-misc/curl ) systemd? ( sys-apps/systemd:= ) ) systemtap? ( >=dev-util/systemtap-1.3:0= ) tcmalloc? ( dev-util/google-perftools:0= ) yassl? ( net-libs/gnutls:0= ) !yassl? ( >=dev-libs/openssl-1.0.0:0= ) server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.8 ) ) test? ( acct-group/mysql acct-user/mysql ) ) static? ( sys-libs/ncurses[static-libs] ) jdbc? ( >=dev-java/java-config-2.2.0-r3 )
 DESCRIPTION=An enhanced, drop-in replacement for MySQL
@@ -14,5 +14,5 @@ REQUIRED_USE=jdbc? ( extraengine server !static ) ?? ( tcmalloc jemalloc ) stati
 RESTRICT=!bindist? ( bindist ) !test? ( test )
 SLOT=10.6/18
 SRC_URI=mirror://mariadb/mariadb-10.6.15/source/mariadb-10.6.15.tar.gz https://github.com/hydrapolic/gentoo-dist/raw/master/mariadb/mariadb-10.6.13-patches-01.tar.xz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	prefix	eab3c99d77fe00506c109c8a736186f7	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	java-utils-2	0fd5b6616cd66c8099a941608e2e0242	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	prefix	eab3c99d77fe00506c109c8a736186f7	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	java-utils-2	0fd5b6616cd66c8099a941608e2e0242	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c
 _md5_=5df265438415c59c86a6919a48cdbd70
diff --git a/metadata/md5-cache/dev-db/mariadb-10.6.15-r1 b/metadata/md5-cache/dev-db/mariadb-10.6.15-r1
index a02ba6846445..bb49156b9974 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.6.15-r1
+++ b/metadata/md5-cache/dev-db/mariadb-10.6.15-r1
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/yacc virtual/pkgconfig app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-alternatives/yacc virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile config configure install postinst preinst prepare setup test unpack
 DEPEND=>=dev-libs/libpcre2-10.34:= >=sys-apps/texinfo-4.7-r1 sys-libs/ncurses:0= >=sys-libs/zlib-1.2.3:0= virtual/libcrypt:= !bindist? ( sys-libs/binutils-libs:0= >=sys-libs/readline-4.1:0= ) jemalloc? ( dev-libs/jemalloc:0= ) kerberos? ( virtual/krb5 ) kernel_linux? ( dev-libs/libaio:0= sys-libs/liburing:= sys-process/procps:0= ) server? ( app-arch/bzip2 app-arch/xz-utils backup? ( app-arch/libarchive:0= ) columnstore? ( app-arch/snappy:= dev-libs/boost:= dev-libs/libxml2:2= ) cracklib? ( sys-libs/cracklib:0= ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) ) innodb-lz4? ( app-arch/lz4 ) innodb-lzo? ( dev-libs/lzo ) innodb-snappy? ( app-arch/snappy:= ) mroonga? ( app-text/groonga-normalizer-mysql >=app-text/groonga-7.0.4 ) numa? ( sys-process/numactl ) oqgraph? ( dev-libs/boost:= dev-libs/judy:0= ) pam? ( sys-libs/pam:0= ) s3? ( net-misc/curl ) systemd? ( sys-apps/systemd:= ) ) systemtap? ( >=dev-util/systemtap-1.3:0= ) tcmalloc? ( dev-util/google-perftools:0= ) yassl? ( net-libs/gnutls:0= ) !yassl? ( >=dev-libs/openssl-1.0.0:0= ) server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.8 ) ) test? ( acct-group/mysql acct-user/mysql ) ) static? ( sys-libs/ncurses[static-libs] ) jdbc? ( >=dev-java/java-config-2.2.0-r3 )
 DESCRIPTION=An enhanced, drop-in replacement for MySQL
@@ -14,5 +14,5 @@ REQUIRED_USE=jdbc? ( extraengine server !static ) ?? ( tcmalloc jemalloc ) stati
 RESTRICT=!bindist? ( bindist ) !test? ( test )
 SLOT=10.6/18
 SRC_URI=mirror://mariadb/mariadb-10.6.15/source/mariadb-10.6.15.tar.gz https://github.com/hydrapolic/gentoo-dist/raw/master/mariadb/mariadb-10.6.13-patches-01.tar.xz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	prefix	eab3c99d77fe00506c109c8a736186f7	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	java-utils-2	0fd5b6616cd66c8099a941608e2e0242	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	prefix	eab3c99d77fe00506c109c8a736186f7	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	java-utils-2	0fd5b6616cd66c8099a941608e2e0242	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c
 _md5_=184658df4df12dc66d161239dd2cf944
diff --git a/metadata/md5-cache/dev-db/mariadb-connector-c-3.2.7 b/metadata/md5-cache/dev-db/mariadb-connector-c-3.2.7
index 612aa995e881..be5de6a6603f 100644
--- a/metadata/md5-cache/dev-db/mariadb-connector-c-3.2.7
+++ b/metadata/md5-cache/dev-db/mariadb-connector-c-3.2.7
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-db/mariadb[server] ) app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=test? ( dev-db/mariadb[server] ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] curl? ( net-misc/curl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( || ( app-crypt/mit-krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-crypt/heimdal[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ssl? ( gnutls? ( >=net-libs/gnutls-3.3.24:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !gnutls? ( dev-libs/openssl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
 DESCRIPTION=C client library for MariaDB/MySQL
@@ -12,5 +12,5 @@ RDEPEND=sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n
 RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=https://downloads.mariadb.com/Connectors/c/connector-c-3.2.7/mariadb-connector-c-3.2.7-src.tar.gz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	cmake-multilib	37d23064f303dcf23453353ab8c77059
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	cmake-multilib	37d23064f303dcf23453353ab8c77059
 _md5_=7bfbd17f0af30466bb9794c450b77a84
diff --git a/metadata/md5-cache/dev-db/mariadb-connector-c-3.3.4 b/metadata/md5-cache/dev-db/mariadb-connector-c-3.3.4
index 0a2e58bb6cf2..2a0df0b42393 100644
--- a/metadata/md5-cache/dev-db/mariadb-connector-c-3.3.4
+++ b/metadata/md5-cache/dev-db/mariadb-connector-c-3.3.4
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-db/mariadb[server] ) app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=test? ( dev-db/mariadb[server] ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] curl? ( net-misc/curl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( || ( app-crypt/mit-krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-crypt/heimdal[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ssl? ( gnutls? ( >=net-libs/gnutls-3.3.24:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !gnutls? ( dev-libs/openssl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
 DESCRIPTION=C client library for MariaDB/MySQL
@@ -12,5 +12,5 @@ RDEPEND=sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n
 RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=https://downloads.mariadb.com/Connectors/c/connector-c-3.3.4/mariadb-connector-c-3.3.4-src.tar.gz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	cmake-multilib	37d23064f303dcf23453353ab8c77059
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	cmake-multilib	37d23064f303dcf23453353ab8c77059
 _md5_=54f7e8ff5fdc5ed7d30486dd50ad0395
diff --git a/metadata/md5-cache/dev-db/mariadb-connector-c-9999 b/metadata/md5-cache/dev-db/mariadb-connector-c-9999
index cb7f8f81d2af..41422236a954 100644
--- a/metadata/md5-cache/dev-db/mariadb-connector-c-9999
+++ b/metadata/md5-cache/dev-db/mariadb-connector-c-9999
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-db/mariadb[server] ) >=dev-vcs/git-1.8.2.1[curl] app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=test? ( dev-db/mariadb[server] ) >=dev-vcs/git-1.8.2.1[curl] app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] curl? ( net-misc/curl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( || ( app-crypt/mit-krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-crypt/heimdal[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ssl? ( gnutls? ( >=net-libs/gnutls-3.3.24:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !gnutls? ( dev-libs/openssl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
 DESCRIPTION=C client library for MariaDB/MySQL
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] curl? ( net-misc/curl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( || ( app-crypt/mit-krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-crypt/heimdal[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ssl? ( gnutls? ( >=net-libs/gnutls-3.3.24:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !gnutls? ( dev-libs/openssl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
 RESTRICT=!test? ( test )
 SLOT=0/3
-_eclasses_=git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	cmake-multilib	37d23064f303dcf23453353ab8c77059
+_eclasses_=git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	cmake-multilib	37d23064f303dcf23453353ab8c77059
 _md5_=5433331abd22ed2b7a58d74f060047cb
diff --git a/metadata/md5-cache/dev-db/mariadb-connector-odbc-3.1.18 b/metadata/md5-cache/dev-db/mariadb-connector-odbc-3.1.18
index 86dc7146716d..b7945168e2b2 100644
--- a/metadata/md5-cache/dev-db/mariadb-connector-odbc-3.1.18
+++ b/metadata/md5-cache/dev-db/mariadb-connector-odbc-3.1.18
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile config configure install postinst prepare test
 DEPEND=dev-db/mariadb-connector-c:=[ssl?] dev-db/unixODBC
 DESCRIPTION=MariaDB Connector/ODBC
@@ -11,5 +11,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-db/mariadb-connector-c:=[ssl?] dev-db/unixODBC
 SLOT=0/3.1
 SRC_URI=mirror://mariadb/connector-odbc-3.1.18/mariadb-connector-odbc-3.1.18-src.tar.gz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	cmake-multilib	37d23064f303dcf23453353ab8c77059
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	cmake-multilib	37d23064f303dcf23453353ab8c77059
 _md5_=e30e3f96731b61b225051b583403bc96
diff --git a/metadata/md5-cache/dev-db/mydumper-0.14.5.2 b/metadata/md5-cache/dev-db/mydumper-0.14.5.2
index ed41c2b1603a..ab8ca172217d 100644
--- a/metadata/md5-cache/dev-db/mydumper-0.14.5.2
+++ b/metadata/md5-cache/dev-db/mydumper-0.14.5.2
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig doc? ( dev-python/sphinx ) app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=virtual/pkgconfig doc? ( dev-python/sphinx ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=app-arch/zstd dev-db/mysql-connector-c:= dev-libs/glib:2 dev-libs/libpcre dev-libs/openssl:= sys-libs/zlib:=
 DESCRIPTION=A high-performance multi-threaded backup (and restore) toolset for MySQL
@@ -11,5 +11,5 @@ LICENSE=GPL-3+
 RDEPEND=app-arch/zstd dev-db/mysql-connector-c:= dev-libs/glib:2 dev-libs/libpcre dev-libs/openssl:= sys-libs/zlib:=
 SLOT=0
 SRC_URI=https://github.com/maxbube/mydumper/archive/v0.14.5-2.tar.gz -> mydumper-0.14.5-2.tar.gz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c
 _md5_=edc7e6ffe1e6bbe879ce01941ea92615
diff --git a/metadata/md5-cache/dev-db/mydumper-0.15.1.3 b/metadata/md5-cache/dev-db/mydumper-0.15.1.3
index 02b138b345ca..2f94afbc479a 100644
--- a/metadata/md5-cache/dev-db/mydumper-0.15.1.3
+++ b/metadata/md5-cache/dev-db/mydumper-0.15.1.3
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig doc? ( dev-python/sphinx ) app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=virtual/pkgconfig doc? ( dev-python/sphinx ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=app-arch/zstd dev-db/mysql-connector-c:= dev-libs/glib:2 dev-libs/libpcre dev-libs/openssl:= sys-libs/zlib:=
 DESCRIPTION=A high-performance multi-threaded backup (and restore) toolset for MySQL
@@ -11,5 +11,5 @@ LICENSE=GPL-3+
 RDEPEND=app-arch/zstd dev-db/mysql-connector-c:= dev-libs/glib:2 dev-libs/libpcre dev-libs/openssl:= sys-libs/zlib:=
 SLOT=0
 SRC_URI=https://github.com/maxbube/mydumper/archive/v0.15.1-3.tar.gz -> mydumper-0.15.1-3.tar.gz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c
 _md5_=d90038fa69440e5f3309167235bd9009
diff --git a/metadata/md5-cache/dev-db/myodbc-8.0.27-r1 b/metadata/md5-cache/dev-db/myodbc-8.0.27-r1
index c584ce9f91f5..af448f8d5397 100644
--- a/metadata/md5-cache/dev-db/myodbc-8.0.27-r1
+++ b/metadata/md5-cache/dev-db/myodbc-8.0.27-r1
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile config configure install postinst prepare test
 DEPEND=dev-db/unixODBC[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-db/mysql-connector-c-8.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=ODBC driver for MySQL
@@ -11,5 +11,5 @@ LICENSE=GPL-2
 RDEPEND=dev-db/unixODBC[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-db/mysql-connector-c-8.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=8.0
 SRC_URI=https://dev.mysql.com/get/Downloads/Connector-ODBC/8.0/mysql-connector-odbc-8.0.27-src.tar.gz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	cmake-multilib	37d23064f303dcf23453353ab8c77059
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	cmake-multilib	37d23064f303dcf23453353ab8c77059
 _md5_=04c142cd81dec138e648368ddaba0cf1
diff --git a/metadata/md5-cache/dev-db/mysql-5.7.41 b/metadata/md5-cache/dev-db/mysql-5.7.41
index 3cd50acb0e23..cd7eb679905f 100644
--- a/metadata/md5-cache/dev-db/mysql-5.7.41
+++ b/metadata/md5-cache/dev-db/mysql-5.7.41
@@ -1,4 +1,4 @@
-BDEPEND=dev-build/make >=dev-util/cmake-3.20.5
+BDEPEND=dev-build/make >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile config configure install postinst preinst prepare pretend setup test unpack
 DEPEND=sys-libs/ncurses:0= client-libs? ( >=sys-libs/zlib-1.2.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] >=dev-libs/openssl-1.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) !client-libs? ( dev-db/mysql-connector-c[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] >=sys-libs/zlib-1.2.3:0= >=dev-libs/openssl-1.0.0:0= ) server? ( >=app-arch/lz4-0_p131:= virtual/libcrypt:= cjk? ( app-text/mecab:= ) experimental? ( dev-libs/libevent:=[ssl] dev-libs/protobuf:= net-libs/libtirpc:= ) jemalloc? ( dev-libs/jemalloc:0= ) kernel_linux? ( dev-libs/libaio:0= sys-process/procps:0= ) numa? ( sys-process/numactl ) ) systemtap? ( >=dev-util/systemtap-1.3:0= ) tcmalloc? ( dev-util/google-perftools:0= ) || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) dev-libs/protobuf app-alternatives/yacc server? ( dev-libs/libevent:=[ssl] experimental? ( net-libs/rpcsvc-proto ) ) static? ( sys-libs/ncurses[static-libs] ) test? ( acct-group/mysql acct-user/mysql dev-perl/JSON )
 DESCRIPTION=A fast, multi-threaded, multi-user SQL database server
@@ -14,5 +14,5 @@ REQUIRED_USE=?? ( tcmalloc jemalloc )
 RESTRICT=!test? ( test )
 SLOT=5.7/18
 SRC_URI=https://cdn.mysql.com/Downloads/MySQL-5.7/mysql-boost-5.7.41.tar.gz https://cdn.mysql.com/archives/mysql-5.7/mysql-boost-5.7.41.tar.gz http://downloads.mysql.com/archives/MySQL-5.7/mysql-boost-5.7.41.tar.gz https://dev.gentoo.org/~whissi/dist/mysql/mysql-5.7.36-patches-01.tar.xz
-_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	prefix	eab3c99d77fe00506c109c8a736186f7	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b
+_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	prefix	eab3c99d77fe00506c109c8a736186f7	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b
 _md5_=d38e49ff7ba291443c6e6527b51f61dc
diff --git a/metadata/md5-cache/dev-db/mysql-8.0.27-r1 b/metadata/md5-cache/dev-db/mysql-8.0.27-r1
index fe80ad771152..a3794772ef6d 100644
--- a/metadata/md5-cache/dev-db/mysql-8.0.27-r1
+++ b/metadata/md5-cache/dev-db/mysql-8.0.27-r1
@@ -1,4 +1,4 @@
-BDEPEND=dev-build/make >=dev-util/cmake-3.20.5
+BDEPEND=dev-build/make >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile config configure install postinst prepare pretend setup test unpack
 DEPEND=>=app-arch/lz4-0_p131:= app-arch/zstd:= sys-libs/ncurses:0= >=sys-libs/zlib-1.2.3:0= >=dev-libs/openssl-1.0.0:0= server? ( dev-libs/icu:= dev-libs/libevent:=[ssl,threads(+)] >=dev-libs/protobuf-3.8:= net-libs/libtirpc:= cjk? ( app-text/mecab:= ) jemalloc? ( dev-libs/jemalloc:0= ) kernel_linux? ( dev-libs/libaio:0= sys-process/procps:0= ) numa? ( sys-process/numactl ) tcmalloc? ( dev-util/google-perftools:0= ) ) || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) app-alternatives/yacc server? ( net-libs/rpcsvc-proto ) test? ( acct-group/mysql acct-user/mysql dev-perl/JSON )
 DESCRIPTION=A fast, multi-threaded, multi-user SQL database server
@@ -14,5 +14,5 @@ REQUIRED_USE=?? ( tcmalloc jemalloc ) cjk? ( server ) jemalloc? ( server ) numa?
 RESTRICT=!test? ( test )
 SLOT=8.0
 SRC_URI=https://cdn.mysql.com/Downloads/MySQL-8.0/mysql-boost-8.0.27.tar.gz https://cdn.mysql.com/archives/mysql-8.0/mysql-boost-8.0.27.tar.gz http://downloads.mysql.com/archives/MySQL-8.0/mysql-boost-8.0.27.tar.gz https://dev.gentoo.org/~whissi/dist/mysql/mysql-8.0.27-patches-03.tar.xz https://dev.gentoo.org/~dlan/dist/mysql/mysql-8.0.27-patches-03.tar.xz
-_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	prefix	eab3c99d77fe00506c109c8a736186f7
+_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	prefix	eab3c99d77fe00506c109c8a736186f7
 _md5_=05338cbc85902e3dc9bf827517eaabea
diff --git a/metadata/md5-cache/dev-db/mysql-8.0.31-r2 b/metadata/md5-cache/dev-db/mysql-8.0.31-r2
index a92764ef6070..37eda7b9c117 100644
--- a/metadata/md5-cache/dev-db/mysql-8.0.31-r2
+++ b/metadata/md5-cache/dev-db/mysql-8.0.31-r2
@@ -1,4 +1,4 @@
-BDEPEND=dev-build/make >=dev-util/cmake-3.20.5
+BDEPEND=dev-build/make >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile config configure install postinst prepare pretend setup test unpack
 DEPEND=>=app-arch/lz4-0_p131:= app-arch/zstd:= sys-libs/ncurses:0= >=sys-libs/zlib-1.2.3:0= >=dev-libs/openssl-1.0.0:0= server? ( dev-libs/icu:= dev-libs/libevent:=[ssl,threads(+)] >=dev-libs/protobuf-3.8:= net-libs/libtirpc:= cjk? ( app-text/mecab:= ) jemalloc? ( dev-libs/jemalloc:0= ) kernel_linux? ( dev-libs/libaio:0= sys-process/procps:0= ) numa? ( sys-process/numactl ) tcmalloc? ( dev-util/google-perftools:0= ) ) || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) app-alternatives/yacc server? ( net-libs/rpcsvc-proto ) test? ( acct-group/mysql acct-user/mysql dev-perl/JSON )
 DESCRIPTION=A fast, multi-threaded, multi-user SQL database server
@@ -14,5 +14,5 @@ REQUIRED_USE=?? ( tcmalloc jemalloc ) cjk? ( server ) jemalloc? ( server ) numa?
 RESTRICT=!test? ( test )
 SLOT=8.0
 SRC_URI=https://cdn.mysql.com/Downloads/MySQL-8.0/mysql-boost-8.0.31.tar.gz https://cdn.mysql.com/archives/mysql-8.0/mysql-boost-8.0.31.tar.gz https://downloads.mysql.com/archives/MySQL-8.0/mysql-boost-8.0.31.tar.gz https://dev.gentoo.org/~sam/distfiles/dev-db/mysql/mysql-8.0.31-patches-01.tar.xz
-_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	prefix	eab3c99d77fe00506c109c8a736186f7
+_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	prefix	eab3c99d77fe00506c109c8a736186f7
 _md5_=f547a82241925fb5fe3436d49840390d
diff --git a/metadata/md5-cache/dev-db/mysql-8.0.32-r2 b/metadata/md5-cache/dev-db/mysql-8.0.32-r2
index e4ba7ea44e32..f8fe428d509f 100644
--- a/metadata/md5-cache/dev-db/mysql-8.0.32-r2
+++ b/metadata/md5-cache/dev-db/mysql-8.0.32-r2
@@ -1,4 +1,4 @@
-BDEPEND=dev-build/make >=dev-util/cmake-3.20.5
+BDEPEND=dev-build/make >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile config configure install postinst prepare pretend setup test unpack
 DEPEND=>=app-arch/lz4-1.9.4:= app-arch/zstd:= >=dev-libs/openssl-1.0.0:= sys-libs/ncurses:= >=sys-libs/zlib-1.2.13:= server? ( dev-libs/icu:= dev-libs/libevent:=[ssl,threads(+)] >=dev-libs/protobuf-3.8:= net-libs/libtirpc:= cjk? ( app-text/mecab:= ) jemalloc? ( dev-libs/jemalloc:= ) kernel_linux? ( dev-libs/libaio:= sys-process/procps:= ) numa? ( sys-process/numactl ) tcmalloc? ( dev-util/google-perftools:= ) ) app-alternatives/yacc server? ( net-libs/rpcsvc-proto ) test? ( acct-group/mysql acct-user/mysql dev-perl/JSON )
 DESCRIPTION=A fast, multi-threaded, multi-user SQL database server
@@ -14,5 +14,5 @@ REQUIRED_USE=?? ( tcmalloc jemalloc ) cjk? ( server ) jemalloc? ( server ) numa?
 RESTRICT=!test? ( test )
 SLOT=8.0
 SRC_URI=https://cdn.mysql.com/Downloads/MySQL-8.0/mysql-boost-8.0.32.tar.gz https://cdn.mysql.com/archives/mysql-8.0/mysql-boost-8.0.32.tar.gz https://downloads.mysql.com/archives/MySQL-8.0/mysql-boost-8.0.32.tar.gz https://dev.gentoo.org/~sam/distfiles/dev-db/mysql/mysql-8.0.31-patches-01.tar.xz
-_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	prefix	eab3c99d77fe00506c109c8a736186f7
+_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	prefix	eab3c99d77fe00506c109c8a736186f7
 _md5_=88d4c1f583b4570fa6fb466d58c37ba9
diff --git a/metadata/md5-cache/dev-db/mysql-8.0.34 b/metadata/md5-cache/dev-db/mysql-8.0.34
index b7d58a96fdd0..bff823f130de 100644
--- a/metadata/md5-cache/dev-db/mysql-8.0.34
+++ b/metadata/md5-cache/dev-db/mysql-8.0.34
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile config configure install postinst prepare pretend setup test unpack
 DEPEND=>=app-arch/lz4-1.9.4:= >=app-arch/zstd-1.2.0:= >=dev-libs/openssl-1.0.0:= sys-libs/ncurses:= >=sys-libs/zlib-1.2.13:= server? ( dev-libs/icu:= dev-libs/libevent:=[ssl,threads(+)] net-libs/libtirpc:= cjk? ( app-text/mecab:= ) jemalloc? ( dev-libs/jemalloc:= ) kernel_linux? ( dev-libs/libaio:= sys-process/procps:= ) numa? ( sys-process/numactl ) tcmalloc? ( dev-util/google-perftools:= ) ) app-alternatives/yacc server? ( net-libs/rpcsvc-proto ) test? ( acct-group/mysql acct-user/mysql dev-perl/Expect dev-perl/JSON )
 DESCRIPTION=A fast, multi-threaded, multi-user SQL database server
@@ -14,5 +14,5 @@ REQUIRED_USE=?? ( tcmalloc jemalloc ) cjk? ( server ) jemalloc? ( server ) numa?
 RESTRICT=!test? ( test )
 SLOT=8.0
 SRC_URI=https://cdn.mysql.com/Downloads/MySQL-8.0/mysql-boost-8.0.34.tar.gz https://cdn.mysql.com/archives/mysql-8.0/mysql-boost-8.0.34.tar.gz https://downloads.mysql.com/archives/MySQL-8.0/mysql-boost-8.0.34.tar.gz https://dev.gentoo.org/~sam/distfiles/dev-db/mysql/mysql-8.0.34-patches-01.tar.xz
-_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	prefix	eab3c99d77fe00506c109c8a736186f7
+_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	prefix	eab3c99d77fe00506c109c8a736186f7
 _md5_=ac478c9cf281be6ffef0fc95d53bca74
diff --git a/metadata/md5-cache/dev-db/mysql-connector-c++-8.0.31 b/metadata/md5-cache/dev-db/mysql-connector-c++-8.0.31
index fca7190893da..0348bbe7a4a6 100644
--- a/metadata/md5-cache/dev-db/mysql-connector-c++-8.0.31
+++ b/metadata/md5-cache/dev-db/mysql-connector-c++-8.0.31
@@ -1,4 +1,4 @@
-BDEPEND=dev-build/make >=dev-util/cmake-3.20.5
+BDEPEND=dev-build/make >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=app-arch/lz4:= app-arch/zstd:= dev-libs/openssl:= dev-libs/protobuf:= sys-libs/zlib legacy? ( dev-libs/boost:= >=dev-db/mysql-connector-c-8.0.27:= )
 DESCRIPTION=MySQL database connector for C++ (mimics JDBC 4.0 API)
@@ -11,5 +11,5 @@ LICENSE=Artistic GPL-2
 RDEPEND=app-arch/lz4:= app-arch/zstd:= dev-libs/openssl:= dev-libs/protobuf:= sys-libs/zlib legacy? ( dev-libs/boost:= >=dev-db/mysql-connector-c-8.0.27:= )
 SLOT=0
 SRC_URI=https://dev.mysql.com/get/Downloads/Connector-C++/mysql-connector-c++-8.0.31-src.tar.gz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c
 _md5_=ad4c7ea75337ad6ffb9add7b5737c7de
diff --git a/metadata/md5-cache/dev-db/mysql-connector-c++-8.0.32 b/metadata/md5-cache/dev-db/mysql-connector-c++-8.0.32
index 095a6268ff8d..5d79386d1680 100644
--- a/metadata/md5-cache/dev-db/mysql-connector-c++-8.0.32
+++ b/metadata/md5-cache/dev-db/mysql-connector-c++-8.0.32
@@ -1,4 +1,4 @@
-BDEPEND=dev-build/make >=dev-util/cmake-3.20.5
+BDEPEND=dev-build/make >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=app-arch/lz4:= app-arch/zstd:= dev-libs/openssl:= >=dev-libs/protobuf-3.19.6:= sys-libs/zlib legacy? ( dev-libs/boost:= >=dev-db/mysql-connector-c-8.0.27:= )
 DESCRIPTION=MySQL database connector for C++ (mimics JDBC 4.0 API)
@@ -11,5 +11,5 @@ LICENSE=Artistic GPL-2
 RDEPEND=app-arch/lz4:= app-arch/zstd:= dev-libs/openssl:= >=dev-libs/protobuf-3.19.6:= sys-libs/zlib legacy? ( dev-libs/boost:= >=dev-db/mysql-connector-c-8.0.27:= )
 SLOT=0
 SRC_URI=https://dev.mysql.com/get/Downloads/Connector-C++/mysql-connector-c++-8.0.32-src.tar.gz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c
 _md5_=7df491d559bdb2d1a847688250acbbe6
diff --git a/metadata/md5-cache/dev-db/mysql-connector-c++-8.0.33 b/metadata/md5-cache/dev-db/mysql-connector-c++-8.0.33
index 4a2ea0f96611..5ec4bcd1e745 100644
--- a/metadata/md5-cache/dev-db/mysql-connector-c++-8.0.33
+++ b/metadata/md5-cache/dev-db/mysql-connector-c++-8.0.33
@@ -1,4 +1,4 @@
-BDEPEND=dev-build/make >=dev-util/cmake-3.20.5
+BDEPEND=dev-build/make >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=app-arch/lz4:= app-arch/zstd:= dev-libs/openssl:= sys-libs/zlib
 DESCRIPTION=MySQL database connector for C++ (mimics JDBC 4.0 API)
@@ -10,5 +10,5 @@ LICENSE=Artistic GPL-2
 RDEPEND=app-arch/lz4:= app-arch/zstd:= dev-libs/openssl:= sys-libs/zlib
 SLOT=0
 SRC_URI=https://dev.mysql.com/get/Downloads/Connector-C++/mysql-connector-c++-8.0.33-src.tar.gz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c
 _md5_=45e930f6a4c4857245c41242a5503e80
diff --git a/metadata/md5-cache/dev-db/mysql-connector-c++-8.0.33-r1 b/metadata/md5-cache/dev-db/mysql-connector-c++-8.0.33-r1
index 8efa1939496d..1c2a6e6aaeac 100644
--- a/metadata/md5-cache/dev-db/mysql-connector-c++-8.0.33-r1
+++ b/metadata/md5-cache/dev-db/mysql-connector-c++-8.0.33-r1
@@ -1,4 +1,4 @@
-BDEPEND=dev-build/make >=dev-util/cmake-3.20.5
+BDEPEND=dev-build/make >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=app-arch/lz4:= app-arch/zstd:= dev-libs/openssl:= sys-libs/zlib legacy? ( >=dev-db/mysql-connector-c-8.0.27:= )
 DESCRIPTION=MySQL database connector for C++ (mimics JDBC 4.0 API)
@@ -11,5 +11,5 @@ LICENSE=Artistic GPL-2
 RDEPEND=app-arch/lz4:= app-arch/zstd:= dev-libs/openssl:= sys-libs/zlib legacy? ( >=dev-db/mysql-connector-c-8.0.27:= )
 SLOT=0
 SRC_URI=https://dev.mysql.com/get/Downloads/Connector-C++/mysql-connector-c++-8.0.33-src.tar.gz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c
 _md5_=9a933dcbda56052fa3bdebd176ee4a0a
diff --git a/metadata/md5-cache/dev-db/mysql-connector-c-8.0.32-r1 b/metadata/md5-cache/dev-db/mysql-connector-c-8.0.32-r1
index cc7dc11b83f4..24fab0fcdc59 100644
--- a/metadata/md5-cache/dev-db/mysql-connector-c-8.0.32-r1
+++ b/metadata/md5-cache/dev-db/mysql-connector-c-8.0.32-r1
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=app-arch/lz4-1.9.4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/openssl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ldap? ( dev-libs/cyrus-sasl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 DESCRIPTION=C client library for MariaDB/MySQL
@@ -11,5 +11,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-arch/lz4-1.9.4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/openssl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ldap? ( dev-libs/cyrus-sasl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<dev-db/mysql-5.6.45-r1 !=dev-db/mysql-5.7.23* !=dev-db/mysql-5.7.24* !=dev-db/mysql-5.7.25* !=dev-db/mysql-5.7.26-r0 !=dev-db/mysql-5.7.27-r0 !<dev-db/percona-server-5.7.26.29-r1
 SLOT=0/21
 SRC_URI=https://dev.mysql.com/get/Downloads/MySQL-8.0/mysql-boost-8.0.32.tar.gz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	cmake-multilib	37d23064f303dcf23453353ab8c77059
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	cmake-multilib	37d23064f303dcf23453353ab8c77059
 _md5_=4922f7a0a5934541c9308d785c928d54
diff --git a/metadata/md5-cache/dev-db/mysql-workbench-8.0.34 b/metadata/md5-cache/dev-db/mysql-workbench-8.0.34
index 5ecf72c9c010..bc5f34c9e749 100644
--- a/metadata/md5-cache/dev-db/mysql-workbench-8.0.34
+++ b/metadata/md5-cache/dev-db/mysql-workbench-8.0.34
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 app-arch/xz-utils app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=>=app-portage/elt-patches-20170815 app-arch/xz-utils app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
 DEPEND=python_single_target_python3_10? ( dev-lang/python:3.10[sqlite] ) python_single_target_python3_11? ( dev-lang/python:3.11[sqlite] ) app-crypt/libsecret dev-libs/glib:2 >=dev-cpp/antlr-cpp-4.11.1:4 dev-cpp/atkmm:* dev-cpp/pangomm:1.4 >=dev-cpp/glibmm-2.14:2 dev-cpp/gtkmm:3.0 dev-libs/atk >=net-libs/libssh-0.9.5[server] x11-libs/pango x11-libs/gtk+:3 >=x11-libs/cairo-1.5.12[glib,svg(+)] >=dev-libs/rapidjson-1.1.0 dev-libs/libsigc++:2 dev-libs/boost[nls] >=dev-cpp/ctemplate-0.95 >=dev-libs/libxml2-2.6.2:2 dev-libs/libzip dev-libs/libpcre[cxx] >=sci-libs/gdal-1.11.1-r1:= virtual/opengl || ( sys-fs/e2fsprogs dev-libs/ossp-uuid ) dev-libs/tinyxml[stl] >=dev-db/mysql-connector-c++-8.0.27-r1 dev-db/vsqlite++ || ( dev-db/libiodbc >=dev-db/unixODBC-2.3.11 ) dev-python/pexpect >=dev-python/paramiko-1.7.4 dev-lang/swig >=virtual/jre-11 virtual/pkgconfig dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=MySQL Workbench
@@ -12,5 +12,5 @@ RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10[sqlite] ) python
 REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 )
 SLOT=0
 SRC_URI=https://cdn.mysql.com/Downloads/MySQLGUITools/mysql-workbench-community-8.0.34-src.tar.gz https://www.antlr.org/download/antlr-4.11.1-complete.jar
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	gnome.org	6b39404f1491c60a2d32e3c693a683fe	xdg-utils	baea6080dd821f5562d715887954c9d3	gnome2-utils	b0183db3b2e07b18f3b77bffec72e116	xdg	4a14c5c24f121e7da66e5aab4a168c6e	gnome2	9bd787a54d31405e742ae7537eed650b	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-utils-r1	042f4cc53680245bf99a84669b94155a	python-single-r1	75118e916668a74c660a13b0ecb22562	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	gnome.org	6b39404f1491c60a2d32e3c693a683fe	xdg-utils	baea6080dd821f5562d715887954c9d3	gnome2-utils	b0183db3b2e07b18f3b77bffec72e116	xdg	4a14c5c24f121e7da66e5aab4a168c6e	gnome2	9bd787a54d31405e742ae7537eed650b	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-utils-r1	042f4cc53680245bf99a84669b94155a	python-single-r1	75118e916668a74c660a13b0ecb22562	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	cmake	c7c9a62d6232cac66d4ea32d575c3e7c
 _md5_=01e11abb9619c72d7bba1321619e2456
diff --git a/metadata/md5-cache/dev-db/mysql-workbench-8.0.34-r1 b/metadata/md5-cache/dev-db/mysql-workbench-8.0.34-r1
index 6ce9f3e48e92..ce3be8ef96bc 100644
--- a/metadata/md5-cache/dev-db/mysql-workbench-8.0.34-r1
+++ b/metadata/md5-cache/dev-db/mysql-workbench-8.0.34-r1
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 app-arch/xz-utils app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=>=app-portage/elt-patches-20170815 app-arch/xz-utils app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
 DEPEND=python_single_target_python3_10? ( dev-lang/python:3.10[sqlite] ) python_single_target_python3_11? ( dev-lang/python:3.11[sqlite] ) app-crypt/libsecret dev-libs/glib:2 >=dev-cpp/antlr-cpp-4.11.1:4 dev-cpp/atkmm:* dev-cpp/pangomm:1.4 >=dev-cpp/glibmm-2.14:2 dev-cpp/gtkmm:3.0 dev-libs/atk >=net-libs/libssh-0.9.5[server] x11-libs/pango x11-libs/gtk+:3 >=x11-libs/cairo-1.5.12[glib,svg(+)] >=dev-libs/rapidjson-1.1.0 dev-libs/libsigc++:2 dev-libs/boost[nls] >=dev-cpp/ctemplate-0.95 >=dev-libs/libxml2-2.6.2:2 dev-libs/libzip dev-libs/libpcre[cxx] >=sci-libs/gdal-1.11.1-r1:= virtual/opengl || ( sys-fs/e2fsprogs dev-libs/ossp-uuid ) dev-libs/tinyxml[stl] >=dev-db/mysql-connector-c++-8.0.27-r1[legacy(-)] dev-db/vsqlite++ || ( dev-db/libiodbc >=dev-db/unixODBC-2.3.11 ) dev-python/pexpect >=dev-python/paramiko-1.7.4 dev-lang/swig >=virtual/jre-11 virtual/pkgconfig dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=MySQL Workbench
@@ -12,5 +12,5 @@ RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10[sqlite] ) python
 REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 )
 SLOT=0
 SRC_URI=https://cdn.mysql.com/Downloads/MySQLGUITools/mysql-workbench-community-8.0.34-src.tar.gz https://www.antlr.org/download/antlr-4.11.1-complete.jar
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	gnome.org	6b39404f1491c60a2d32e3c693a683fe	xdg-utils	baea6080dd821f5562d715887954c9d3	gnome2-utils	b0183db3b2e07b18f3b77bffec72e116	xdg	4a14c5c24f121e7da66e5aab4a168c6e	gnome2	9bd787a54d31405e742ae7537eed650b	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-utils-r1	042f4cc53680245bf99a84669b94155a	python-single-r1	75118e916668a74c660a13b0ecb22562	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	9d3a9a889a6fa62ae794f817c156491b	gnome.org	6b39404f1491c60a2d32e3c693a683fe	xdg-utils	baea6080dd821f5562d715887954c9d3	gnome2-utils	b0183db3b2e07b18f3b77bffec72e116	xdg	4a14c5c24f121e7da66e5aab4a168c6e	gnome2	9bd787a54d31405e742ae7537eed650b	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-utils-r1	042f4cc53680245bf99a84669b94155a	python-single-r1	75118e916668a74c660a13b0ecb22562	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	cmake	c7c9a62d6232cac66d4ea32d575c3e7c
 _md5_=b278c74c370e50ce2caa1dc421fa4f50
diff --git a/metadata/md5-cache/dev-db/percona-server-8.0.26.16-r2 b/metadata/md5-cache/dev-db/percona-server-8.0.26.16-r2
index b674f55dbd07..4331a639d302 100644
--- a/metadata/md5-cache/dev-db/percona-server-8.0.26.16-r2
+++ b/metadata/md5-cache/dev-db/percona-server-8.0.26.16-r2
@@ -1,4 +1,4 @@
-BDEPEND=dev-build/make >=dev-util/cmake-3.20.5
+BDEPEND=dev-build/make >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile config configure install postinst prepare pretend setup test unpack
 DEPEND=>=app-arch/lz4-0_p131:= app-arch/zstd:= sys-libs/ncurses:0= >=sys-libs/zlib-1.2.3:0= >=dev-libs/openssl-1.0.0:0= server? ( dev-libs/icu:= dev-libs/libevent:=[ssl,threads(+)] >=dev-libs/protobuf-3.8:= net-libs/libtirpc:= net-misc/curl:= cjk? ( app-text/mecab:= ) ldap? ( dev-libs/cyrus-sasl <net-nds/openldap-2.6:= ) jemalloc? ( dev-libs/jemalloc:0= ) kernel_linux? ( dev-libs/libaio:0= sys-process/procps:0= ) numa? ( sys-process/numactl ) pam? ( sys-libs/pam:0= ) tcmalloc? ( dev-util/google-perftools:0= ) ) || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) app-alternatives/yacc server? ( net-libs/rpcsvc-proto ) test? ( acct-group/mysql acct-user/mysql dev-perl/JSON )
 DESCRIPTION=Fully compatible, enhanced and open source drop-in replacement for MySQL
@@ -14,5 +14,5 @@ REQUIRED_USE=?? ( tcmalloc jemalloc ) cjk? ( server ) jemalloc? ( server ) numa?
 RESTRICT=!test? ( test )
 SLOT=8.0
 SRC_URI=https://www.percona.com/downloads/Percona-Server-8.0/Percona-Server-8.0.26-16/source/tarball/percona-server-8.0.26-16.tar.gz https://dl.bintray.com/boostorg/release/1.73.0/source/boost_1_73_0.tar.bz2 https://dev.gentoo.org/~whissi/dist/percona-server/percona-server-8.0.26.16-patches-01.tar.xz
-_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	prefix	eab3c99d77fe00506c109c8a736186f7
+_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	prefix	eab3c99d77fe00506c109c8a736186f7
 _md5_=a7d72c9e92b818c0ae132e0816bddf16
diff --git a/metadata/md5-cache/dev-db/percona-xtrabackup-8.0.30.23 b/metadata/md5-cache/dev-db/percona-xtrabackup-8.0.30.23
index 3305344a7973..490d1d08ff77 100644
--- a/metadata/md5-cache/dev-db/percona-xtrabackup-8.0.30.23
+++ b/metadata/md5-cache/dev-db/percona-xtrabackup-8.0.30.23
@@ -1,4 +1,4 @@
-BDEPEND=dev-build/make >=dev-util/cmake-3.20.5
+BDEPEND=dev-build/make >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=app-arch/lz4:0= app-editors/vim-core dev-libs/icu:= dev-libs/libaio dev-libs/libedit dev-libs/libev dev-libs/libevent:0= dev-libs/libfido2:= dev-libs/libgcrypt:0= dev-libs/libgpg-error dev-libs/openssl:0= dev-libs/protobuf:= dev-libs/rapidjson dev-libs/re2:= dev-python/sphinx net-misc/curl sys-libs/zlib:=
 DESCRIPTION=Hot backup utility for MySQL based servers
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=app-arch/lz4:0= app-editors/vim-core dev-libs/icu:= dev-libs/libaio dev-libs/libedit dev-libs/libev dev-libs/libevent:0= dev-libs/libfido2:= dev-libs/libgcrypt:0= dev-libs/libgpg-error dev-libs/openssl:0= dev-libs/protobuf:= dev-libs/rapidjson dev-libs/re2:= dev-python/sphinx net-misc/curl sys-libs/zlib:= !dev-db/percona-xtrabackup-bin dev-perl/DBD-mysql
 SLOT=0
 SRC_URI=https://www.percona.com/downloads/Percona-XtraBackup-8.0/Percona-XtraBackup-8.0.30-23/source/tarball/percona-xtrabackup-8.0.30-23.tar.gz https://boostorg.jfrog.io/artifactory/main/release/1.77.0/source/boost_1_77_0.tar.bz2
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c
 _md5_=db3f35dfbc282d0c6c6ba61461a39408
diff --git a/metadata/md5-cache/dev-db/pg-gvm-22.6.3 b/metadata/md5-cache/dev-db/pg-gvm-22.6.3
index 8bcfcf1f568f..31973400ac86 100644
--- a/metadata/md5-cache/dev-db/pg-gvm-22.6.3
+++ b/metadata/md5-cache/dev-db/pg-gvm-22.6.3
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst prepare test
 DEPEND=>=dev-libs/glib-2.42:2 >=dev-libs/libical-1.0.0:= >=net-analyzer/gvm-libs-22.6
 DESCRIPTION=Greenbone Library for helper functions in PostgreSQL
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/glib-2.42:2 >=dev-libs/libical-1.0.0:= >=net-analyzer/gvm-lib
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/greenbone/pg-gvm/archive/refs/tags/v22.6.3.tar.gz -> pg-gvm-22.6.3.tar.gz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3
 _md5_=c26267aa2661b926313a857f3c50b96a
diff --git a/metadata/md5-cache/dev-db/pg_top-4.0.0-r3 b/metadata/md5-cache/dev-db/pg_top-4.0.0-r3
index 71083f536ae7..713d5096446d 100644
--- a/metadata/md5-cache/dev-db/pg_top-4.0.0-r3
+++ b/metadata/md5-cache/dev-db/pg_top-4.0.0-r3
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-db/postgresql:= dev-libs/libbsd sys-libs/ncurses:= virtual/libelf:=
 DESCRIPTION='top' for PostgreSQL
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=dev-db/postgresql:= dev-libs/libbsd sys-libs/ncurses:= virtual/libelf:=
 SLOT=0
 SRC_URI=https://pg_top.gitlab.io/source/pg_top-4.0.0.tar.xz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c
 _md5_=f61603a2a92a7ac87d908e0fb001053b
diff --git a/metadata/md5-cache/dev-db/pgagent-4.2.1 b/metadata/md5-cache/dev-db/pgagent-4.2.1
index 8292799004ea..49ccb45ee143 100644
--- a/metadata/md5-cache/dev-db/pgagent-4.2.1
+++ b/metadata/md5-cache/dev-db/pgagent-4.2.1
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=acct-user/pgagent dev-db/postgresql:* dev-libs/boost
 DESCRIPTION=pgAgent is a job scheduler for PostgreSQL
@@ -10,5 +10,5 @@ LICENSE=POSTGRESQL GPL-2
 RDEPEND=acct-user/pgagent dev-db/postgresql:* dev-libs/boost
 SLOT=0
 SRC_URI=https://ftp.postgresql.org/pub/pgadmin/pgagent/pgAgent-4.2.1-Source.tar.gz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c
 _md5_=428654f052b9d4dcf70458f1d0c0e92f
diff --git a/metadata/md5-cache/dev-db/pgrouting-3.2.1 b/metadata/md5-cache/dev-db/pgrouting-3.2.1
index b48ad7c95b32..44eb3c7f48c3 100644
--- a/metadata/md5-cache/dev-db/pgrouting-3.2.1
+++ b/metadata/md5-cache/dev-db/pgrouting-3.2.1
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=postgres_targets_postgres14? ( dev-db/postgresql:14=[server] ) postgres_targets_postgres13? ( dev-db/postgresql:13=[server] ) postgres_targets_postgres12? ( dev-db/postgresql:12=[server] ) postgres_targets_postgres11? ( dev-db/postgresql:11=[server] ) >=dev-db/postgis-2.0 dev-libs/boost sci-mathematics/cgal
 DESCRIPTION=pgRouting extends PostGIS and PostgreSQL with geospatial routing functionality
@@ -12,5 +12,5 @@ RDEPEND=postgres_targets_postgres14? ( dev-db/postgresql:14=[server] ) postgres_
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/pgRouting/pgrouting/archive/v3.2.1.tar.gz -> pgrouting-3.2.1.tar.gz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	multibuild	d67e78a235f541871c7dfe4cf7931489	postgres	f7e8262a0ea1d45b88075bf93d1a74bd	postgres-multi	eb5db133692fe18bccaa7c2c5f45306d
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	multibuild	d67e78a235f541871c7dfe4cf7931489	postgres	f7e8262a0ea1d45b88075bf93d1a74bd	postgres-multi	eb5db133692fe18bccaa7c2c5f45306d
 _md5_=bbe9dc9585688405b61c0cd87a52230a
diff --git a/metadata/md5-cache/dev-db/pgrouting-3.5.1 b/metadata/md5-cache/dev-db/pgrouting-3.5.1
index 92f6ea2fec80..9e22572a84ee 100644
--- a/metadata/md5-cache/dev-db/pgrouting-3.5.1
+++ b/metadata/md5-cache/dev-db/pgrouting-3.5.1
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=postgres_targets_postgres16? ( dev-db/postgresql:16=[server] ) postgres_targets_postgres15? ( dev-db/postgresql:15=[server] ) postgres_targets_postgres14? ( dev-db/postgresql:14=[server] ) postgres_targets_postgres13? ( dev-db/postgresql:13=[server] ) postgres_targets_postgres12? ( dev-db/postgresql:12=[server] ) postgres_targets_postgres11? ( dev-db/postgresql:11=[server] ) >=dev-db/postgis-2.0 dev-libs/boost sci-mathematics/cgal
 DESCRIPTION=pgRouting extends PostGIS and PostgreSQL with geospatial routing functionality
@@ -12,5 +12,5 @@ RDEPEND=postgres_targets_postgres16? ( dev-db/postgresql:16=[server] ) postgres_
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/pgRouting/pgrouting/archive/v3.5.1.tar.gz -> pgrouting-3.5.1.tar.gz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	multibuild	d67e78a235f541871c7dfe4cf7931489	postgres	f7e8262a0ea1d45b88075bf93d1a74bd	postgres-multi	eb5db133692fe18bccaa7c2c5f45306d
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	multibuild	d67e78a235f541871c7dfe4cf7931489	postgres	f7e8262a0ea1d45b88075bf93d1a74bd	postgres-multi	eb5db133692fe18bccaa7c2c5f45306d
 _md5_=157b5bbca69d586d81e0f52b58d9cbb4
diff --git a/metadata/md5-cache/dev-db/pgrouting-3.6.1 b/metadata/md5-cache/dev-db/pgrouting-3.6.1
index 3e1899815514..5f0f7c61db35 100644
--- a/metadata/md5-cache/dev-db/pgrouting-3.6.1
+++ b/metadata/md5-cache/dev-db/pgrouting-3.6.1
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=postgres_targets_postgres16? ( dev-db/postgresql:16=[server] ) postgres_targets_postgres15? ( dev-db/postgresql:15=[server] ) postgres_targets_postgres14? ( dev-db/postgresql:14=[server] ) postgres_targets_postgres13? ( dev-db/postgresql:13=[server] ) postgres_targets_postgres12? ( dev-db/postgresql:12=[server] ) postgres_targets_postgres11? ( dev-db/postgresql:11=[server] ) >=dev-db/postgis-2.0 dev-libs/boost sci-mathematics/cgal
 DESCRIPTION=pgRouting extends PostGIS and PostgreSQL with geospatial routing functionality
@@ -12,5 +12,5 @@ RDEPEND=postgres_targets_postgres16? ( dev-db/postgresql:16=[server] ) postgres_
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/pgRouting/pgrouting/archive/v3.6.1.tar.gz -> pgrouting-3.6.1.tar.gz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	multibuild	d67e78a235f541871c7dfe4cf7931489	postgres	f7e8262a0ea1d45b88075bf93d1a74bd	postgres-multi	eb5db133692fe18bccaa7c2c5f45306d
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	multibuild	d67e78a235f541871c7dfe4cf7931489	postgres	f7e8262a0ea1d45b88075bf93d1a74bd	postgres-multi	eb5db133692fe18bccaa7c2c5f45306d
 _md5_=157b5bbca69d586d81e0f52b58d9cbb4
diff --git a/metadata/md5-cache/dev-db/qt5-sqlcipher-1.0.11-r1 b/metadata/md5-cache/dev-db/qt5-sqlcipher-1.0.11-r1
index 531b825c217f..8c46fd944ad3 100644
--- a/metadata/md5-cache/dev-db/qt5-sqlcipher-1.0.11-r1
+++ b/metadata/md5-cache/dev-db/qt5-sqlcipher-1.0.11-r1
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=dev-db/sqlcipher-3.4.1 >=dev-qt/qtcore-5.12.3:5= >=dev-qt/qtsql-5.12.3:5=[sqlite] <dev-qt/qtsql-5.16:5=[sqlite]
 DESCRIPTION=Qt SQL driver plugin for SQLCipher
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-db/sqlcipher-3.4.1 >=dev-qt/qtcore-5.12.3:5= >=dev-qt/qtsql-5.12.3:5=[sqlite] <dev-qt/qtsql-5.16:5=[sqlite]
 SLOT=0
 SRC_URI=https://github.com/blizzard4591/qt5-sqlcipher/archive/v1.0.11.tar.gz -> qt5-sqlcipher-1.0.11.tar.gz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c
 _md5_=8e81ebfe489401738d54b814e46f54fa
diff --git a/metadata/md5-cache/dev-db/sqlitebrowser-3.12.2 b/metadata/md5-cache/dev-db/sqlitebrowser-3.12.2
index 12314589d226..9a98f715845d 100644
--- a/metadata/md5-cache/dev-db/sqlitebrowser-3.12.2
+++ b/metadata/md5-cache/dev-db/sqlitebrowser-3.12.2
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-qt/linguist-tools-5.5:5 test? ( >=dev-qt/qttest-5.5:5 ) app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=>=dev-qt/linguist-tools-5.5:5 test? ( >=dev-qt/qttest-5.5:5 ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
 DEPEND=app-editors/qhexedit2 dev-db/sqlite:3 dev-libs/qcustomplot >=dev-qt/qtconcurrent-5.5:5 >=dev-qt/qtcore-5.5:5 >=dev-qt/qtgui-5.5:5 >=dev-qt/qtnetwork-5.5:5[ssl] >=dev-qt/qtprintsupport-5.5:5 >=dev-qt/qtwidgets-5.5:5 >=dev-qt/qtxml-5.5:5 >=x11-libs/qscintilla-2.8.10:= dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=A light GUI editor for SQLite databases
@@ -12,5 +12,5 @@ RDEPEND=app-editors/qhexedit2 dev-db/sqlite:3 dev-libs/qcustomplot >=dev-qt/qtco
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sqlitebrowser/sqlitebrowser/archive/v3.12.2.tar.gz -> sqlitebrowser-3.12.2.tar.gz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	xdg	4a14c5c24f121e7da66e5aab4a168c6e
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	xdg	4a14c5c24f121e7da66e5aab4a168c6e
 _md5_=e752f4ffe8e0507f11cd2fd6dae7b87a
diff --git a/metadata/md5-cache/dev-db/sqlitebrowser-9999 b/metadata/md5-cache/dev-db/sqlitebrowser-9999
index 960f69f3e896..c86b8e6708d7 100644
--- a/metadata/md5-cache/dev-db/sqlitebrowser-9999
+++ b/metadata/md5-cache/dev-db/sqlitebrowser-9999
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-qt/linguist-tools-5.5:5 test? ( >=dev-qt/qttest-5.5:5 ) app-alternatives/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=>=dev-qt/linguist-tools-5.5:5 test? ( >=dev-qt/qttest-5.5:5 ) app-alternatives/ninja >=dev-build/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
 DEPEND=app-editors/qhexedit2 dev-db/sqlite:3 dev-libs/qcustomplot >=dev-qt/qtconcurrent-5.5:5 >=dev-qt/qtcore-5.5:5 >=dev-qt/qtgui-5.5:5 >=dev-qt/qtnetwork-5.5:5[ssl] >=dev-qt/qtprintsupport-5.5:5 >=dev-qt/qtwidgets-5.5:5 >=dev-qt/qtxml-5.5:5 >=x11-libs/qscintilla-2.8.10:= dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=A light GUI editor for SQLite databases
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=app-editors/qhexedit2 dev-db/sqlite:3 dev-libs/qcustomplot >=dev-qt/qtconcurrent-5.5:5 >=dev-qt/qtcore-5.5:5 >=dev-qt/qtgui-5.5:5 >=dev-qt/qtnetwork-5.5:5[ssl] >=dev-qt/qtprintsupport-5.5:5 >=dev-qt/qtwidgets-5.5:5 >=dev-qt/qtxml-5.5:5 >=x11-libs/qscintilla-2.8.10:= >=dev-qt/qtsvg-5.5:5
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	xdg	4a14c5c24f121e7da66e5aab4a168c6e	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	xdg	4a14c5c24f121e7da66e5aab4a168c6e	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b
 _md5_=e2fe80274de4d7803f92688bd531cd65
diff --git a/metadata/md5-cache/dev-db/sqliteman-1.2.2-r5 b/metadata/md5-cache/dev-db/sqliteman-1.2.2-r5
index 8f2d6c98280c..beab53e4b514 100644
--- a/metadata/md5-cache/dev-db/sqliteman-1.2.2-r5
+++ b/metadata/md5-cache/dev-db/sqliteman-1.2.2-r5
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
 DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsql:5[sqlite] dev-qt/qtwidgets:5 >=x11-libs/qscintilla-2.10.3:=
 DESCRIPTION=Powerful GUI manager for the Sqlite3 database
@@ -11,5 +11,5 @@ LICENSE=GPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsql:5[sqlite] dev-qt/qtwidgets:5 >=x11-libs/qscintilla-2.10.3:=
 SLOT=0
 SRC_URI=mirror://sourceforge/sqliteman/sqliteman-1.2.2.tar.gz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	xdg	4a14c5c24f121e7da66e5aab4a168c6e
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	xdg	4a14c5c24f121e7da66e5aab4a168c6e
 _md5_=dbdf5b318a2704737488dc9efe15d6f4
diff --git a/metadata/md5-cache/dev-db/timescaledb-2.12.2 b/metadata/md5-cache/dev-db/timescaledb-2.12.2
index b64b02fb2b04..5aa8f0352d8c 100644
--- a/metadata/md5-cache/dev-db/timescaledb-2.12.2
+++ b/metadata/md5-cache/dev-db/timescaledb-2.12.2
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=postgres_targets_postgres15? ( dev-db/postgresql:15=[ssl] ) postgres_targets_postgres14? ( dev-db/postgresql:14=[ssl] ) postgres_targets_postgres13? ( dev-db/postgresql:13=[ssl] )
 DESCRIPTION=Open-source time-series SQL database
@@ -12,5 +12,5 @@ RDEPEND=postgres_targets_postgres15? ( dev-db/postgresql:15=[ssl] ) postgres_tar
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/timescale/timescaledb/archive/2.12.2.tar.gz -> timescaledb-2.12.2.tar.gz
-_eclasses_=out-of-source-utils	1a9007554652a6e627edbccb3c25a439	multibuild	d67e78a235f541871c7dfe4cf7931489	postgres	f7e8262a0ea1d45b88075bf93d1a74bd	postgres-multi	eb5db133692fe18bccaa7c2c5f45306d	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0
+_eclasses_=out-of-source-utils	1a9007554652a6e627edbccb3c25a439	multibuild	d67e78a235f541871c7dfe4cf7931489	postgres	f7e8262a0ea1d45b88075bf93d1a74bd	postgres-multi	eb5db133692fe18bccaa7c2c5f45306d	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c
 _md5_=d8baa8863f7ac30efc988322a9b462f1
diff --git a/metadata/md5-cache/dev-db/timescaledb-2.13.0 b/metadata/md5-cache/dev-db/timescaledb-2.13.0
index 2717d327212d..e3cf28bbc85d 100644
--- a/metadata/md5-cache/dev-db/timescaledb-2.13.0
+++ b/metadata/md5-cache/dev-db/timescaledb-2.13.0
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=postgres_targets_postgres15? ( dev-db/postgresql:15=[ssl] ) postgres_targets_postgres14? ( dev-db/postgresql:14=[ssl] ) postgres_targets_postgres13? ( dev-db/postgresql:13=[ssl] )
 DESCRIPTION=Open-source time-series SQL database
@@ -12,5 +12,5 @@ RDEPEND=postgres_targets_postgres15? ( dev-db/postgresql:15=[ssl] ) postgres_tar
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/timescale/timescaledb/archive/2.13.0.tar.gz -> timescaledb-2.13.0.tar.gz
-_eclasses_=out-of-source-utils	1a9007554652a6e627edbccb3c25a439	multibuild	d67e78a235f541871c7dfe4cf7931489	postgres	f7e8262a0ea1d45b88075bf93d1a74bd	postgres-multi	eb5db133692fe18bccaa7c2c5f45306d	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0
+_eclasses_=out-of-source-utils	1a9007554652a6e627edbccb3c25a439	multibuild	d67e78a235f541871c7dfe4cf7931489	postgres	f7e8262a0ea1d45b88075bf93d1a74bd	postgres-multi	eb5db133692fe18bccaa7c2c5f45306d	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c
 _md5_=d8baa8863f7ac30efc988322a9b462f1
diff --git a/metadata/md5-cache/dev-db/tora-3.2-r2 b/metadata/md5-cache/dev-db/tora-3.2-r2
index 231b9a524c2b..881f29d36ace 100644
--- a/metadata/md5-cache/dev-db/tora-3.2-r2
+++ b/metadata/md5-cache/dev-db/tora-3.2-r2
@@ -1,4 +1,4 @@
-BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig doc? ( app-text/doxygen ) app-alternatives/ninja >=dev-util/cmake-3.20.5
+BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig doc? ( app-text/doxygen ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
 DEPEND=dev-libs/ferrisloki dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5[mysql?,postgres?] dev-qt/qtwidgets:5 >=x11-libs/qscintilla-2.10.1:=[qt5(+)] oracle? ( dev-db/oracle-instantclient ) postgres? ( dev-db/postgresql:* ) dev-libs/boost
 DESCRIPTION=SQL IDE for Oracle, MySQL and PostgreSQL dbs
@@ -13,5 +13,5 @@ RDEPEND=dev-libs/ferrisloki dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 de
 REQUIRED_USE=|| ( mysql oracle postgres )
 SLOT=0
 SRC_URI=https://github.com/tora-tool/tora/archive/v3.2.tar.gz -> tora-3.2.tar.gz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	b7ccad6f1800c4ea58dbbdafb0b1b5e0	desktop	021728fdc1b03b36357dbc89489e0f0d	xdg	4a14c5c24f121e7da66e5aab4a168c6e
+_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	xdg-utils	baea6080dd821f5562d715887954c9d3	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	desktop	021728fdc1b03b36357dbc89489e0f0d	xdg	4a14c5c24f121e7da66e5aab4a168c6e
 _md5_=6a07a08c3853973f4d5251fb1e8b6ab9