gentoo auto-resync : 08:01:2024 - 12:58:45

author: V3n3RiX <venerix@koprulu.sector> 2024-01-08 12:58:45 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2024-01-08 12:58:45 +0000
commit: 5cbf14acf23c82626389931f64cfe3ef12a1c29f (patch)
tree: de93b0b9ae374935f2ddf615d19a837b6a6a0822 /dev-util
parent: 1fbaf1314579f2155166bebd1ddfe6131d400807 (diff)
81 files changed, 170 insertions, 170 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index ad99414afe27..c78d2db18a47 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/aruba/Manifest b/dev-util/aruba/Manifest
index 8d1c1186efeb..cc18da3253d9 100644
--- a/dev-util/aruba/Manifest
+++ b/dev-util/aruba/Manifest
@@ -1,7 +1,7 @@
 DIST aruba-0.6.2.gem 75776 BLAKE2B 569af009cc20b644878fda25b5e7f79bd2f7c6f5fa9ef2503a5e730b8eb5938872563dace27031d31847bacfbb7e4764079da74fa2a917cc3d98a596cf2248c7 SHA512 ad859aa34f6e6778d9eb92b7e8f298180250e0690b21285e48b85dda88c09c74437ed0dff4e07ea8a02e8c784841ef89504219aa844457273349b8072ebc761e
 DIST aruba-2.1.0.tar.gz 130073 BLAKE2B 534bc67cbc4b5871a1bc6e37170586b3a5829e70d611dde9fe130a4cfdce98044c1a3fe29de961419a605eb4bbe8e21b8efb52a61aa8a2d2b2b9fa7e42bd3169 SHA512 f30d67ba94157eaf0477a09f4049174ff0cd6195b92c4121117775e56502178525eb5a7f69148e7f5531d6d4e67f4ecd9d840e693c38340a10819a19247021fa
 DIST aruba-2.2.0.tar.gz 130616 BLAKE2B f2f359d5ba79232e575a240e6d278b936f17d532d01e58f840f537a4d1e6a3663c04b24636aa20fda64ac3eccd4111c61d2f18e26e8c18cef35c7eeaaf7d797b SHA512 e4802dd915062b61e0a536d31294165310ce80aca3e4560f59bb23fcb3e01ea73a547d3f5738d3590c33175fb55268fa69512fe8f33f7cea6b83070e26b7cfee
-EBUILD aruba-0.6.2-r3.ebuild 1044 BLAKE2B 20631d4dc9c2dd8371b93f67c0aa1cc92a4fc3c16d84cc7eccc0d91bd3e60d02caa985ef01dc4b21b80fb8afdcc2b28d9b633dd7a4de15acef0d9ed993258a51 SHA512 4848be3d58ed4407dc55f7f6ae9267b92cb1ebad9dd12d1cf97fe9e50e813dc8d8ea3086db3ff5962041f8da160c04d983f34c8fafac5009c4f9dc911517e10e
-EBUILD aruba-2.1.0.ebuild 2241 BLAKE2B b9a220b21e0347a1b5ed8e332d242a5f835dd1e06c26ab328cc124a2fd2507fa840804458b84ea674041293e1f6a3c245114a4851cd812f808d6f3bee09bd565 SHA512 66ea5442ff6cd7706bae991d8c98f88b0f2eebc057eae141bbbe202a2c58814266fdb94f5b6df56a50fc603f8170cb7a64c4c27d2dc3210c85cd2b45990c6c03
-EBUILD aruba-2.2.0.ebuild 2171 BLAKE2B 1eb68a50ee98742bf156ab632e9020e2ce86e2f3599350626103485ed87a95684e634db1476e948ea7c8e067ba13a0edd82986f94d976c242ba33f1644dca1ba SHA512 521ef2daa6615ce393e17fbbf3170e1f71eeb663a2f45c76305637361b4e9e7fc82ffb7903c821ef2845f18ac68d818f3fa55eeb377c0080ecc87ee814e3a9ce
+EBUILD aruba-0.6.2-r3.ebuild 1051 BLAKE2B 74adb785f62d6ca6379a782b93de3634bbde652e593eb897954b613a529d4389a022a9345fd0606b6c2762675c78e215231bdc5cf31fe40f9628ea2eb2ced212 SHA512 b6fee287b335d67a3b90f422bacf2977f622cfb77a35373c94fa7a25a75bebb9a0a348c9a98c05a5a331efa09a8456883a0ad0cfabe94ef1dd73e1338d71a75c
+EBUILD aruba-2.1.0.ebuild 2248 BLAKE2B f1ae5aed5b5b558b4f00851516277cef0f8fa7468f2217d3c4ef3d15e1fa0585a313811a43550579a1ca3cd4e5027bad713f29bbf8693646910024373b96a44f SHA512 a0bbf2a14dffe700fea2d18ccc810a2a55da23ec03cfcaaacea8b57fb9ddf131eca5ecaefa058a4d0b2f21d9a51eea3fe72e0f7e343c2e95171831456b7d9030
+EBUILD aruba-2.2.0.ebuild 2178 BLAKE2B 25e520e144230fafa808b05d5452516052793b8e653cf8b06fe55e6953e6ccae973cacb923e8ea77de369fc452fc1d4a6d5768130b06840b0007b5316ad9d4e5 SHA512 8fc466be92e7717e15f51c7778ff632c09322dd15163ff9fced58ebd40b52db5554a6ee0f1732254168f67c9f84357162d80a111e93476b19c38aed5586aa0fd
 MISC metadata.xml 297 BLAKE2B 013e79bd25020910ff023586ed3e1349ee1dcbf195b73c230133775c2fe031794f91fd7e54d4df43bfc61de716f452492f2b7af3ba7dbf7e04cf4a47ac16a00d SHA512 c57a4e881304d3bdc2001d4f221ec7d4789223fa36b104271ec9a2439e7730ccbfd349b16209ac6a59fe782618b14423cf3b7b345ef2a7d4944a535eaed75c9a
diff --git a/dev-util/aruba/aruba-0.6.2-r3.ebuild b/dev-util/aruba/aruba-0.6.2-r3.ebuild
index 8213a2f3b1cd..509c2f3f0eb7 100644
--- a/dev-util/aruba/aruba-0.6.2-r3.ebuild
+++ b/dev-util/aruba/aruba-0.6.2-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -20,7 +20,7 @@ KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86"
 SLOT="0"
 IUSE=""
 
-DEPEND="${DEPEND} test? ( sys-devel/bc )"
+DEPEND="${DEPEND} test? ( app-alternatives/bc )"
 RDEPEND="${RDEPEND}"
 
 ruby_add_rdepend "
diff --git a/dev-util/aruba/aruba-2.1.0.ebuild b/dev-util/aruba/aruba-2.1.0.ebuild
index 81e0dbdc8b26..0c2fae317791 100644
--- a/dev-util/aruba/aruba-2.1.0.ebuild
+++ b/dev-util/aruba/aruba-2.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -22,7 +22,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 SLOT="$(ver_cut 1)"
 IUSE=""
 
-DEPEND="${DEPEND} test? ( sys-devel/bc )"
+DEPEND="${DEPEND} test? ( app-alternatives/bc )"
 RDEPEND="${RDEPEND}"
 
 ruby_add_rdepend "
diff --git a/dev-util/aruba/aruba-2.2.0.ebuild b/dev-util/aruba/aruba-2.2.0.ebuild
index 335fb24c7232..d57ae5f806bf 100644
--- a/dev-util/aruba/aruba-2.2.0.ebuild
+++ b/dev-util/aruba/aruba-2.2.0.ebuild
@@ -22,7 +22,7 @@ KEYWORDS="~amd64 ~loong ~ppc ~riscv ~s390"
 SLOT="$(ver_cut 1)"
 IUSE=""
 
-DEPEND="${DEPEND} test? ( sys-devel/bc )"
+DEPEND="${DEPEND} test? ( app-alternatives/bc )"
 RDEPEND="${RDEPEND}"
 
 ruby_add_rdepend "
diff --git a/dev-util/babeltrace/Manifest b/dev-util/babeltrace/Manifest
index 03d4cc18be20..a11d18e3ff5d 100644
--- a/dev-util/babeltrace/Manifest
+++ b/dev-util/babeltrace/Manifest
@@ -1,6 +1,6 @@
 AUX babeltrace-1.5.8-slibtool.patch 4148 BLAKE2B e086dd6aee512a0d2cd3db63a33275dcabb129def9bbaff6cd1b081bed3dc7fcc99d3f645fe009f55db72b72e86b420c9c12757544f85bfe253b55e7940f4c81 SHA512 3a43c19309297838752181c1c4f1957b7fe93900e932410dc237c8d11b4cfa7a5044826e2f60e192dbfeb1fee46185508ed2fa093d62a200dd86ffd78e24a553
 DIST babeltrace-1.5.8.tar.bz2 992610 BLAKE2B 3d47f9ba40b406271a0b35e441968718c93e8744f95b56f79acf8359001ebffb4966931f2860d48ced4f0d98261b37156564a0d798bf8d9e0ed465c05355cc5d SHA512 827749ae8507efd433bb97ef668628837a3ff15b5be5097af5621d46055c6f10401da0be1f9d9f843a96c8c307b33745e04284d166e275e03b7ddb0a7dd57e96
 DIST babeltrace2-2.0.5.tar.bz2 3252593 BLAKE2B 31a8f3c080e4a6b6e33c224ec4a64d5ff12724a5697954cb92b88c569d6f2019f49ddcb88f82d36be3007c7b5d1334370202d1c0e89122acf340a7cb9e399fa3 SHA512 63469cb0796c720b18bfc09569875eb9a44d2f8a776228bfa503af8ba613b2988b2d20be870f41451e5d6146a3dfb08de6284131d25f1a86137deb75c3a4d514
-EBUILD babeltrace-1.5.8.ebuild 808 BLAKE2B cb965f19d6d2dbd8297cd6adbf860436e5b4447243c834503bcc9c9bd0af81635493c7d2f89904a6255aa5e5455c85e7419e8224d0c3d9c21ecab02d6c5de73b SHA512 7e45597f9cfbf8cae62d118bdeaca26fca737a959b612adb91b6c1fe8e6cfa27dd497cd53136f3b0817b58ca03e601c9d2c06fde24fb1d143a09c4bfe526de10
-EBUILD babeltrace-2.0.5.ebuild 1543 BLAKE2B 5f48bfca11cded8d60083c73b697d102caca234fb01b126c4a88f05cd636b1636cc4b93266ae04cf35e94f3c6d59a4cc46cc576de19decd3fe8b209ad54446ba SHA512 25fd97ed728cdcc10ed74ca92959f2a8c737ba46adcf71ec5aa0e9624c491a5db67206649b4e255bd35fd4ec065404136b9aad3bbe65a841ce88972041f1e775
+EBUILD babeltrace-1.5.8.ebuild 814 BLAKE2B dbd7521736175087865d89a6c26bb49ae27bfd4f90d3f8dc6a466d011b3dbfa1a68734941104894c51a15a25dad5976d478aa7da7f637576c924f63e987aac48 SHA512 60decdf160cdbed65e0c537f0858a540ce1e8ce453218468fe8cc53250e717acb3a9b1f73e026876abe12afb04385db99b7c7ea3ca5bb3cfcbe4ffcfe10f0cd1
+EBUILD babeltrace-2.0.5.ebuild 1540 BLAKE2B 7113ab046fd1f15d73c86d8e84a25ac79ee7666337e264fe64023ecc017d1fbfc1f6a7e14052578acd898dcd03a678c392f227ebe53ee1227bae033e4a0271b1 SHA512 40c13d6aa11556344b530a78592e09d83ba24cefbcf618711b970c3196a3c561dc99509c56b6d26d8cc80f8b0dff30d0b83645f416644b211dc1d6c07d448454
 MISC metadata.xml 678 BLAKE2B 0298ddf00050c55f360e4e02d9c590db5df5b9b6cfc6d2096685281cef84130a8003bdb9190215310aa955e30fcf6c3fb72eb301091ae9c4f0a3d29b55d9e627 SHA512 2bf5458672c71b4511e64eea1cee4324d245a8adc0bc43b9e9340e43b8a2826555bcceb80f37baf06c99deb60340a752478d033eb8a271ac79d9b86ed0a583cc
diff --git a/dev-util/babeltrace/babeltrace-1.5.8.ebuild b/dev-util/babeltrace/babeltrace-1.5.8.ebuild
index aa58b116da22..bd34b6536b42 100644
--- a/dev-util/babeltrace/babeltrace-1.5.8.ebuild
+++ b/dev-util/babeltrace/babeltrace-1.5.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -23,7 +23,7 @@ RDEPEND="dev-libs/glib:2
 
 DEPEND="${RDEPEND}
 	sys-devel/bison
