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

29 files changed, 52 insertions, 52 deletions

diff --git a/metadata/md5-cache/sys-auth/AusweisApp2-1.26.7 b/metadata/md5-cache/sys-auth/AusweisApp2-1.26.7
index f84a826c4e45..2712d674b161 100644
--- a/metadata/md5-cache/sys-auth/AusweisApp2-1.26.7
+++ b/metadata/md5-cache/sys-auth/AusweisApp2-1.26.7
@@ -1,4 +1,4 @@
-BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig app-alternatives/ninja >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm prepare test
 DEPEND=dev-libs/openssl:0= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols2:5 dev-qt/qtsvg:5 dev-qt/qtwebsockets:5[qml] dev-qt/qtwidgets:5 net-libs/http-parser:0= sys-apps/pcsc-lite virtual/udev
 DESCRIPTION=Official authentication app for German ID cards and residence permits
@@ -10,5 +10,5 @@ LICENSE=EUPL-1.2
 RDEPEND=dev-libs/openssl:0= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols2:5 dev-qt/qtsvg:5 dev-qt/qtwebsockets:5[qml] dev-qt/qtwidgets:5 net-libs/http-parser:0= sys-apps/pcsc-lite virtual/udev
 SLOT=0
 SRC_URI=https://github.com/Governikus/AusweisApp2/archive/1.26.7.tar.gz -> AusweisApp2-1.26.7.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_=c5fb0998d53409859caa7bdd1f7b1a98
diff --git a/metadata/md5-cache/sys-auth/AusweisApp2-9999 b/metadata/md5-cache/sys-auth/AusweisApp2-9999
index 855a592c8bdf..f62c4612ac70 100644
--- a/metadata/md5-cache/sys-auth/AusweisApp2-9999
+++ b/metadata/md5-cache/sys-auth/AusweisApp2-9999
@@ -1,4 +1,4 @@
-BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig app-alternatives/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
 DEPEND=dev-libs/openssl:0= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols2:5 dev-qt/qtsvg:5 dev-qt/qtwebsockets:5[qml] dev-qt/qtwidgets:5 net-libs/http-parser:0= sys-apps/pcsc-lite virtual/udev
 DESCRIPTION=Official authentication app for German ID cards and residence permits
@@ -9,5 +9,5 @@ LICENSE=EUPL-1.2
 PROPERTIES=live
 RDEPEND=dev-libs/openssl:0= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols2:5 dev-qt/qtsvg:5 dev-qt/qtwebsockets:5[qml] dev-qt/qtwidgets:5 net-libs/http-parser:0= sys-apps/pcsc-lite virtual/udev
 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_=91dcc6572a616830addeac1a18856931
diff --git a/metadata/md5-cache/sys-auth/Manifest.gz b/metadata/md5-cache/sys-auth/Manifest.gz
index 7f135454851d..3b6f2e408a43 100644
--- a/metadata/md5-cache/sys-auth/Manifest.gz
+++ b/metadata/md5-cache/sys-auth/Manifest.gz
diff --git a/metadata/md5-cache/sys-auth/elogind-246.10-r3 b/metadata/md5-cache/sys-auth/elogind-246.10-r3
index 76bf21dfffc9..3feb2ddfba67 100644
--- a/metadata/md5-cache/sys-auth/elogind-246.10-r3
+++ b/metadata/md5-cache/sys-auth/elogind-246.10-r3
@@ -1,4 +1,4 @@
-BDEPEND=app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-util/gperf virtual/pkgconfig >=dev-util/meson-1.2.1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
+BDEPEND=app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-util/gperf virtual/pkgconfig >=dev-util/meson-1.2.1 app-alternatives/ninja dev-util/meson-format-array virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst prepare setup test
 DEPEND=audit? ( sys-process/audit ) sys-apps/util-linux sys-libs/libcap virtual/libudev:= acl? ( sys-apps/acl ) pam? ( sys-libs/pam ) selinux? ( sys-libs/libselinux )
 DESCRIPTION=The systemd project's logind, extracted to a standalone package
