gentoo auto-resync : 16:11:2024 - 03:02:52

2 files changed, 20 insertions, 25 deletions

diff --git a/dev-util/include-what-you-use/Manifest b/dev-util/include-what-you-use/Manifest
index 78300ec4a14f..03fa27162512 100644
--- a/dev-util/include-what-you-use/Manifest
+++ b/dev-util/include-what-you-use/Manifest
@@ -1,9 +1,8 @@
 AUX include-what-you-use-0.19-tests-cxx-badinc.cc-remove-stddef-from-expected.patch 1123 BLAKE2B fdf322e66d199671cdf69d606e658398661313ead19f30b2922bae427b1e428c7e91e71b9402badcb811279d2d9d839cfe4b890248604e5e4c918a493d1e046f SHA512 2bbd0b778751cd09de98c8461643686ef7e15c7be9caae8f5a3572ad92a5d866998d1c31db570b602d85b795456067cde666c0148617b0a4b9087628998f4fb9
-DIST include-what-you-use-0.19-test-util-support-EXTRA_IWYU_ARGS.patch 2314 BLAKE2B d6c99aa59b52207ece610f8a8fe52ae967f3e027118c97f665b0a5d21782d85d94658ece1e0ae0e2d86cdcb94a345f072fdbda495caf589b045a8be38bf56f99 SHA512 2ecd6afc2de5ff85c8a6609b151d7d1e50a985e5c52db9b298ce21bad94a3bafb7b939fcd3b3cec0b753e83ba9ea256f628fbda16837ee6b3c3f1d2ec664d4d9
-DIST include-what-you-use-0.20.tar.gz 766208 BLAKE2B 54ae7ab18afc592bae201e551377a22d9439cb38418197836aef9d7a74d84ec7cca81ae155358504af9520a07d513e78e61ed7bcf55028f3b56aaa6e949f950b SHA512 77195dc36338a37d3397c78701d81e52fc1c6a3441979fa016f154b0fc860598959e6430e78a51bbf9049f6b2bb62956e50f5531ac5c94c6554e2383ace540f5
 DIST include-what-you-use-0.21.tar.gz 776263 BLAKE2B 32e1afc3400641ba4d648cfed0228db5b12357e5aaf4a4c5d8f063e82f14db4c6c568eedbfbfdfed033ae36d787db42122a026df8f74a080901247264ae856e2 SHA512 d6940fcde5f8212b7d6e1b3b8c9075157f831320279f5b7e57346c292c5b2cc52b53491a2c65b69dfcbd83ae2246c7c71555416e1faad9fd9a0aff9c12ddf1ba
 DIST include-what-you-use-0.22.tar.gz 796681 BLAKE2B 6ae0b2fd94367c458f2db268493af8922f9e82e0a389765fc94d3d53482b7f276f7a7959f6a8d9fe6ca55e58c0db77ee50f58ce4ad375c0ea73b9029e26ea54d SHA512 e95dc64372ed791441b0b92e113cbeee8aa76e8912776f776ffeb02d96f84fec18988527f46b1fbf7e174e11af043b4387ff47d9012cdd74ce38ec0bfc7ebad2
-EBUILD include-what-you-use-0.20.ebuild 2463 BLAKE2B 288e581be0efeaa5b5595ded1ff4a1fa7bf308a01e131bc31f140dd01f4751861cab6174d0187a898937d91f6d8736001aee6ef2c9205c879d44d5e4939650d3 SHA512 ab601598e09276e702e0a00dd6beade7fb515d9961882eb426a4a06c79c4ac3a76c6ce0b3ec882f51552b471e901b40a20f81881330a1abdc59264ac880ecca8
+DIST include-what-you-use-0.23.tar.gz 813726 BLAKE2B 845101985d1c39925605d2908ad76c40b8df0838467d7afd83b644914893f8e32ed1563348e568bc126ea4349ab390b189b734f66cf3b8da75277af169313a23 SHA512 5c2bbda7dbc614089717d2a4f8b9a96111dc30efcdd331a21c548399d58b47229210d5f17eb48eeb56c44797068ebac634a5d68a5c50ff322753e5f7965b3d48
 EBUILD include-what-you-use-0.21.ebuild 2060 BLAKE2B 439f981a4bf3b56162aacaf54f248e99f1c352d29055ba3f7425602690bf0d3969e5f2d23ff0f521b2a46011da70afd0a83a658f3d647d786b9f30a0e8b698ff SHA512 d28c68eddb498b4522811ecab6d69e45bf9d3f9a10863b11dff79fa24d6e7ea1c7731bae59d332a6b193ab88f9791b56cb51d367ee6fde7cdff63ff0d44e7363
 EBUILD include-what-you-use-0.22.ebuild 2060 BLAKE2B 5f9b3237d3b1fcbd8e79231f4510792b4b6c3ad3a4b1ffbcf57ada2a129000e19bbf7bb5979f25620a44722e7cef698ce5fa93e0cc35d47a70dbbd02ccb9b790 SHA512 e33b2c675b8c918175be3b26795e35ad5653690e0b80f9a891b57bae11c9468f7a96c9c0dceca3de6bc948db7d23b7dacfbfcb04ff200378a6bbc5a5a6486816