-	sys-devel/flex
+	app-alternatives/lex
 "
 
 PATCHES=(
diff --git a/dev-util/babeltrace/babeltrace-2.0.5.ebuild b/dev-util/babeltrace/babeltrace-2.0.5.ebuild
index 422dc7e259ad..538ec918a04b 100644
--- a/dev-util/babeltrace/babeltrace-2.0.5.ebuild
+++ b/dev-util/babeltrace/babeltrace-2.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -24,7 +24,7 @@ RDEPEND=">=dev-libs/glib-2.28:2
 
 BDEPEND="${RDEPEND}
 	>=sys-devel/bison-2.5
-	>=sys-devel/flex-2.5.35
+	app-alternatives/lex
 	python? (
 		>=dev-lang/swig-3.0
 		$(python_gen_cond_dep 'dev-python/setuptools[${PYTHON_USEDEP}]' python3_12)
diff --git a/dev-util/bpftrace/Manifest b/dev-util/bpftrace/Manifest
index c3e8857261b7..eaedcb6226a6 100644
--- a/dev-util/bpftrace/Manifest
+++ b/dev-util/bpftrace/Manifest
@@ -2,5 +2,5 @@ AUX bpftrace-0.11.4-old-kernels.patch 563 BLAKE2B 3b2afb997119188e7095b24ec459f4
 AUX bpftrace-0.15.0-dont-compress-man.patch 1885 BLAKE2B 89a327cef68fa838d5c04b37e7bf72e6b03b54c244889706ba3c5156e2355d00cf395d14a6e8a7fe622e002acf9bab06dbc1427f6b637f0c59db86af08f05d51 SHA512 b591a73b0bbdd0105e6b87fb264ca4345e200ab58754d09a87dec79e60044eab165f2b34fe5ddc904cd877a460d5f41eef8b4d59eac255ea4f4e0fae37cf3511
 AUX bpftrace-0.19.0-install-libs.patch 14102 BLAKE2B 626bcebeba565dec1e1ffb389731ab5a408262de4c52c58408d93a097a5fe955c0460c6bf710aa65e832d6f1e1023ecc68999125fd386e62e0dd24d13920e913 SHA512 02e064a7332bf7eeddfed3169d31eee7faa32048c01e8c0363e0a5632c4a65bb371e967bab8706ca97b59bea2d10eb46dd1b0bd2b998cc63163d90c25570ceba
 DIST bpftrace-0.19.1.gh.tar.gz 1157777 BLAKE2B 9db6285c7a82110106bd05759a09f16d85c82f2516f0b6ea34044e7389b2d38ed418d0fe5da44c2c9f9e67f72404f104f419ce3316c07ea54e65d4f039188039 SHA512 2f56b8fb7abfa58631ebc93c7a98cc066446808cbc0116902e43ebefa5f9625232da5ee3ede1d14a236296660a2f4c0907fa1ef24d383b4e32c70dcc3988c765
-EBUILD bpftrace-0.19.1.ebuild 1835 BLAKE2B ae8c7ff7ba48ffd580cea8eb139bfd4d05a745cf105527c6616e06dc6954ea40301b7b2c48801572f42c7477184c8604e8ced89c83f3650a7251f52deb4a1af8 SHA512 ae02e438e7dcc44893fba419d5aed2e8e6bbe2d329e7d43579820cfcfe324562b1f64a81231b454c32fa2885ded247423c52467dd61b78c799327b77d61641ff
+EBUILD bpftrace-0.19.1.ebuild 1841 BLAKE2B 1da64c583f7acb847550c83c38e56dd42a0db6974c7696702c086b768df318afaff5e18d1b9e1ea303c3003733e4f5f9233fb3c332b67b8791b5545d85451a1c SHA512 57547d0d4355270acc6aa718fe10eb19863810f898d21c567c033fb48fb634198adcff32ff77cf2312469a6dfbd315d8e0874385921e176115370193ce17c149
 MISC metadata.xml 499 BLAKE2B ce7c46f4c5e49f2f779ff6584053f7fc78dffaeee432ac46a8881b3d49dc569e309af95aaf9d6e77a36ebc87be0cd2f86a5db7b733463e4252d3a242d914f293 SHA512 dfb827afd47feb8204ef40c940ebcc7d1b3217cdf0f24425e4ab32195309d727225e942d777871565e47a2c02244d053f46ed25165e9728c94e0683ff61bf4ce
diff --git a/dev-util/bpftrace/bpftrace-0.19.1.ebuild b/dev-util/bpftrace/bpftrace-0.19.1.ebuild
index 8867a4b1b3ae..48a259038e95 100644
--- a/dev-util/bpftrace/bpftrace-0.19.1.ebuild
+++ b/dev-util/bpftrace/bpftrace-0.19.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2023 Gentoo Authors
+# Copyright 2019-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -41,7 +41,7 @@ DEPEND="
 "
 BDEPEND="
 	app-arch/xz-utils
-	sys-devel/flex
+	app-alternatives/lex
 	sys-devel/bison
 	virtual/pkgconfig
 "
diff --git a/dev-util/cdecl/Manifest b/dev-util/cdecl/Manifest
index 2a913539c4bc..21b46874e81e 100644
--- a/dev-util/cdecl/Manifest
+++ b/dev-util/cdecl/Manifest
@@ -1,5 +1,5 @@
 DIST cdecl-14.0.release.tar.gz 1243688 BLAKE2B c43aff760305805d6ceeca136a1107120e2199c440dca935e1915dc55b75e0f49f60d651c377f3566b7a8c8d548b2db5006cb3477ce41cfe338c92e4f1c7041a SHA512 e079b2731020b819c6021854fb763e0094de6b361255dd7c98687ee064f5f8d67da3d4d2fe14c416edc20dfa73cb28d101f90f03c3c438506e5fe6063cc56f09
 DIST cdecl-14.2.release.tar.gz 1263258 BLAKE2B b130f2d4b950c7dc0ddba3bcfba511f6964b20731f2a505fea33c9387a831f6aea05508a4f7d3fb4f6b512b57434657dcd984cb81f73f93c803341f21a4b8d8e SHA512 b39575e7a2e068aec88e7b975a56ca9d7a4a216a2ec20bcc4816c89df2827885f1aa5009acdb81c83f7f1e8585ff6bc6ce4b83efebac52cd6988e87f889ca480
-EBUILD cdecl-14.0.ebuild 744 BLAKE2B 5df26a8ad2d06c9eadba3a62a0906708a62b8fa9358cb3bcce14982fe68639e604ddb5dcf37a69264b2ac4992d23831f4d35128347d0583c47b3fec8ec8e0535 SHA512 4a16e317eb7cd5a177a957fd55fea1747b83ccb9c0fb0707b6d72c15ddef96bdce6104921ed61ad909b1b546763788de5c3613e00c4abf923329904f18dd38d9
-EBUILD cdecl-14.2.ebuild 751 BLAKE2B 5339130056bb2742ea7ca9803975951b87efcaa65f483b8e027cdb5889b148e260ff869213e289d33fe0876b4e2debcb2bf8b0ddc06573a14be63a232ad9986c SHA512 634a350f2b2e3a3c50999da0ef41869a1566d9f3ae5a44746d86c6b3ae327d402fa8a7e95835f12f5c7d686282b3432836939287238499d28cb48f19c95c09a0
+EBUILD cdecl-14.0.ebuild 750 BLAKE2B 94654d01af6607cd68f9363114474a7ba50711fbeeb1d036c890a3915d2a21120cd965a6e9446ee56b2c09d604f0c23b6eb78cb5de9c220ced3a6fc359d5da0b SHA512 006bea97bd900316509d23f9431673b9e66bc54416dd6aadacc43cd710646654d187bbb69cfc8a52c053eac5705e4321754ce7619ba8a21db3af26f6488097cf
+EBUILD cdecl-14.2.ebuild 757 BLAKE2B b9c2a5ca4fea3149a5783a8b7283f671990407dc02b23b28a1f5db5538426b5b7e67d9ac071b4e3ad1e8ab067acefc42044c56a0c15f441e0f9bb28ff1283707 SHA512 c7d4dda40866db07dcbaf6aeaf789787ab2b9212de46cac61c8c23c309a589c56477bdafe5dc85fd0a8dbd6fec66d749591191d18165b5029b25db9b172b63e6
 MISC metadata.xml 468 BLAKE2B b883da549653ee0df224561567b7fcad423674260ccce2f5f2af6487927ad4e7fc81171582274af55d5f0d1733b92617424b39a5193a46f27bffab9a9422afe5 SHA512 7e77833fa924f265031e1d6db658147fc179767c3150cb3f80f0c145a2514da108e684ae136848928a56495e1a1d794ea35217e7fc407c0394b2514f889b75a0
diff --git a/dev-util/cdecl/cdecl-14.0.ebuild b/dev-util/cdecl/cdecl-14.0.ebuild
index dc541f650892..87e73c11a1cd 100644
--- a/dev-util/cdecl/cdecl-14.0.ebuild
+++ b/dev-util/cdecl/cdecl-14.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 Gentoo Authors
+# Copyright 2021-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -19,7 +19,7 @@ DEPEND="
 RDEPEND="${DEPEND}"
 BDEPEND="
 	sys-devel/bison
-	sys-devel/flex
+	app-alternatives/lex
 "
 
 src_configure() {
diff --git a/dev-util/cdecl/cdecl-14.2.ebuild b/dev-util/cdecl/cdecl-14.2.ebuild
index a7c9e7ca8637..25122f03a31d 100644
--- a/dev-util/cdecl/cdecl-14.2.ebuild
+++ b/dev-util/cdecl/cdecl-14.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 Gentoo Authors
+# Copyright 2021-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -19,7 +19,7 @@ DEPEND="
 RDEPEND="${DEPEND}"
 BDEPEND="
 	sys-devel/bison
-	sys-devel/flex
+	app-alternatives/lex
 "
 
 src_configure() {
diff --git a/dev-util/cflow/Manifest b/dev-util/cflow/Manifest
index 89e231c504dd..6a77bf0fe8be 100644
--- a/dev-util/cflow/Manifest
+++ b/dev-util/cflow/Manifest
@@ -1,4 +1,4 @@
 AUX 50cflow-gentoo.el 177 BLAKE2B d43229ed9ebeea653f91ceadd84f641eff4bf1168cf6e94524c228c943ff973e2cf99216bf7be10dc766014d607f9edf1ab74230e963fbe62561c66914665b15 SHA512 1edbe2c330206fdb9ad3844a2278dc71d13a0ce7c46c73030192de3f05634fe08012c04e7c94883b1f6fde21483aba29e16f7a1466719c975e9c60d59507c5e3
 DIST cflow-1.7.tar.xz 727604 BLAKE2B 0d015f66a1cdeb5119d09c6a81231414362bb5a130d744a4532f3eac7de54f05472716afdcf244d413f510f2f955655654192ef467c56588a09a69b064bd43b7 SHA512 e92a559c5a7141b6c94b700b91e5737b22ddd8236771ebef420a71f2d3a979a64339f56163a16b00e11125f5730927dad29f39ab1c154ceefe3ac4d622c82b02
-EBUILD cflow-1.7.ebuild 1066 BLAKE2B f9bace29bdad9b9bd5f1f29dbf1dc625615b416a1f8893957591a33cb3aa5fce4cd847e4d7209a55e0eb6028770c20b8e9097f54ded19588636ecbfcb02f28c8 SHA512 16fa9db42abec33f5c41bd2328db4c61a04188085462b7156ea1b8ba95e219869074959ddfbbd4da5072903a52334a8d0560eb95f2cffbd3230bbd1da7f8ff40
+EBUILD cflow-1.7.ebuild 1072 BLAKE2B 523ec2b670bf0f765522ad10c93cdeb13003173b2fe8f068f80e480e641a343e638338256423acf9c3389493a2cd89b7ae8727e7229dbb8dcf453beca5355ea8 SHA512 1a1646baf7d39af837926f578870e2358b9c258c5bcba7276dbeeac1ca92ae1cefb6bcac71620864b8ae1602e712300fb4a412b34b1d72a9febee8206abc0161
 MISC metadata.xml 616 BLAKE2B 142b797410bdcf4a201932a28b39e1f1428494ced7a561a0fe82993d5631b58dc06414022a197510598fa4f65ce6b01b1f6fe7d0043b7dcbd999ce97aff7c4cd SHA512 d13be0287c24f00b22347ff05c22e4496f9678d864c2b3acbcd6ffc4a142c5417dfe8da845a08503b635d05fec6d4cd54f145e72dd3503b108f9ae89e9bb8ba8
diff --git a/dev-util/cflow/cflow-1.7.ebuild b/dev-util/cflow/cflow-1.7.ebuild
index 11de52ba090c..b09c50df820b 100644
--- a/dev-util/cflow/cflow-1.7.ebuild
+++ b/dev-util/cflow/cflow-1.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,7 +18,7 @@ RDEPEND="emacs? ( >=app-editors/emacs-23.1:* )
 	nls? ( virtual/libintl virtual/libiconv )"
 DEPEND="nls? ( virtual/libintl virtual/libiconv )"
 BDEPEND="emacs? ( >=app-editors/emacs-23.1:* )
-	sys-devel/flex
+	app-alternatives/lex
 	nls? ( sys-devel/gettext )"
 
 SITEFILE="50${PN}-gentoo.el"
diff --git a/dev-util/clion/Manifest b/dev-util/clion/Manifest
index 436e132ce73c..a37cdb92e0bf 100644
--- a/dev-util/clion/Manifest
+++ b/dev-util/clion/Manifest
@@ -1,5 +1,5 @@
 DIST CLion-2022.3.2.tar.gz 847111855 BLAKE2B 7e1814bcc683126f51eefd350b3d171a22d320ec658bc24b8831db1198756c59ee1be951665d10f2c3e76831f0d8ab55c0ae5fd9abeae0acf4e7009ce00f1faa SHA512 7ca87933323c0e1a4800eb75fbe40d179af987f33de51bca0e6b35264aaffea991712187719b837e07bd11457f8891f9f6038fb10f4e3157170d7818179b7531
 DIST CLion-2023.1.4.tar.gz 858589459 BLAKE2B aed16b6cd6f88279f772fd38f63ff27019998ed1f7e63c1fcaba16fd1b43277d112806dd8ba4ff5e08a23fb5d80b0b80e24b7ef693e19a38220a7129c71d2d98 SHA512 b50ebcdb0b85ec00a9caaad6a309c8f37524a62115a8efeaa8b05819849bdda2d81bf2fae4a723d7d378fb32910a45af26aa5303006aff2e1ad96d5a4749ba90
-EBUILD clion-2022.3.2.ebuild 2745 BLAKE2B 626a8a4365d67f3a21bc9ee5a7a822b8d4b18831baacd471ccdd7277a3e9a694cf261474c5534d83110e9b4d65a23a102d68a21cd5fa9f7d503331e50d6b05ec SHA512 a9a2deea9b25abcb67d590823ae1935785fdee37d9d77e62cb489ff573ba15ea64e55f28b9194a3878898913591d1c0b156ea2c4216ff84c849f4e721084db1d
-EBUILD clion-2023.1.4.ebuild 2745 BLAKE2B 626a8a4365d67f3a21bc9ee5a7a822b8d4b18831baacd471ccdd7277a3e9a694cf261474c5534d83110e9b4d65a23a102d68a21cd5fa9f7d503331e50d6b05ec SHA512 a9a2deea9b25abcb67d590823ae1935785fdee37d9d77e62cb489ff573ba15ea64e55f28b9194a3878898913591d1c0b156ea2c4216ff84c849f4e721084db1d
+EBUILD clion-2022.3.2.ebuild 2753 BLAKE2B 2fa11e174abc9b885b1f9958072703656b0bf260c7a9820e59e26430ae0785305331166202dfa8d84dd01e6b81d588e68076b2a5211e81879f2e41d83764897c SHA512 bfff93e688992f8fe0333432194861a940002d24cfb4e9ff29de61a99e07e4365222333bffe64713e3796b6cb30e0f9826ecf057fee538180079b5766d0a1504
+EBUILD clion-2023.1.4.ebuild 2753 BLAKE2B 2fa11e174abc9b885b1f9958072703656b0bf260c7a9820e59e26430ae0785305331166202dfa8d84dd01e6b81d588e68076b2a5211e81879f2e41d83764897c SHA512 bfff93e688992f8fe0333432194861a940002d24cfb4e9ff29de61a99e07e4365222333bffe64713e3796b6cb30e0f9826ecf057fee538180079b5766d0a1504
 MISC metadata.xml 402 BLAKE2B a74ce91089fa83dc91f1878f17b0e2adc483fdfdd987eb2dd4b184b2a98b8f1d995ab5d2c4dca2d7f25d3a8e1dfec711625e980feb5a0422fe5635c5816ef4fe SHA512 6d425358265cac8deb12c18632cfe520d82a733e4caab71eeb89b6d6643eddbfa27df03fcd8111477a77efea136aca1093c84024c89b85dc66ce1b92633709c6
diff --git a/dev-util/clion/clion-2022.3.2.ebuild b/dev-util/clion/clion-2022.3.2.ebuild
index 1faba92b159b..110b95bd7e1d 100644
--- a/dev-util/clion/clion-2022.3.2.ebuild
+++ b/dev-util/clion/clion-2022.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -27,7 +27,7 @@ RDEPEND="
 	dev-libs/nss
 	dev-libs/wayland
 	dev-util/cmake
-	dev-util/ninja
+	app-alternatives/ninja
 	media-libs/alsa-lib
 	media-libs/freetype:2
 	media-libs/mesa
diff --git a/dev-util/clion/clion-2023.1.4.ebuild b/dev-util/clion/clion-2023.1.4.ebuild
index 1faba92b159b..110b95bd7e1d 100644
--- a/dev-util/clion/clion-2023.1.4.ebuild
+++ b/dev-util/clion/clion-2023.1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -27,7 +27,7 @@ RDEPEND="
 	dev-libs/nss
 	dev-libs/wayland
 	dev-util/cmake
-	dev-util/ninja
+	app-alternatives/ninja
 	media-libs/alsa-lib
 	media-libs/freetype:2
 	media-libs/mesa
diff --git a/dev-util/cscope/Manifest b/dev-util/cscope/Manifest
index 9b9b23f8064e..2dabb81a55f1 100644
--- a/dev-util/cscope/Manifest
+++ b/dev-util/cscope/Manifest
@@ -3,6 +3,6 @@ AUX cscope-15.7a-ocs-sysdir.patch 582 BLAKE2B f9144657cb8d584f4d504481b986f68322
 AUX cscope-15.9-emacs-27.patch 1083 BLAKE2B 0982fcd6a804e6b2a1c5d5b47f184ec6f74a38ebeef737aaf8164db183787d817f0927fe7757cd51a82f9eba1d7034d565d61a403f2ee4532ea08e730d87e68d SHA512 d3c6c90d2a1838945a68b2495b1771a37dd2837d77b16793955f3e021741ad9fa2244fee3b0ce6790c0704430508febecd09e59ce60c071872ed0e988eef9956
 AUX cscope-15.9-pkgconfig.patch 833 BLAKE2B 4f8869517758d4b8725d772c7b4252c4f7aec57b3d63ab36c3fd4a6df08c6374773b016901a0418327b76c04f9fce131b58845c074073e1bcdc3f319261c74a3 SHA512 98002268e01be238a4f918bd95d9f69957477e9bbd0bd7cd0be204efc421fec8daf2aac86cfad9310c7bbd1f6ef0b6234e11e6e9d5490787ae2011160080f731
 DIST cscope-15.9.tar.gz 613948 BLAKE2B 66c0c85d0db810e8cd5a286925eeb1026fa4a9e9c3a5a9decd1412188fca43f831949c231acca428b5eeb476662b7ce9f81defcda81759c18027655535b855be SHA512 f3b95da5eb5c036cd39215785990c7cce7ce7b8eda4b18e60792e70d01ffb63809ce32ace310a9aefd88e6761c1609039ccfab0e8e49f81730bc1630babbcb80
-EBUILD cscope-15.9-r1.ebuild 1614 BLAKE2B a6a21e041b4717bcb7012d01a325c03d47ec1254e6d93141b81b7f89cff72c628920278b50ddaa9a63c4ab7bcfafe5bdfbd86742dd2a936248e22dde49abf144 SHA512 a409c3eaa00774dcec00d727c2d121a508cef1703128d620730f45794ac7a6974f673ffce28888e2726a28bc3990076a870df2c50224a814ea73ba1e0b33c64a
-EBUILD cscope-15.9.ebuild 1565 BLAKE2B c68857afaf40c591ba5577133e32ea6ff511745eae55571ca2323cf90cfa1a610d7f7a1f67397b5c610c5010b89ae7265024a79033e0a64e87ebad60c0a2b2b9 SHA512 03926d187dd74b128e1ff6a15f5bbfa58012620fa2c9e0bc8592dc918a279ffd3bb5cd874fdcf9a4fca02412fc534461d5bca83e21adcb2dc3dca64089ac8189
+EBUILD cscope-15.9-r1.ebuild 1620 BLAKE2B 7de2212d6c86897ec9ab9d0596dcb17193bc26a4830cbca5e957ba6f5876f5853ba8c97bc533fccbae7be3c96e944101483e6e4275075805a958be41da4b97be SHA512 3c89def45470ef668ab70b5a95cc48088db9f84e111aa44247d1af96f228a0fae4a68cdb129335d76ca6bbdc6fb70fa5afacba93c6ebde86c423ed4c444cc6d1
+EBUILD cscope-15.9.ebuild 1571 BLAKE2B 6b8a591e24e8dd19feeffed93cc817f98872842db769fed4acff5d1abf9f1f8b3efed4b78c4bc2d5803281a6614619c1b5cb81250fde14ef6653b112e1c2cc1b SHA512 6611e4f07c5a10a4b1939cfe33d6a99709b918c7463a29a1f24b62f8403e28f343a2aae1cb67d8c6a941fded1c456654eff290cd3ca621ce78d1e3d40b60823e
 MISC metadata.xml 1087 BLAKE2B 2e4779a4e1d063adc26a16774898a6cca08788ddfbfa036d29ae751e547a74cbf3252645e2b6444c59ed106f6088acb0bb5490dde7e7f5b55c74b3c9f941ea1c SHA512 6db0a7194cf116f4f1a1b34de222729dd0521dfb21486ead4885b068e52c3191091bf98e52b31b2e9d4d564560cec9a184d8d7c2387262afcf8442d66507c60b
diff --git a/dev-util/cscope/cscope-15.9-r1.ebuild b/dev-util/cscope/cscope-15.9-r1.ebuild
index fe7293d98505..b62326879dc8 100644
--- a/dev-util/cscope/cscope-15.9-r1.ebuild
+++ b/dev-util/cscope/cscope-15.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ IUSE="emacs"
 RDEPEND=">=sys-libs/ncurses-5.2:0=
 	emacs? ( >=app-editors/emacs-23.1:* )"
 DEPEND="${RDEPEND}"
-BDEPEND="sys-devel/flex
+BDEPEND="app-alternatives/lex
 	virtual/pkgconfig
 	app-alternatives/yacc"
 
diff --git a/dev-util/cscope/cscope-15.9.ebuild b/dev-util/cscope/cscope-15.9.ebuild
index 37929236fe0f..75399ed62c95 100644
--- a/dev-util/cscope/cscope-15.9.ebuild
+++ b/dev-util/cscope/cscope-15.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ IUSE="emacs"
 RDEPEND=">=sys-libs/ncurses-5.2:0=
 	emacs? ( >=app-editors/emacs-23.1:* )"
 DEPEND="${RDEPEND}"
-BDEPEND="sys-devel/flex
+BDEPEND="app-alternatives/lex
 	virtual/pkgconfig
 	app-alternatives/yacc"
 
diff --git a/dev-util/cutils/Manifest b/dev-util/cutils/Manifest
index 23cfd7638a84..9f2f26e6638a 100644
--- a/dev-util/cutils/Manifest
+++ b/dev-util/cutils/Manifest
@@ -3,5 +3,5 @@ AUX cutils-1.6-case-insensitive.patch 312 BLAKE2B 58b98dc60606dd5ad0992a233c768f
 AUX cutils-1.6-clang16.patch 394 BLAKE2B c176d9cd9186c439af906ce720555de07ca84be9552e34712d3794ad1f0ee1da9e2b87fad85b257ff29fdd23b0bcce53804547150be8f8c8c1a5205c13e47a56 SHA512 7de05762edff245a89bba585ca14d437fc4fc5021098c56b6c58a95b7f1bf92d5625c19be8930256fb4431ca05800a13e26bea735a4883aa008927772b8ef6cb
 AUX cutils-infopage.patch 458 BLAKE2B 444ed84a751a5fbb0179d6ffdba3445af20ba45120c2964fb47531060fc01fcde4a40b0635b5b76e8f54a52b696414d996614eac8814e18919e9507b865cbdb1 SHA512 53fbcaec4fdaf1b7804752f952f6fa2f8715601be2ce5185557c2a1378504b7158c398f59e674eed9fc30e95e51157ce8c4c8f71e9a08c63daf97efd7210eba6
 DIST cutils-1.6.tar.gz 128722 BLAKE2B a3589660c188ae4459911e73686e4322d190964fc40f802a5d1a8932c2cf1ea0b989f1f9a3f76845757e90e850b376cc8b019ddaf995b6e1648b2912cf9d531b SHA512 49a0f6ed210be01eec335903dee7ac6000bfa9d9c05a31b9a9fd6ae8534c8058d774f884d55b2b9fa029abc30beeca1866d8a74389b76158ebb216fb3dfad6eb
-EBUILD cutils-1.6-r5.ebuild 1297 BLAKE2B 2f74d969dd72f0b4f758ef95638b21c5bc31ba08c7456b6a727a12890c4ab47b3a2a307ae34c6c84994e9374781276aa90a1369808a220adcc7ca019e4eecade SHA512 119727aa27b159017bd463ec5216a072c7c35a6cea8d42b01a51b3e2a47e370ff914dfc787738377a0f67da0397d92f24ee0fc92330a334811733d81bcbb28ab
+EBUILD cutils-1.6-r5.ebuild 1303 BLAKE2B a60bf2ab34765efc95a027bf03b643a11b412cfbf008c6cf580ea43bd0b07a70846a696461901c8ec4e45c725ba95a37c17d654f230497325ab113208918bf0d SHA512 402d5e9910232f53f4d3b43d55bd748e65fb2f45be2efcd7eb38267917479f6d8af8c0986290afb958238d867e62a8a59563d2c2b170d9032b6db60dd1e6f9b2
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/dev-util/cutils/cutils-1.6-r5.ebuild b/dev-util/cutils/cutils-1.6-r5.ebuild
index 2e0f6fc2a62a..b617020ed090 100644
--- a/dev-util/cutils/cutils-1.6-r5.ebuild
+++ b/dev-util/cutils/cutils-1.6-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 BDEPEND="
-	sys-devel/flex
+	app-alternatives/lex
 	app-alternatives/yacc"
 
 PATCHES=(
diff --git a/dev-util/cvise/Manifest b/dev-util/cvise/Manifest
index e9e1b90b7836..5b87594b65a9 100644
--- a/dev-util/cvise/Manifest
+++ b/dev-util/cvise/Manifest
@@ -1,5 +1,5 @@
 DIST cvise-2.8.0.tar.gz 269582 BLAKE2B fe0f0d4e63ec7c69b209b8be1f3fd160a2573b9bfc555a3bb5caec5c818c8251569103e71509d194e0effc86c09420cf523393686dd412660acde1e85ebffb67 SHA512 7e2dee2001aacb96cf5ffdb62047d229e23273fd26f34648e23ab4374bf6cae149f13db529494ce8d2d16555a0d2143487923c57f4b303b0ab1f678ffcff6f6e
 DIST cvise-2.9.0.tar.gz 269921 BLAKE2B d3b491316ea4ec5b623eeba0131f31edb421635508786a04868394c9bdc62c4510c34bd30095c5b034fa66ec5f8f6f78bb762e17f1c534ba137eb469544ddafe SHA512 dd3b2e5c4603e8a73594863ce5b83d0ca864fc688a7b094c84b745b7086d384173809b9a915edb51938a7df8310eabbde1ea6a997c480d19618065c0d8270c52
-EBUILD cvise-2.8.0.ebuild 1439 BLAKE2B c20c9b5bf5915b459ef5f3d453f8d78e9ed81b876a8ad0bf4659bdd10a340cacf11939708f021f5462f382e790ad4743d2a5c55d839d84be2f9fea16eae18d74 SHA512 a8a2d77bdd5a0323ba839331490d966b9ba1ca1d3e16f10e646c6129eeb6077658eccab7c2f3d631ba6ee68d0ad5c88dd51b65340de83998a3c159f9d37c6876
-EBUILD cvise-2.9.0.ebuild 1460 BLAKE2B 314e7444dd9d51a0a547e667d3a599b6d71b30316dcaab49d06a434b6ed2414ece3c9a849ae8ca28374717c628b4f710981b06caf63ca3a703aceb2596d1b59c SHA512 6663ec0b83f54c66e4dd1b5cd4218be541d1fcd0505a8320e9a8c08ce533958983d3a53fb165f2164ba9457a1b4eabb94612a9631f29299f009716a5649c9528
+EBUILD cvise-2.8.0.ebuild 1451 BLAKE2B 696ae54f957f98a1fd799472e1957cb8dbcdbcb2f29412c164ec769161b46ff482a371539cde86dcdb68283d923aefe3729cb2a3be3a6689ad6856cf567ca36c SHA512 9a32a41ebab9cd87dc8da3d3e6ca86679eec33005635c81e1f6c7e5f3f6e7f17c5bb7cca4fbcad189bd7c6f84970efefd1f6adf0d8546508d3fc30cb26ce5225
+EBUILD cvise-2.9.0.ebuild 1472 BLAKE2B 88e8579740e6294217caff4235cb70517c5ad07176253c6cdf68fd8ef1692bb0cf7c58b2afbd1d21e6bd940efd298b24abdee5572674342ed7d4e1a9a398fb5c SHA512 a1041f57656abfcf05ca3653b37872c97abc6575e89f09bf61404502ffd281410ea3ffa9b8a42ebcc64a04020263e2f7c0f0a5430cba9cd32d74814ba87c29f8
 MISC metadata.xml 339 BLAKE2B 20fe70be5308893c6472158a8e308de12e44b37a1167669d72e3bb1aa628000a43e4cfc9997a56b6e46e34a139fca3cf76492f4e56d1be7747f1c99eba203d2d SHA512 0f4ee363471b584714ac357ba1cb98f5a9b88f45b543dd5f64fc4be1a460a19793b5beeabd019d7a3c74abd1907f3555f6b5a2a2c8325d4ab34adc98d8bc76dd
diff --git a/dev-util/cvise/cvise-2.8.0.ebuild b/dev-util/cvise/cvise-2.8.0.ebuild
index be0b1a3c6b19..51cbfc589702 100644
--- a/dev-util/cvise/cvise-2.8.0.ebuild
+++ b/dev-util/cvise/cvise-2.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -38,11 +38,11 @@ RDEPEND="
 		dev-python/psutil[${PYTHON_USEDEP}]
 	')
 	dev-util/unifdef
-	sys-devel/flex
+	app-alternatives/lex
 "
 BDEPEND="
 	${PYTHON_DEPS}
-	sys-devel/flex
+	app-alternatives/lex
 	test? (
 		$(python_gen_cond_dep '
 			dev-python/pebble[${PYTHON_USEDEP}]
diff --git a/dev-util/cvise/cvise-2.9.0.ebuild b/dev-util/cvise/cvise-2.9.0.ebuild
index 4050d29d2d50..624905d68c72 100644
--- a/dev-util/cvise/cvise-2.9.0.ebuild
+++ b/dev-util/cvise/cvise-2.9.0.ebuild
@@ -39,11 +39,11 @@ RDEPEND="
 		dev-python/psutil[${PYTHON_USEDEP}]
 	')
 	dev-util/unifdef
-	sys-devel/flex
+	app-alternatives/lex
 "
 BDEPEND="
 	${PYTHON_DEPS}
-	sys-devel/flex
+	app-alternatives/lex
 	test? (
 		$(python_gen_cond_dep '
 			dev-python/pebble[${PYTHON_USEDEP}]
diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index f2c5af408704..189d7c3392bb 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -1,5 +1,5 @@
 DIST diffoscope-247.tar.bz2 3091118 BLAKE2B cb41b98d439c123b5ee5f458d635f08afebde1dad724f53a8227826a509bca5e94204855fcd4f220567552abc0a3ea93e1c4a6e16dea0ed32ce7587c15d4976c SHA512 ceaa55512373e9283e6a18a9c5c814cd5b3ee8a9e9721f69b924ee55644640ea28302029232a310fca4d92e53fb37886d3d5ce2c6b577742261c86df24f52740
 DIST diffoscope-253.tar.bz2 3102408 BLAKE2B 11743d3c6821c0ce2c78857152ab562780e39d6a4fc6e62da7a59652ff015c1ad643eaac2a2df0784419545045ef8854178377fd9f570ecd00d4059db2afd4c4 SHA512 e0516f5f0f20e4322f3525f5d00ee9b9029695fb94732c4c610ee09af5b6a9824789e99fe42611e807f11c284655bd9a872c4292e48a2237b400beb12575e950
-EBUILD diffoscope-247.ebuild 4035 BLAKE2B 95aac565c6f708ea5738484b9e1e272eff126c36b9a06e20cf7a67db66993bcd27de9d3fd06c3fb3d68bd12e3b4ad38b0a6d91e51a48301f1f171484ee37d9dd SHA512 3cc46b1b638d6f9ead72e354dccd4c4f19284e4f730b808111b77a2849f899f5845e1cde5e8fcac106f298092caf6e58dd2bc04324d50e640d5a829b7b110db3
-EBUILD diffoscope-253-r1.ebuild 3674 BLAKE2B 7916dd7a87101fc97ce207e5558656795492ed53860614e60800c354a2da209229d8bd3f471ac1d8f176a43ce80a1383d0ac4ed149b78a9375ac8da4882add42 SHA512 1692dfcd7f03834a086f4a5656fd1ca1c1435d68ef5e2a9967f4b5bf06ae9fdc1d4009c95e36ab297df3374a7c82f6f16795c939a01b1d420aee66f8002008eb
-MISC metadata.xml 2078 BLAKE2B 3bb126836e45e8d4e5b6170a12219ec9cceb1a12dca4658211b1971cb16fa5593622642ade363904cf24df16de0749b957d0fc03838d2a9a004484d0b551c886 SHA512 382cefe0478282000b74e404cdd9d636a0323fceb55b97fd8545190628c319e0c5e213c7d082198e4b8b1fc693a52ce85c52b3ad831778e6fadbe6ba401782f5
+EBUILD diffoscope-247.ebuild 4043 BLAKE2B 511752eff66f2ab826c63ff90f43643a804ba98eb865ec401f20bb12da9212fa17a3f5674a279be3e32cbbb72fb39a585d81ebd1824df859e613ea4dfd0eb09f SHA512 7218505a6938db6fcdaa7f7df7b756932f95d5d3b6065dd702af3b1c84c8267b5afb672e666309c5d3a08ebc8f66170102f62fbf6892b54388ce71963bd98409
+EBUILD diffoscope-253-r1.ebuild 3682 BLAKE2B 9416955c1c9414ea2bcfb9ca5138638a3963dc71ec5443d6d993e3d132a566f62e613dd6dea2e38f26b3af6a176d620da2fabbe2159a8f979d2f8d91ae49332f SHA512 6a1cf8404cb306e7ddba0d19e591f62b622e616118f60285612a75991df02270d772eb647d1649f720da5c709312a4c18ad1eb86d9941c7f8512339fba7904d4
+MISC metadata.xml 2086 BLAKE2B b05c2c3c425a990f64aea25e9dda3e1afb410068d90e034d5d9df7c76363613d309f8bc57c70284f2e607a3e2096a0132724dddba8df487bda3046d8ed7aefa1 SHA512 8c86ddad7fda722956931d73a6f5dfa8e43c25623edb3b20bf3e68765b04ed4d20ba31b68315812978a9546b3c678597fd41132a4a6ad4658ba9fa5f79cfc90d
diff --git a/dev-util/diffoscope/diffoscope-247.ebuild b/dev-util/diffoscope/diffoscope-247.ebuild
index ed600f8fab16..530e541a520c 100644
--- a/dev-util/diffoscope/diffoscope-247.ebuild
+++ b/dev-util/diffoscope/diffoscope-247.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -36,7 +36,7 @@ RDEPEND="
 	bzip2? ( app-arch/bzip2 )
 	libcaca? ( media-libs/libcaca )
 	colord? ( x11-misc/colord )
-	cpio? ( app-arch/cpio )
+	cpio? ( app-alternatives/cpio )
 	diff? ( sys-apps/diffutils )
 	docx? ( app-text/docx2txt )
 	dtc? ( sys-apps/dtc )
diff --git a/dev-util/diffoscope/diffoscope-253-r1.ebuild b/dev-util/diffoscope/diffoscope-253-r1.ebuild
index 5db2f28b4041..7db31ced97d2 100644
--- a/dev-util/diffoscope/diffoscope-253-r1.ebuild
+++ b/dev-util/diffoscope/diffoscope-253-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -36,7 +36,7 @@ RDEPEND="
 	bzip2? ( app-arch/bzip2 )
 	libcaca? ( media-libs/libcaca )
 	colord? ( x11-misc/colord )
-	cpio? ( app-arch/cpio )
+	cpio? ( app-alternatives/cpio )
 	diff? ( sys-apps/diffutils )
 	docx? ( app-text/docx2txt )
 	dtc? ( sys-apps/dtc )
diff --git a/dev-util/diffoscope/metadata.xml b/dev-util/diffoscope/metadata.xml
index ead5d22c4fb4..abb0a28b1460 100644
--- a/dev-util/diffoscope/metadata.xml
+++ b/dev-util/diffoscope/metadata.xml
@@ -13,7 +13,7 @@
 	</longdescription>
 	<use>
 		<flag name="binutils">Use <pkg>sys-devel/binutils</pkg></flag>
-		<flag name="cpio">Use <pkg>app-arch/cpio</pkg></flag>
+		<flag name="cpio">Use <pkg>app-alternatives/cpio</pkg></flag>
 		<flag name="diff">Use <pkg>sys-apps/diffutils</pkg></flag>
 		<flag name="docx">Use <pkg>app-text/docx2txt</pkg></flag>
 		<flag name="dtc">Use <pkg>sys-apps/dtc</pkg></flag>
diff --git a/dev-util/gn/Manifest b/dev-util/gn/Manifest
index 87755ccf623f..9cd7ae6ee6d3 100644
--- a/dev-util/gn/Manifest
+++ b/dev-util/gn/Manifest
@@ -4,10 +4,10 @@ DIST gn-0.2077.tar.xz 735596 BLAKE2B 48da6c1b08746d364974c94a8395708ba44f4fb88a4
 DIST gn-0.2088.tar.xz 736408 BLAKE2B 23cb932c6fa1711472e0369b5c9271dd28b1d1a8eee40366295ea576fb0d913f3e01dd802df718d6d55ad27b566b0fae5da0cb03167e38df46bbda284b26f99c SHA512 be1d0a0095a7de9fc130935d45c610ab77dd9451822b33c344ac79d096828752bab04b81183eaa35b654abbb76748ce13751c04d44968d08643b6cd89f3fe8f7
 DIST gn-0.2114.tar.xz 740080 BLAKE2B 51c6d373ed7a33673e76fe8bb40f727193c6e1172fba328916fd2229d1e350cea5c51da734edf6dbf4c0b7bed61a590424484d4150e7cd4c890abba7f43251c7 SHA512 f5370e45bc2a079b79e4bcfc802fbc6cf67f7674a11311f849699f54775593e75def15323843ef887231891cb06b043863c79c5168e565319a4b73fcffa13738
 DIST gn-0.2122.tar.xz 740444 BLAKE2B df57fb611f26964ed3ac47365080cd043ba4206233450bb39699e78e35b8acff918e94efe4e7cea957199dd2f441dfcf31566e7d64ad10aace9d2c1d538ed6ac SHA512 80c330eac876fc0d6f46038b96eefd19bc1b6e5e89515489c1d02f82675213174fba394398ffc1bdd1405ddcd11b60c2870f3076296390976da74012867faf39
-EBUILD gn-0.2049.ebuild 1314 BLAKE2B 0f18a123a6ea07c2bf9fbaaa854679f12db7ba38ae154a7dd5124f963891e10a1653dac8f582ba0549f7dc7feb9c84cc16e4d2069b980ee7a221ae14eb8c0d82 SHA512 674a875512675c60a0ddd8576b47ffd927db2ed8fa76665dd7941cb38661b7317c6927f6c0410a01cd3d90b6300d155a78d0b87c7c036ed767b3abc88c87c4e9
-EBUILD gn-0.2077.ebuild 1316 BLAKE2B 29c222f0435a87914dbd0f9837aecb94e401fcee0bb2c48945491652b4c81ef03a67e2cc8e3a38c985f7b943c2eb85540ec29d3db52c13dd2e08e08c6b91cb2a SHA512 0a389b3bd5102321311b4ba5bb102079248930c47f929bdeeaf2014e7a7007ba60e9dae757023f1e4fce0ae737167814750c174dc76c1242f0dc5d41185b2144
-EBUILD gn-0.2088.ebuild 1270 BLAKE2B dcf621b8d70e5a691429145a81568d4fab14fa0b32ef52c5f333e1a8d96c89946c09b44bd2cbf3f97d4a35d56042a025866b29bbb383db033b3d2edd7e7369aa SHA512 29bb1d08567edb941f08f9deea01316769031252e7cc74fd3dbf66a526fc837c58732dc976f85909d59f99a3747b48a5da43a250e73c87c60c638dd3fcb753cc
-EBUILD gn-0.2114.ebuild 1268 BLAKE2B bb31d67fd388dfeb69363aa53e88efea68af5beaa826b26ac26500436c47f4282efaab7923f6a0251d9131df0d4925f300e6b80e75ac5644dc14207a4f30b1ff SHA512 ca43d1fc8248f2f8922d889d44179d72a0e1fd73a2437e1fd713e71ad6d210b08f0af27222a21f8bcde08c7544c4e7d57e03e234639c57ccb0a848499e25cc44
-EBUILD gn-0.2122.ebuild 1410 BLAKE2B 8b43d61732af08fcfaf6f17bdb60965ed3fe96208bb89bea361a72b7963bd757af95095a2ce06061c490d26dc2cf516ae139ace755b29c6cb28134a03c3d97ad SHA512 f1806f787c7e3054d02539a05926a8a39b304a8e90fc0667a248f991d73af01a6c2e8338e5fd9e53381e192060c801be34994056ac8d2c85391fbf94b3d0f56a
-EBUILD gn-9999.ebuild 1413 BLAKE2B e7dc0e1a109545798341c72e42ad57635bb8dab8a25db65adfb24849a9b9e8fc8ae03c89402b68b439aa5961fff9f00f3604d5f6abec5175d9d2175002e26a6e SHA512 080283706d031f3d77f79bc02b8131b579099eddbe0678d5de272f4be2560ef2c73eb221213e66865f339e702d11b7ce961bce5f6a027a9b440a0a9b32b717b1
+EBUILD gn-0.2049.ebuild 1322 BLAKE2B fee4fffbbc93a2504b12e2a7825ef60bf4652333a3a8301bb56a76ca9ec9ecae362346640126f096a6f486d53fe74b1819eb0ada60402904b504c3d26b4bc48d SHA512 f600f465d178985cd058694676e050ad0ec2418bbfd2257eeed68a40155dfb96851c8a7c44261b2827ff7d6eefd6b4f32c35f196658549e534b2a25f8b3d1af0
+EBUILD gn-0.2077.ebuild 1324 BLAKE2B e8a4f27995d82c0821232b923acf0be944db5135d9ee2a72627666c972d6592ff80cee70a4202359a9837926af15e9f98c94c3496ae4459d8462dac3ddba3a53 SHA512 42f2b48b9ed37843f7ef88c8470bbf86b1b3a3b4e71273d6496c468b9f46e107269aa7b691a4903bedc49639e29f913a4cc2adaca506d0f6a75c962f76c9d148
+EBUILD gn-0.2088.ebuild 1278 BLAKE2B 7542d3a8a4ebfb6e69ce0e0c1cd86d7b3a661ddf1d374661cae8fb6234a68ec7dc03f60542187caab5ca221e56c332e93d57fdecff8d54da8040a6772a10e4df SHA512 70fb984afd0b75b9a737dd21752083cc0b5e2a712ef38e0019350974c152b4d7d4e805deb134171aa36e176f1c7013e9491c1bfdae68903dc9cb35d4312c3987
+EBUILD gn-0.2114.ebuild 1276 BLAKE2B 266a57db3b88167d9a28e33e8b9b1af10661ab48a77000e8defe817836a9ac65be3aa39b7fbe77437e712c91edcd2043e077616c2b5e9e173d2e30e388d75fd5 SHA512 4bf377a5915d3134d8ac3202ad43f7ae21f87c22fac646def2228fde3c4c4a843c69a872d0b001b9fe320d9ad4ae614d9d2a61300141b879ff38afa0dcc22fb3
+EBUILD gn-0.2122.ebuild 1418 BLAKE2B 8b30006dee649c7c3dfbfbdb47bf054724825c371e5db34c752b4307b61e496fb9c310afe3704fbde5f6465c2f51a3489ce03e04df12ce0a0e46451ec80ec198 SHA512 6c6807cd897c287db2e6cc9239991781d3164e66a7838223660983ee5630c9e7de9b3f69e5934bf36073be2397d96db3f262e967d1f44807a8fa64c275a15af1
+EBUILD gn-9999.ebuild 1421 BLAKE2B 2bf631ca9418375a1162313b695e76dbcbcc52405909310c2e84cfc1c82be1d81d728589f4048eeb523e9cd2c830a34bd7478d559ad1c67280f0d24b5f1adee5 SHA512 7eee0bb5739684a96d65681760e7356664b46332346a7c9c55c67d66e5efe95c3e4a27e46c049d891675f16737d8efe6b9992f756059c0b5c76a80beaa1f7fe9
 MISC metadata.xml 221 BLAKE2B ce7615d8eda5f58e7729bf86156010821052ae580769c3be3922f1270f1211bc5cf297afc5c68db67a46c1c01450c08751fc3cda0995d62bbe60da64d21802d6 SHA512 6ffee27f859f923795e8ded3a5544a82473f72568e96475374b937adbf0963f81d46fbcf4752a9d4eef3f071cadd3dedf141f43802b58c6a788243c7f05114cf
diff --git a/dev-util/gn/gn-0.2049.ebuild b/dev-util/gn/gn-0.2049.ebuild
index 80af7cdf6f78..4778d017b5cb 100644
--- a/dev-util/gn/gn-0.2049.ebuild
+++ b/dev-util/gn/gn-0.2049.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2018-2023 Gentoo Authors
+# Copyright 2018-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,7 +17,7 @@ IUSE="vim-syntax"
 
 BDEPEND="
 	${PYTHON_DEPS}
-	dev-util/ninja
+	app-alternatives/ninja
 "
 
 PATCHES=(
diff --git a/dev-util/gn/gn-0.2077.ebuild b/dev-util/gn/gn-0.2077.ebuild
index ab0180f314d7..5566e264e3de 100644
--- a/dev-util/gn/gn-0.2077.ebuild
+++ b/dev-util/gn/gn-0.2077.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2018-2023 Gentoo Authors
+# Copyright 2018-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,7 +17,7 @@ IUSE="vim-syntax"
 
 BDEPEND="
 	${PYTHON_DEPS}
-	dev-util/ninja
+	app-alternatives/ninja
 "
 
 PATCHES=(
diff --git a/dev-util/gn/gn-0.2088.ebuild b/dev-util/gn/gn-0.2088.ebuild
index a68b570ed9b3..d219107c1dbc 100644
--- a/dev-util/gn/gn-0.2088.ebuild
+++ b/dev-util/gn/gn-0.2088.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2018-2023 Gentoo Authors
+# Copyright 2018-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 
 BDEPEND="
 	${PYTHON_DEPS}
-	dev-util/ninja
+	app-alternatives/ninja
 "
 
 PATCHES=(
diff --git a/dev-util/gn/gn-0.2114.ebuild b/dev-util/gn/gn-0.2114.ebuild
index b44aa0e8b64d..e7e680b79c4e 100644
--- a/dev-util/gn/gn-0.2114.ebuild
+++ b/dev-util/gn/gn-0.2114.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2018-2023 Gentoo Authors
+# Copyright 2018-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 
 BDEPEND="
 	${PYTHON_DEPS}
-	dev-util/ninja
+	app-alternatives/ninja
 "
 
 PATCHES=(
diff --git a/dev-util/gn/gn-0.2122.ebuild b/dev-util/gn/gn-0.2122.ebuild
index 8d7926f1503a..e49600fc3955 100644
--- a/dev-util/gn/gn-0.2122.ebuild
+++ b/dev-util/gn/gn-0.2122.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2018-2023 Gentoo Authors
+# Copyright 2018-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -22,7 +22,7 @@ SLOT="0"
 
 BDEPEND="
 	${PYTHON_DEPS}
-	dev-util/ninja
+	app-alternatives/ninja
 "
 
 PATCHES=(
diff --git a/dev-util/gn/gn-9999.ebuild b/dev-util/gn/gn-9999.ebuild
index 399b5b73b12b..6ed90545455f 100644
--- a/dev-util/gn/gn-9999.ebuild
+++ b/dev-util/gn/gn-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2018-2023 Gentoo Authors
+# Copyright 2018-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -22,7 +22,7 @@ SLOT="0"
 
 BDEPEND="
 	${PYTHON_DEPS}
-	dev-util/ninja
+	app-alternatives/ninja
 "
 
 PATCHES=(
diff --git a/dev-util/gob/Manifest b/dev-util/gob/Manifest
index 383457aaaa81..230b2d5aed50 100644
--- a/dev-util/gob/Manifest
+++ b/dev-util/gob/Manifest
@@ -1,3 +1,3 @@
 DIST gob2-2.0.20.tar.xz 202540 BLAKE2B 942fdaa77e660d3c8ea49e9b326ae8201893e01f335b2cb5c518597f4638058c7cb51e89061a6f707f39044a40c71cd1ec91b5fd514aa36904e91401abd9c9b1 SHA512 9d09692ef208f8d6422fd573aa1955ca5dcfc3feaf9e0fb64c27e52f4638fe19a5e08a7282f682ed5241a8fafce3852e4168ba4f3865890df972dad4ee342b7a
-EBUILD gob-2.0.20-r1.ebuild 531 BLAKE2B 7f9aa93ca1b2e9f6d4d9cc60fa829150e20feac6accc8c4173c27e71eeeeb738ecb3524187a28fc5f02dc1b1ea88e29fc0e59ded061a150260b37a83dfbdf1ea SHA512 81e1d5cff03421c9755dd26d96d809eb593ca2ecb4c542b45d773218ae1bc2303331a115d0cb9ad8f194d2fc10634e0fbebe298c61d0b6ec63cfc3126addca98
+EBUILD gob-2.0.20-r1.ebuild 537 BLAKE2B 6b12297ea303342d638f14231a32d99287d00e297637af94ae4f12b2f8b04233cc4fe3cded78ac070dbadacdd48cc750a2b5d64f108a941cb6f91a5faec87edc SHA512 47a7d42be4187325b74a855b5becb76d1f82ca4ecb021a11a330d9ddfcbb62c9cff0079633adfa3dfd203e51579935135776efb8cf6284121cb2498805496e16
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/dev-util/gob/gob-2.0.20-r1.ebuild b/dev-util/gob/gob-2.0.20-r1.ebuild
index 9071d5e3c116..7dd6638b0069 100644
--- a/dev-util/gob/gob-2.0.20-r1.ebuild
+++ b/dev-util/gob/gob-2.0.20-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,6 +17,6 @@ KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ppc ~ppc64 ~s390 ~sparc x86
 RDEPEND=">=dev-libs/glib-2.4:2"
 DEPEND="${RDEPEND}"
 BDEPEND="
-	sys-devel/flex
+	app-alternatives/lex
 	virtual/pkgconfig
 	app-alternatives/yacc"
diff --git a/dev-util/gtk-update-icon-cache/Manifest b/dev-util/gtk-update-icon-cache/Manifest
index 96dad63ed872..b92086388edf 100644
--- a/dev-util/gtk-update-icon-cache/Manifest
+++ b/dev-util/gtk-update-icon-cache/Manifest
@@ -3,5 +3,5 @@ DIST gtk-update-icon-cache-3.24.38.tar.bz2 92762 BLAKE2B 9edd023da4aa9bfb2540132
 DIST gtk-update-icon-cache-3.24.39.tar.bz2 92389 BLAKE2B 74bbbb7d0e4528a1179400a8c14090ec72f1103306a2819b60d643543de070b445fd837ca85ca97493bbcbce999a009b3dd03ca044bed089177fb5fa4974db4c SHA512 127858788bfa9c3715114c54bc52a2a52c4bebe1423c77227ce5b7165f19f39f794be33df06d9994baaf3b0dc6224fc98b5c1ee8c63554d5c3e2361b96b161da
 EBUILD gtk-update-icon-cache-3.24.31.ebuild 856 BLAKE2B 362f34449273fc9d8ea4ef46fd842a28a80da2c68f9e21459337ba0b931a3a8c368e3398667f38e564eb61d7bc6f1878997dcaf917b1a149e04d1656accb440d SHA512 558ff7a57c3d7b7a60a4c7763aaeb3d75374a2ea48961659afa800138df3e00fb931597ce4e0b7d30ff13475a61c2f246daeebe8e80bf7bbf7387106f397c76f
 EBUILD gtk-update-icon-cache-3.24.38.ebuild 834 BLAKE2B b364b4b6a5ac59ae87edbbf26b8f47dce272ab1adf511a90ee5bcc93726a544c31c5a330fb6ae45cd68e2142a88733ffd88369d639fb273f342439e09e42a8a8 SHA512 de032d08695509dc174fbd6eb7cf7e6577117f5f414ee8e4b5ae0c4492c3aba84a52345bd08e994dc7ce76c7acc93416337880f8046c1c487ac00aa6120b7755
-EBUILD gtk-update-icon-cache-3.24.39.ebuild 834 BLAKE2B b364b4b6a5ac59ae87edbbf26b8f47dce272ab1adf511a90ee5bcc93726a544c31c5a330fb6ae45cd68e2142a88733ffd88369d639fb273f342439e09e42a8a8 SHA512 de032d08695509dc174fbd6eb7cf7e6577117f5f414ee8e4b5ae0c4492c3aba84a52345bd08e994dc7ce76c7acc93416337880f8046c1c487ac00aa6120b7755
+EBUILD gtk-update-icon-cache-3.24.39.ebuild 833 BLAKE2B f74c3d4de6b2803c499aa611b69e80ecd75754a5c0d51305ac80d6d555ed02b107c49a392df5087581d74e886ef4aef1782fef4783000ce5727d80f44bf0f8f7 SHA512 84307219faa816e96905d92da12bb8054f7a71b277fd50b70ab987c8640a42208568558385c96b7dc3a6c7a597d2f35483b26d2fecbf739d4d8d1af7301de3a5
 MISC metadata.xml 664 BLAKE2B f281b9e20e66222f658bbf7d919fb1de6f95c3582b9c5193e82cecebda5083250ea9677b09d1f30d01a024027780d9d4fac803c6caab6e65c0f1783ee541be44 SHA512 a78afb049c25f2ccf70150d0c8160041c20cee3dc8fcc62e436d951d23c5e0b1a365082b7284d3b0fff95efac2521af1bd9cd81fcc4429b5791cbe8238b1165e
diff --git a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.39.ebuild b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.39.ebuild
index d4ef282891f7..f6cd1170fa6d 100644
--- a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.39.ebuild
+++ b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.39.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://gitlab.gnome.org/Community/gentoo/${PN}/-/archive/${PV}/${P}.ta
 LICENSE="LGPL-2.1+"
 SLOT="0"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
 
 # man page was previously installed by gtk+:3 ebuild
 RDEPEND="
diff --git a/dev-util/kbuild/Manifest b/dev-util/kbuild/Manifest
index 346736c8f50e..d85e959a07db 100644
--- a/dev-util/kbuild/Manifest
+++ b/dev-util/kbuild/Manifest
@@ -14,8 +14,8 @@ DIST kbuild-0.1.9998.3499-fix-clang-16.patch.bz2 10271 BLAKE2B fe40a3a0afafefa10
 DIST kbuild-0.1.9998.3499-src.tar.xz 2371580 BLAKE2B 847c5c67ded37ca87228ff7164d6c7f2f670a57f2fd94d6d0bf4f8896266e7fe5442666c03dbda016564a52dc91d10be83f0d4b0ef5093db0f5210ac8d5f3aaa SHA512 eebdcd1d2fa71313edd764d45a4aa3580078af22d7c5fed32d3d139a4f41c4e028282fdfdda0ee9b617ed0e8e63b8f5d065b3cf6647f08fe446560938b7577fc
 DIST kbuild-0.1.9998.3572-src.tar.xz 3973848 BLAKE2B 103e42d719fd77bc5c55aea48bdfd01c8ad136529cc76cc8c1297f87e21e5d4e2e7149f9321c5174808613a84331dbea8bb4c0a7662eb2de9e1045c8ad365047 SHA512 96bb5e1759990bf3acaca4b0ba7c02926c6607b0cd94f7fca222b13eee5c3364c64b35e3473c5cee45fa094cb2b851ac9f3a3a9fe60cff894baf46238ccb4006
 DIST kbuild-0.1.9998.3592-src.tar.xz 3975348 BLAKE2B 4b1862238f6f6c35ba1b586e11e17baca3b66c4ba3a97b17168ced902d7fcc9f1baa9a4b8669489902346b9bab67095f4ff4d008187c36cd2ef4b7841d4134be SHA512 b9ca1723b426db81571b048db5afe4b7c3d2d8a881003812e9a5f9df44c5109b628d77af415cf56eb44a8775c590a6f0e343efccf562ef83213c5525e081e59b
-EBUILD kbuild-0.1.9998.3499-r4.ebuild 2180 BLAKE2B d00a9f19a47d2689baa2a331a3d7474a3b3a117fec84f5f41581abbe778b3a299cd0622a15bfed5ca317252dfa76cf957a86bbda7985468555fc16129d4219b7 SHA512 63aeb1b024b938bca7adb277ad16e2dced42d4d24512a5360133a7d6e60fc191e0f266ecc85343ea4219588ee633c0e31d122a280856d72c95fc4f0197ab345e
-EBUILD kbuild-0.1.9998.3572-r4.ebuild 2047 BLAKE2B f0f3e079954c4b2d8c9afda365fc3257e3af12f2f5f2ef791501836c928637d985969bafb7514e7af384badf0509fbd87fc38a91d3e66a18c4106ae43a3a0394 SHA512 8c685b04987337ba48f9c3073ea096e875cc365bea697b63b22e0fdb8b4d0a9d1650e66a9f2939af0c4b9bc9f90ed87d26fe4e3cdd395b9743b5ba7cfb92e8b1
-EBUILD kbuild-0.1.9998.3592.ebuild 2122 BLAKE2B 84ae5bddd905baf82b6414ed75b398036d458f4326f322087af34d89437ab7c3629d92eeacd85c9a13be196d695f450f71059ec71177c37e9f5cc80550e27a20 SHA512 3951b04c21d82d4bc6e49fcc34b1b59891f139e5d72fef272f6236e6b74c0e1d730401f4c4f2604414f014fefb34d2f2c5acb1be4c69b9d5821e02b590b2325c
-EBUILD kbuild-9999.ebuild 2125 BLAKE2B 14eb0ca8e3be71a9e82b61f974c59ae06fff52d182a94bd314c968f0e17da0af66b462efdcbdb9fb65f0f7ce29d3a3fa96a3035279f0a4e0691d29f29fe64568 SHA512 2d106f64a7f3307a6dfd85c97727c8083fe0267237be17a5f71502e9f18242afb64cad73ed07099ad41e6d841ffa2c4005afd66a45cf391e5ef2444d980dbda1
+EBUILD kbuild-0.1.9998.3499-r4.ebuild 2186 BLAKE2B cd0e1543b9139b8bf62602a2387a61dd4378ffbed970ef8319cd9ec626f3f1d92afdf15230b4d903c2abe6ae3b542f5c12fb801256d7c2b6c4f6a3fc74a37d7b SHA512 4ece814e56c73f48a36c4587736d1603fb937a4d97a9c4f1fac93142e99be827b473e5ee3ce816f168009e1d1dfdd1748c50a3b7ec1aaf6c3d968fc8183d2448
+EBUILD kbuild-0.1.9998.3572-r4.ebuild 2053 BLAKE2B 6d3ed28a987b94c8ecd146fe703b47a9dace4896f2495ecb95ee107f0e7fd54e67e7c46424679375d601b41f1fdc7f6bd6e07d2d07904e4d2fb4a5b051083754 SHA512 1d69eb35501e21bfa29e831179ef3c7af7e8c4eef591e50e134ec0082ecaa888b40967f9ed18f92ef740a4b00a9eb1c54a01a8646de2fc834f6c7ff5d6fbcd74
+EBUILD kbuild-0.1.9998.3592.ebuild 2128 BLAKE2B 7b05945eaa6bb1afd241652bc1da82759c668d5fb15d2f23b574ccf8ace9e9a11b64e4c9081779d81f174805ff6d2ac73d87f510cedeeb83b69a72beb7c64a77 SHA512 0a9d9c9668108a42c107e8a1a5f611052aa09aa4c34de3c927c385ef30c512aaadc9d1ab7d2bd57375f01f657e43b175a7fa4f3a34e7a81cf7f51b756e5bc175
+EBUILD kbuild-9999.ebuild 2131 BLAKE2B b499c02d359bfd6a78f625d81b59b74fe8a978c62e041dc6e830296928fa45cba5d67bf0979c9acd6501e3916f748369f78ad670434aed8f085ccdbb5bf04a5f SHA512 1952521ad4a6760efd64aaff624d80a3950bd31e7321bc85177fd4f905b78e1572b55b306895e5df5fa9a63f5aef3837da3191ae3569c8a63d5a594f802f8282
 MISC metadata.xml 249 BLAKE2B 3bc7510e014ef8df90da064f4ef969eab6cc3311951a6dd556ca7b6f4e2e74e229f12a16ceb641393d1ec1f89d1942718267ecc664a8136df194c40de94a58e4 SHA512 63f88d798d410e4fb6670d199a86a665ab61b09cb9508b4047f13fe73070c682231d35a27c9d2c1fd82a1b8a84676d857b534c96bd09f4562cf13d7fc8de36b2
diff --git a/dev-util/kbuild/kbuild-0.1.9998.3499-r4.ebuild b/dev-util/kbuild/kbuild-0.1.9998.3499-r4.ebuild
index 14a330e3ad6b..1ed4a97698af 100644
--- a/dev-util/kbuild/kbuild-0.1.9998.3499-r4.ebuild
+++ b/dev-util/kbuild/kbuild-0.1.9998.3499-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -19,7 +19,7 @@ IUSE=""
 
 BDEPEND="
 	sys-apps/texinfo
-	sys-devel/flex
+	app-alternatives/lex
 	sys-devel/gettext
 	virtual/pkgconfig
 	app-alternatives/yacc
diff --git a/dev-util/kbuild/kbuild-0.1.9998.3572-r4.ebuild b/dev-util/kbuild/kbuild-0.1.9998.3572-r4.ebuild
index 53206a6cd816..31c91dcacac0 100644
--- a/dev-util/kbuild/kbuild-0.1.9998.3572-r4.ebuild
+++ b/dev-util/kbuild/kbuild-0.1.9998.3572-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -19,7 +19,7 @@ IUSE=""
 
 BDEPEND="
 	sys-apps/texinfo
-	sys-devel/flex
+	app-alternatives/lex
 	sys-devel/gettext
 	virtual/pkgconfig
 	app-alternatives/yacc
diff --git a/dev-util/kbuild/kbuild-0.1.9998.3592.ebuild b/dev-util/kbuild/kbuild-0.1.9998.3592.ebuild
index 86e558479af4..0d1386d186ec 100644
--- a/dev-util/kbuild/kbuild-0.1.9998.3592.ebuild
+++ b/dev-util/kbuild/kbuild-0.1.9998.3592.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,7 +18,7 @@ KEYWORDS="amd64 x86"
 
 BDEPEND="
 	sys-apps/texinfo
-	sys-devel/flex
+	app-alternatives/lex
 	sys-devel/gettext
 	virtual/pkgconfig
 	app-alternatives/yacc
diff --git a/dev-util/kbuild/kbuild-9999.ebuild b/dev-util/kbuild/kbuild-9999.ebuild
index 63851a665f3b..0c7ecee2efa6 100644
--- a/dev-util/kbuild/kbuild-9999.ebuild
+++ b/dev-util/kbuild/kbuild-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -22,7 +22,7 @@ IUSE=""
 
 BDEPEND="
 	sys-apps/texinfo
-	sys-devel/flex
+	app-alternatives/lex
 	sys-devel/gettext
 	virtual/pkgconfig
 	app-alternatives/yacc
diff --git a/dev-util/kdevelop-pg-qt/Manifest b/dev-util/kdevelop-pg-qt/Manifest
index 289d1a16c5cd..bf5019f8d1f0 100644
--- a/dev-util/kdevelop-pg-qt/Manifest
+++ b/dev-util/kdevelop-pg-qt/Manifest
@@ -1,3 +1,3 @@
 DIST kdevelop-pg-qt-2.2.2.tar.xz 660708 BLAKE2B 822753315969cf4176ed1a25bb27516661af865a4c337f069a892b008802359f4a933ebc9e9e1ac0c91d2314a6ec5cdcf91db4641e624e07373dfec47a71dcf1 SHA512 e82f2fa2aafa2c9f949e298989de70a0455c30f6bef4a40e38977c23ad645ee49a0a8c57b5c45d0ddfef13ee7b7e4efd2dc2ed3003a456f24108161415700369
-EBUILD kdevelop-pg-qt-2.2.2.ebuild 441 BLAKE2B e21afed6abcc603179983f44eb063241a17e8f0a7ccb2085c417ddcc88ece8a41853487f0b0e67cd12198ac745bd6e18a1c3e21c5ec855ed634b44bbabfa09a4 SHA512 29403b2c3e10f43b40b814d9a40b8e3655327e36a2889c66ea42dfec6026e093e9597f85b2bdf4cc971acb861aa439cdcec4fd2a19bf6787c0146b8713ecb967
+EBUILD kdevelop-pg-qt-2.2.2.ebuild 447 BLAKE2B b5634ef3ca75323e2942bc9ecee63690a3cb376231e71bf90ddda05625c7109cbe6b4e51198e774ef510829d77109bcd4b608916e8a626550f10ad1419dbe669 SHA512 52e47522fd99f1b3d0a661f470c970f7814ba3284c91d0817475c83cf9c8458dc35487cc35c3e5718d20a5e2525912918d699fddfae763bd5b7cc6f60cb3dc2c
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.2.2.ebuild b/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.2.2.ebuild
index edbfc053d9f9..199ddb96d5d3 100644
--- a/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.2.2.ebuild
+++ b/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,5 +16,5 @@ KEYWORDS="amd64 arm64 ~ppc64 x86"
 
 BDEPEND="
 	sys-devel/bison
-	sys-devel/flex
+	app-alternatives/lex
 "
diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
index d2e85d0ad0be..df3109b9ba89 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -1,3 +1,3 @@
 DIST kdevelop-23.08.4.tar.xz 8707260 BLAKE2B 4bd88e2165261f771edc36f45b68a86434a252ae2f5ff638641ce8b9c2d76e38eceefb243310dd2c8181e704746985b612d02664db61c83a164a293151ea3f20 SHA512 e5a1bf3b6c46006165a6169fdfe244d02bff945c8dd01d0b5897a0752b4759c03f58ce136e636366b14b3b27e91aa14b29b0f432589a2114f45fbdf2a3cf3135
-EBUILD kdevelop-23.08.4.ebuild 4112 BLAKE2B 661b137f251f0665d242f799339dbb905ce7bca83a173cc2a9d10b0a9521aa6023844b22f7bc1426dfe4764888d11f603961bd2fa945137314a9f796bb94ef84 SHA512 ac683eccea96baf6559173f7cee64fe0c1437c56641f0ea77ba66008a28a1ed8f4d349c45d5473e6ce07d145339bed3ae0dfb33b7682347804f9ab3ccdf46af0
+EBUILD kdevelop-23.08.4.ebuild 4120 BLAKE2B 8121ac54c86b70af525ab9a551de6cbb5fd0f876dd9d162451b99abcf6eabb273b5c3d7e88e1d87f0ebe5f1e2ff29845c71cc70961de9175e9bdd0a90763d45b SHA512 b39d854047f679b2772a8d9d78c9d5ccb4adf095420b484044ad6b674471da45c9d6ab192f3491101d1e4b9d2f33da7c1cc23d932fc1d94603d85580ec1cf420
 MISC metadata.xml 623 BLAKE2B defbd6a6a992f04fe71d13ca0e6da0b6c7015992f148f1fdd0d844430c44268e5c765c46afabee4af650992556e81acfb1024c94e6e274aefbbf46b65b9762af SHA512 4b022d64a261251c01eb9c8d8ee8aafeac6309272274fa8493f5bb8480cc93be482b145a70fd1a36bc30feaf8649ae17addfe8d7bcf57f78173e0f198805985c
diff --git a/dev-util/kdevelop/kdevelop-23.08.4.ebuild b/dev-util/kdevelop/kdevelop-23.08.4.ebuild
index 0b77f05a7d07..9736787d4856 100644
--- a/dev-util/kdevelop/kdevelop-23.08.4.ebuild
+++ b/dev-util/kdevelop/kdevelop-23.08.4.ebuild
@@ -88,7 +88,7 @@ RDEPEND="${COMMON_DEPEND}
 	>=dev-qt/qdbus-${QTMIN}:*
 	>=dev-qt/qtquickcontrols-${QTMIN}:5
 	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	dev-util/ninja
+	app-alternatives/ninja
 	kde-apps/kapptemplate:5
 	|| (
 		kde-apps/kio-extras-kf5:5
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index cdc16510b423..d381f7570c9e 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -23,14 +23,14 @@ DIST meson-1.3.0.tar.gz 2222383 BLAKE2B cb9ac8e00fe924df67166938687584a9de35e784
 DIST meson-1.3.0.tar.gz.asc 833 BLAKE2B d83b819e75e732d694ac98412717af39a8115defc7371f1983e4619cf990b5cdfd7ab7c93911f2a8b6c7055c7252ebeba04d15f508f4278b506e326fa1801a25 SHA512 8c72bfe5f3bdec9c9f787dd5a7186599bb44079a89d0a87a535a6e890adb7718cbf570b2ac74583b72b92aa05160823a8571ca530384787c428e49d6fbe095ba
 DIST meson-1.3.1.tar.gz 2222386 BLAKE2B 64d53eddc8cb321a4e2dabaa4b7499798a7b68764b1a7a5182bfa21d081dc07105acab616119b88ff610e5d75504f03d1c0aefee3602ddf538fc491ff3d0204a SHA512 6e694beb70329535faca9405358c04e2fd5a490b0c0d2678d5831b7de3477e0fcf4f6a242f1bc6218da04ac4f6e096ee53cdf273c6b6a38a35d370e8c16694ba
 DIST meson-1.3.1.tar.gz.asc 833 BLAKE2B 1db7aabe3b7d491dfcd288a780d10784517a73e07348f2d5b98d1fa347dd08b2afa210511c7f5ff867b10ecd3ce470ea764b5ce6907aa7dcaa4d619f705e339c SHA512 0f652d375fa7700f3048266330d783664593c08da47d4f0d87af0be5d8b5e21113521651fb923c6a1cfe88aef7067ebd85b27946f19e71133d7c9805839fc873
-EBUILD meson-1.1.1.ebuild 3279 BLAKE2B 1421e17fd17c8f94f75632f24222134bbc866c4691af6894875b4e7aa88e8cc624f5bbc0ad17fd89baf31568d82d20ed758c22e4a3539f1d1e348c87cf11008c SHA512 f5058d9eb3aad90043ca8f53cf7bdfa010609aec21b9510cd2751bb6ff9151364546302bc157ec41143b11d817a1c33bd475f82b0e8d347b48b86ffc08b2c4cc
-EBUILD meson-1.2.1-r1.ebuild 3270 BLAKE2B 9f630906fac0060bfc185988e65279ef626cb11f0c9624341898fc28d569cc06aca9cdffd75296a06e3802af5e0465f405b2d1f27f27d3ee6035c2723792fab8 SHA512 38da9d8af6c46a63c6f39cd291a273f13d5440ad90ce8c2d63ea6bf9d017786e84e4102a190936ba65a82afed42b45445dde897e75f0da6245cc0f0a3d9d2260
-EBUILD meson-1.2.1-r2.ebuild 3312 BLAKE2B 4e36e20e3585b7db4ba1744311af7788f22be2b5d3b6585bb65adf16c6c986474a257c91efbda5967ec33843e45a0ff105da570bf63c6b7c788e18ef00a1e22f SHA512 ae47ca6a07e8deee3cd3cf2e05a2de7a300044d2fb3770f2fe2c18376af5cdbb701a66bb92d75d0f371482d4266913bfe039034b11b1b6c40ecfc1d3e719be03
-EBUILD meson-1.2.2-r1.ebuild 3298 BLAKE2B df141e7d10d26fdb41e298cdf856fe46e632ad484a8fc363ac9230a8f46e44f9939ed15935ee5d6b0cf7a9022779080dbe621d2b54ebbbd9165de43e7f3cceb1 SHA512 76b7aee97f500107364a7e3fbf55e077f09d3b75cbb379537b71de05c269d7dc140c81963c1feb146d363c0ff558624be55af306c5adcf19de33012e2976a3f6
-EBUILD meson-1.2.2.ebuild 3285 BLAKE2B 1b38a024705bc9a5046a19ed80f2ba126ff984112a5761283778207d1cce3e33ea39260cc3e6ce864b3f5d07ceaf7a0431f56638830491814da0455cfd2a7e7a SHA512 c581592f28a3a39834afa3369af14ddc267a1e3c2f35e2c41674354da560828fd2037550a6314f0063700528414b0bdfa42aecc82ea86340384985db8aee0fc3
-EBUILD meson-1.2.3.ebuild 3277 BLAKE2B 8a19cba268c31b8adc4f4852eca184639f0d6344934c321279a7dd48f5e3de02ce63bd4f3cff5814d8e42beff6733c9cf52c3742c254b051fa1d7a07d1885c33 SHA512 7fa82018c0f7d0179e1ccd5df33651e0e59561d2a35ccb189a32f7dc298cbe25bdfe4fd5db0eaf314a22b181ed111b74d957e240ab77cad62e2de9b3be9be512
-EBUILD meson-1.3.0-r1.ebuild 3402 BLAKE2B 86c1be84d1a2a95ef3a2c325754d773502fc38e0e689f8eb449c4a26e1498148383f608612d3f82fe223402b6d09b58a7f38f52c24211e1285512c7f134b9fa0 SHA512 28e238d500cfcd0afc8b01f1bb22c957fc86c0d85b3c17814861e2ffc4dee2024a022cb08b991dd73d32e0fef1c01ab411a2db6df6595851bbf70e1211e51aa0
-EBUILD meson-1.3.0-r2.ebuild 3558 BLAKE2B 6f020132e748713ec85b1d555a49793f132d033c0f27642ba88af7b2d07742a0f6a168ec1b4684554f2135a02c948b6f3e5c99d6500a11216fd2f9d3c60bff48 SHA512 7871062323a4b9ee3331eb2b9bb2b0f1d0fd0b83e05d4b71e25c5167ab1dd7b6b63b346d690a5e56d4e3b3891f499889a04b5fe32b2f26b65d6d6dac900f31fc
-EBUILD meson-1.3.1.ebuild 3580 BLAKE2B 1dd390f3ca0606952cf5bd2c10ccbed5f1b1c69fe179ecd70dffd73d8e9b7a81f8d5002129c4fc365af9554c848df17099e6c45559f85f6f155d6d8de55e38bc SHA512 cc92c6aa97b7005dc5f3865b74b1e432391a43e114e28239e7b36d5ac7ec1852dc75fdd10cbdca2e0d494b4e50e759b48da7def6d7f2357939a205176241d5b2
-EBUILD meson-9999.ebuild 3227 BLAKE2B 8c8e99032af1d188ca7a8a227c992a4f53676523bcbdb5d7a0b44e254f897f6c2ed597bc6bd8472ddcf67f27e0d9117129fe93ebb452b80603dddf2d1664023e SHA512 a483a7433c22951f9da4d82c13eaff36f94b3772324641483129a4d7a138438382d6b349079808579d4fee22d59631f00a20759a8ac01f73a506c73f7e077218
+EBUILD meson-1.1.1.ebuild 3287 BLAKE2B d449d5e7511b47baf4d26aae0359183d4ef9ea21bf163d5af5fbe6cc78c44bd9788d5c807486f106be3a8abfb07cc1d34782616cffed333e94dd4225f6650056 SHA512 9fca53429ebd722f91084a4796bc1c466216b2021cb6b88e76cdaa559fefa17651d76e744e32c3126b2bad5b4ca36f5b17d402cec57a764340406610e7c97dae
+EBUILD meson-1.2.1-r1.ebuild 3278 BLAKE2B b826205796d6ba329718e2fabf420ba227b26ef8c26eff417253342f4df76f3f81cd3d431018d0cc0024a55930cfaa1f484d70bd98102765f6614e585cfd87e7 SHA512 1a44a84296a297a3927230bd390d188051af6439759dddc2364871e10879b74ab1a70b52a754c7840771050ef97341ef21e8b516d8cdcc2a34e29f7c40a004b2
+EBUILD meson-1.2.1-r2.ebuild 3320 BLAKE2B 086a61e7b7e1583faf4e3e652466cf9bbf8aba03c3bff66f48e443e564d181bfde85c721c9d2696c28082ce7569533c1de78ac833a9a3809336a914e1d4aa1d4 SHA512 2ca3f9c81f5286df86c0e1b7a507686ae1ee933222bab7b1d1805f57d09da23efa81a4009dc90e09a0a5ec8582bf6fe5b709bfef4db6cece18727a893a625090
+EBUILD meson-1.2.2-r1.ebuild 3306 BLAKE2B 3407c0dd432035182c2fc2f8b346b4c71e7ccea2011359d5b655a2f74c33acc5dc771d152c4bf63c23f07552fb9e8f6215cc196a6cb048ab989a417f42efcc73 SHA512 7cb7b50865efbb26e82f54014e822c7e75bbe937d0ad7800e2122dd3274d96f60307dde8a3a807b91be9cbadcb143fd1503dff8faf0d4575f53bc07c5bcaa900
+EBUILD meson-1.2.2.ebuild 3293 BLAKE2B 2e4f4bb4e7281e0af6b93874dfe05e2536d41e00fd5997ede3ee2f20d7ea10cffa850904f881a829c51ce59e300ef71f2b5c868a21be62ed67c847f8fa43be96 SHA512 b777ef452ce8237664bd050eba18eb5b6df0d754965a7e1d42b3cc91561b58f068d649b708fe3ae8f4474693af17291e34840e843e6bf8c80da8dce4cb23169a
+EBUILD meson-1.2.3.ebuild 3285 BLAKE2B f937d7add71afbfb05e1ce2f7a07c9077a76b8018d6cc3e7e5ebc029419aa45e57cb98f0b05e7236500bfdcee35a35ddbedad9c3c00133817c4b0867cea71730 SHA512 e8415edf199ad281e253331e72e7ed4e2398c658d006b54a7a89b24b9e2ce3950fb6d750c8a6b728849e973af7e576e9d95b7510d3aa27a320fc38614ec439bc
+EBUILD meson-1.3.0-r1.ebuild 3410 BLAKE2B 76f565c4ecf7f1b08e3447133c87221da251362d17152e5e7151c69e33057064d9998a181a9b10c0576d2caa744e62295b41a37a27eaa4e3ebca6aa10b273a59 SHA512 15ae4d826750895062d0986130612e993b8ce4a64d7ef154e1aae458b09a7985bc5f52d0319223b4db6b8995a8cff713f3a152c5d7785e0fddbc359c355f8d1b
+EBUILD meson-1.3.0-r2.ebuild 3566 BLAKE2B 2fe99b8c567c73a21c6d693fdd6bce7e27080e737bd18733bdeecdaf6d8e887b634561a0ccea9ddeef9d37fbc961e9cd81efd774a2cbc4a5c42245db3138e01c SHA512 2848384b4b620a1328463b715a40efe78265c65d6ff25cc647da9ac7adaca8c8ebe688770df45fbaadc01d5f47883799dd63aaa3db9cd2eda9ada6336198d4fb
+EBUILD meson-1.3.1.ebuild 3588 BLAKE2B 245a20c4f1a296c6038c23485758abc00ddd3b225a4c964043a2f75ed76bbe2a8dfb7aed20b76c2324a01b9a3d3b386c4592e259268ab8838598cb427a9fcfc9 SHA512 84dcaf773703132c1e68a824aa9749634ea9ca5b3585c0fc467b8881583ef0fdf5470e592adb4d238080bd18da55a9489263fb142ba4aab245e8ca19219c7d8e
+EBUILD meson-9999.ebuild 3235 BLAKE2B a70383fb27538f5539c16d0ca07f1cff24def033d6bde05053657c8c5217798ce65c3e15f599aa15f54f173b7ddcceefc4debb5af4ab53284cf75900a1e97152 SHA512 6d6afb4820807ef0d852ea7d7284ca574d089767917a4f1157726505e98aad1e4c485701023bbb99d7bec174dda802ccb16375237d5e05c874b59f058eceda43
 MISC metadata.xml 472 BLAKE2B 559073667cf007cd507f379014c8d0d494908742f606ca5eeb2a0cef3b5a8cb63cea4e9aa33b228163211dff8f794d178cbcd6c91bb283f894e6b072db28bacc SHA512 9232fe05900dca57d21f41023255c9a6fba57b213737ac8842ea180681488d9a2a306c8fbeba66cf02204f4523192e64af745aa65db946beac723cfe271e4fd5
diff --git a/dev-util/meson/meson-1.1.1.ebuild b/dev-util/meson/meson-1.1.1.ebuild
index affad54f237d..e7cc67555212 100644
--- a/dev-util/meson/meson-1.1.1.ebuild
+++ b/dev-util/meson/meson-1.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2016-2023 Gentoo Authors
+# Copyright 2016-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -42,7 +42,7 @@ DEPEND="
 	test? (
 		dev-libs/glib:2
 		dev-libs/gobject-introspection
-		dev-util/ninja
+		app-alternatives/ninja
 		dev-vcs/git
 		sys-libs/zlib[static-libs(+)]
 		virtual/pkgconfig
diff --git a/dev-util/meson/meson-1.2.1-r1.ebuild b/dev-util/meson/meson-1.2.1-r1.ebuild
index 016c524354aa..5443030fc815 100644
--- a/dev-util/meson/meson-1.2.1-r1.ebuild
+++ b/dev-util/meson/meson-1.2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2016-2023 Gentoo Authors
+# Copyright 2016-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -42,7 +42,7 @@ DEPEND="
 	test? (
 		dev-libs/glib:2
 		dev-libs/gobject-introspection
-		dev-util/ninja
+		app-alternatives/ninja
 		dev-vcs/git
 		sys-libs/zlib[static-libs(+)]
 		virtual/pkgconfig
diff --git a/dev-util/meson/meson-1.2.1-r2.ebuild b/dev-util/meson/meson-1.2.1-r2.ebuild
index 280175c18c6a..8394dad75715 100644
--- a/dev-util/meson/meson-1.2.1-r2.ebuild
+++ b/dev-util/meson/meson-1.2.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2016-2023 Gentoo Authors
+# Copyright 2016-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -42,7 +42,7 @@ DEPEND="
 	test? (
 		dev-libs/glib:2
 		dev-libs/gobject-introspection
-		dev-util/ninja
+		app-alternatives/ninja
 		dev-vcs/git
 		sys-libs/zlib[static-libs(+)]
 		virtual/pkgconfig
diff --git a/dev-util/meson/meson-1.2.2-r1.ebuild b/dev-util/meson/meson-1.2.2-r1.ebuild
index 191b8ea6ead8..f19775d1fd3d 100644
--- a/dev-util/meson/meson-1.2.2-r1.ebuild
+++ b/dev-util/meson/meson-1.2.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2016-2023 Gentoo Authors
+# Copyright 2016-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -42,7 +42,7 @@ DEPEND="
 	test? (
 		dev-libs/glib:2
 		dev-libs/gobject-introspection
-		dev-util/ninja
+		app-alternatives/ninja
 		dev-vcs/git
 		sys-libs/zlib[static-libs(+)]
 		virtual/pkgconfig
diff --git a/dev-util/meson/meson-1.2.2.ebuild b/dev-util/meson/meson-1.2.2.ebuild
index 429bfd5ba7d3..2562b7ab025f 100644
--- a/dev-util/meson/meson-1.2.2.ebuild
+++ b/dev-util/meson/meson-1.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2016-2023 Gentoo Authors
+# Copyright 2016-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -42,7 +42,7 @@ DEPEND="
 	test? (
 		dev-libs/glib:2
 		dev-libs/gobject-introspection
-		dev-util/ninja
+		app-alternatives/ninja
 		dev-vcs/git
 		sys-libs/zlib[static-libs(+)]
 		virtual/pkgconfig
diff --git a/dev-util/meson/meson-1.2.3.ebuild b/dev-util/meson/meson-1.2.3.ebuild
index 71e1bdb7dc07..9c472cdd34c0 100644
--- a/dev-util/meson/meson-1.2.3.ebuild
+++ b/dev-util/meson/meson-1.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2016-2023 Gentoo Authors
+# Copyright 2016-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -42,7 +42,7 @@ DEPEND="
 	test? (
 		dev-libs/glib:2
 		dev-libs/gobject-introspection
-		dev-util/ninja
+		app-alternatives/ninja
 		dev-vcs/git
 		sys-libs/zlib[static-libs(+)]
 		virtual/pkgconfig
diff --git a/dev-util/meson/meson-1.3.0-r1.ebuild b/dev-util/meson/meson-1.3.0-r1.ebuild
index 1621828da199..63d6c0a17684 100644
--- a/dev-util/meson/meson-1.3.0-r1.ebuild
+++ b/dev-util/meson/meson-1.3.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2016-2023 Gentoo Authors
+# Copyright 2016-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -42,7 +42,7 @@ DEPEND="
 	test? (
 		dev-libs/glib:2
 		dev-libs/gobject-introspection
-		dev-util/ninja
+		app-alternatives/ninja
 		dev-vcs/git
 		sys-libs/zlib[static-libs(+)]
 		virtual/pkgconfig
diff --git a/dev-util/meson/meson-1.3.0-r2.ebuild b/dev-util/meson/meson-1.3.0-r2.ebuild
index c866e99a75e1..c663b7fe3456 100644
--- a/dev-util/meson/meson-1.3.0-r2.ebuild
+++ b/dev-util/meson/meson-1.3.0-r2.ebuild
@@ -42,7 +42,7 @@ DEPEND="
 	test? (
 		dev-libs/glib:2
 		dev-libs/gobject-introspection
-		dev-util/ninja
+		app-alternatives/ninja
 		dev-vcs/git
 		sys-libs/zlib[static-libs(+)]
 		virtual/pkgconfig
diff --git a/dev-util/meson/meson-1.3.1.ebuild b/dev-util/meson/meson-1.3.1.ebuild
index 0ae70d840991..2498ea56a83a 100644
--- a/dev-util/meson/meson-1.3.1.ebuild
+++ b/dev-util/meson/meson-1.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2016-2023 Gentoo Authors
+# Copyright 2016-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -42,7 +42,7 @@ DEPEND="
 	test? (
 		dev-libs/glib:2
 		dev-libs/gobject-introspection
-		dev-util/ninja
+		app-alternatives/ninja
 		dev-vcs/git
 		sys-libs/zlib[static-libs(+)]
 		virtual/pkgconfig
diff --git a/dev-util/meson/meson-9999.ebuild b/dev-util/meson/meson-9999.ebuild
index 58946549b0ad..4e7497b5c819 100644
--- a/dev-util/meson/meson-9999.ebuild
+++ b/dev-util/meson/meson-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2016-2023 Gentoo Authors
+# Copyright 2016-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -42,7 +42,7 @@ DEPEND="
 	test? (
 		dev-libs/glib:2
 		dev-libs/gobject-introspection
-		dev-util/ninja
+		app-alternatives/ninja
 		dev-vcs/git
 		sys-libs/zlib[static-libs(+)]
 		virtual/pkgconfig
diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest
index 296d004eef27..d4fadacfde1d 100644
--- a/dev-util/perf/Manifest
+++ b/dev-util/perf/Manifest
@@ -4,7 +4,7 @@ AUX perf-6.4-libtracefs.patch 780 BLAKE2B dc97e42f1d3ece03722441b5a2c1f87ab9871c
 DIST linux-6.3.tar.xz 136891752 BLAKE2B f1887c8924efa8d0cb14c4e604affd0b0168bcf20f56a37c027405c7bc11aba822a43fcb38ccb55a81a26f747d00e1ab5a6554818affbf1e1c7ef5220150fc69 SHA512 768979440f4907ba64d4481b383d6101faf208f27a0b897156123aa278c5743fe3c4f61945b2541429c532d45382aaee8899ea9d44a1d2895bfbb79bfd937f65
 DIST linux-6.5.tar.xz 138898084 BLAKE2B 2e641b79a080e8f4ce283bcf6b74e2c6f15a374367f1c4c875c663868dbe801317340824fb3adb46b3a51d3b7e1f67cc4e8144d367621ec43ffba5c4eb8abb39 SHA512 1b59dc5e65d4922c3217a8c8f19022dfd6595ae89747861d825bfeb51a4ae6c85449d05db69635a712bef7b355b80318195665582d8933b1fed6ba582f6ff257
 DIST linux-6.6.tar.xz 140064536 BLAKE2B 5f02fd8696d42f7ec8c5fbadec8e7270bdcfcb1f9844a6c4db3e1fd461c93ce1ccda650ca72dceb4890ebcbbf768ba8fba0bce91efc49fbd2c307b04e95665f2 SHA512 458b2c34d46206f9b4ccbac54cc57aeca1eaecaf831bc441e59701bac6eadffc17f6ce24af6eadd0454964e843186539ac0d63295ad2cc32d112b60360c39a35
-EBUILD perf-6.3.ebuild 7844 BLAKE2B 30bc7a2ee9db31f89553228baf7330780ec6e03a8dc9b4bfc5b8306e5a40ffb10d6e49a425b7580bb1d0df32d6016dd041b0d998543216771a4ec19525210b57 SHA512 ac316d6316f5f8b21ccb0fcd8d7f104b3b8d254d20dfd869980f4262fa9e1c22a4bf8c890bb7f5174a3cd5bf172fd89f6e9ff1d6544ceee5fd87fb8116eb448b
-EBUILD perf-6.5.ebuild 8574 BLAKE2B 05dd5c04b78c41982410cd39e1fe6ce9deb0c80086b95cdfb34b969e84b371e90f66fb4ad03520aea708fe7c5caddef5d090a43464967ba3079e410ab8422960 SHA512 f4e2a3743ce488e81cfba612c8d81acbbba119fa3b9ec275f756d2e6e41c2d62fed6ac5dcfdd22ec8b1f0981f077a0c306d569565efc102d49eeacaf24946725
-EBUILD perf-6.6.ebuild 8983 BLAKE2B 9059ffe059fd345ff04f5b618ea114ae23f594be938f83b3a52c6af80dad5fd56fb74573304c79aad655051eea4788eb5bd81d6e1c869c0f406ffc99df918b5b SHA512 4d08c2203943f445d24f2a813e8db2b4d5137872238050b127cb622724836580fd304b46d8db2a2ff410ab8ba996ba55a989ccbf4865068b8dac5e16e585d27e
+EBUILD perf-6.3.ebuild 7850 BLAKE2B bce9560d2913148f64f2b7748792fc210a26260a0d8f0526cede81015f29124d7fda4f614c771268ea33597ab05d40f64614b88b492c91537f67735c609316fa SHA512 ef9870a1563ebbc6d818e31e13e1afaf0b13d7d0650a5f597c9a8a336ddc800dc54e9a50f28985e42f66658a172290f4b93a06bde76931da393e99e788aa151e
+EBUILD perf-6.5.ebuild 8580 BLAKE2B fc46cc375cbb0c33daa696003fb0f39e608f16f4c175f63113d61b630315c88313449930138b9481c4fbd182542b94bf3101b1c7b5995e1bfefae6077dde068b SHA512 cbbcd88c719a9db69dce9e8824546e1ba1ef767c7d45f05447803331df645517228808237358b1e4a438b096478cb1d6747a701a024099bfcbfddc37a1c27e51
+EBUILD perf-6.6.ebuild 8989 BLAKE2B 26f1fac549e7b45989dd6ffecf1530c04ce4c6a7146992f69b187df6222ba092cc8515bce3fba277f37cd2abe8387085457a5c9a637001bb31df943f67175483 SHA512 7f5ec567d2102205e630b0e360f77f1c7ac2c1f15bd4c4d635e0c4126f54283e22407baeb018e154b73d7024a143e54e460b8e3187f59e685b0c17a07ec00b3c
 MISC metadata.xml 1642 BLAKE2B 648d70e60d8f8661c475da2be7ce7d120d1d96d505b2a9cacf92f5922c3c1266c0e0d3f8731c00a443cd7b05e317e874675038e709f0045d3e2f8e47ce4ffd6c SHA512 7da28e8493f318cd8b8a5e4f03f6f0deffc6b42ff9a4b9f304ccf684ea30dc85e0525804cd851ba1597f49d3500681d76c7fd7b6de08c1e479f1fdf4f91d0cae
diff --git a/dev-util/perf/perf-6.3.ebuild b/dev-util/perf/perf-6.3.ebuild
index e3f009470d74..07bfe1f6f31c 100644
--- a/dev-util/perf/perf-6.3.ebuild
+++ b/dev-util/perf/perf-6.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -42,7 +42,7 @@ BDEPEND="
 	>=app-arch/tar-1.34-r2
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	sys-devel/bison
-	sys-devel/flex
+	app-alternatives/lex
 	virtual/pkgconfig
 	doc? (
 		app-text/asciidoc
diff --git a/dev-util/perf/perf-6.5.ebuild b/dev-util/perf/perf-6.5.ebuild
index 128f4fd8b60a..c394674589dc 100644
--- a/dev-util/perf/perf-6.5.ebuild
+++ b/dev-util/perf/perf-6.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -45,7 +45,7 @@ BDEPEND="
 	>=app-arch/tar-1.34-r2
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	sys-devel/bison
-	sys-devel/flex
+	app-alternatives/lex
 	virtual/pkgconfig
 	doc? (
 		app-text/asciidoc
diff --git a/dev-util/perf/perf-6.6.ebuild b/dev-util/perf/perf-6.6.ebuild
index 206b06714a2f..8001a2edcbad 100644
--- a/dev-util/perf/perf-6.6.ebuild
+++ b/dev-util/perf/perf-6.6.ebuild
@@ -44,7 +44,7 @@ BDEPEND="
 	>=app-arch/tar-1.34-r2
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	sys-devel/bison
-	sys-devel/flex
+	app-alternatives/lex
 	virtual/pkgconfig
 	doc? (
 		app-text/asciidoc
diff --git a/dev-util/poke/Manifest b/dev-util/poke/Manifest
index 31176368ad20..01cfcba84585 100644
--- a/dev-util/poke/Manifest
+++ b/dev-util/poke/Manifest
@@ -5,11 +5,11 @@ DIST poke-3.0.tar.gz 7510801 BLAKE2B 4e80bd0603b0f690f7b6dc9b3913bb165f61160cd6e
 DIST poke-3.1.tar.gz 7562582 BLAKE2B c348973185e7f33d670a9dccab60c02e8ccc247c5aa46936ac4b04674687c9e7edae707639a16c3853232b422d0c969930fe3879b59c1dba351fe7c3da56d34f SHA512 5680ce13b0a8e9a1f2770d295bccf7ccbe3aff54f3f4301a12c4719f54a6717ce5addb6ae3fe0478d0e426ccc756ef06a5e852b0d6ada0f8d3c587640ad209dd
 DIST poke-3.2.tar.gz 7559660 BLAKE2B c1d5739a1a497fb3daadec53fe812b65ec787dd268030a6517764541497c82451f4df391f3c434ef7729bc8e3762c31852ef3ce41aa83928e7646c40bde557dd SHA512 bd3651a2962165b318cc59c53604199eb6278ee3be45c18c36864612b0926d78a06f0e1338fdcc1fcd1cd48e2792bb3cd36a2bb5383143a66dc3aab023c0019c
 DIST poke-3.3.tar.gz 7553544 BLAKE2B 1e98f77937f9c45daa80591be603a74857b1bbd230cb931e59d7e9753c1687d5a4c96837bb6aca76615feca71cbeabd3be7ad234260657288d060ff63d59c040 SHA512 b00dca38d27bddee6ea131d45988aaead1d11d29b757c048f3b2be8013575cedc591844d4d99870f90964fd4f517d500cbb42aae5aff57e9fe07aac8273aa236
-EBUILD poke-2.4-r1.ebuild 2589 BLAKE2B 2890f51ef7b0cd9d92ff1552716487e56c9cbe91f56ecd904e156bf8b9c020da57d834756a2cd971f42f35f62f504d9dda0baa74caf2112202bcbe5dff3fc513 SHA512 93bb5c643a2232bc515b37aa1f9f769b0ada88bb391234f89aa467b5de52d07e45072585217acdba59eb2f9cf0210a18c6a0494e33bfeee05f0680f70eb0d989
-EBUILD poke-2.90.1.ebuild 2288 BLAKE2B cf999f5cd5d214a34a409ac03e75e521ab97bc715d2519839ecabfffff5d36b4e86dd423404baca4b0030d9aa9aa0f04a4199ee890c4ebcf7ac1db1021a717d5 SHA512 ec3b7ebca203e52df3f16eb3928e111194cb2e4f5be35208a10586d8a77fc5ae7ccffa2728bb3e795a85740d32b7bbfd3b5b7c8f909a041cade295a3ec51cfc3
-EBUILD poke-3.0.ebuild 2563 BLAKE2B 62560d868184fc31a5bbaf3f18255a08ad6f7c77e48bd9f8a866c92260425f6afa01bd93207973ba43bf418b39bb6b4dcf62e9c62ebdac9f304caed467b97ab0 SHA512 99f69fdc85c3c00145beb7c1d2d84a3d1250c64d6cccb68aa55a1f46edec3a0ab059a7c8f696ef557420a1e2a47cb2a23a2b4a61354f6bce3f983865a69a22cc
-EBUILD poke-3.1.ebuild 2563 BLAKE2B 62560d868184fc31a5bbaf3f18255a08ad6f7c77e48bd9f8a866c92260425f6afa01bd93207973ba43bf418b39bb6b4dcf62e9c62ebdac9f304caed467b97ab0 SHA512 99f69fdc85c3c00145beb7c1d2d84a3d1250c64d6cccb68aa55a1f46edec3a0ab059a7c8f696ef557420a1e2a47cb2a23a2b4a61354f6bce3f983865a69a22cc
-EBUILD poke-3.2.ebuild 2563 BLAKE2B 62560d868184fc31a5bbaf3f18255a08ad6f7c77e48bd9f8a866c92260425f6afa01bd93207973ba43bf418b39bb6b4dcf62e9c62ebdac9f304caed467b97ab0 SHA512 99f69fdc85c3c00145beb7c1d2d84a3d1250c64d6cccb68aa55a1f46edec3a0ab059a7c8f696ef557420a1e2a47cb2a23a2b4a61354f6bce3f983865a69a22cc
-EBUILD poke-3.3.ebuild 2562 BLAKE2B 111cb3440dc01a8f125554b0dd4149f16506a5e767f2199b891bcb178ca1985e6b46233994b08635143fdf07df629e29332da5f751008980a1b829c589e04e01 SHA512 0bb4dfece0214da0dda189ec775e342dea3549084c1d8c7825f76e86cbe74bab64182bd490e0510ea626713a6a31465881947c9d1df2b8ecbb575e5fd3bbd53c
-EBUILD poke-9999.ebuild 2443 BLAKE2B e910747cb87493d0374e1d8188bdb3d8ada0b7dcf7284181507cccd66f5668538c56cbcb36970e95ade54ceb078ed4fbbe7d4c729000e3dd34f94a3f435d07bc SHA512 ba1f5e4a17906e6b24b152b9f9dbaec57efefb83c26505525aad16565f0f1d08ac17e8faa72ed5d06badae2f95ee609afb56b21e3718cc0009cd547750ea372f
+EBUILD poke-2.4-r1.ebuild 2595 BLAKE2B 47b5d084edee6e5ebedd47a5c20af18fc9bba8b0a7dde5cc99cfca8e0943ebcbe69add769a0e9995ef33c85b7461596d9e63e78ef3ed9760a4936678adad4c8a SHA512 b173f53a94554549819ad1f4c5473bc862775278a47ed2d4689c31bf5ebadd9848bf767c4314326201c93483c80dbf5957a3da08405c7fbc29d58dc6d48187f3
+EBUILD poke-2.90.1.ebuild 2294 BLAKE2B dfe5a2e4bb07b3dde1b9195f2df6c5d9303f7455cbc2c12e27c8d984aead02f1f29ac4a3cd0ee4a6bd458d8ed086c62147078d57cc811f93d0437fc1a470464a SHA512 558592e93fcc813aba483a7769e2c96050f10cc2e105fd6bb4bc1f43b138c762161f0ec4e4134056e3f7f69b33b65a3b8f9569574c977a954f324c8789faab43
+EBUILD poke-3.0.ebuild 2569 BLAKE2B 465c4ff52fe55ca07b911712f0912b89d7f189d6e18b9f252901cb5876bc859750f41b2176146089e9585a162993fc4a1b2c1e9d86c4662d758601990813c8d7 SHA512 9e826c906abdc5d2bcf03bffbbd6eb1bdb84cd01cba5508397f27f07aa2e31ad493b8fa0072fe4760cf5aa48dbd60b5eec80b969a81c7afef7c175a35d396897
+EBUILD poke-3.1.ebuild 2569 BLAKE2B 465c4ff52fe55ca07b911712f0912b89d7f189d6e18b9f252901cb5876bc859750f41b2176146089e9585a162993fc4a1b2c1e9d86c4662d758601990813c8d7 SHA512 9e826c906abdc5d2bcf03bffbbd6eb1bdb84cd01cba5508397f27f07aa2e31ad493b8fa0072fe4760cf5aa48dbd60b5eec80b969a81c7afef7c175a35d396897
+EBUILD poke-3.2.ebuild 2569 BLAKE2B 465c4ff52fe55ca07b911712f0912b89d7f189d6e18b9f252901cb5876bc859750f41b2176146089e9585a162993fc4a1b2c1e9d86c4662d758601990813c8d7 SHA512 9e826c906abdc5d2bcf03bffbbd6eb1bdb84cd01cba5508397f27f07aa2e31ad493b8fa0072fe4760cf5aa48dbd60b5eec80b969a81c7afef7c175a35d396897
+EBUILD poke-3.3.ebuild 2568 BLAKE2B f7642fdb6c4d9a96526bc41f107f76cd5f5abb74aeca52c23a32a383a5c9f45ce581500deccab3e0c5c6f5351db2b41b07ccc7510b5a9d564ba11c6c79e23ec4 SHA512 2a068f0d39a7d3e1c96ab164d16532fbf308d551f78b5f12662036560ada3a128b3235e6b220fa2ad761820430533cf7ea1d856540129dc7dce7ffe4fc220f5e
+EBUILD poke-9999.ebuild 2449 BLAKE2B 98d3e795886a4aea5fed0c321ce36eec15d58cd07c5d43f2e5b05968e2fb1ced4082bb194e21f3f05ef19edb7b45bec491edf0de0c1cdc46367414722d782e60 SHA512 b87e32f6ec57dc0dfd6440b5c17c640da1e98b39d84612198d2acdd6177056219a859bc7dc1bb4debb418395ae6050f0144ef260cd23689cdcd529345a50246c
 MISC metadata.xml 514 BLAKE2B 5df1664ca8693598aba1a31675859940052e5e3aa6f5b045036e0da3a47a26ed601f6241977c8a1e611a096798f6d219e6818ce2963f88a4d5e4f6595495e877 SHA512 3e60b71e68d20a2b8c6ee0a5133b41a4beccf942a9c52739dbf7f11c998851411464d2882b0d2b2aab96ea00b9994d3dc73b2d68afcf874af1e561efaa97caf2
diff --git a/dev-util/poke/poke-2.4-r1.ebuild b/dev-util/poke/poke-2.4-r1.ebuild
index 0495d5a50622..095ad34975be 100644
--- a/dev-util/poke/poke-2.4-r1.ebuild
+++ b/dev-util/poke/poke-2.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,7 +18,7 @@ if [[ ${PV} == 9999 ]]; then
 		sys-apps/help2man
 		sys-apps/texinfo
 		sys-devel/bison
-		sys-devel/flex
+		app-alternatives/lex
 	"
 else
 	SRC_URI="mirror://gnu/poke/${P}.tar.gz"
diff --git a/dev-util/poke/poke-2.90.1.ebuild b/dev-util/poke/poke-2.90.1.ebuild
index 83a14a35e497..c66f080e0c70 100644
--- a/dev-util/poke/poke-2.90.1.ebuild
+++ b/dev-util/poke/poke-2.90.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,7 +18,7 @@ if [[ ${PV} == 9999 ]]; then
 		sys-apps/help2man
 		sys-apps/texinfo
 		sys-devel/bison
-		sys-devel/flex
+		app-alternatives/lex
 	"
 elif [[ $(ver_cut 2) -ge 90 || $(ver_cut 3) -ge 90 ]]; then
 	SRC_URI="https://alpha.gnu.org/gnu/poke/${P}.tar.gz"
diff --git a/dev-util/poke/poke-3.0.ebuild b/dev-util/poke/poke-3.0.ebuild
index 0ab0c56d8c9f..98957b4fdebf 100644
--- a/dev-util/poke/poke-3.0.ebuild
+++ b/dev-util/poke/poke-3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,7 +18,7 @@ if [[ ${PV} == 9999 ]]; then
 		sys-apps/help2man
 		sys-apps/texinfo
 		sys-devel/bison
-		sys-devel/flex
+		app-alternatives/lex
 	"
 elif [[ $(ver_cut 2) -ge 90 || $(ver_cut 3) -ge 90 ]]; then
 	SRC_URI="https://alpha.gnu.org/gnu/poke/${P}.tar.gz"
diff --git a/dev-util/poke/poke-3.1.ebuild b/dev-util/poke/poke-3.1.ebuild
index 0ab0c56d8c9f..98957b4fdebf 100644
--- a/dev-util/poke/poke-3.1.ebuild
+++ b/dev-util/poke/poke-3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,7 +18,7 @@ if [[ ${PV} == 9999 ]]; then
 		sys-apps/help2man
 		sys-apps/texinfo
 		sys-devel/bison
-		sys-devel/flex
+		app-alternatives/lex
 	"
 elif [[ $(ver_cut 2) -ge 90 || $(ver_cut 3) -ge 90 ]]; then
 	SRC_URI="https://alpha.gnu.org/gnu/poke/${P}.tar.gz"
diff --git a/dev-util/poke/poke-3.2.ebuild b/dev-util/poke/poke-3.2.ebuild
index 0ab0c56d8c9f..98957b4fdebf 100644
--- a/dev-util/poke/poke-3.2.ebuild
+++ b/dev-util/poke/poke-3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,7 +18,7 @@ if [[ ${PV} == 9999 ]]; then
 		sys-apps/help2man
 		sys-apps/texinfo
 		sys-devel/bison
-		sys-devel/flex
+		app-alternatives/lex
 	"
 elif [[ $(ver_cut 2) -ge 90 || $(ver_cut 3) -ge 90 ]]; then
 	SRC_URI="https://alpha.gnu.org/gnu/poke/${P}.tar.gz"
diff --git a/dev-util/poke/poke-3.3.ebuild b/dev-util/poke/poke-3.3.ebuild
index b176ec0d712a..f8f82f1eeb36 100644
--- a/dev-util/poke/poke-3.3.ebuild
+++ b/dev-util/poke/poke-3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,7 +18,7 @@ if [[ ${PV} == 9999 ]]; then
 		sys-apps/help2man
 		sys-apps/texinfo
 		sys-devel/bison
-		sys-devel/flex
+		app-alternatives/lex
 	"
 elif [[ $(ver_cut 2) -ge 90 || $(ver_cut 3) -ge 90 ]]; then
 	SRC_URI="https://alpha.gnu.org/gnu/poke/${P}.tar.gz"
diff --git a/dev-util/poke/poke-9999.ebuild b/dev-util/poke/poke-9999.ebuild
index 9ac3d2fc40bf..553465853116 100644
--- a/dev-util/poke/poke-9999.ebuild
+++ b/dev-util/poke/poke-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,7 +18,7 @@ if [[ ${PV} == 9999 ]]; then
 		sys-apps/help2man
 		sys-apps/texinfo
 		sys-devel/bison
-		sys-devel/flex
+		app-alternatives/lex
 	"
 elif [[ $(ver_cut 2) -ge 90 || $(ver_cut 3) -ge 90 ]]; then
 	SRC_URI="https://alpha.gnu.org/gnu/poke/${P}.tar.gz"
diff --git a/dev-util/pscan/Manifest b/dev-util/pscan/Manifest
index 1dafda01b635..25b1c7c59059 100644
--- a/dev-util/pscan/Manifest
+++ b/dev-util/pscan/Manifest
@@ -1,4 +1,4 @@
 AUX pscan-20000721-fix-build-system.patch 380 BLAKE2B 93c29ae8c17a798bd7b0a28c43dfed21410f336fa17c7ba58c2c9b5588831ad6ca6e056d2cf9d6375bc2ba1e043665525aa58e903545691f9d6bd21616d11b5d SHA512 9c0e2b237553ae396398c0e0727b5eed7879ea112d940289c60be4e3f289dbcddeedbbfb4c9563e558dbc96d0f7420e672b9d70cc488be86b00ef42b5abbf76c
 DIST pscan-20000721.tar.gz 14555 BLAKE2B 8e1a8ea91bc2a1b323dc607f703565579e596a3001151609e46a09160766b3b913610a15b64859dc88031a3acf2e3c147dcbd7b033517d3786976ab3cb1bc9f4 SHA512 83196cc9c450217fc2287d38fd1a0b9d1d9951b8f6328b6b9f7f50b680f653b099af04d4c448f3cb2b2a96871eec8772557851e887faa2f41dc259f01c031e78
-EBUILD pscan-20000721-r1.ebuild 716 BLAKE2B 0ae74f8f292797f9671e1203afe738e36bc0d5a54291543da512c222f23c4d8bd27df5260cec84eca127811ce32aea541e2bf1cb5e4611d4977295ea5a33e1ae SHA512 d2bbc8a0656793be4725f4f3bb814764af5f9b5ecebd1224a51f8423bac58ec1a6b0b7d3bd4818c2490fa0e532534bb063d30b9053b0596b90984f519461ead7
+EBUILD pscan-20000721-r1.ebuild 722 BLAKE2B 5507eef9a4b6c97e6658997489f7298a32c2272c951f0d5900915cc662e07808a31fccc71253afd1ae1bb5288f46ce4eeaad846e0bf4d5e570671ef4007bb4ac SHA512 9e974e0bf00443bb9241f633bf6953b11cf0f32e97597f3b3c214e235d9948cff3b901bad95d087d98be91318213620950b63497a6a0f4321161e896a6330384
 MISC metadata.xml 217 BLAKE2B fbec54484edc2603e95c90cb231985ef0f5f8d2cd48632ac8a097a4dac165499ff4cc087b1ca9ba6a4368bbb73b3af1ee99622a80df17072e1a340c345a2ee64 SHA512 7d3fc456b183fe7bdea26fb6edce39f702741a762b74cd7d2159a0ba85af50ebc87fbd921c926692a6164d50c9faf6b19680ab96528819bb06aaeac679e42de2
diff --git a/dev-util/pscan/pscan-20000721-r1.ebuild b/dev-util/pscan/pscan-20000721-r1.ebuild
index 260a2eb5405a..152745bc2ad7 100644
--- a/dev-util/pscan/pscan-20000721-r1.ebuild
+++ b/dev-util/pscan/pscan-20000721-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ IUSE=""
 # Does NOT contain a testsuite, but does contain a test.c that confuses src_test
 RESTRICT="test"
 
-BDEPEND="sys-devel/flex"
+BDEPEND="app-alternatives/lex"
 
 S="${WORKDIR}/${PN}"
 PATCHES=( "${FILESDIR}"/${P}-fix-build-system.patch )
diff --git a/dev-util/systemtap/Manifest b/dev-util/systemtap/Manifest
index eca2194dc3f0..b7ddc4b9dd85 100644
--- a/dev-util/systemtap/Manifest
+++ b/dev-util/systemtap/Manifest
@@ -2,7 +2,7 @@ AUX systemtap-3.1-ia64.patch 885 BLAKE2B e26c60e4549f95f0db3e128cd535f923f03dc45
 DIST systemtap-4.8.tar.gz 5628003 BLAKE2B 9f5050eba29d390c907b117187f94ef088f16bb739b4971bc32ffe88b1024a4157cd4e9793a8fc1e149a5a182a28330e3b4fd9d51213bb3637d616fbb9867f6d SHA512 fdcbc48ba17b2155c1419d99147a4cfbee2e69db945bfd0e6881b71ab11165bd23ea7ce9456856ae36807fb18f9934880a6b7c44456b63833ea260038744d9f2
 DIST systemtap-4.9.tar.gz 6684228 BLAKE2B 880747bcfbaa1909ca20a6cb30eb37d9443547783489396355b642758054ae0e0bf5b495a0adf57851c7c7a6b4300e498bb8c1c8da6df83ab1d1e18877b108a7 SHA512 a2736223fee0c801c36719a0245f31ed7e2e63c30bb7d5cab631dd57e4eb10e04abf2c9b272bda2a17c207c9dd163a1eb8a3e0759eda0c781946e644625510b7
 DIST systemtap-5.0.tar.gz 6572411 BLAKE2B db962df2fdcbc5bc11259c03d78073924f03fee4434dca8686a62fcb0818dab1ca91558160dd9d67d43b709f63ffe4f0af30ab1fe6965e19155bdd4c04501a04 SHA512 dc511a05e66abcbbd8c926973962751196180f3c571d0cd2a3b158ae367c5339ad32967a680ecd03224ab5f7ed2c55be7064867e4fb1b1cd7ea1cb21b2436e4c
-EBUILD systemtap-4.8.ebuild 3280 BLAKE2B 3df1b7041908984eb23fa9a61e6a3dc97a56316797987cd619834d5c66b0e0e8b9046730d804e1e1077f3738939f4c8fa1ae65b26b0e36a3eb9e6cd6c651eb1a SHA512 9eaac26fe33c19d5f6adcdf3f4b6be4b71707d1205a8e0ff087315c7c6767d84332065f5ec735947d787ba3e8be22aaab071dd95bb3e189724cd42e024dbc364
-EBUILD systemtap-4.9.ebuild 3322 BLAKE2B c46c9e1cfd5a79c1491f4084f391bbac41fdefe82b7aec0af40a20a736abe799ef14bd84a5d50810cfb7cb7787dd5b9a1dcfdfebbf6607b44908d17433c227ad SHA512 ee68504d60a2e56b33f1fbd6a7d7e28e5b95fb0c722ca59a91a5b67c22162e2c54878919fcec67c327db68c469edffd514133e7dcfe82523fc2384b2b386aca4
-EBUILD systemtap-5.0.ebuild 3334 BLAKE2B 51461b67a54ac1e53d33bcb612ccccc81eadc91b3a84d24492e9d0de297da3271f7b82d0265cca7799a8b06da096fda717cea4311b52d3914a0efd7a864290e3 SHA512 7f95ba6626128f03ebcd59fab74dbc866f2d2e46ef764a698ca36cb7bd876813450fd54890c741b03fffa33a843fbd22427e9fcfad11358b6d1f67e800341e1e
+EBUILD systemtap-4.8.ebuild 3288 BLAKE2B 378599e202385596f12b082c451029dc773b1086ce9e3865cf738602dd9aa5a7363e77823132865e36e5a2f994f88722fe8c022b76a4321edfeb8e683b14dd71 SHA512 569d642b48824dfb02971a74a7119f6e0deba89366b7f651a134c90537844381356c0638fd26521d97098ed6742f09799eb736c214395c1878abef8d040ae421
+EBUILD systemtap-4.9.ebuild 3330 BLAKE2B fed11478d3c671dc2a8b44fe3e565212464f336fb49c9caf961cb61005e23460e8c800bd75cf6a6779c90b93fea267a248620554e0a8a3ea90d9bdc85b22811e SHA512 095689fdb73f1ab7764c7e3aae5d9b32f97873e61c56fdd7a51ae33c58e97050f6afd4fe18d449b8f0f5d02cb726ace3d1b4394ffdf801f9d586e7a922f30aa9
+EBUILD systemtap-5.0.ebuild 3342 BLAKE2B 2b8655ad159d1adce584d59ae1f1521bd3a36223dbd09eb730b2c23e375d79da87b2298a75ac1a8dc2115a1bb62c998cb4aee7dade9e40d693a3a1438331e812 SHA512 6b3613708822ac5bf2495437bf58ff16394e9e5c4e7aa9863c1832a064c13273f79d516c6aa52ca46eb6b6bae9c00bc4a14f951ad5e25c78594c922d9b207a13
 MISC metadata.xml 303 BLAKE2B 5db95d500a08d656d0221a474d297c8357712f19334f45db347e36f14a10365d65777e0d24c68f75d4855b3ee1778dca1ecf4a05b19d2dd3975acf25a12b4523 SHA512 27261bc875c881495a9b0e1fffc811dff40b763a9e6453ca47143cb8d7d867682becd7266f8d559ad8c32bb5d7de9698341055d483f3e6a68b107895aa174b77
diff --git a/dev-util/systemtap/systemtap-4.8.ebuild b/dev-util/systemtap/systemtap-4.8.ebuild
index a38eb34da1ac..3c104ee392db 100644
--- a/dev-util/systemtap/systemtap-4.8.ebuild
+++ b/dev-util/systemtap/systemtap-4.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -36,7 +36,7 @@ CDEPEND="
 "
 DEPEND="
 	${CDEPEND}
-	app-arch/cpio
+	app-alternatives/cpio
 	app-text/xmlto
 	$(python_gen_cond_dep 'dev-python/setuptools[${PYTHON_USEDEP}]')
 	>=sys-devel/gettext-0.18.2
diff --git a/dev-util/systemtap/systemtap-4.9.ebuild b/dev-util/systemtap/systemtap-4.9.ebuild
index d8827e63733e..a37ebe5df640 100644
--- a/dev-util/systemtap/systemtap-4.9.ebuild
+++ b/dev-util/systemtap/systemtap-4.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -36,7 +36,7 @@ CDEPEND="
 "
 DEPEND="
 	${CDEPEND}
-	app-arch/cpio
+	app-alternatives/cpio
 	app-text/xmlto
 	$(python_gen_cond_dep 'dev-python/setuptools[${PYTHON_USEDEP}]')
 	>=sys-devel/gettext-0.18.2
diff --git a/dev-util/systemtap/systemtap-5.0.ebuild b/dev-util/systemtap/systemtap-5.0.ebuild
index 27c3f6d257b6..15d5a7155f0f 100644
--- a/dev-util/systemtap/systemtap-5.0.ebuild
+++ b/dev-util/systemtap/systemtap-5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -36,7 +36,7 @@ CDEPEND="
 "
 DEPEND="
 	${CDEPEND}
-	app-arch/cpio
+	app-alternatives/cpio
 	app-text/xmlto
 	$(python_gen_cond_dep 'dev-python/setuptools[${PYTHON_USEDEP}]')
 	>=sys-devel/gettext-0.18.2
diff --git a/dev-util/xmlindent/Manifest b/dev-util/xmlindent/Manifest
index 8a3cfcfe4a8d..da5434b29ba6 100644
--- a/dev-util/xmlindent/Manifest
+++ b/dev-util/xmlindent/Manifest
@@ -1,3 +1,3 @@
 DIST xmlindent-0.2.17.tar.gz 18333 BLAKE2B 5d72679e95cfa9528a94222b31b320993b32588ea18c48b251ceb24147eed57a5308f6ed2ae68a9a2d620107c21b512f16ebc51caa834225b138700f66e2a3d5 SHA512 ab4b46dbd68f29e7adba6283485eb9d1c614ece640c18e1eabbe7f0e1e6f27f14d00d694e4e1981aaf66e0ddcf208c6cb2c80dda1cbeb0ceb1a40987a419f716
-EBUILD xmlindent-0.2.17-r2.ebuild 611 BLAKE2B 6ac161b5a804c642bf270e6f8675ecd5a51c759ed828dee70c456d2ebffffb9c814da56a8940ebe56756d5cd7033df1854a26ae8105dbf56087ed10bf39c9d43 SHA512 201330b1e86adb054dd5863d8c5d07fe2f70d3eac18edd8ae1262b710db1162784a1da0f8e3b1f5ec87de67e8c51ee8f845bdbe884043e9dc000db7687285eab
+EBUILD xmlindent-0.2.17-r2.ebuild 614 BLAKE2B d7c93c97002b6a79e961137e7f5679868900d0051487e05b03874c1aef7264665a0e7301f21b6dd94dd78a5cf189b48287558bcffc59f130c278179b51e14939 SHA512 c86ac3e236fd67c385c4140d91c10a5ec0fdf630683a937479c32caaa0145b962129b3aa524e21df3bda8c457dcbc1934e7a388e20bb272dc71e33a24e9a572f
 MISC metadata.xml 331 BLAKE2B 233de2a864bae041e94a50d4e99444c765ef4377195b531d23c94d69854b4c586e5f59eee07da0bec189cc9903fa9595eaf4df74d7d05ba3c715120b6b5816c4 SHA512 58723aacde572323bb7889ab297142a29e7126ef1ec9069e04698755fb841a68c95718f3c7011cfc2b30799169c82198f03fcdd6887d6dc1b466dbb864ad7cd7
diff --git a/dev-util/xmlindent/xmlindent-0.2.17-r2.ebuild b/dev-util/xmlindent/xmlindent-0.2.17-r2.ebuild
index 3b038a3ca663..98aa27cb72a2 100644
--- a/dev-util/xmlindent/xmlindent-0.2.17-r2.ebuild
+++ b/dev-util/xmlindent/xmlindent-0.2.17-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
 
-DEPEND="sys-devel/flex"
+DEPEND="app-alternatives/lex"
 
 src_prepare() {
 	default
author	V3n3RiX <venerix@koprulu.sector>	2024-01-08 12:58:45 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2024-01-08 12:58:45 +0000
commit	5cbf14acf23c82626389931f64cfe3ef12a1c29f (patch)
tree	de93b0b9ae374935f2ddf615d19a837b6a6a0822 /dev-util
parent	1fbaf1314579f2155166bebd1ddfe6131d400807 (diff)