gentoo auto-resync : 29:04:2023 - 23:15:57

3 files changed, 56 insertions, 3 deletions

diff --git a/dev-util/include-what-you-use/Manifest b/dev-util/include-what-you-use/Manifest
index 071c1193230c..866568f913e0 100644
--- a/dev-util/include-what-you-use/Manifest
+++ b/dev-util/include-what-you-use/Manifest
@@ -1,3 +1,5 @@
+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.19.tar.gz 757761 BLAKE2B 09dfe686db78973059039f878029cda8dea9912127cf7ed9ddc123abe14459e670304fd531760afbebedee8c4992d15add18b75f9b62dc2d9c4b0f4edb8e0a1d SHA512 0847ae898696b51540ab9f5715e69bae67db42409d60205227d543ba6597b12cc2ea5bf68a3315c31f22e7186e05c06a86f5ae5b893c23bfe4cd9ef6f06ccddc
-EBUILD include-what-you-use-0.19.ebuild 1220 BLAKE2B c22b5788d0a3485564a075427578f6ffc15ca507542088d6fb87b5a71c94d525622394c39b2a620d7897cf88e4e7439bec8c386d5648cc2c4018f313147133e5 SHA512 d7a19b38c65a1e6b1c9f1bf50fb9aa8978aa6a0c851788e5a17091b744956a0a3e5582bdb6b5b3b751550bb03182d8e811a4aee35398a0347711c08530c9d480
+EBUILD include-what-you-use-0.19.ebuild 2011 BLAKE2B 9f4e2887826ca95540070acf1db1ebba8445a7655c452ca96d32d8628bf8859bbf36090c03a2a29f43cf0517a619df87944c3e1d640cfb5c1099b96c59eb3b5d SHA512 69d66ee9c991e21dc7dbaf5baa19ee75d779ffc9532dad5c59224a5f193bbb7e9c318583acdec376b7c60c7fa913d311bd22114ef35dd0d3e69e4e59220187fd
 MISC metadata.xml 353 BLAKE2B 2d95f026ce60294177b001cddd8904988aeddb3fb257a73bcf1d028bebd747b0b9467322a0fb87a5de1f7074721ebc2b9931eaa1c519fcef0388a61a8924fea9 SHA512 88e999a1bb1d9993d150347db7b1ec340978594cd2543191646e54d8fb5e125a68063916f048cc1a7166ccd646d66ea33f7f37d94ff20ed21abc7b7c8413e222
diff --git a/dev-util/include-what-you-use/files/include-what-you-use-0.19-tests-cxx-badinc.cc-remove-stddef-from-expected.patch b/dev-util/include-what-you-use/files/include-what-you-use-0.19-tests-cxx-badinc.cc-remove-stddef-from-expected.patch
new file mode 100644
index 000000000000..4d63e0c1530a
--- /dev/null
+++ b/dev-util/include-what-you-use/files/include-what-you-use-0.19-tests-cxx-badinc.cc-remove-stddef-from-expected.patch
@@ -0,0 +1,34 @@
+From 0c4577fc5796b2824da5629f77bf6bf6bdcd4823 Mon Sep 17 00:00:00 2001
+From: Florian Schmaus <flo@geekplace.eu>
+Date: Sat, 29 Apr 2023 20:12:00 +0200
+Subject: [PATCH] tests/cxx/badinc.cc: remove stddef from expected output
+
+--- a/tests/cxx/badinc.cc
++++ b/tests/cxx/badinc.cc
+@@ -1415,7 +1415,6 @@ int main() {
+   typeof(kI1ConstInt) another_const_int = 1;
+   (void)(another_const_int);
+   // This is a C standard macro, but is implemented via a gcc extension too.
+-  // IWYU: offsetof is...*<stddef.h>
+   // IWYU: I1_Struct is...*badinc-i1.h
+   (void)(offsetof(I1_Struct, c));
+   // IWYU: kI1ConstInt is...*badinc-i1.h
+@@ -1807,7 +1806,6 @@ int main() {
+ 
+ tests/cxx/badinc.cc should add these lines:
+ #include <ctype.h>
+-#include <stddef.h>
+ #include <list>
+ #include "tests/cxx/badinc-i1.h"
+ class D2_Class;
+@@ -1836,7 +1834,6 @@ The full include-list for tests/cxx/badinc.cc:
+ #include "tests/cxx/badinc-inl.h"
+ #include <ctype.h>  // for isascii
+ #include <setjmp.h>
+-#include <stddef.h>  // for offsetof
+ #include <algorithm>  // for find
+ #include <fstream>  // for fstream
+ #include <list>  // for list
+-- 
+2.39.2
+
diff --git a/dev-util/include-what-you-use/include-what-you-use-0.19.ebuild b/dev-util/include-what-you-use/include-what-you-use-0.19.ebuild
index 367e7c6d5101..eb3c6a7e4c82 100644
--- a/dev-util/include-what-you-use/include-what-you-use-0.19.ebuild
+++ b/dev-util/include-what-you-use/include-what-you-use-0.19.ebuild
@@ -9,7 +9,11 @@ inherit cmake llvm 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"
+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
+"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -26,6 +30,12 @@ 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}"
 }
@@ -54,5 +64,12 @@ src_configure() {
 }
 
 src_test() {
-	"${EPYTHON}" run_iwyu_tests.py || die
+	local clang_version=$(best_version sys-devel/clang:${LLVM_MAX_SLOT})
+	clang_version=${clang_version#*/*-} # reduce it to ${PV}-${PR}
+	clang_version=${clang_version%%[_-]*} # main version without beta/pre/patch/revision
+
+	local -x EXTRA_IWYU_ARGS="-I ${ESYSROOT}/usr/lib/clang/${clang_version}/include"
+	"${EPYTHON}" run_iwyu_tests.py \
+				 -- "${BUILD_DIR}"/bin/${PN} \
+		|| die "Tests failed with $? (using ${EPYTHON})"
 }