8 files changed, 69 insertions, 9 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 2cf15e2fdf82..848188db355d 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/global/Manifest b/dev-util/global/Manifest
index 067e049decf6..5cc43db46f0a 100644
--- a/dev-util/global/Manifest
+++ b/dev-util/global/Manifest
@@ -6,6 +6,6 @@ DIST global-6.6.10.tar.gz 2999863 BLAKE2B 496bac144c935893b29e23bbb1fa4583a5d6d0
 DIST global-6.6.13.tar.gz 3003671 BLAKE2B 476c918bad8f6d246ef6b50bcccdee9040ced2b529737e55cd5daa62d2b96d9f5073e1a48d98fe2ec0c2da68b1fb557b0f0f7d7d25eba8c5c5d784dda7b29cb1 SHA512 072d10a6911cef3bf66b5cf17e101f9c1ff29c993bf7db4c99164e5c1b18b4e3ddec31962c77beea2685cb116330919abb9b226d472d0003949a91286d0f1b6d
 DIST global-6.6.4.tar.gz 2988969 BLAKE2B 784087537094d27c10d1f2bc992e799c35ab6ce3b86e041c31279e6954b203e80676b3158ba95e7957456b75a213d70998aae9047836cd4d388212236f05a081 SHA512 cb4ed451d3aaf47c4c59cdc3f74c97d3171108177d4846b5dac843589710e66d87c9d7bbe080c3770329e8e40105ac52dcafb4609257347593cca4d94711f483
 EBUILD global-6.6.10.ebuild 1875 BLAKE2B 52d6c6e45527ea1f377cd2d926f1cf8df66e431d0e8f395200fa9dc1cc0a893af9a47ae80c9077ab4cb3d951a2a9f7cfbef7de9a986ba07f3924c0e85d6149db SHA512 a9cbf0ec37fbe3cbcca0f40f782df4e9489e437b056b6eba72344bb8c22e122b6cfcc66da2984ed91f6c9a81864472f06c6125063dd044b467f58b1c37df6fce
-EBUILD global-6.6.13.ebuild 1878 BLAKE2B a85c2154211e02cc827c372531ff0955e14aa0cc6c46cbde92fd476047b1176b116db2cdf29d3fabcab3d7dcd56336422e2c21277d983e673bbae9d41e0c7e8e SHA512 6108bd3e34aedd5794a4c488ce796809527f6e29d61a5f776a05b42ee40fd6fe31943a4cafc864c19d2200fe4f131bac80de6e2c17f90c2f4351fa3c2490cb2e
+EBUILD global-6.6.13.ebuild 1877 BLAKE2B a543dd8fea53ab5b03cf22c8ee4c8c1b49abf115db2218c0c65ba3c74494375939a2f54fd721f643f0148cc9906e5b15fb7ad69abc6e362c2791e89c20a3134d SHA512 748a9fe22cbdac99df882d36fe3aba79aeb4edc840fbe9237ad902baad2d4361ae7e0c98c9db78467094a6749dbfe08dbfbaaa20faa3d9ce44754da8e2957fc0
 EBUILD global-6.6.4.ebuild 1755 BLAKE2B 34ff7d7db35c67badca747e1195e9692bf999747c74944887e7d1aa4ea12948fc3ec8266a20009386bc0a23c6fd1ba310cd5206b0c8c02a254ca0378312171bc SHA512 ffb5882bfadf14829991dc8c2e6d668fa0d7a856727a312c8a33d98c668b9a227513ea849a51aa3746083ae8711d478c291b23fb079bfa10f18f35a3128096a0
 MISC metadata.xml 430 BLAKE2B 248f38a3d8bcc6ff4f519ad8bf2266e9aeec39fd51f7d8e1f47dacc1dc6ce5877fb9b7892ba0b8f51d81689d195df0b93db7a23a87b61dc17265649dca9e9f78 SHA512 00306d483618beab79929e82c7c0fea4d0036c239bc0e5e29ef8cc4956110d6b477379a590398d8244770c3ab4fe988f99936743e4b0f09fa26ba163795a338c
