gentoo auto-resync : 15:12:2023 - 08:46:53

42 files changed, 85 insertions, 68 deletions

diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index 45adcbff0550..d1f15e7b2129 100644
--- a/metadata/md5-cache/app-arch/Manifest.gz
+++ b/metadata/md5-cache/app-arch/Manifest.gz
diff --git a/metadata/md5-cache/app-arch/brotli-1.0.9-r6 b/metadata/md5-cache/app-arch/brotli-1.0.9-r6
index 9c31a91a0097..be0ea9fb46e4 100644
--- a/metadata/md5-cache/app-arch/brotli-1.0.9-r6
+++ b/metadata/md5-cache/app-arch/brotli-1.0.9-r6
@@ -1,4 +1,4 @@
-BDEPEND=python? ( >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( python_targets_pypy3? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+BDEPEND=python? ( >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( python_targets_pypy3? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) ) app-alternatives/ninja >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=python? ( python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) )
 DESCRIPTION=Generic-purpose lossless compression algorithm
@@ -13,5 +13,5 @@ REQUIRED_USE=python? ( || ( python_targets_pypy3 python_targets_python3_10 pytho
 RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://github.com/google/brotli/archive/v1.0.9.tar.gz -> brotli-1.0.9.tar.gz test? ( https://dev.gentoo.org/~mgorny/dist/brotli-1.0.9.testdata.tar.xz )
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	cmake-multilib	37d23064f303dcf23453353ab8c77059	distutils-r1	2329ddf7eec9f8177aec51648249d790	flag-o-matic	c816c598969cbaf38cc02d2496ad2e98	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	474cb53a7d1b62721a91809a1d702661	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	cmake-multilib	37d23064f303dcf23453353ab8c77059	distutils-r1	2329ddf7eec9f8177aec51648249d790	flag-o-matic	c816c598969cbaf38cc02d2496ad2e98	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	c8951c1dfcc1d43e3f967f61fd0ec59c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	474cb53a7d1b62721a91809a1d702661	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=e69e7775d0abc604a889819393e2a4d1
diff --git a/metadata/md5-cache/app-arch/brotli-1.1.0 b/metadata/md5-cache/app-arch/brotli-1.1.0
index d7856b31ca4d..3e5aa14104bd 100644
--- a/metadata/md5-cache/app-arch/brotli-1.1.0
+++ b/metadata/md5-cache/app-arch/brotli-1.1.0
@@ -1,4 +1,4 @@
-BDEPEND=python? ( >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( python_targets_python3_10? ( dev-python/unittest-or-fail[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/unittest-or-fail[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+BDEPEND=python? ( >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( python_targets_python3_10? ( dev-python/unittest-or-fail[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/unittest-or-fail[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) ) app-alternatives/ninja >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=python? ( python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) )
 DESCRIPTION=Generic-purpose lossless compression algorithm
@@ -13,5 +13,5 @@ REQUIRED_USE=python? ( || ( python_targets_python3_10 python_targets_python3_11
 RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://github.com/google/brotli/archive/v1.1.0.tar.gz -> brotli-1.1.0.tar.gz
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	cmake-multilib	37d23064f303dcf23453353ab8c77059	distutils-r1	2329ddf7eec9f8177aec51648249d790	flag-o-matic	c816c598969cbaf38cc02d2496ad2e98	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	474cb53a7d1b62721a91809a1d702661	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	cmake-multilib	37d23064f303dcf23453353ab8c77059	distutils-r1	2329ddf7eec9f8177aec51648249d790	flag-o-matic	c816c598969cbaf38cc02d2496ad2e98	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	c8951c1dfcc1d43e3f967f61fd0ec59c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	474cb53a7d1b62721a91809a1d702661	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=7b89c637206634d9e7056666610781e8
diff --git a/metadata/md5-cache/app-arch/brotli-9999 b/metadata/md5-cache/app-arch/brotli-9999
index 74253589d677..383b298d9032 100644
--- a/metadata/md5-cache/app-arch/brotli-9999
+++ b/metadata/md5-cache/app-arch/brotli-9999
@@ -1,4 +1,4 @@
-BDEPEND=python? ( >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( python_targets_pypy3? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=python? ( >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( python_targets_pypy3? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) ) app-alternatives/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=python? ( python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) )
 DESCRIPTION=Generic-purpose lossless compression algorithm
@@ -12,5 +12,5 @@ RDEPEND=python? ( python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_py
 REQUIRED_USE=python? ( || ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 ) )
 RESTRICT=!test? ( test )
 SLOT=0/9999
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	cmake-multilib	37d23064f303dcf23453353ab8c77059	distutils-r1	2329ddf7eec9f8177aec51648249d790	flag-o-matic	c816c598969cbaf38cc02d2496ad2e98	git-r3	5133e393e8717a3a093660f990801dc1	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	474cb53a7d1b62721a91809a1d702661	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	cmake-multilib	37d23064f303dcf23453353ab8c77059	distutils-r1	2329ddf7eec9f8177aec51648249d790	flag-o-matic	c816c598969cbaf38cc02d2496ad2e98	git-r3	5133e393e8717a3a093660f990801dc1	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	c8951c1dfcc1d43e3f967f61fd0ec59c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	474cb53a7d1b62721a91809a1d702661	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=3b493643f0c6cbff85f8e9a1b362103b
diff --git a/metadata/md5-cache/app-arch/bzip2-9999 b/metadata/md5-cache/app-arch/bzip2-9999
index d621b8c219f5..f41a77fcec97 100644
--- a/metadata/md5-cache/app-arch/bzip2-9999
+++ b/metadata/md5-cache/app-arch/bzip2-9999
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-util/meson-1.2.1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=>=dev-util/meson-1.2.1 app-alternatives/ninja dev-util/meson-format-array >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install test unpack
 DESCRIPTION=A high-quality data compressor used extensively by Gentoo Linux
 EAPI=8
@@ -9,5 +9,5 @@ LICENSE=BZIP2
 PDEPEND=app-alternatives/bzip2
 PROPERTIES=live
 SLOT=0/1
-_eclasses_=git-r3	5133e393e8717a3a093660f990801dc1	meson	576e6bbef90e9753368f8b4ad0bd5383	meson-multilib	8989922d980e5e870cc3de949d1b2586	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-utils-r1	474cb53a7d1b62721a91809a1d702661	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	usr-ldscript	ff03a5d223e97515fa25b5cae97ebda9
+_eclasses_=git-r3	5133e393e8717a3a093660f990801dc1	meson	576e6bbef90e9753368f8b4ad0bd5383	meson-multilib	8989922d980e5e870cc3de949d1b2586	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	c8951c1dfcc1d43e3f967f61fd0ec59c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-utils-r1	474cb53a7d1b62721a91809a1d702661	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	usr-ldscript	ff03a5d223e97515fa25b5cae97ebda9
 _md5_=ce87b58e207a41917627f83047e23c0f
diff --git a/metadata/md5-cache/app-arch/cfv-3.0.0 b/metadata/md5-cache/app-arch/cfv-3.0.0
index 1f03f8dae7fb..4407a967fd3d 100644
--- a/metadata/md5-cache/app-arch/cfv-3.0.0
+++ b/metadata/md5-cache/app-arch/cfv-3.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/cfv-project/cfv/archive/v3.0.0.tar.gz -> cfv-3.0.0.gh.tar.gz
-_eclasses_=distutils-r1	2329ddf7eec9f8177aec51648249d790	flag-o-matic	c816c598969cbaf38cc02d2496ad2e98	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	474cb53a7d1b62721a91809a1d702661	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
+_eclasses_=distutils-r1	2329ddf7eec9f8177aec51648249d790	flag-o-matic	c816c598969cbaf38cc02d2496ad2e98	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	c8951c1dfcc1d43e3f967f61fd0ec59c	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	474cb53a7d1b62721a91809a1d702661	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
 _md5_=3e4dd5c64e2960035ba5753753c107b4
diff --git a/metadata/md5-cache/app-arch/createrepo_c-1.0.2 b/metadata/md5-cache/app-arch/createrepo_c-1.0.2
index 544dfc655f6e..57310e24d4f7 100644
--- a/metadata/md5-cache/app-arch/createrepo_c-1.0.2
+++ b/metadata/md5-cache/app-arch/createrepo_c-1.0.2
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=app-arch/bzip2:= app-arch/drpm app-arch/rpm app-arch/xz-utils app-arch/zchunk dev-db/sqlite:3 dev-libs/glib:2 dev-libs/libxml2 dev-libs/openssl:= net-misc/curl sys-apps/file sys-libs/libmodulemd sys-libs/zlib:= zstd? ( app-arch/zstd:= )
 DESCRIPTION=C implementation of createrepo
@@ -12,5 +12,5 @@ RDEPEND=app-arch/bzip2:= app-arch/drpm app-arch/rpm app-arch/xz-utils app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rpm-software-management/createrepo_c/archive/1.0.2.tar.gz -> createrepo_c-1.0.2.tar.gz
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	c816c598969cbaf38cc02d2496ad2e98	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	c816c598969cbaf38cc02d2496ad2e98	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	c8951c1dfcc1d43e3f967f61fd0ec59c	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=b4e1edb02cf9786c2e3744bfd7ef62af
diff --git a/metadata/md5-cache/app-arch/createrepo_c-9999 b/metadata/md5-cache/app-arch/createrepo_c-9999
index 7daccd38fed7..ebf88b348f0c 100644
--- a/metadata/md5-cache/app-arch/createrepo_c-9999
+++ b/metadata/md5-cache/app-arch/createrepo_c-9999
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=app-arch/bzip2:= app-arch/drpm app-arch/rpm app-arch/xz-utils app-arch/zchunk dev-db/sqlite:3 dev-libs/glib:2 dev-libs/libxml2 dev-libs/openssl:= net-misc/curl sys-apps/file sys-libs/libmodulemd sys-libs/zlib:= zstd? ( app-arch/zstd:= )
 DESCRIPTION=C implementation of createrepo
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=app-arch/bzip2:= app-arch/drpm app-arch/rpm app-arch/xz-utils app-arch/zchunk dev-db/sqlite:3 dev-libs/glib:2 dev-libs/libxml2 dev-libs/openssl:= net-misc/curl sys-apps/file sys-libs/libmodulemd sys-libs/zlib:= zstd? ( app-arch/zstd:= )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	c816c598969cbaf38cc02d2496ad2e98	git-r3	5133e393e8717a3a093660f990801dc1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	c816c598969cbaf38cc02d2496ad2e98	git-r3	5133e393e8717a3a093660f990801dc1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	c8951c1dfcc1d43e3f967f61fd0ec59c	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=b4e1edb02cf9786c2e3744bfd7ef62af
diff --git a/metadata/md5-cache/app-arch/drpm-0.5.2 b/metadata/md5-cache/app-arch/drpm-0.5.2
index b33cfcdc41ba..c7828858de9f 100644
--- a/metadata/md5-cache/app-arch/drpm-0.5.2
+++ b/metadata/md5-cache/app-arch/drpm-0.5.2
@@ -1,4 +1,4 @@
-BDEPEND=app-arch/bzip2:= app-arch/rpm app-arch/xz-utils dev-libs/openssl:= sys-libs/zlib lzip? ( app-arch/lzlib ) zstd? ( app-arch/zstd:= ) test? ( dev-util/cmocka ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+BDEPEND=app-arch/bzip2:= app-arch/rpm app-arch/xz-utils dev-libs/openssl:= sys-libs/zlib lzip? ( app-arch/lzlib ) zstd? ( app-arch/zstd:= ) test? ( dev-util/cmocka ) app-alternatives/ninja >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=app-arch/bzip2:= app-arch/rpm app-arch/xz-utils dev-libs/openssl:= sys-libs/zlib lzip? ( app-arch/lzlib ) zstd? ( app-arch/zstd:= )
 DESCRIPTION=A library for making, reading and applying deltarpm packages
@@ -12,5 +12,5 @@ RDEPEND=app-arch/bzip2:= app-arch/rpm app-arch/xz-utils dev-libs/openssl:= sys-l
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rpm-software-management/drpm/archive/refs/tags/0.5.2.tar.gz -> drpm-0.5.2.tar.gz
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	c816c598969cbaf38cc02d2496ad2e98	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	c816c598969cbaf38cc02d2496ad2e98	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	c8951c1dfcc1d43e3f967f61fd0ec59c	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=c5a93d2e1a8935a77036d17d76257948
diff --git a/metadata/md5-cache/app-arch/drpm-9999 b/metadata/md5-cache/app-arch/drpm-9999
index 8a251bf89c2b..79d97673d66a 100644
--- a/metadata/md5-cache/app-arch/drpm-9999
+++ b/metadata/md5-cache/app-arch/drpm-9999
@@ -1,4 +1,4 @@
-BDEPEND=app-arch/bzip2:= app-arch/rpm app-arch/xz-utils dev-libs/openssl:= sys-libs/zlib lzip? ( app-arch/lzlib ) zstd? ( app-arch/zstd:= ) test? ( dev-util/cmocka ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=app-arch/bzip2:= app-arch/rpm app-arch/xz-utils dev-libs/openssl:= sys-libs/zlib lzip? ( app-arch/lzlib ) zstd? ( app-arch/zstd:= ) test? ( dev-util/cmocka ) app-alternatives/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=app-arch/bzip2:= app-arch/rpm app-arch/xz-utils dev-libs/openssl:= sys-libs/zlib lzip? ( app-arch/lzlib ) zstd? ( app-arch/zstd:= )
 DESCRIPTION=A library for making, reading and applying deltarpm packages
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=app-arch/bzip2:= app-arch/rpm app-arch/xz-utils dev-libs/openssl:= sys-libs/zlib lzip? ( app-arch/lzlib ) zstd? ( app-arch/zstd:= )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	c816c598969cbaf38cc02d2496ad2e98	git-r3	5133e393e8717a3a093660f990801dc1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	c816c598969cbaf38cc02d2496ad2e98	git-r3	5133e393e8717a3a093660f990801dc1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	c8951c1dfcc1d43e3f967f61fd0ec59c	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=c5a93d2e1a8935a77036d17d76257948
diff --git a/metadata/md5-cache/app-arch/dtrx-8.5.3 b/metadata/md5-cache/app-arch/dtrx-8.5.3
index 7c99c766e3f9..722af02f74c5 100644
--- a/metadata/md5-cache/app-arch/dtrx-8.5.3
+++ b/metadata/md5-cache/app-arch/dtrx-8.5.3
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/d/dtrx/dtrx-8.5.3.tar.gz
-_eclasses_=distutils-r1	2329ddf7eec9f8177aec51648249d790	flag-o-matic	c816c598969cbaf38cc02d2496ad2e98	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	474cb53a7d1b62721a91809a1d702661	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
+_eclasses_=distutils-r1	2329ddf7eec9f8177aec51648249d790	flag-o-matic	c816c598969cbaf38cc02d2496ad2e98	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	c8951c1dfcc1d43e3f967f61fd0ec59c	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	474cb53a7d1b62721a91809a1d702661	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
 _md5_=aec15bbfb15a8e53632609790c13e57a
diff --git a/metadata/md5-cache/app-arch/dtrx-9999 b/metadata/md5-cache/app-arch/dtrx-9999
index c61e82a720fb..23eb2ca6f43b 100644
--- a/metadata/md5-cache/app-arch/dtrx-9999
+++ b/metadata/md5-cache/app-arch/dtrx-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
-_eclasses_=distutils-r1	2329ddf7eec9f8177aec51648249d790	flag-o-matic	c816c598969cbaf38cc02d2496ad2e98	git-r3	5133e393e8717a3a093660f990801dc1	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	474cb53a7d1b62721a91809a1d702661	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
+_eclasses_=distutils-r1	2329ddf7eec9f8177aec51648249d790	flag-o-matic	c816c598969cbaf38cc02d2496ad2e98	git-r3	5133e393e8717a3a093660f990801dc1	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	c8951c1dfcc1d43e3f967f61fd0ec59c	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	474cb53a7d1b62721a91809a1d702661	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
 _md5_=93e926731845f458f463e2e2aba04157
diff --git a/metadata/md5-cache/app-arch/file-roller-43.0 b/metadata/md5-cache/app-arch/file-roller-43.0
index 7bcd75aee225..dca7beedb2ee 100644
--- a/metadata/md5-cache/app-arch/file-roller-43.0
+++ b/metadata/md5-cache/app-arch/file-roller-43.0
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/glib-utils dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig gtk-doc? ( dev-util/gi-docgen ) app-arch/xz-utils >=dev-util/meson-1.2.1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+BDEPEND=dev-util/glib-utils dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig gtk-doc? ( dev-util/gi-docgen ) app-arch/xz-utils >=dev-util/meson-1.2.1 app-alternatives/ninja dev-util/meson-format-array
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
 DEPEND=>=dev-libs/glib-2.38:2 >=x11-libs/gtk+-3.22.0:3 >=gui-libs/libhandy-1.5.0:1 nautilus? ( >=gnome-base/nautilus-43.0 ) >=dev-libs/json-glib-0.14 >=app-arch/libarchive-3.2:= introspection? ( dev-libs/gobject-introspection ) x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/pango
 DESCRIPTION=Archive manager for GNOME
@@ -13,5 +13,5 @@ RDEPEND=>=dev-libs/glib-2.38:2 >=x11-libs/gtk+-3.22.0:3 >=gui-libs/libhandy-1.5.
 REQUIRED_USE=gtk-doc? ( introspection )
 SLOT=0
 SRC_URI=mirror://gnome/sources/file-roller/43/file-roller-43.0.tar.xz
-_eclasses_=gnome.org	6b39404f1491c60a2d32e3c693a683fe	gnome2-utils	b0183db3b2e07b18f3b77bffec72e116	meson	576e6bbef90e9753368f8b4ad0bd5383	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-utils-r1	474cb53a7d1b62721a91809a1d702661	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=gnome.org	6b39404f1491c60a2d32e3c693a683fe	gnome2-utils	b0183db3b2e07b18f3b77bffec72e116	meson	576e6bbef90e9753368f8b4ad0bd5383	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	c8951c1dfcc1d43e3f967f61fd0ec59c	python-utils-r1	474cb53a7d1b62721a91809a1d702661	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=444ae8d6284c833055d289964d21d394
diff --git a/metadata/md5-cache/app-arch/gcab-1.6 b/metadata/md5-cache/app-arch/gcab-1.6
index 5be3f188641c..632c6e56248a 100644
--- a/metadata/md5-cache/app-arch/gcab-1.6
+++ b/metadata/md5-cache/app-arch/gcab-1.6
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/glib-utils gtk-doc? ( >=dev-util/gtk-doc-1.14 app-text/docbook-xml-dtd:4.3 ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.56 ) ) app-arch/xz-utils >=dev-util/meson-1.2.1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+BDEPEND=dev-util/glib-utils gtk-doc? ( >=dev-util/gtk-doc-1.14 app-text/docbook-xml-dtd:4.3 ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.56 ) ) app-arch/xz-utils >=dev-util/meson-1.2.1 app-alternatives/ninja dev-util/meson-format-array
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
 DEPEND=>=dev-libs/glib-2.62.0:2 sys-libs/zlib introspection? ( >=dev-libs/gobject-introspection-1.54:= )
 DESCRIPTION=Library and tool for working with Microsoft Cabinet (CAB) files
@@ -14,5 +14,5 @@ REQUIRED_USE=vala? ( introspection )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gcab/1.6/gcab-1.6.tar.xz
-_eclasses_=flag-o-matic	c816c598969cbaf38cc02d2496ad2e98	gnome.org	6b39404f1491c60a2d32e3c693a683fe	meson	576e6bbef90e9753368f8b4ad0bd5383	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-utils-r1	474cb53a7d1b62721a91809a1d702661	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	vala	e477903dbe0105930c51f170a592dc16	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=flag-o-matic	c816c598969cbaf38cc02d2496ad2e98	gnome.org	6b39404f1491c60a2d32e3c693a683fe	meson	576e6bbef90e9753368f8b4ad0bd5383	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	c8951c1dfcc1d43e3f967f61fd0ec59c	python-utils-r1	474cb53a7d1b62721a91809a1d702661	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	vala	e477903dbe0105930c51f170a592dc16	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=d10e28d8b2f8493fc12f00f5e896b5e3
diff --git a/metadata/md5-cache/app-arch/gnome-autoar-0.4.4 b/metadata/md5-cache/app-arch/gnome-autoar-0.4.4
index 4a36cf131773..d118779a4f75 100644
--- a/metadata/md5-cache/app-arch/gnome-autoar-0.4.4
+++ b/metadata/md5-cache/app-arch/gnome-autoar-0.4.4
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig dev-util/glib-utils gtk-doc? ( dev-util/gtk-doc app-text/docbook-xml-dtd:4.3 ) vala? ( || ( dev-lang/vala:0.56[vapigen(+)] ) ) app-arch/xz-utils >=dev-util/meson-1.2.1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+BDEPEND=virtual/pkgconfig dev-util/glib-utils gtk-doc? ( dev-util/gtk-doc app-text/docbook-xml-dtd:4.3 ) vala? ( || ( dev-lang/vala:0.56[vapigen(+)] ) ) app-arch/xz-utils >=dev-util/meson-1.2.1 app-alternatives/ninja dev-util/meson-format-array
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=app-arch/libarchive-3.4.0:= >=dev-libs/glib-2.35.6:2 gtk? ( >=x11-libs/gtk+-3.2:3[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-1.30.0:= )
 DESCRIPTION=Automatic archives creating and extracting library
@@ -13,5 +13,5 @@ REQUIRED_USE=vala? ( introspection ) gtk-doc? ( gtk )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-autoar/0.4/gnome-autoar-0.4.4.tar.xz
-_eclasses_=eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	flag-o-matic	c816c598969cbaf38cc02d2496ad2e98	gnome.org	6b39404f1491c60a2d32e3c693a683fe	meson	576e6bbef90e9753368f8b4ad0bd5383	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-utils-r1	474cb53a7d1b62721a91809a1d702661	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	vala	e477903dbe0105930c51f170a592dc16
+_eclasses_=eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	flag-o-matic	c816c598969cbaf38cc02d2496ad2e98	gnome.org	6b39404f1491c60a2d32e3c693a683fe	meson	576e6bbef90e9753368f8b4ad0bd5383	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	c8951c1dfcc1d43e3f967f61fd0ec59c	python-utils-r1	474cb53a7d1b62721a91809a1d702661	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	vala	e477903dbe0105930c51f170a592dc16
 _md5_=d3cf03935799a400ebb4e4c36680b949
diff --git a/metadata/md5-cache/app-arch/innoextract-1.9 b/metadata/md5-cache/app-arch/innoextract-1.9
index ee9fda76c893..4be8e114a48f 100644
--- a/metadata/md5-cache/app-arch/innoextract-1.9
+++ b/metadata/md5-cache/app-arch/innoextract-1.9
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-libs/boost:=[bzip2,zlib] iconv? ( virtual/libiconv ) lzma? ( app-arch/xz-utils )
 DESCRIPTION=A tool to unpack installers created by Inno Setup
@@ -11,5 +11,5 @@ LICENSE=ZLIB
 RDEPEND=dev-libs/boost:=[bzip2,zlib] iconv? ( virtual/libiconv ) lzma? ( app-arch/xz-utils )
 SLOT=0
 SRC_URI=https://constexpr.org/innoextract/files/innoextract-1.9.tar.gz
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	c816c598969cbaf38cc02d2496ad2e98	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	c816c598969cbaf38cc02d2496ad2e98	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	c8951c1dfcc1d43e3f967f61fd0ec59c	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=3974d327b009cde255b5f56bdd04e2e2
diff --git a/metadata/md5-cache/app-arch/lxqt-archiver-0.8.0 b/metadata/md5-cache/app-arch/lxqt-archiver-0.8.0
index dee15bbe52b9..83fc35212533 100644
--- a/metadata/md5-cache/app-arch/lxqt-archiver-0.8.0
+++ b/metadata/md5-cache/app-arch/lxqt-archiver-0.8.0
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-qt/linguist-tools-5.15:5 >=dev-util/lxqt-build-tools-0.13.0 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+BDEPEND=>=dev-qt/linguist-tools-5.15:5 >=dev-util/lxqt-build-tools-0.13.0 app-alternatives/ninja >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm prepare test
 DEPEND=dev-libs/glib:2 dev-libs/json-glib >=dev-qt/qtcore-5.15:5 >=dev-qt/qtgui-5.15:5 >=dev-qt/qtwidgets-5.15:5 >=dev-qt/qtx11extras-5.15:5 >=x11-libs/libfm-qt-1.3:=
 DESCRIPTION=Qt GUI File Archiver
@@ -10,5 +10,5 @@ LICENSE=GPL-2 GPL-2+
 RDEPEND=dev-libs/glib:2 dev-libs/json-glib >=dev-qt/qtcore-5.15:5 >=dev-qt/qtgui-5.15:5 >=dev-qt/qtwidgets-5.15:5 >=dev-qt/qtx11extras-5.15:5 >=x11-libs/libfm-qt-1.3:=
 SLOT=0
 SRC_URI=https://github.com/lxqt/lxqt-archiver/releases/download/0.8.0/lxqt-archiver-0.8.0.tar.xz
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	c816c598969cbaf38cc02d2496ad2e98	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	c816c598969cbaf38cc02d2496ad2e98	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	c8951c1dfcc1d43e3f967f61fd0ec59c	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=bf02bddeba10cd18d39192f7f263daf1
diff --git a/metadata/md5-cache/app-arch/lxqt-archiver-0.9.0 b/metadata/md5-cache/app-arch/lxqt-archiver-0.9.0
index 9639d6e5379b..898bb353147e 100644
--- a/metadata/md5-cache/app-arch/lxqt-archiver-0.9.0
+++ b/metadata/md5-cache/app-arch/lxqt-archiver-0.9.0
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-qt/linguist-tools-5.15:5 >=dev-util/lxqt-build-tools-0.13.0 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+BDEPEND=>=dev-qt/linguist-tools-5.15:5 >=dev-util/lxqt-build-tools-0.13.0 app-alternatives/ninja >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm prepare test
 DEPEND=dev-libs/glib:2 dev-libs/json-glib >=dev-qt/qtcore-5.15:5 >=dev-qt/qtgui-5.15:5 >=dev-qt/qtwidgets-5.15:5 >=dev-qt/qtx11extras-5.15:5 >=x11-libs/libfm-qt-1.4:=
 DESCRIPTION=Qt GUI File Archiver
@@ -10,5 +10,5 @@ LICENSE=GPL-2 GPL-2+
 RDEPEND=dev-libs/glib:2 dev-libs/json-glib >=dev-qt/qtcore-5.15:5 >=dev-qt/qtgui-5.15:5 >=dev-qt/qtwidgets-5.15:5 >=dev-qt/qtx11extras-5.15:5 >=x11-libs/libfm-qt-1.4:=
 SLOT=0
 SRC_URI=https://github.com/lxqt/lxqt-archiver/releases/download/0.9.0/lxqt-archiver-0.9.0.tar.xz
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	c816c598969cbaf38cc02d2496ad2e98	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	c816c598969cbaf38cc02d2496ad2e98	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	c8951c1dfcc1d43e3f967f61fd0ec59c	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=6fc8a7d47dc62286faba99b10f11478f
diff --git a/metadata/md5-cache/app-arch/lz4-1.9.4 b/metadata/md5-cache/app-arch/lz4-1.9.4
index 014d8917749f..9a4e34275725 100644
--- a/metadata/md5-cache/app-arch/lz4-1.9.4
+++ b/metadata/md5-cache/app-arch/lz4-1.9.4
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Extremely Fast Compression algorithm
 EAPI=8
@@ -9,5 +9,5 @@ KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~
 LICENSE=BSD-2 GPL-2
 SLOT=0/r132
 SRC_URI=https://github.com/lz4/lz4/archive/v1.9.4.tar.gz -> lz4-1.9.4.tar.gz
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	c816c598969cbaf38cc02d2496ad2e98	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	c816c598969cbaf38cc02d2496ad2e98	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	c8951c1dfcc1d43e3f967f61fd0ec59c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=7ac3c393cd6885b1c366930a4d2ee73a
diff --git a/metadata/md5-cache/app-arch/patool-1.12_p20230424 b/metadata/md5-cache/app-arch/patool-1.12_p20230424
index 2747f672d005..c7ae36274d34 100644
--- a/metadata/md5-cache/app-arch/patool-1.12_p20230424
+++ b/metadata/md5-cache/app-arch/patool-1.12_p20230424
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_tar
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/wummel/patool/archive/ab64562c8cdac34dfd69fcb6e30c8c0014282d11.tar.gz -> patool-1.12_p20230424.gh.tar.gz
-_eclasses_=distutils-r1	2329ddf7eec9f8177aec51648249d790	flag-o-matic	c816c598969cbaf38cc02d2496ad2e98	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	474cb53a7d1b62721a91809a1d702661	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
+_eclasses_=distutils-r1	2329ddf7eec9f8177aec51648249d790	flag-o-matic	c816c598969cbaf38cc02d2496ad2e98	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	c8951c1dfcc1d43e3f967f61fd0ec59c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	474cb53a7d1b62721a91809a1d702661	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
 _md5_=aac48a397d4e53f5165169b6dfbbd0e1
diff --git a/metadata/md5-cache/app-arch/patool-1.14.1 b/metadata/md5-cache/app-arch/patool-1.14.1
index cf1f6b320104..3ea9910b27b8 100644
--- a/metadata/md5-cache/app-arch/patool-1.14.1
+++ b/metadata/md5-cache/app-arch/patool-1.14.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_tar
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/p/patool/patool-1.14.1.tar.gz
-_eclasses_=distutils-r1	2329ddf7eec9f8177aec51648249d790	flag-o-matic	c816c598969cbaf38cc02d2496ad2e98	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	474cb53a7d1b62721a91809a1d702661	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
+_eclasses_=distutils-r1	2329ddf7eec9f8177aec51648249d790	flag-o-matic	c816c598969cbaf38cc02d2496ad2e98	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	c8951c1dfcc1d43e3f967f61fd0ec59c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	474cb53a7d1b62721a91809a1d702661	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
 _md5_=a08422bfbfa2d34dcc0b6e1f63f3bc4f
diff --git a/metadata/md5-cache/app-arch/patool-1.15.0 b/metadata/md5-cache/app-arch/patool-1.15.0
index aebf72bb8f83..288aee4e6fb8 100644
--- a/metadata/md5-cache/app-arch/patool-1.15.0
+++ b/metadata/md5-cache/app-arch/patool-1.15.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_tar
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/p/patool/patool-1.15.0.tar.gz
-_eclasses_=distutils-r1	2329ddf7eec9f8177aec51648249d790	flag-o-matic	c816c598969cbaf38cc02d2496ad2e98	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	474cb53a7d1b62721a91809a1d702661	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
+_eclasses_=distutils-r1	2329ddf7eec9f8177aec51648249d790	flag-o-matic	c816c598969cbaf38cc02d2496ad2e98	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	c8951c1dfcc1d43e3f967f61fd0ec59c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	474cb53a7d1b62721a91809a1d702661	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
 _md5_=a3bfa77e1df6d6b4d4e388f3d08c6730
diff --git a/metadata/md5-cache/app-arch/patool-2.0.0 b/metadata/md5-cache/app-arch/patool-2.0.0
index 7ddaa76cabca..1c97779a1a49 100644
--- a/metadata/md5-cache/app-arch/patool-2.0.0
+++ b/metadata/md5-cache/app-arch/patool-2.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_tar
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/p/patool/patool-2.0.0.tar.gz
-_eclasses_=distutils-r1	2329ddf7eec9f8177aec51648249d790	flag-o-matic	c816c598969cbaf38cc02d2496ad2e98	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	474cb53a7d1b62721a91809a1d702661	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
+_eclasses_=distutils-r1	2329ddf7eec9f8177aec51648249d790	flag-o-matic	c816c598969cbaf38cc02d2496ad2e98	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	c8951c1dfcc1d43e3f967f61fd0ec59c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	474cb53a7d1b62721a91809a1d702661	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
 _md5_=a3bfa77e1df6d6b4d4e388f3d08c6730
diff --git a/metadata/md5-cache/app-arch/rpm-4.19.1 b/metadata/md5-cache/app-arch/rpm-4.19.1
new file mode 100644
index 000000000000..58cd7c957454
--- /dev/null
+++ b/metadata/md5-cache/app-arch/rpm-4.19.1
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen ) nls? ( sys-devel/gettext ) sys-devel/make >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test
+DEPEND=lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) app-arch/libarchive:= >=app-arch/bzip2-1.0.1 app-arch/xz-utils app-arch/zstd:= >=app-crypt/gnupg-1.2 >=dev-lang/perl-5.8.8 dev-libs/elfutils >=dev-libs/popt-1.7 sys-apps/file sys-libs/readline:= >=sys-libs/zlib-1.2.3-r1 virtual/libintl acl? ( virtual/acl ) audit? ( sys-process/audit ) caps? ( >=sys-libs/libcap-2.0 ) dbus? ( sys-apps/dbus ) sqlite? ( dev-db/sqlite:3 ) python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) ) nls? ( virtual/libintl ) sequoia? ( app-crypt/rpm-sequoia ) !sequoia? ( dev-libs/libgcrypt:= )
+DESCRIPTION=The RPM Package Manager
+EAPI=8
+HOMEPAGE=https://rpm.org/ https://github.com/rpm-software-management/rpm
+INHERIT=cmake lua-single python-single-r1 toolchain-funcs
+IUSE=acl audit caps +berkdb doc dbus nls openmp python selinux +sequoia +sqlite lua_single_target_lua5-3 lua_single_target_lua5-4 python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12
+KEYWORDS=~amd64
+LICENSE=GPL-2 LGPL-2
+RDEPEND=lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) app-arch/libarchive:= >=app-arch/bzip2-1.0.1 app-arch/xz-utils app-arch/zstd:= >=app-crypt/gnupg-1.2 >=dev-lang/perl-5.8.8 dev-libs/elfutils >=dev-libs/popt-1.7 sys-apps/file sys-libs/readline:= >=sys-libs/zlib-1.2.3-r1 virtual/libintl acl? ( virtual/acl ) audit? ( sys-process/audit ) caps? ( >=sys-libs/libcap-2.0 ) dbus? ( sys-apps/dbus ) sqlite? ( dev-db/sqlite:3 ) python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) ) nls? ( virtual/libintl ) sequoia? ( app-crypt/rpm-sequoia ) !sequoia? ( dev-libs/libgcrypt:= ) selinux? ( sec-policy/selinux-rpm )
+REQUIRED_USE=^^ ( lua_single_target_lua5-3 lua_single_target_lua5-4 ) python? ( ^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 ) )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://ftp.osuosl.org/pub/rpm/releases/rpm-4.19.x/rpm-4.19.1.tar.bz2 http://ftp.rpm.org/releases/rpm-4.19.x/rpm-4.19.1.tar.bz2
+_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	c816c598969cbaf38cc02d2496ad2e98	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	c8951c1dfcc1d43e3f967f61fd0ec59c	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	474cb53a7d1b62721a91809a1d702661	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=e75e7c71161e8652ec5fb45c6fcadb35
diff --git a/metadata/md5-cache/app-arch/snappy-1.1.10-r1 b/metadata/md5-cache/app-arch/snappy-1.1.10-r1
index 20b0ecc445e0..c19a36b3e077 100644
--- a/metadata/md5-cache/app-arch/snappy-1.1.10-r1
+++ b/metadata/md5-cache/app-arch/snappy-1.1.10-r1
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=test? ( dev-cpp/gtest )
 DESCRIPTION=A high-speed compression/decompression library by Google
@@ -11,5 +11,5 @@ LICENSE=BSD
 RESTRICT=!test? ( test )
 SLOT=0/1.1
 SRC_URI=https://github.com/google/snappy/archive/1.1.10.tar.gz -> snappy-1.1.10.tar.gz
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	c816c598969cbaf38cc02d2496ad2e98	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	c816c598969cbaf38cc02d2496ad2e98	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	c8951c1dfcc1d43e3f967f61fd0ec59c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=48f7a62a21d6c99c716b8667495b7ef1
diff --git a/metadata/md5-cache/app-arch/snappy-1.1.9-r1 b/metadata/md5-cache/app-arch/snappy-1.1.9-r1
index 8f7b24be09c5..f0d84348760f 100644
--- a/metadata/md5-cache/app-arch/snappy-1.1.9-r1
+++ b/metadata/md5-cache/app-arch/snappy-1.1.9-r1
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=test? ( dev-cpp/gtest )
 DESCRIPTION=A high-speed compression/decompression library by Google
@@ -11,5 +11,5 @@ LICENSE=BSD
 RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://github.com/google/snappy/archive/1.1.9.tar.gz -> snappy-1.1.9.tar.gz
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	c816c598969cbaf38cc02d2496ad2e98	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	c816c598969cbaf38cc02d2496ad2e98	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	c8951c1dfcc1d43e3f967f61fd0ec59c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=cfb48386f1a812d74f99310e055f008a
diff --git a/metadata/md5-cache/app-arch/stormlib-9.24 b/metadata/md5-cache/app-arch/stormlib-9.24
index 824ceb1aa256..7c14f61380f3 100644
--- a/metadata/md5-cache/app-arch/stormlib-9.24
+++ b/metadata/md5-cache/app-arch/stormlib-9.24
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=app-arch/bzip2:= dev-libs/libtomcrypt:=[libtommath] sys-libs/zlib:=
 DESCRIPTION=Library to read and write MPQ archives (Diablo, StarCraft)
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=app-arch/bzip2:= dev-libs/libtomcrypt:=[libtommath] sys-libs/zlib:=
 SLOT=0
 SRC_URI=https://github.com/ladislav-zezula/StormLib/archive/v9.24.tar.gz -> StormLib-9.24.tar.gz
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	c816c598969cbaf38cc02d2496ad2e98	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	c816c598969cbaf38cc02d2496ad2e98	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	c8951c1dfcc1d43e3f967f61fd0ec59c	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=cf19a8f9def6b163c53eb94db8c816db
diff --git a/metadata/md5-cache/app-arch/stormlib-9.25 b/metadata/md5-cache/app-arch/stormlib-9.25
index 087af920c709..cf13aa43fdae 100644
--- a/metadata/md5-cache/app-arch/stormlib-9.25
+++ b/metadata/md5-cache/app-arch/stormlib-9.25
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=app-arch/bzip2:= dev-libs/libtomcrypt:=[libtommath] sys-libs/zlib:=
 DESCRIPTION=Library to read and write MPQ archives (Diablo, StarCraft)
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=app-arch/bzip2:= dev-libs/libtomcrypt:=[libtommath] sys-libs/zlib:=
 SLOT=0
 SRC_URI=https://github.com/ladislav-zezula/StormLib/archive/v9.25.tar.gz -> StormLib-9.25.tar.gz
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	c816c598969cbaf38cc02d2496ad2e98	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	c816c598969cbaf38cc02d2496ad2e98	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	c8951c1dfcc1d43e3f967f61fd0ec59c	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=5b84bc49dbcfee4c2380d4adb89c85b7
diff --git a/metadata/md5-cache/app-arch/tardelta-1.0.1 b/metadata/md5-cache/app-arch/tardelta-1.0.1
index 17f2c948acab..c23694fe76d0 100644
--- a/metadata/md5-cache/app-arch/tardelta-1.0.1
+++ b/metadata/md5-cache/app-arch/tardelta-1.0.1
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=https://github.com/zmedico/tardelta/archive/1.0.1.tar.gz -> tardelta-1.0.1.tar.gz
-_eclasses_=distutils-r1	2329ddf7eec9f8177aec51648249d790	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	flag-o-matic	c816c598969cbaf38cc02d2496ad2e98	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	474cb53a7d1b62721a91809a1d702661	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
+_eclasses_=distutils-r1	2329ddf7eec9f8177aec51648249d790	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	flag-o-matic	c816c598969cbaf38cc02d2496ad2e98	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	c8951c1dfcc1d43e3f967f61fd0ec59c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	474cb53a7d1b62721a91809a1d702661	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
 _md5_=9a1fd482eac4a058c583dd4785ade15a
diff --git a/metadata/md5-cache/app-arch/tarsync-0.2.3 b/metadata/md5-cache/app-arch/tarsync-0.2.3
index 327da3bc162d..9e0f057225fa 100644
--- a/metadata/md5-cache/app-arch/tarsync-0.2.3
+++ b/metadata/md5-cache/app-arch/tarsync-0.2.3
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=dev-util/diffball-0.7:=
 DESCRIPTION=Synchronize tarball content with file system content
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-util/diffball-0.7:=
 SLOT=0
 SRC_URI=https://github.com/zmedico/tarsync/archive/refs/tags/v0.2.3.tar.gz -> tarsync-0.2.3.tar.gz
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	c816c598969cbaf38cc02d2496ad2e98	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	c816c598969cbaf38cc02d2496ad2e98	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	c8951c1dfcc1d43e3f967f61fd0ec59c	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=8c0823df91cf2409816757ba85e44d3b
diff --git a/metadata/md5-cache/app-arch/unrar-6.2.12-r1 b/metadata/md5-cache/app-arch/unrar-6.2.12-r1
index aabecd4e8498..279e16278aee 100644
--- a/metadata/md5-cache/app-arch/unrar-6.2.12-r1
+++ b/metadata/md5-cache/app-arch/unrar-6.2.12-r1
@@ -3,9 +3,9 @@ DESCRIPTION=Uncompress rar files
 EAPI=8
 HOMEPAGE=https://www.rarlab.com/rar_add.htm
 INHERIT=multilib toolchain-funcs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=unRAR
 SLOT=0/6
 SRC_URI=https://www.rarlab.com/rar/unrarsrc-6.2.12.tar.gz -> unrar-6.2.12.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=14dfb669853e0c636fc3fc36134bad8b
+_md5_=f815a02fd228af8cbfe85c14d13766c8
diff --git a/metadata/md5-cache/app-arch/unrpa-2.3.0-r1 b/metadata/md5-cache/app-arch/unrpa-2.3.0-r1
index 9c5e4c5fac13..9e7f6241d8c4 100644
--- a/metadata/md5-cache/app-arch/unrpa-2.3.0-r1
+++ b/metadata/md5-cache/app-arch/unrpa-2.3.0-r1
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=https://github.com/Lattyware/unrpa/archive/2.3.0.tar.gz -> unrpa-2.3.0.tar.gz
-_eclasses_=distutils-r1	2329ddf7eec9f8177aec51648249d790	flag-o-matic	c816c598969cbaf38cc02d2496ad2e98	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	474cb53a7d1b62721a91809a1d702661	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
+_eclasses_=distutils-r1	2329ddf7eec9f8177aec51648249d790	flag-o-matic	c816c598969cbaf38cc02d2496ad2e98	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	c8951c1dfcc1d43e3f967f61fd0ec59c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	474cb53a7d1b62721a91809a1d702661	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
 _md5_=77d260d65aa50dd801be328b5b673417
diff --git a/metadata/md5-cache/app-arch/unshield-1.5.1 b/metadata/md5-cache/app-arch/unshield-1.5.1
index b9c7e2f2635a..fd9198450493 100644
--- a/metadata/md5-cache/app-arch/unshield-1.5.1
+++ b/metadata/md5-cache/app-arch/unshield-1.5.1
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-libs/openssl:0= sys-libs/zlib
 DESCRIPTION=InstallShield CAB file extractor
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=dev-libs/openssl:0= sys-libs/zlib
 SLOT=0
 SRC_URI=https://github.com/twogood/unshield/archive/1.5.1.tar.gz -> unshield-1.5.1.tar.gz
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	c816c598969cbaf38cc02d2496ad2e98	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	c816c598969cbaf38cc02d2496ad2e98	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	c8951c1dfcc1d43e3f967f61fd0ec59c	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=12aed8fe5df733dddc0c770734462827
diff --git a/metadata/md5-cache/app-arch/upx-4.0.2 b/metadata/md5-cache/app-arch/upx-4.0.2
index f69e53f584c0..c83570e9e8d0 100644
--- a/metadata/md5-cache/app-arch/upx-4.0.2
+++ b/metadata/md5-cache/app-arch/upx-4.0.2
@@ -1,4 +1,4 @@
-BDEPEND=app-arch/xz-utils[extra-filters] >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+BDEPEND=app-arch/xz-utils[extra-filters] app-alternatives/ninja >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Ultimate Packer for eXecutables (free version using UCL compression and not NRV)
 EAPI=8
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ UPX-exception
 RDEPEND=!app-arch/upx-bin
 SLOT=0
 SRC_URI=https://github.com/upx/upx/releases/download/v4.0.2/upx-4.0.2-src.tar.xz
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	c816c598969cbaf38cc02d2496ad2e98	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	c816c598969cbaf38cc02d2496ad2e98	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	c8951c1dfcc1d43e3f967f61fd0ec59c	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=30de1bcf8e710fdfab8e268852259a65
diff --git a/metadata/md5-cache/app-arch/upx-4.1.0 b/metadata/md5-cache/app-arch/upx-4.1.0
index de5ad03672dd..ba6b4edf285e 100644
--- a/metadata/md5-cache/app-arch/upx-4.1.0
+++ b/metadata/md5-cache/app-arch/upx-4.1.0
@@ -1,4 +1,4 @@
-BDEPEND=app-arch/xz-utils[extra-filters] >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+BDEPEND=app-arch/xz-utils[extra-filters] app-alternatives/ninja >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Ultimate Packer for eXecutables (free version using UCL compression and not NRV)
 EAPI=8
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ UPX-exception
 RDEPEND=!app-arch/upx-bin
 SLOT=0
 SRC_URI=https://github.com/upx/upx/releases/download/v4.1.0/upx-4.1.0-src.tar.xz
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	c816c598969cbaf38cc02d2496ad2e98	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	c816c598969cbaf38cc02d2496ad2e98	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	c8951c1dfcc1d43e3f967f61fd0ec59c	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=85a497347096e81328ddd4264c0f6939
diff --git a/metadata/md5-cache/app-arch/vimball-0.5.1 b/metadata/md5-cache/app-arch/vimball-0.5.1
index 34df5aaf5ce7..7dc18a3d7247 100644
--- a/metadata/md5-cache/app-arch/vimball-0.5.1
+++ b/metadata/md5-cache/app-arch/vimball-0.5.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/v/vimball/vimball-0.5.1.tar.gz
-_eclasses_=distutils-r1	2329ddf7eec9f8177aec51648249d790	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	flag-o-matic	c816c598969cbaf38cc02d2496ad2e98	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	474cb53a7d1b62721a91809a1d702661	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
+_eclasses_=distutils-r1	2329ddf7eec9f8177aec51648249d790	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	flag-o-matic	c816c598969cbaf38cc02d2496ad2e98	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	c8951c1dfcc1d43e3f967f61fd0ec59c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	474cb53a7d1b62721a91809a1d702661	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
 _md5_=6c817ded3fa16968fa6607e30dd79cb9
diff --git a/metadata/md5-cache/app-arch/vimball-0.5.1-r1 b/metadata/md5-cache/app-arch/vimball-0.5.1-r1
index b9c239c2c32e..989f52044ae5 100644
--- a/metadata/md5-cache/app-arch/vimball-0.5.1-r1
+++ b/metadata/md5-cache/app-arch/vimball-0.5.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/v/vimball/vimball-0.5.1.tar.gz
-_eclasses_=distutils-r1	2329ddf7eec9f8177aec51648249d790	flag-o-matic	c816c598969cbaf38cc02d2496ad2e98	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	474cb53a7d1b62721a91809a1d702661	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
+_eclasses_=distutils-r1	2329ddf7eec9f8177aec51648249d790	flag-o-matic	c816c598969cbaf38cc02d2496ad2e98	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	c8951c1dfcc1d43e3f967f61fd0ec59c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	474cb53a7d1b62721a91809a1d702661	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
 _md5_=9fd79893085343ee31fe77248fd8427e
diff --git a/metadata/md5-cache/app-arch/vimball-9999 b/metadata/md5-cache/app-arch/vimball-9999
index 632423b4fbd7..109755251b5d 100644
--- a/metadata/md5-cache/app-arch/vimball-9999
+++ b/metadata/md5-cache/app-arch/vimball-9999
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	2329ddf7eec9f8177aec51648249d790	flag-o-matic	c816c598969cbaf38cc02d2496ad2e98	git-r3	5133e393e8717a3a093660f990801dc1	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	474cb53a7d1b62721a91809a1d702661	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
+_eclasses_=distutils-r1	2329ddf7eec9f8177aec51648249d790	flag-o-matic	c816c598969cbaf38cc02d2496ad2e98	git-r3	5133e393e8717a3a093660f990801dc1	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	c8951c1dfcc1d43e3f967f61fd0ec59c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	474cb53a7d1b62721a91809a1d702661	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
 _md5_=c5f2e7d955b70c39e130828de448c4d0
diff --git a/metadata/md5-cache/app-arch/zchunk-1.3.2 b/metadata/md5-cache/app-arch/zchunk-1.3.2
index 12e0def4c83b..9907f69cc907 100644
--- a/metadata/md5-cache/app-arch/zchunk-1.3.2
+++ b/metadata/md5-cache/app-arch/zchunk-1.3.2
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-util/meson-1.2.1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+BDEPEND=>=dev-util/meson-1.2.1 app-alternatives/ninja dev-util/meson-format-array
 DEFINED_PHASES=compile configure install test
 DEPEND=app-arch/zstd:= net-misc/curl dev-libs/openssl:=
 DESCRIPTION=File format designed for highly efficient deltas with good compression
@@ -12,5 +12,5 @@ RDEPEND=app-arch/zstd:= net-misc/curl dev-libs/openssl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/zchunk/zchunk/archive/1.3.2.tar.gz -> zchunk-1.3.2.tar.gz
-_eclasses_=meson	576e6bbef90e9753368f8b4ad0bd5383	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-utils-r1	474cb53a7d1b62721a91809a1d702661	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
+_eclasses_=meson	576e6bbef90e9753368f8b4ad0bd5383	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	c8951c1dfcc1d43e3f967f61fd0ec59c	python-utils-r1	474cb53a7d1b62721a91809a1d702661	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
 _md5_=c1797c6f6ec6cd7a3fcdf8ef13ee976f
diff --git a/metadata/md5-cache/app-arch/zchunk-9999 b/metadata/md5-cache/app-arch/zchunk-9999
index 5084cd72a138..2d02e5d43754 100644
--- a/metadata/md5-cache/app-arch/zchunk-9999
+++ b/metadata/md5-cache/app-arch/zchunk-9999
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-util/meson-1.2.1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=>=dev-util/meson-1.2.1 app-alternatives/ninja dev-util/meson-format-array >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install test unpack
 DEPEND=app-arch/zstd:= net-misc/curl dev-libs/openssl:=
 DESCRIPTION=File format designed for highly efficient deltas with good compression
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=app-arch/zstd:= net-misc/curl dev-libs/openssl:=
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	5133e393e8717a3a093660f990801dc1	meson	576e6bbef90e9753368f8b4ad0bd5383	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-utils-r1	474cb53a7d1b62721a91809a1d702661	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
+_eclasses_=git-r3	5133e393e8717a3a093660f990801dc1	meson	576e6bbef90e9753368f8b4ad0bd5383	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	c8951c1dfcc1d43e3f967f61fd0ec59c	python-utils-r1	474cb53a7d1b62721a91809a1d702661	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
 _md5_=c1797c6f6ec6cd7a3fcdf8ef13ee976f
diff --git a/metadata/md5-cache/app-arch/zopfli-1.0.3 b/metadata/md5-cache/app-arch/zopfli-1.0.3
index 2ba857bdee2d..3f958d986ea4 100644
--- a/metadata/md5-cache/app-arch/zopfli-1.0.3
+++ b/metadata/md5-cache/app-arch/zopfli-1.0.3
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Very good, but slow, deflate or zlib compression
 EAPI=8
@@ -8,5 +8,5 @@ KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x
 LICENSE=Apache-2.0
 SLOT=0/1
 SRC_URI=https://github.com/google/zopfli/archive/zopfli-1.0.3.tar.gz
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	c816c598969cbaf38cc02d2496ad2e98	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	c816c598969cbaf38cc02d2496ad2e98	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	c8951c1dfcc1d43e3f967f61fd0ec59c	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=282020a706ecdd6c64973590fdd21dc5
diff --git a/metadata/md5-cache/app-arch/zstd-1.5.5 b/metadata/md5-cache/app-arch/zstd-1.5.5
index 66008c614af8..e175cf0b3f41 100644
--- a/metadata/md5-cache/app-arch/zstd-1.5.5
+++ b/metadata/md5-cache/app-arch/zstd-1.5.5
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-util/meson-1.2.1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+BDEPEND=>=dev-util/meson-1.2.1 app-alternatives/ninja dev-util/meson-format-array
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4:= ) zlib? ( sys-libs/zlib )
 DESCRIPTION=zstd fast compression library
@@ -12,5 +12,5 @@ RDEPEND=lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4:= ) zlib? ( sys-libs/zli
 RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://github.com/facebook/zstd/releases/download/v1.5.5/zstd-1.5.5.tar.gz
-_eclasses_=meson	576e6bbef90e9753368f8b4ad0bd5383	meson-multilib	8989922d980e5e870cc3de949d1b2586	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-utils-r1	474cb53a7d1b62721a91809a1d702661	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	usr-ldscript	ff03a5d223e97515fa25b5cae97ebda9
+_eclasses_=meson	576e6bbef90e9753368f8b4ad0bd5383	meson-multilib	8989922d980e5e870cc3de949d1b2586	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	c8951c1dfcc1d43e3f967f61fd0ec59c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-utils-r1	474cb53a7d1b62721a91809a1d702661	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	usr-ldscript	ff03a5d223e97515fa25b5cae97ebda9
 _md5_=1b2a7a2e69785aa790d5405fd01e79ad