@@ -13,5 +13,5 @@ RDEPEND=audit? ( sys-process/audit ) sys-apps/util-linux sys-libs/libcap virtual
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/elogind/elogind/archive/v246.10.tar.gz -> elogind-246.10.tar.gz
-_eclasses_=eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	flag-o-matic	c816c598969cbaf38cc02d2496ad2e98	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	meson	576e6bbef90e9753368f8b4ad0bd5383	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	pam	b56d0c9c20fc5b553f13c8ae165a10a5	python-utils-r1	474cb53a7d1b62721a91809a1d702661	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	udev	eec0bbab06977f1cfc5597269c1fa152	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	flag-o-matic	c816c598969cbaf38cc02d2496ad2e98	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	meson	576e6bbef90e9753368f8b4ad0bd5383	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	c8951c1dfcc1d43e3f967f61fd0ec59c	pam	b56d0c9c20fc5b553f13c8ae165a10a5	python-utils-r1	474cb53a7d1b62721a91809a1d702661	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	udev	eec0bbab06977f1cfc5597269c1fa152	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=c0c37b9ec93fe6c4bc31d10eeee68cee
diff --git a/metadata/md5-cache/sys-auth/elogind-252.9 b/metadata/md5-cache/sys-auth/elogind-252.9
index a8fdd73e33e8..4d00a65c197f 100644
--- a/metadata/md5-cache/sys-auth/elogind-252.9
+++ b/metadata/md5-cache/sys-auth/elogind-252.9
@@ -1,4 +1,4 @@
-BDEPEND=app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-util/gperf virtual/pkgconfig || ( ( dev-lang/python:3.12 dev-python/jinja[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/jinja[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/jinja[python_targets_python3_10(-)] ) ) || ( ( dev-lang/python:3.12 dev-python/lxml[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/lxml[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/lxml[python_targets_python3_10(-)] ) ) >=dev-util/meson-1.2.1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
+BDEPEND=app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-util/gperf virtual/pkgconfig || ( ( dev-lang/python:3.12 dev-python/jinja[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/jinja[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/jinja[python_targets_python3_10(-)] ) ) || ( ( dev-lang/python:3.12 dev-python/lxml[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/lxml[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/lxml[python_targets_python3_10(-)] ) ) >=dev-util/meson-1.2.1 app-alternatives/ninja dev-util/meson-format-array virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst prepare setup test
 DEPEND=audit? ( sys-process/audit ) sys-apps/util-linux sys-libs/libcap virtual/libudev:= acl? ( sys-apps/acl ) pam? ( sys-libs/pam ) selinux? ( sys-libs/libselinux )
 DESCRIPTION=The systemd project's logind, extracted to a standalone package
@@ -13,5 +13,5 @@ RDEPEND=audit? ( sys-process/audit ) sys-apps/util-linux sys-libs/libcap virtual
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/elogind/elogind/archive/v252.9.tar.gz -> elogind-252.9.tar.gz
-_eclasses_=eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	flag-o-matic	c816c598969cbaf38cc02d2496ad2e98	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	meson	576e6bbef90e9753368f8b4ad0bd5383	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	pam	b56d0c9c20fc5b553f13c8ae165a10a5	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	474cb53a7d1b62721a91809a1d702661	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	udev	eec0bbab06977f1cfc5597269c1fa152	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	flag-o-matic	c816c598969cbaf38cc02d2496ad2e98	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	meson	576e6bbef90e9753368f8b4ad0bd5383	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	c8951c1dfcc1d43e3f967f61fd0ec59c	pam	b56d0c9c20fc5b553f13c8ae165a10a5	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	474cb53a7d1b62721a91809a1d702661	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	udev	eec0bbab06977f1cfc5597269c1fa152	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=d317121043eea4a28b9e75d0780fe6ae
diff --git a/metadata/md5-cache/sys-auth/fprintd-1.94.1 b/metadata/md5-cache/sys-auth/fprintd-1.94.1
index 6e8c4b4f75da..f28eac487a45 100644
--- a/metadata/md5-cache/sys-auth/fprintd-1.94.1
+++ b/metadata/md5-cache/sys-auth/fprintd-1.94.1
@@ -1,4 +1,4 @@
-BDEPEND=dev-lang/perl dev-util/gdbus-codegen virtual/pkgconfig doc? ( dev-libs/libxml2 dev-libs/libxslt dev-util/gtk-doc ) >=dev-util/meson-1.2.1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
+BDEPEND=dev-lang/perl dev-util/gdbus-codegen virtual/pkgconfig doc? ( dev-libs/libxml2 dev-libs/libxslt dev-util/gtk-doc ) >=dev-util/meson-1.2.1 app-alternatives/ninja dev-util/meson-format-array virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst setup test
 DEPEND=dev-libs/dbus-glib dev-libs/glib:2 >=sys-auth/libfprint-1.94.0:2 sys-auth/polkit pam? ( sys-libs/pam systemd? ( sys-apps/systemd ) !systemd? ( sys-auth/elogind ) ) test? ( || ( ( dev-lang/python:3.10 dev-python/python-dbusmock[python_targets_python3_10(-)] dev-python/dbus-python[python_targets_python3_10(-)] dev-python/pycairo[python_targets_python3_10(-)] pam? ( sys-libs/pam_wrapper[python_targets_python3_10(-)] ) ) ) )
 DESCRIPTION=D-Bus service to access fingerprint readers
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/dbus-glib dev-libs/glib:2 >=sys-auth/libfprint-1.94.0:2 sys-aut
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://gitlab.freedesktop.org/libfprint/fprintd/-/archive/v1.94.1/fprintd-v1.94.1.tar.bz2
-_eclasses_=flag-o-matic	c816c598969cbaf38cc02d2496ad2e98	meson	576e6bbef90e9753368f8b4ad0bd5383	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	pam	b56d0c9c20fc5b553f13c8ae165a10a5	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	474cb53a7d1b62721a91809a1d702661	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
+_eclasses_=flag-o-matic	c816c598969cbaf38cc02d2496ad2e98	meson	576e6bbef90e9753368f8b4ad0bd5383	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	c8951c1dfcc1d43e3f967f61fd0ec59c	pam	b56d0c9c20fc5b553f13c8ae165a10a5	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	474cb53a7d1b62721a91809a1d702661	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
 _md5_=fc797948d9ce2c80c6884816a9f43a8c
diff --git a/metadata/md5-cache/sys-auth/fprintd-1.94.2 b/metadata/md5-cache/sys-auth/fprintd-1.94.2
index caee0f54b0a6..3329c6483e1f 100644
--- a/metadata/md5-cache/sys-auth/fprintd-1.94.2
+++ b/metadata/md5-cache/sys-auth/fprintd-1.94.2
@@ -1,4 +1,4 @@
-BDEPEND=dev-lang/perl dev-util/gdbus-codegen virtual/pkgconfig doc? ( dev-libs/libxml2 dev-libs/libxslt dev-util/gtk-doc ) >=dev-util/meson-1.2.1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
+BDEPEND=dev-lang/perl dev-util/gdbus-codegen virtual/pkgconfig doc? ( dev-libs/libxml2 dev-libs/libxslt dev-util/gtk-doc ) >=dev-util/meson-1.2.1 app-alternatives/ninja dev-util/meson-format-array virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst setup test
 DEPEND=dev-libs/dbus-glib dev-libs/glib:2 >=sys-auth/libfprint-1.94.0:2 sys-auth/polkit pam? ( sys-libs/pam systemd? ( sys-apps/systemd:= ) !systemd? ( sys-auth/elogind:= ) ) test? ( || ( ( dev-lang/python:3.11 dev-python/python-dbusmock[python_targets_python3_11(-)] dev-python/dbus-python[python_targets_python3_11(-)] dev-python/pycairo[python_targets_python3_11(-)] pam? ( sys-libs/pam_wrapper[python_targets_python3_11(-)] ) ) ( dev-lang/python:3.10 dev-python/python-dbusmock[python_targets_python3_10(-)] dev-python/dbus-python[python_targets_python3_10(-)] dev-python/pycairo[python_targets_python3_10(-)] pam? ( sys-libs/pam_wrapper[python_targets_python3_10(-)] ) ) ) )
 DESCRIPTION=D-Bus service to access fingerprint readers
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/dbus-glib dev-libs/glib:2 >=sys-auth/libfprint-1.94.0:2 sys-aut
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://gitlab.freedesktop.org/libfprint/fprintd/-/archive/v1.94.2/fprintd-v1.94.2.tar.bz2
-_eclasses_=flag-o-matic	c816c598969cbaf38cc02d2496ad2e98	meson	576e6bbef90e9753368f8b4ad0bd5383	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	pam	b56d0c9c20fc5b553f13c8ae165a10a5	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	474cb53a7d1b62721a91809a1d702661	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
+_eclasses_=flag-o-matic	c816c598969cbaf38cc02d2496ad2e98	meson	576e6bbef90e9753368f8b4ad0bd5383	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	c8951c1dfcc1d43e3f967f61fd0ec59c	pam	b56d0c9c20fc5b553f13c8ae165a10a5	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	474cb53a7d1b62721a91809a1d702661	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
 _md5_=55896dfe22f1b5a287cc6ffcffc57069
diff --git a/metadata/md5-cache/sys-auth/google-authenticator-wrappers-1 b/metadata/md5-cache/sys-auth/google-authenticator-wrappers-1
index 27e08d2ce216..d0fd3ac4608a 100644
--- a/metadata/md5-cache/sys-auth/google-authenticator-wrappers-1
+++ b/metadata/md5-cache/sys-auth/google-authenticator-wrappers-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
 DESCRIPTION=Set of scripts to manage google-auth setup on Gentoo Infra
 EAPI=7
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=sys-auth/google-authenticator
 SLOT=0
 SRC_URI=https://github.com/projg2/google-authenticator-wrappers/archive/v1.tar.gz -> google-authenticator-wrappers-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_=00316f6d2214c66344e8337fbf75742d
diff --git a/metadata/md5-cache/sys-auth/google-authenticator-wrappers-2 b/metadata/md5-cache/sys-auth/google-authenticator-wrappers-2
index 3d5358dbdcdc..a2a505d751ee 100644
--- a/metadata/md5-cache/sys-auth/google-authenticator-wrappers-2
+++ b/metadata/md5-cache/sys-auth/google-authenticator-wrappers-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
 DESCRIPTION=Set of scripts to manage google-auth setup on Gentoo Infra
 EAPI=7
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=sys-auth/google-authenticator
 SLOT=0
 SRC_URI=https://github.com/projg2/google-authenticator-wrappers/archive/v2.tar.gz -> google-authenticator-wrappers-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_=00316f6d2214c66344e8337fbf75742d
diff --git a/metadata/md5-cache/sys-auth/google-authenticator-wrappers-3-r1 b/metadata/md5-cache/sys-auth/google-authenticator-wrappers-3-r1
index ff44aac16491..2afafbfa6fba 100644
--- a/metadata/md5-cache/sys-auth/google-authenticator-wrappers-3-r1
+++ b/metadata/md5-cache/sys-auth/google-authenticator-wrappers-3-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 preinst prepare pretend test
 DEPEND=acct-group/gauth acct-user/gauth
 DESCRIPTION=Set of scripts to manage google-auth setup on Gentoo Infra
@@ -10,5 +10,5 @@ LICENSE=BSD-2
 RDEPEND=acct-group/gauth acct-user/gauth sys-auth/google-authenticator
 SLOT=0
 SRC_URI=https://github.com/projg2/google-authenticator-wrappers/archive/v3.tar.gz -> google-authenticator-wrappers-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_=7839c6fae3c292d2c3c8bd7ff18a40a8
diff --git a/metadata/md5-cache/sys-auth/libfprint-1.94.3 b/metadata/md5-cache/sys-auth/libfprint-1.94.3
index 5e11322b5272..0e6759159eda 100644
--- a/metadata/md5-cache/sys-auth/libfprint-1.94.3
+++ b/metadata/md5-cache/sys-auth/libfprint-1.94.3
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig gtk-doc? ( dev-util/gtk-doc ) introspection? ( dev-libs/gobject-introspection dev-libs/libgusb[introspection] ) >=dev-util/meson-1.2.1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
+BDEPEND=virtual/pkgconfig gtk-doc? ( dev-util/gtk-doc ) introspection? ( dev-libs/gobject-introspection dev-libs/libgusb[introspection] ) >=dev-util/meson-1.2.1 app-alternatives/ninja dev-util/meson-format-array virtual/pkgconfig
 DEFINED_PHASES=compile configure install test
 DEPEND=dev-libs/glib:2 dev-libs/libgudev dev-libs/libgusb dev-libs/nss virtual/libusb:1= x11-libs/libX11 x11-libs/libXv x11-libs/pixman !>=sys-auth/libfprint-1.90:0 examples? ( x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 )
 DESCRIPTION=Library to add support for consumer fingerprint readers
@@ -11,5 +11,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=dev-libs/glib:2 dev-libs/libgudev dev-libs/libgusb dev-libs/nss virtual/libusb:1= x11-libs/libX11 x11-libs/libXv x11-libs/pixman !>=sys-auth/libfprint-1.90:0 examples? ( x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 )
 SLOT=2
 SRC_URI=https://github.com/freedesktop/libfprint/archive/refs/tags/v1.94.3.tar.gz -> libfprint-1.94.3.tar.gz
-_eclasses_=meson	576e6bbef90e9753368f8b4ad0bd5383	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-utils-r1	474cb53a7d1b62721a91809a1d702661	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	udev	eec0bbab06977f1cfc5597269c1fa152
+_eclasses_=meson	576e6bbef90e9753368f8b4ad0bd5383	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	c8951c1dfcc1d43e3f967f61fd0ec59c	python-utils-r1	474cb53a7d1b62721a91809a1d702661	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	udev	eec0bbab06977f1cfc5597269c1fa152
 _md5_=05fcaed690f384cd2af7ee82c47aeb8a
diff --git a/metadata/md5-cache/sys-auth/libfprint-1.94.4 b/metadata/md5-cache/sys-auth/libfprint-1.94.4
index 9898633c387b..2685cd71eeb3 100644
--- a/metadata/md5-cache/sys-auth/libfprint-1.94.4
+++ b/metadata/md5-cache/sys-auth/libfprint-1.94.4
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig gtk-doc? ( dev-util/gtk-doc ) introspection? ( dev-libs/gobject-introspection dev-libs/libgusb[introspection] ) >=dev-util/meson-1.2.1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
+BDEPEND=virtual/pkgconfig gtk-doc? ( dev-util/gtk-doc ) introspection? ( dev-libs/gobject-introspection dev-libs/libgusb[introspection] ) >=dev-util/meson-1.2.1 app-alternatives/ninja dev-util/meson-format-array virtual/pkgconfig
 DEFINED_PHASES=compile configure install test
 DEPEND=dev-libs/glib:2 dev-libs/libgudev dev-libs/libgusb dev-libs/nss virtual/libusb:1= x11-libs/pixman !>=sys-auth/libfprint-1.90:0 examples? ( x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 )
 DESCRIPTION=Library to add support for consumer fingerprint readers
@@ -11,5 +11,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=dev-libs/glib:2 dev-libs/libgudev dev-libs/libgusb dev-libs/nss virtual/libusb:1= x11-libs/pixman !>=sys-auth/libfprint-1.90:0 examples? ( x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 )
 SLOT=2
 SRC_URI=https://github.com/freedesktop/libfprint/archive/refs/tags/v1.94.4.tar.gz -> libfprint-1.94.4.tar.gz
-_eclasses_=meson	576e6bbef90e9753368f8b4ad0bd5383	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-utils-r1	474cb53a7d1b62721a91809a1d702661	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	udev	eec0bbab06977f1cfc5597269c1fa152
+_eclasses_=meson	576e6bbef90e9753368f8b4ad0bd5383	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	c8951c1dfcc1d43e3f967f61fd0ec59c	python-utils-r1	474cb53a7d1b62721a91809a1d702661	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	udev	eec0bbab06977f1cfc5597269c1fa152
 _md5_=1fddc7b307432e75c06294fa966320b0
diff --git a/metadata/md5-cache/sys-auth/libfprint-1.94.5 b/metadata/md5-cache/sys-auth/libfprint-1.94.5
index 2f8831233fbc..7d4e38461bd7 100644
--- a/metadata/md5-cache/sys-auth/libfprint-1.94.5
+++ b/metadata/md5-cache/sys-auth/libfprint-1.94.5
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig gtk-doc? ( dev-util/gtk-doc ) introspection? ( dev-libs/gobject-introspection dev-libs/libgusb[introspection] ) >=dev-util/meson-1.2.1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
+BDEPEND=virtual/pkgconfig gtk-doc? ( dev-util/gtk-doc ) introspection? ( dev-libs/gobject-introspection dev-libs/libgusb[introspection] ) >=dev-util/meson-1.2.1 app-alternatives/ninja dev-util/meson-format-array virtual/pkgconfig
 DEFINED_PHASES=compile configure install test
 DEPEND=dev-libs/glib:2 dev-libs/libgudev dev-libs/nss dev-python/pygobject dev-libs/libgusb x11-libs/pixman examples? ( x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 )
 DESCRIPTION=Library to add support for consumer fingerprint readers
@@ -11,5 +11,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=dev-libs/glib:2 dev-libs/libgudev dev-libs/nss dev-python/pygobject dev-libs/libgusb x11-libs/pixman examples? ( x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 )
 SLOT=2
 SRC_URI=https://gitlab.freedesktop.org/libfprint/libfprint/-/archive/v1.94.5/libfprint-v1.94.5.tar.bz2 -> libfprint-1.94.5.tar.bz2
-_eclasses_=meson	576e6bbef90e9753368f8b4ad0bd5383	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-utils-r1	474cb53a7d1b62721a91809a1d702661	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	udev	eec0bbab06977f1cfc5597269c1fa152
+_eclasses_=meson	576e6bbef90e9753368f8b4ad0bd5383	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	c8951c1dfcc1d43e3f967f61fd0ec59c	python-utils-r1	474cb53a7d1b62721a91809a1d702661	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	udev	eec0bbab06977f1cfc5597269c1fa152
 _md5_=4325a0d28c7b8be785a40646961212c8
diff --git a/metadata/md5-cache/sys-auth/libfprint-1.94.6 b/metadata/md5-cache/sys-auth/libfprint-1.94.6
index d36fcdd9ffdf..f11bd2e0c408 100644
--- a/metadata/md5-cache/sys-auth/libfprint-1.94.6
+++ b/metadata/md5-cache/sys-auth/libfprint-1.94.6
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig gtk-doc? ( dev-util/gtk-doc ) introspection? ( dev-libs/gobject-introspection dev-libs/libgusb[introspection] ) >=dev-util/meson-1.2.1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
+BDEPEND=virtual/pkgconfig gtk-doc? ( dev-util/gtk-doc ) introspection? ( dev-libs/gobject-introspection dev-libs/libgusb[introspection] ) >=dev-util/meson-1.2.1 app-alternatives/ninja dev-util/meson-format-array virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm test
 DEPEND=dev-libs/glib:2 dev-libs/libgudev dev-libs/nss dev-python/pygobject dev-libs/libgusb x11-libs/pixman examples? ( x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 )
 DESCRIPTION=Library to add support for consumer fingerprint readers
@@ -11,5 +11,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=dev-libs/glib:2 dev-libs/libgudev dev-libs/nss dev-python/pygobject dev-libs/libgusb x11-libs/pixman examples? ( x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 )
 SLOT=2
 SRC_URI=https://gitlab.freedesktop.org/libfprint/libfprint/-/archive/v1.94.6/libfprint-v1.94.6.tar.bz2 -> libfprint-1.94.6.tar.bz2
-_eclasses_=meson	576e6bbef90e9753368f8b4ad0bd5383	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-utils-r1	474cb53a7d1b62721a91809a1d702661	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	udev	eec0bbab06977f1cfc5597269c1fa152
+_eclasses_=meson	576e6bbef90e9753368f8b4ad0bd5383	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	c8951c1dfcc1d43e3f967f61fd0ec59c	python-utils-r1	474cb53a7d1b62721a91809a1d702661	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	udev	eec0bbab06977f1cfc5597269c1fa152
 _md5_=81d0fcc38c004a4b3a70c093caa04f2d
diff --git a/metadata/md5-cache/sys-auth/otpcalc-0.97.9 b/metadata/md5-cache/sys-auth/otpcalc-0.97.9
index c0af9f0c14f8..1185dd44fa4c 100644
--- a/metadata/md5-cache/sys-auth/otpcalc-0.97.9
+++ b/metadata/md5-cache/sys-auth/otpcalc-0.97.9
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig >=dev-util/meson-1.2.1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+BDEPEND=virtual/pkgconfig >=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/openssl:0= x11-libs/gtk+:3 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=A One Time Password and S/Key calculator for GTK+
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-libs/openssl:0= x11-libs/gtk+:3
 SLOT=0
 SRC_URI=https://gitlab.com/otpcalc/otpcalc/-/archive/0.97.9/otpcalc-0.97.9.tar.bz2
-_eclasses_=eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	meson	576e6bbef90e9753368f8b4ad0bd5383	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-utils-r1	474cb53a7d1b62721a91809a1d702661	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	meson	576e6bbef90e9753368f8b4ad0bd5383	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	c8951c1dfcc1d43e3f967f61fd0ec59c	python-utils-r1	474cb53a7d1b62721a91809a1d702661	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=86905e24408322fafb019b6a4895428e
diff --git a/metadata/md5-cache/sys-auth/otpcalc-0.98 b/metadata/md5-cache/sys-auth/otpcalc-0.98
index 3725c0ab74d8..c1522520ee03 100644
--- a/metadata/md5-cache/sys-auth/otpcalc-0.98
+++ b/metadata/md5-cache/sys-auth/otpcalc-0.98
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig >=dev-util/meson-1.2.1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+BDEPEND=virtual/pkgconfig >=dev-util/meson-1.2.1 app-alternatives/ninja dev-util/meson-format-array
 DEFINED_PHASES=compile configure install postinst postrm preinst test
 DEPEND=dev-libs/openssl:0= x11-libs/gtk+:3
 DESCRIPTION=A One Time Password and S/Key calculator for GTK+
@@ -11,5 +11,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-libs/openssl:0= x11-libs/gtk+:3
 SLOT=0
 SRC_URI=https://gitlab.com/otpcalc/otpcalc/-/archive/0.98/otpcalc-0.98.tar.bz2
-_eclasses_=meson	576e6bbef90e9753368f8b4ad0bd5383	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-utils-r1	474cb53a7d1b62721a91809a1d702661	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=meson	576e6bbef90e9753368f8b4ad0bd5383	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	c8951c1dfcc1d43e3f967f61fd0ec59c	python-utils-r1	474cb53a7d1b62721a91809a1d702661	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=03fe98335cc1d46c54ef04c8e180c968
diff --git a/metadata/md5-cache/sys-auth/pam_abl-0.6.0 b/metadata/md5-cache/sys-auth/pam_abl-0.6.0
index 6009761d030c..1f0893adf5cb 100644
--- a/metadata/md5-cache/sys-auth/pam_abl-0.6.0
+++ b/metadata/md5-cache/sys-auth/pam_abl-0.6.0
@@ -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=>=sys-libs/pam-0.78-r2 >=sys-libs/db-4.2.52_p2:=
 DESCRIPTION=PAM module for blacklisting hosts and users repeatedly failed authentication
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/pam-0.78-r2 >=sys-libs/db-4.2.52_p2:=
 SLOT=0
 SRC_URI=mirror://sourceforge/pam-abl/pam-abl-0.6.0.tar.gz
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	db-use	3807d3e43e20aaa6e4decedd2bb2db4c	flag-o-matic	c816c598969cbaf38cc02d2496ad2e98	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	pam	b56d0c9c20fc5b553f13c8ae165a10a5	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	db-use	3807d3e43e20aaa6e4decedd2bb2db4c	flag-o-matic	c816c598969cbaf38cc02d2496ad2e98	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	c8951c1dfcc1d43e3f967f61fd0ec59c	pam	b56d0c9c20fc5b553f13c8ae165a10a5	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=183abbe9f645cb4839d18c3a5147d281
diff --git a/metadata/md5-cache/sys-auth/passwdqc-2.0.3-r1 b/metadata/md5-cache/sys-auth/passwdqc-2.0.3-r1
index 4b818b957724..57d89de2dbe8 100644
--- a/metadata/md5-cache/sys-auth/passwdqc-2.0.3-r1
+++ b/metadata/md5-cache/sys-auth/passwdqc-2.0.3-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Password strength checking library (and PAM module)
 EAPI=8
 HOMEPAGE=http://www.openwall.com/passwdqc/
 INHERIT=pam toolchain-funcs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=Openwall BSD public-domain
 RDEPEND=sys-libs/pam virtual/libcrypt:=
 SLOT=0
 SRC_URI=http://www.openwall.com/passwdqc/passwdqc-2.0.3.tar.gz
 _eclasses_=flag-o-matic	c816c598969cbaf38cc02d2496ad2e98	multilib	c19072c3cd7ac5cb21de013f7e9832e0	pam	b56d0c9c20fc5b553f13c8ae165a10a5	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=ca52cb8ca2456c2e24faf54c98630d9e
+_md5_=306a31c2423dbc8412216b2d3e2f33c5
diff --git a/metadata/md5-cache/sys-auth/polkit-122-r1 b/metadata/md5-cache/sys-auth/polkit-122-r1
index 84ed30d38b8e..7b33ba401536 100644
--- a/metadata/md5-cache/sys-auth/polkit-122-r1
+++ b/metadata/md5-cache/sys-auth/polkit-122-r1
@@ -1,4 +1,4 @@
-BDEPEND=acct-user/polkitd app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xsl-stylesheets dev-libs/glib dev-libs/gobject-introspection-common dev-libs/libxslt dev-util/glib-utils sys-devel/gettext virtual/pkgconfig introspection? ( dev-libs/gobject-introspection ) test? ( || ( ( dev-lang/python:3.11 dev-python/dbus-python[python_targets_python3_11(-)] dev-python/python-dbusmock[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/dbus-python[python_targets_python3_10(-)] dev-python/python-dbusmock[python_targets_python3_10(-)] ) ) ) >=dev-util/meson-1.2.1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
+BDEPEND=acct-user/polkitd app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xsl-stylesheets dev-libs/glib dev-libs/gobject-introspection-common dev-libs/libxslt dev-util/glib-utils sys-devel/gettext virtual/pkgconfig introspection? ( dev-libs/gobject-introspection ) test? ( || ( ( dev-lang/python:3.11 dev-python/dbus-python[python_targets_python3_11(-)] dev-python/python-dbusmock[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/dbus-python[python_targets_python3_10(-)] dev-python/python-dbusmock[python_targets_python3_10(-)] ) ) ) >=dev-util/meson-1.2.1 app-alternatives/ninja dev-util/meson-format-array virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst prepare setup test
 DEPEND=dev-libs/glib:2 dev-libs/expat daemon? ( duktape? ( dev-lang/duktape:= ) !duktape? ( dev-lang/spidermonkey:102[-debug] ) ) pam? ( sys-auth/pambase sys-libs/pam ) !pam? ( virtual/libcrypt:= ) systemd? ( sys-apps/systemd:0=[policykit] ) !systemd? ( sys-auth/elogind )
 DESCRIPTION=Policy framework for controlling privileges for system-wide services
@@ -13,5 +13,5 @@ RDEPEND=dev-libs/glib:2 dev-libs/expat daemon? ( duktape? ( dev-lang/duktape:= )
 RESTRICT=!test? ( test ) test
 SLOT=0
 SRC_URI=https://gitlab.freedesktop.org/polkit/polkit/-/archive/122/polkit-122.tar.bz2
-_eclasses_=flag-o-matic	c816c598969cbaf38cc02d2496ad2e98	meson	576e6bbef90e9753368f8b4ad0bd5383	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	pam	b56d0c9c20fc5b553f13c8ae165a10a5	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	474cb53a7d1b62721a91809a1d702661	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=flag-o-matic	c816c598969cbaf38cc02d2496ad2e98	meson	576e6bbef90e9753368f8b4ad0bd5383	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	c8951c1dfcc1d43e3f967f61fd0ec59c	pam	b56d0c9c20fc5b553f13c8ae165a10a5	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	474cb53a7d1b62721a91809a1d702661	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=ba6d816a9304a0ba7cef4a333b2a7d07
diff --git a/metadata/md5-cache/sys-auth/polkit-123 b/metadata/md5-cache/sys-auth/polkit-123
index d88daf80108a..0a90b35e8b7b 100644
--- a/metadata/md5-cache/sys-auth/polkit-123
+++ b/metadata/md5-cache/sys-auth/polkit-123
@@ -1,4 +1,4 @@
-BDEPEND=acct-user/polkitd app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xsl-stylesheets dev-libs/glib dev-libs/gobject-introspection-common dev-libs/libxslt dev-util/glib-utils sys-devel/gettext virtual/pkgconfig introspection? ( >=dev-libs/gobject-introspection-0.6.2 ) test? ( || ( ( dev-lang/python:3.11 dev-python/dbus-python[python_targets_python3_11(-)] dev-python/python-dbusmock[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/dbus-python[python_targets_python3_10(-)] dev-python/python-dbusmock[python_targets_python3_10(-)] ) ) ) >=dev-util/meson-1.2.1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
+BDEPEND=acct-user/polkitd app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xsl-stylesheets dev-libs/glib dev-libs/gobject-introspection-common dev-libs/libxslt dev-util/glib-utils sys-devel/gettext virtual/pkgconfig introspection? ( >=dev-libs/gobject-introspection-0.6.2 ) test? ( || ( ( dev-lang/python:3.11 dev-python/dbus-python[python_targets_python3_11(-)] dev-python/python-dbusmock[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/dbus-python[python_targets_python3_10(-)] dev-python/python-dbusmock[python_targets_python3_10(-)] ) ) ) >=dev-util/meson-1.2.1 app-alternatives/ninja dev-util/meson-format-array virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst prepare setup test
 DEPEND=>=dev-libs/glib-2.32:2 dev-libs/expat daemon? ( duktape? ( dev-lang/duktape:= ) !duktape? ( dev-lang/spidermonkey:102[-debug] ) ) pam? ( sys-auth/pambase sys-libs/pam ) !pam? ( virtual/libcrypt:= ) systemd? ( sys-apps/systemd:0=[policykit] ) !systemd? ( sys-auth/elogind )
 DESCRIPTION=Policy framework for controlling privileges for system-wide services
@@ -13,5 +13,5 @@ RDEPEND=>=dev-libs/glib-2.32:2 dev-libs/expat daemon? ( duktape? ( dev-lang/dukt
 RESTRICT=!test? ( test ) test
 SLOT=0
 SRC_URI=https://gitlab.freedesktop.org/polkit/polkit/-/archive/123/polkit-123.tar.bz2
-_eclasses_=flag-o-matic	c816c598969cbaf38cc02d2496ad2e98	meson	576e6bbef90e9753368f8b4ad0bd5383	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	pam	b56d0c9c20fc5b553f13c8ae165a10a5	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	474cb53a7d1b62721a91809a1d702661	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=flag-o-matic	c816c598969cbaf38cc02d2496ad2e98	meson	576e6bbef90e9753368f8b4ad0bd5383	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	c8951c1dfcc1d43e3f967f61fd0ec59c	pam	b56d0c9c20fc5b553f13c8ae165a10a5	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	474cb53a7d1b62721a91809a1d702661	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=d87f015224f760b6e5abeadc7cf4f12f
diff --git a/metadata/md5-cache/sys-auth/polkit-qt-0.114.0-r3 b/metadata/md5-cache/sys-auth/polkit-qt-0.114.0-r3
index 8f3739540332..b6a694bcae2a 100644
--- a/metadata/md5-cache/sys-auth/polkit-qt-0.114.0-r3
+++ b/metadata/md5-cache/sys-auth/polkit-qt-0.114.0-r3
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install nofetch prepare test unpack
 DEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-auth/polkit-0.103[daemon(+)]
 DESCRIPTION=Qt wrapper around polkit-1 client libraries
@@ -10,5 +10,5 @@ LICENSE=LGPL-2
 RDEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-auth/polkit-0.103[daemon(+)]
 SLOT=0
 SRC_URI=mirror://kde/stable/polkit-qt-1/polkit-qt-1-0.114.0.tar.xz
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	c816c598969cbaf38cc02d2496ad2e98	kde.org	411cb92019a6e2aa174d06896084bf57	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	c816c598969cbaf38cc02d2496ad2e98	kde.org	411cb92019a6e2aa174d06896084bf57	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	c8951c1dfcc1d43e3f967f61fd0ec59c	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=0bdf692abec68e0aec39b30c67aaaaf7
diff --git a/metadata/md5-cache/sys-auth/rtkit-0.13-r2 b/metadata/md5-cache/sys-auth/rtkit-0.13-r2
index dcc397b12dcf..850616d426ae 100644
--- a/metadata/md5-cache/sys-auth/rtkit-0.13-r2
+++ b/metadata/md5-cache/sys-auth/rtkit-0.13-r2
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig >=dev-util/meson-1.2.1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+BDEPEND=virtual/pkgconfig >=dev-util/meson-1.2.1 app-alternatives/ninja dev-util/meson-format-array
 DEFINED_PHASES=compile configure install pretend setup test
 DEPEND=acct-group/rtkit acct-user/rtkit sys-apps/dbus sys-auth/polkit sys-libs/libcap systemd? ( sys-apps/systemd )
 DESCRIPTION=Realtime Policy and Watchdog Daemon
@@ -11,5 +11,5 @@ LICENSE=GPL-3 BSD
 RDEPEND=acct-group/rtkit acct-user/rtkit sys-apps/dbus sys-auth/polkit sys-libs/libcap systemd? ( sys-apps/systemd ) selinux? ( sec-policy/selinux-rtkit )
 SLOT=0
 SRC_URI=https://github.com/heftig/rtkit/releases/download/v0.13/rtkit-0.13.tar.xz
-_eclasses_=eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	meson	576e6bbef90e9753368f8b4ad0bd5383	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-utils-r1	474cb53a7d1b62721a91809a1d702661	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
+_eclasses_=eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	meson	576e6bbef90e9753368f8b4ad0bd5383	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	c8951c1dfcc1d43e3f967f61fd0ec59c	python-utils-r1	474cb53a7d1b62721a91809a1d702661	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
 _md5_=ba61108fd8176f58666a54edae672bdc
diff --git a/metadata/md5-cache/sys-auth/seatd-0.8.0 b/metadata/md5-cache/sys-auth/seatd-0.8.0
index 1923f9909e87..c0aaf4b42b30 100644
--- a/metadata/md5-cache/sys-auth/seatd-0.8.0
+++ b/metadata/md5-cache/sys-auth/seatd-0.8.0
@@ -1,4 +1,4 @@
-BDEPEND=>=app-text/scdoc-1.9.7 >=dev-util/meson-1.2.1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
+BDEPEND=>=app-text/scdoc-1.9.7 >=dev-util/meson-1.2.1 app-alternatives/ninja dev-util/meson-format-array virtual/pkgconfig
 DEFINED_PHASES=compile configure install test
 DEPEND=elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd:= )
 DESCRIPTION=Minimal seat management daemon and universal library
@@ -12,5 +12,5 @@ RDEPEND=elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd:= ) server? (
 REQUIRED_USE=?? ( elogind systemd )
 SLOT=0/1
 SRC_URI=https://git.sr.ht/~kennylevinsen/seatd/archive/0.8.0.tar.gz -> seatd-0.8.0.tar.gz
-_eclasses_=meson	576e6bbef90e9753368f8b4ad0bd5383	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-utils-r1	474cb53a7d1b62721a91809a1d702661	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
+_eclasses_=meson	576e6bbef90e9753368f8b4ad0bd5383	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	c8951c1dfcc1d43e3f967f61fd0ec59c	python-utils-r1	474cb53a7d1b62721a91809a1d702661	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
 _md5_=b14234b3412b98930cf35073aa227af5
diff --git a/metadata/md5-cache/sys-auth/seatd-9999 b/metadata/md5-cache/sys-auth/seatd-9999
index a9f2506393f3..6330c1baf477 100644
--- a/metadata/md5-cache/sys-auth/seatd-9999
+++ b/metadata/md5-cache/sys-auth/seatd-9999
@@ -1,4 +1,4 @@
-BDEPEND=>=app-text/scdoc-1.9.7 >=dev-util/meson-1.2.1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=>=app-text/scdoc-1.9.7 >=dev-util/meson-1.2.1 app-alternatives/ninja dev-util/meson-format-array virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install test unpack
 DEPEND=elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd:= )
 DESCRIPTION=Minimal seat management daemon and universal library
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd:= ) server? ( acct-group/seat )
 REQUIRED_USE=?? ( elogind systemd )
 SLOT=0/1
-_eclasses_=git-r3	5133e393e8717a3a093660f990801dc1	meson	576e6bbef90e9753368f8b4ad0bd5383	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-utils-r1	474cb53a7d1b62721a91809a1d702661	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
+_eclasses_=git-r3	5133e393e8717a3a093660f990801dc1	meson	576e6bbef90e9753368f8b4ad0bd5383	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	c8951c1dfcc1d43e3f967f61fd0ec59c	python-utils-r1	474cb53a7d1b62721a91809a1d702661	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
 _md5_=54352ec1f9b33f4843e349107e409814
diff --git a/metadata/md5-cache/sys-auth/solo1-0.1.1-r1 b/metadata/md5-cache/sys-auth/solo1-0.1.1-r1
index 75c33ac4f4cf..154ad9dff811 100644
--- a/metadata/md5-cache/sys-auth/solo1-0.1.1-r1
+++ b/metadata/md5-cache/sys-auth/solo1-0.1.1-r1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/click-7.1.0[python_targets_python3_10(-)?,python_targets_py
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/s/solo1/solo1-0.1.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_=41c05211d52b6e5fae1eecab1cd7a394
diff --git a/metadata/md5-cache/sys-auth/ssh-import-id-5.11 b/metadata/md5-cache/sys-auth/ssh-import-id-5.11
index c8af7547145e..e436198284a1 100644
--- a/metadata/md5-cache/sys-auth/ssh-import-id-5.11
+++ b/metadata/md5-cache/sys-auth/ssh-import-id-5.11
@@ -12,5 +12,5 @@ RDEPEND=dev-python/distro[python_targets_python3_10(-)?] python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://launchpad.net/ssh-import-id/trunk/5.11/+download/ssh-import-id-5.11.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_=f391d15c5003271e6ad63c32aa53580d
diff --git a/metadata/md5-cache/sys-auth/ssh-import-id-5.11-r1 b/metadata/md5-cache/sys-auth/ssh-import-id-5.11-r1
index 99cb74805df3..e2a42a3fa084 100644
--- a/metadata/md5-cache/sys-auth/ssh-import-id-5.11-r1
+++ b/metadata/md5-cache/sys-auth/ssh-import-id-5.11-r1
@@ -12,5 +12,5 @@ RDEPEND=dev-python/distro[python_targets_python3_10(-)?,python_targets_python3_1
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=https://launchpad.net/ssh-import-id/trunk/5.11/+download/ssh-import-id-5.11.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_=fa1aaa3a2cfd8f387aeff0d2ada8a651
diff --git a/metadata/md5-cache/sys-auth/ssh-ldap-pubkey-1.4.0 b/metadata/md5-cache/sys-auth/ssh-ldap-pubkey-1.4.0
index 52aa4c6a8c34..c3fdb30f76b2 100644
--- a/metadata/md5-cache/sys-auth/ssh-ldap-pubkey-1.4.0
+++ b/metadata/md5-cache/sys-auth/ssh-ldap-pubkey-1.4.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jirutka/ssh-ldap-pubkey/archive/v1.4.0.tar.gz -> ssh-ldap-pubkey-1.4.0.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_=ca304f834acdfc0c683c622d3673bd15
diff --git a/metadata/md5-cache/sys-auth/yubico-piv-tool-2.3.1 b/metadata/md5-cache/sys-auth/yubico-piv-tool-2.3.1
index b62048b56daa..5bbe5cb2edf4 100644
--- a/metadata/md5-cache/sys-auth/yubico-piv-tool-2.3.1
+++ b/metadata/md5-cache/sys-auth/yubico-piv-tool-2.3.1
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/gengetopt sys-apps/help2man virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+BDEPEND=dev-util/gengetopt sys-apps/help2man virtual/pkgconfig app-alternatives/ninja >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=sys-apps/pcsc-lite dev-libs/openssl:=[-bindist(-)] test? ( dev-libs/check )
 DESCRIPTION=Command-line tool and p11-kit module for the YubiKey PIV application
@@ -12,5 +12,5 @@ RDEPEND=sys-apps/pcsc-lite dev-libs/openssl:=[-bindist(-)]
 RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://developers.yubico.com/yubico-piv-tool/Releases/yubico-piv-tool-2.3.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_=afdf42ee1463602af9b8ac5cd5647fb2