diff --git a/dev-util/global/global-6.6.13.ebuild b/dev-util/global/global-6.6.13.ebuild
index 3307ec39c98c..34ca0d0c67d3 100644
--- a/dev-util/global/global-6.6.13.ebuild
+++ b/dev-util/global/global-6.6.13.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ppc ~x86"
 IUSE="doc emacs"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-util/include-what-you-use/Manifest b/dev-util/include-what-you-use/Manifest
index 6bb1fb4f038c..29d529429ac6 100644
--- a/dev-util/include-what-you-use/Manifest
+++ b/dev-util/include-what-you-use/Manifest
@@ -3,5 +3,6 @@ DIST include-what-you-use-0.22.tar.gz 796681 BLAKE2B 6ae0b2fd94367c458f2db268493
 DIST include-what-you-use-0.23.tar.gz 813726 BLAKE2B 845101985d1c39925605d2908ad76c40b8df0838467d7afd83b644914893f8e32ed1563348e568bc126ea4349ab390b189b734f66cf3b8da75277af169313a23 SHA512 5c2bbda7dbc614089717d2a4f8b9a96111dc30efcdd331a21c548399d58b47229210d5f17eb48eeb56c44797068ebac634a5d68a5c50ff322753e5f7965b3d48
 EBUILD include-what-you-use-0.21.ebuild 2060 BLAKE2B 7b2cbf43a176e8fdb8da30539e6f6c580b4068378e59ef6c2ab6fcf951d8640afcf99af6072636dea11169cf4739f42a5f88af9ff958bcdd8bb51d3d4eb80a1c SHA512 ccb0f0b1f039f362f391fd65eec84406e7a73ba13b882de1e36443f1d56b0d128f7dd12adbb1339a305f04086eb9b75b567a31e71930cbf623e722f7d714c607
 EBUILD include-what-you-use-0.22.ebuild 2060 BLAKE2B b78f1005c46ad3b2069f847190de4797481b4a686b588878a54654f2b08ab431022f1da0f3f554738668494cce50eeed2edeacac96f9b54acb2ea7ec7cf03764 SHA512 c56f78dfe7c0f257b7c2cf7ebf6891783e896be92341ea2df8a79be19d6d2542febb00b00b783e9c7a96113109f31ba4a939e81aca490c666d20d605208963ea
-EBUILD include-what-you-use-0.23.ebuild 2090 BLAKE2B b34c63ab970730edc7246e85a09d6ae83d58f4bde0bca23febcb64162b6d10694bf45a9d3d6f31fff24122f64278d01ec13db2fa163a382ede108c7f862c65ba SHA512 7290078a9c954ef340fe2f0b3f5a047e1baa217c373c94172c6d043fe0854530f4da65cecb1b5b839bc649a218ed17edd1b85ffe7f9fe3943335910712088a64
+EBUILD include-what-you-use-0.23-r1.ebuild 1451 BLAKE2B 36412430e8d41c73f928277b8d8a4ee392ec07aded533259603059f1c68812ef492d8aadacad7f9cc8e0976fb4f346115187ec31b127a3367fc33d7c781a0dc7 SHA512 ad7b28bb37e59a92d08191d96b602f3690876e9925c084e0c040ddb9ab5ced11e9fc0694b907a5eb7633afd90efa07ac487cc6de7e0748772df74b2f09ca8410
+EBUILD include-what-you-use-0.23.ebuild 2023 BLAKE2B 577b28c1d896ecda9713a9139e837e87060ac2967a6d0db0780528238a4dbceec8d35aa856e84bf1c80e6afc73e0ef4f308e5b1e4d4d0796bbeb13d3e5c04a10 SHA512 66ede734cb1c371a8ba30fc816344a78459dea970712f3fc45d243c875edf01d871a55433cb96b1544466393c32c291718ef0fd373296163012dae372dd02bb1
 MISC metadata.xml 353 BLAKE2B 2d95f026ce60294177b001cddd8904988aeddb3fb257a73bcf1d028bebd747b0b9467322a0fb87a5de1f7074721ebc2b9931eaa1c519fcef0388a61a8924fea9 SHA512 88e999a1bb1d9993d150347db7b1ec340978594cd2543191646e54d8fb5e125a68063916f048cc1a7166ccd646d66ea33f7f37d94ff20ed21abc7b7c8413e222