+EBUILD include-what-you-use-0.23.ebuild 2091 BLAKE2B d71c1c991d2825dbc8becb79af83a8643e2007968455c37f6c90d4911f01743746c1ef23e483102ddf45fea66c2a451833d4e6bdabfe12fd8c912d897ba465b7 SHA512 2ac6fddd3508945bf9d757bb25256eee6ff450db6551902629ec14fa2d769534a3c99ddef08019bb412c99c2191c48f32ae3cdeaf31d76bafc8ddcb01301631b
 MISC metadata.xml 353 BLAKE2B 2d95f026ce60294177b001cddd8904988aeddb3fb257a73bcf1d028bebd747b0b9467322a0fb87a5de1f7074721ebc2b9931eaa1c519fcef0388a61a8924fea9 SHA512 88e999a1bb1d9993d150347db7b1ec340978594cd2543191646e54d8fb5e125a68063916f048cc1a7166ccd646d66ea33f7f37d94ff20ed21abc7b7c8413e222
diff --git a/dev-util/include-what-you-use/include-what-you-use-0.20.ebuild b/dev-util/include-what-you-use/include-what-you-use-0.23.ebuild
index 45a0926a6a68..09fa7d9e2fce 100644
--- a/dev-util/include-what-you-use/include-what-you-use-0.20.ebuild
+++ b/dev-util/include-what-you-use/include-what-you-use-0.23.ebuild
@@ -1,53 +1,49 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..13} )
+LLVM_COMPAT=( 19 )
 
-inherit cmake llvm python-single-r1
+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
-	https://github.com/include-what-you-use/include-what-you-use/commit/62e5e2e35380e46ccbff2c2ed118f8bb5c01755b.patch
-		-> ${PN}-0.19-test-util-support-EXTRA_IWYU_ARGS.patch
+	https://github.com/${PN}/${PN}/archive/${PV}.tar.gz
+		-> ${P}.tar.gz
 "
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
-
-LLVM_MAX_SLOT=16
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 RDEPEND="
-	sys-devel/clang:${LLVM_MAX_SLOT}
-	sys-devel/llvm:${LLVM_MAX_SLOT}
+	$(llvm_gen_dep '
+		sys-devel/clang:${LLVM_SLOT}
+		sys-devel/llvm:${LLVM_SLOT}
+	')
 	${PYTHON_DEPS}
 "
 DEPEND="${RDEPEND}"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-PATCHES=(
-	# https://github.com/include-what-you-use/include-what-you-use/pull/1252
-	"${DISTDIR}"/${PN}-0.19-test-util-support-EXTRA_IWYU_ARGS.patch
-	"${FILESDIR}"/${PN}-0.19-tests-cxx-badinc.cc-remove-stddef-from-expected.patch
-)
-
 llvm_check_deps() {
 	has_version "sys-devel/clang:${LLVM_SLOT}"
 }
 
 pkg_setup() {
-	llvm_pkg_setup
+	llvm-r1_pkg_setup
 	python-single-r1_pkg_setup
 }
 
 src_prepare() {
 	cmake_src_prepare
 	python_fix_shebang .
+
+	rm tests/cxx/stdint.cc || die
 }
 
 src_configure() {
@@ -58,19 +54,19 @@ src_configure() {
 		# '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 "${LLVM_MAX_SLOT}")"
+		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix)"
 	)
 	cmake_src_configure
 }
 
 src_test() {
-	local clang_version=$(best_version sys-devel/clang:${LLVM_MAX_SLOT})
+	local clang_version=$(best_version sys-devel/clang:${LLVM_SLOT})
 	clang_version=${clang_version#*/*-} # reduce it to ${PV}-${PR}
 	clang_version=${clang_version%%[_-]*} # main version without beta/pre/patch/revision
 
 	local clang_include_dir_candidates=(
 		"${ESYSROOT}/usr/lib/clang/${clang_version}/include"
-		"${ESYSROOT}/usr/lib/clang/${LLVM_MAX_SLOT}/include"
+		"${ESYSROOT}/usr/lib/clang/${LLVM_SLOT}/include"
 	)
 
 	local candidate_dir
@@ -85,7 +81,7 @@ src_test() {
 		die "Could not infer clang include directory. Candidates: ${clang_include_dir_candidates[*]}"
 	fi
 
-	local -x EXTRA_IWYU_ARGS="-I ${clang_include_dir}"
+	local -x IWYU_EXTRA_ARGS="-I ${clang_include_dir}"
 	"${EPYTHON}" run_iwyu_tests.py \
 				 -- "${BUILD_DIR}"/bin/${PN} \
 		|| die "Tests failed with $? (using ${EPYTHON})"