diff --git a/dev-util/include-what-you-use/include-what-you-use-0.23-r1.ebuild b/dev-util/include-what-you-use/include-what-you-use-0.23-r1.ebuild
new file mode 100644
index 000000000000..8b90092ee700
--- /dev/null
+++ b/dev-util/include-what-you-use/include-what-you-use-0.23-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+LLVM_COMPAT=( 19 )
+
+inherit cmake llvm-r1 python-single-r1
+
+DESCRIPTION="Find unused include directives in C/C++ programs"
+HOMEPAGE="https://include-what-you-use.org/"
+SRC_URI="
+	https://github.com/${PN}/${PN}/archive/${PV}.tar.gz
+		-> ${P}.tar.gz
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	$(llvm_gen_dep '
+		llvm-core/clang:${LLVM_SLOT}=
+		llvm-core/llvm:${LLVM_SLOT}=
+	')
+	${PYTHON_DEPS}
+"
+DEPEND="${RDEPEND}"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+pkg_setup() {
+	llvm-r1_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	python_fix_shebang .
+}
+
+src_configure() {
+	local mycmakeargs=(
+		# Note [llvm install path]
+		# Unfortunately all binaries using clang driver
+		# have to reside at the same path depth as
+		# 'clang' binary itself. See bug #625972
+		# Thus as a hack we install it to the same directory
+		# as llvm/clang itself.
+		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix)"
+		# Relative path to the clang library
+		# https://github.com/include-what-you-use/include-what-you-use/commit/e046d23571876e72719ef96a36ff0cb1cb2e64b6
+		-DIWYU_RESOURCE_DIR="../../../clang/${LLVM_SLOT}"
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	"${EPYTHON}" run_iwyu_tests.py \
+				 -- "${BUILD_DIR}"/bin/${PN} \
+		|| die "Tests failed with $? (using ${EPYTHON})"
+}
diff --git a/dev-util/include-what-you-use/include-what-you-use-0.23.ebuild b/dev-util/include-what-you-use/include-what-you-use-0.23.ebuild
index 85401442c5d1..b7e3a9e1a4ff 100644
--- a/dev-util/include-what-you-use/include-what-you-use-0.23.ebuild
+++ b/dev-util/include-what-you-use/include-what-you-use-0.23.ebuild
@@ -30,10 +30,6 @@ DEPEND="${RDEPEND}"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-llvm_check_deps() {
-	has_version "llvm-core/clang:${LLVM_SLOT}"
-}
-
 pkg_setup() {
 	llvm-r1_pkg_setup
 	python-single-r1_pkg_setup
diff --git a/dev-util/spirv-llvm-translator/Manifest b/dev-util/spirv-llvm-translator/Manifest
index a188f8cb48b8..1c855170589f 100644
--- a/dev-util/spirv-llvm-translator/Manifest
+++ b/dev-util/spirv-llvm-translator/Manifest
@@ -12,7 +12,7 @@ EBUILD spirv-llvm-translator-15.0.4-r1.ebuild 1293 BLAKE2B 64a5b0e0ff4ef6f553b6f
 EBUILD spirv-llvm-translator-16.0.4-r1.ebuild 1410 BLAKE2B db9257e65e87099d33a60558bbdf1557cf629366c2af2e2cecb10fe83885321881d6df6d6ef681f9968e21add67c354a2199d5768b2d699a90161f2504003e20 SHA512 1269fe0f60f55cc01d589523005a5726d296742bcfcfb260d8183404ec77ee2c7aa7c19d738db16102f172343c8cd7aa237457b02f392f308736bcb3bdd198e6
 EBUILD spirv-llvm-translator-17.0.4-r1.ebuild 1363 BLAKE2B c34a7f7b8aab6d5797e3bd5144da1bb69516c9024d376b242c554927c08fa3185d871c330a54378578fec2daef520258054b8d2ea41d7455bf70ad8d117258a5 SHA512 6703333d818ad50742679e40a7deb508951e419b4f99cd5241f2401feda0a593eb8c8ead951b205334fa45be10241c1074b4c54be1a5d94290dc6199d649a771
 EBUILD spirv-llvm-translator-18.1.4.ebuild 1443 BLAKE2B a2034d194932551f6f92f0df9fb5baab68df91552f271e4222e169011e60c2a9a826c954a4cd50533c78bab84922d96f52b31fee2acd8289ec7c19ad89e25c93 SHA512 ee3db3b644276ddbee5919f1856cdcd6d0fa96850a7b226ebe0d8e74d5ad4f1d3f5e1daa485a1c272f39dcc2b7173a9a42f9c9c3f8ee9d331f7dbce1fa7eae73
-EBUILD spirv-llvm-translator-18.1.7.ebuild 1446 BLAKE2B ca34b579e99cc665c34b9663441cf6babc2bb6ebab0fd86124ea09bd8e35ae006381cfd9737e9b900bfe4066f3df8abfdb2b8ca9418c23135d7a42b91d1accc3 SHA512 1c17cdde11a7e825eb4e001e4fe0a269afb2373dedb905d99dd1fa066d3c36345964fcb5b7af8a739010145d780ca5ba800ca8521c3abb5085f97d927b38b859
+EBUILD spirv-llvm-translator-18.1.7.ebuild 1445 BLAKE2B 3b98fc95d9558817c2014e4c5f233b06113474eb92804b14c7148a740e69e584fe51f803968288dd09b8c19cc6763359b977509395edb43baa56e4f2d3025f77 SHA512 45aef3841247d0de62304ab89badd158d16063f5d71bb07ab04f8d6d26291630d05bfad6d61ca6851168b9986a758900ad4a258d827b08eade9187d8a30cb416
 EBUILD spirv-llvm-translator-19.1.1.ebuild 1443 BLAKE2B d4d5a27179a82ce1631e5f8d8b38b27243d3e48993ca8db6daac78f6adef11dcf5dc523f4856a0e1a237b2a35edfb6aae57c5d2d5a4cc8794cc26444d4c3b8a2 SHA512 5c589ccf3e85ca5507169a8eb6437dacb4ba356df50f4ed05e29ebabc85bceb4036fd7b588e496e0c0bde8df1e35be0dc0d9487ce77a0af8423dc7b351124131
 EBUILD spirv-llvm-translator-19.1.2.ebuild 1446 BLAKE2B e11e0524e4c76950f42959c371bb1a138ec65629f16c3d2ac0dea2274e7e343ba730bf356dfd6022ca54a6e277e01a013f623b67de58c51f305f4a8b4929b866 SHA512 84ab45459d4a65244c175dd96b93e4564d5584006cc57ad7e3cb8a7cb9695ddb7b1d8d981953ec774e647fded42e6d2610bbfe415a30fa2ef75d247cf1f5a283
 MISC metadata.xml 445 BLAKE2B 11c5d6b6e94192c6fe1aa0cdce39ddb6e3e0aac1462533b5480136c415cc5d82ac77c4930a07a234d0ae987d3409c8dae590f0d5b99139282a89939d0b65cf4e SHA512 e58ae0f86f23be399eff43be9b90006f9be0f699af67f354f2e5434bc0fd43856863763192e0270fd06f7df65e0bdea2bd0b9d43b5b200d8a0399e0230c86e71
diff --git a/dev-util/spirv-llvm-translator/spirv-llvm-translator-18.1.7.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-18.1.7.ebuild
index 0755f06ce2bd..093c144a695c 100644
--- a/dev-util/spirv-llvm-translator/spirv-llvm-translator-18.1.7.ebuild
+++ b/dev-util/spirv-llvm-translator/spirv-llvm-translator-18.1.7.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="UoI-NCSA"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~riscv x86"
 IUSE="test"
 RESTRICT="!test? ( test )"