gentoo auto-resync : 12:12:2024 - 02:01:23

8 files changed, 3 insertions, 477 deletions

diff --git a/dev-util/clazy/Manifest b/dev-util/clazy/Manifest
index 2d8ef6168830..8ff12fb81dd9 100644
--- a/dev-util/clazy/Manifest
+++ b/dev-util/clazy/Manifest
@@ -1,8 +1,3 @@
-AUX clazy-1.11-fix-llvm-15.patch 12053 BLAKE2B d329cb3a93a7b9cf6256590e281c6f13955eb8a83a9c0ef17a8d5fe719ff1f09164aec56ea8a31391adb5a9490ce6a4e8336a32dc22f872182e5491d81b89e70 SHA512 285e73848d9fc7bf8eada208660cb8d42c245617205be9bae708e6f9e0d8b06ba814a305b33d641589f8a0ee17a71156cea2450fd2e7d5a342389eada5421e34
-AUX clazy-1.11-fix-llvm-16.patch 3418 BLAKE2B bee024e761008e6d1bf14f4ac285fecab7e1e5f6870d230128f6e5f3ef222a8bb75bdfa4c7e74f0249803e3c8ff915e46e94c4fa77ffd98ea71158095a76be1b SHA512 8a20746c71dab10d6c10c2d8dfc65da964cd5a52c1ac2194e3c6da1ff6430f9689288086f763d18cb496a1195492049450639bbfad5b621153f718e27e755b93
-AUX clazy-1.11-fix-llvm-17.patch 1546 BLAKE2B fdc8a1387c6db82c993ec935bcbbe1e58f6e754f90efb65f9f8da2ab00e2240a9a7dcc287f3055a3a86e91f7dd8b6ddb8c1df9e7c4bfc9831f401fea14055c4f SHA512 90c60cc4d6b589ddba1a5b6b9bc077dd79a48894bcdce0cb99d51e768ee325b21cc83e56e57f1cfd1d4bb2c7e443d663c2dec55aca5e07df8db0ce19f0fa99c8
-AUX clazy-1.11-fix-regex-detect.patch 859 BLAKE2B 6a953c3927dcc1a3aac5aab55c01eb1eaf977f40c96c26f57032608de8e0d709ae6bf67f5d04f991ee14ded80023a8faf19b9ea18f9a2e2dd9dc19b2831ff58c SHA512 8bd1ab72bf36620250a228f9cb45fe403853d16c5eec8704c6980405ffca71cfcea82f9587b3b3f748ab623ecee757cb8adc54c7a137c5070eb04e26d06fab36
-AUX clazy-1.11-jobs-for-tests.patch 1626 BLAKE2B 58d8c059fa631c2c534e6ec2c33268af88ef95e5ed7b1b3bb37d189d61bd998143a7fa5d38d40a925c6dd59592e0df30c22d42c04cb3f1bb5d915afad2b879e9 SHA512 1fd25f986d8ecf092fe3dcf73a61609f183e1d90d4926676cd8c4de34326a8ed7610a05dee5eafe91d4a5b830f4423c5b66be3f049a26b632e1e094f3f2ac446
 AUX clazy-1.12-INCLUDE_DIRS.patch 1615 BLAKE2B 2e1d0898d12fe58f11e4286d56085a6b608e338ec0095c642e7b551d84269ca8d1e244f7dc88c95d3b264434b3724e0999fe9396525ae83c4e3f9740ab3163cb SHA512 86305b07f6099d135a1a397bd20b7dba5f51d3b9971cd63886306077b873d410b108baad2c9b21e2470a0bfaa66e2fe1a40ff37162713bdfea43fb259ed83e56
 AUX clazy-1.12-LIBRARY_DIRS.patch 1161 BLAKE2B 6210b53e9219042c79605f84598dd9e34bd2b0ebb99987ca6a34ab53e76553befdbe413d53bf213a5e095b2939c40e6664cb7ae9ef135a1f56bb117c79c0cd57 SHA512 804abd9e01b6f4e36849e062dae8b36863abc0710a2c245aa7043a3295bded0bbcbee4fcec64a9c63ae2973f520a5c1f79d81322c4c68f41e1b3d1840e619bf2
 AUX clazy-1.12-clang-16-no-src-root.patch 2167 BLAKE2B 84f2cd26abea61998f4e78cb325126bd61b539924bbb1140793b888db8c80b891afb21700472a8d44d0c37e6da613350be570802ceffcd342463854bcd45af6f SHA512 da93e8320184f832c20f390d9b77a9829972cb9d95ca801d072efc41fc88fd584fc423a000c40621f86040fe5a9d3468382f390a7b525b4677a1e7163004d466
@@ -11,8 +6,6 @@ AUX clazy-1.12-fix-tests-Qt-detect-1.patch 3388 BLAKE2B 4aace0f453e84a3e00651eda
 AUX clazy-1.12-fix-tests-Qt-detect-2.patch 5164 BLAKE2B 7ce4d58f5ca52df4ce229c7892cec13754e557000e755f7f3954b7810aacad3e5d001e0ea90422191c5869b954387cb22baff2e485666e9f0ef2803819587a4c SHA512 3b84aa5f407402a4abef33090f2efc60cc8dca47f0f2324c61f825b674023080ec9c4d693aed451642c80dd38759ef8bca942faff6dad7d6bc79aa1be4515a14
 AUX clazy-1.12-llvm-18.patch 1532 BLAKE2B 6527759799a8e99db6c996177f2f4ed9b1fd5f2327b2a950db6138c2bc4dd6c0b8f2d06bc45668836b8a6fc406df0973f9b3f5218361f2d401b7180cb824e308 SHA512 b0666907bb4d023e605b2b8ce4fd9addaa477e87a811d38bdb68c03bdf4a45d52fabb191e300cf3f877eb32189e23b23046c702c11e50527b474d79e4695c2de
 AUX clazy-1.12-standalone-install-location.patch 1728 BLAKE2B 9ef38ca69289f767219b7556675f147861725a70a7b94c6c94bbef004c70d714cf08a7e19a0c0ef0d5b6cce812e34fad7072c1de788494a640bc4a536689fd6f SHA512 8b36af55e818658a16108ce92479605a354f56415331d75c0eaf188e998203aa57900bdfca9e69c80d637b2f13424ecd50eafd32b49df86347431e34c3bef562
-DIST clazy-1.11.tar.xz 404088 BLAKE2B 1a69fe07ef81a0efe3c9db9129083247d60943592967f705d62d3859039cec250673eecc06184f70d134cbab85708d957b0a085beff8b3e46325a69547e005b7 SHA512 6a7c162392dd30aea29669275cea814d6daccf7931b8cdb20997f9bbff5619832d5461a6d0f854ecbc4726e52b6937c4f9cb8651087ffe73676c04239a38ca2b
 DIST clazy-1.12.tar.xz 427740 BLAKE2B ad2c78a506132b5fd6b3c22a7e9794c38ddd71242cde6f760e48d0250f6215629007d45303f4b35fdc7717865b8221ab1c2f3c6889a44ea1809e112845f16463 SHA512 7a2b4a753098f15936a4731c82c660c1cd4d81949279435e87f00f7f72bef3e32cb574c8991c0707798581278e9fbcae34d354c1e6b77a15a5e26166d658fa9e
-EBUILD clazy-1.11-r4.ebuild 1312 BLAKE2B 5ff282ba38629cdd15ea65c1837d798563ac6ef396f771c6d91058c3e0f82ffab4e69b2ca7842afc96514b89b49c23f4aac291d6c186bdc285510500e87e063f SHA512 7c6e9aee3960b00e778455fd9832b41d845beaff25e1fb9c0959168598c3162a93c3592164533ea9183d782b5ebcfa54a4ffbab28544e69318628d0e62cd460f
-EBUILD clazy-1.12.ebuild 2236 BLAKE2B c2043a5c6dc2d37d3584da1734d29e1e13a68af42ee86fb62dbc0043fac1e9960bd929e0e0274c52ed384066ae2209750fe8cb598a53c9ee50a0e2a550c2558c SHA512 df38838e4dee7645ee5f1d18eefa326eea0f0cd4c273baddea0965bdc80c530cb290435cbe5cb15ecef8b0553bc16fcd6ae8de52c654173b672b5cd3edd777a5
+EBUILD clazy-1.12.ebuild 2236 BLAKE2B 03215cae9ffca622db565dcdc09065dd45f3fbb12f99782837a03d4e8ab753bd3a969c25fee389a6157c8fbee532313490df43a12ce4aa3a73cd65a47c2698ec SHA512 3bbd93a7e315c3de2748956ad31ab268d376cb161bd8771b6ff808ef9e6cfe4c2092dd270c366cc50a548367f975d6529b57e0746f172fc383880aea0b24d4df
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/dev-util/clazy/clazy-1.11-r4.ebuild b/dev-util/clazy/clazy-1.11-r4.ebuild
deleted file mode 100644
index 472e84d5ffea..000000000000
--- a/dev-util/clazy/clazy-1.11-r4.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_MAX_SLOT=17
-PYTHON_COMPAT=( python3_{10..12} )
-inherit cmake llvm python-any-r1
-
-DESCRIPTION="Compiler plugin which allows clang to understand Qt semantics"
-HOMEPAGE="https://apps.kde.org/clazy"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):="
-DEPEND="${RDEPEND}"
-BDEPEND="test? ( ${PYTHON_DEPS} )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-fix-regex-detect.patch
-	"${FILESDIR}"/${P}-fix-llvm-{15,16,17}.patch
-	"${FILESDIR}"/${P}-jobs-for-tests.patch
-)
-
-llvm_check_deps() {
-	has_version "sys-devel/clang:${LLVM_SLOT}" && has_version "sys-devel/llvm:${LLVM_SLOT}"
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-
-	llvm_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	sed -e '/install(FILES README.md COPYING-LGPL2.txt checks.json DESTINATION/d' \
-		-i CMakeLists.txt || die
-}
-
-src_configure() {
-	export LLVM_ROOT="$(get_llvm_prefix -d ${LLVM_MAX_SLOT})"
-
-	cmake_src_configure
-}
-
-src_test() {
-	# Run tests against built copy, not installed
-	# bug #811723
-	PATH="${BUILD_DIR}/bin:${PATH}" LD_LIBRARY_PATH="${BUILD_DIR}/lib" cmake_src_test
-}
diff --git a/dev-util/clazy/clazy-1.12.ebuild b/dev-util/clazy/clazy-1.12.ebuild
index 633a2cb76aa9..e99a8da7633f 100644
--- a/dev-util/clazy/clazy-1.12.ebuild
+++ b/dev-util/clazy/clazy-1.12.ebuild
@@ -18,8 +18,8 @@ IUSE="test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	$(llvm_gen_dep 'sys-devel/clang:${LLVM_SLOT}')
-	$(llvm_gen_dep 'sys-devel/llvm:${LLVM_SLOT}')
+	$(llvm_gen_dep 'llvm-core/clang:${LLVM_SLOT}')
+	$(llvm_gen_dep 'llvm-core/llvm:${LLVM_SLOT}')
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
diff --git a/dev-util/clazy/files/clazy-1.11-fix-llvm-15.patch b/dev-util/clazy/files/clazy-1.11-fix-llvm-15.patch
deleted file mode 100644
index b98e4b1c2fee..000000000000
--- a/dev-util/clazy/files/clazy-1.11-fix-llvm-15.patch
+++ /dev/null
@@ -1,223 +0,0 @@
-From 20fca52da739ebefa47e35f6b338bb99a0da3cfe Mon Sep 17 00:00:00 2001
-From: Cristian Adam <cristian.adam@qt.io>
-Date: Tue, 6 Sep 2022 16:30:02 +0200
-Subject: [PATCH] Build fixes for LLVM/Clang 15.0.0
-
-Change-Id: Icc39a0b1acffb5a6a4798b1259d8ad4e7dd47bc5
----
- CMakeLists.txt                              |  6 ++++++
- src/PreProcessorVisitor.cpp                 |  2 +-
- src/PreProcessorVisitor.h                   |  2 +-
- src/SourceCompatibilityHelpers.h            | 15 +++++++++++++++
- src/Utils.cpp                               |  3 ++-
- src/checkbase.cpp                           |  4 ++--
- src/checkbase.h                             |  4 ++--
- src/checks/manuallevel/qt6-fwd-fixes.cpp    |  2 +-
- src/checks/manuallevel/qt6-fwd-fixes.h      |  2 +-
- src/checks/manuallevel/qt6-header-fixes.cpp |  2 +-
- src/checks/manuallevel/qt6-header-fixes.h   |  2 +-
- 11 files changed, 33 insertions(+), 11 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3c780b0d..100135af 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -114,6 +114,10 @@ else()
-     set(clang_tooling_refactoring_lib clangToolingRefactor)
- endif()
- 
-+if (${LLVM_VERSION} VERSION_GREATER_EQUAL "15.0.0")
-+  set(clang_support_lib clangSupport)
-+endif()
-+
- macro(link_to_llvm name is_standalone)
-   if (CLAZY_LINK_CLANG_DYLIB)
-     target_link_libraries(${name} clang-cpp)
-@@ -131,6 +135,7 @@ macro(link_to_llvm name is_standalone)
- 
-       target_link_libraries(${name} ${clang_lib})
-     endforeach()
-+    target_link_libraries(${name} ${clang_support_lib})
-     target_link_libraries(${name} clangTooling)
-     target_link_libraries(${name} clangToolingCore)
-     target_link_libraries(${name} ${clang_tooling_refactoring_lib})
-@@ -302,6 +307,7 @@ else()
-     clangFrontendTool
-     clangRewrite
-     clangSerialization
-+    ${clang_support_lib}
-     clangTooling
-     clangStaticAnalyzerCheckers
-     clangStaticAnalyzerCore
-diff --git a/src/PreProcessorVisitor.cpp b/src/PreProcessorVisitor.cpp
-index 5e63a131..5fdfe5f3 100644
---- a/src/PreProcessorVisitor.cpp
-+++ b/src/PreProcessorVisitor.cpp
-@@ -185,7 +185,7 @@ void PreProcessorVisitor::MacroExpands(const Token &MacroNameTok, const MacroDef
- 
- void PreProcessorVisitor::InclusionDirective (clang::SourceLocation, const clang::Token &,
-                                               clang::StringRef FileName, bool IsAngled, clang::CharSourceRange FilenameRange,
--                                              const clang::FileEntry *, clang::StringRef, clang::StringRef,
-+                                              clazy::OptionalFileEntryRef, clang::StringRef, clang::StringRef,
-                                               const clang::Module *, clang::SrcMgr::CharacteristicKind)
- {
-    if (m_ci.getPreprocessor().isInPrimaryFile() && !clazy::endsWith(FileName.str(), ".moc")) {
-diff --git a/src/PreProcessorVisitor.h b/src/PreProcessorVisitor.h
-index dc80ff36..1bb17a5e 100644
---- a/src/PreProcessorVisitor.h
-+++ b/src/PreProcessorVisitor.h
-@@ -71,7 +71,7 @@ protected:
-                       clang::SourceRange range, const clang::MacroArgs *) override;
-     void InclusionDirective (clang::SourceLocation HashLoc, const clang::Token &IncludeTok,
-                              clang::StringRef FileName, bool IsAngled, clang::CharSourceRange FilenameRange,
--                             const clang::FileEntry *File, clang::StringRef SearchPath, clang::StringRef RelativePath,
-+                             clazy::OptionalFileEntryRef File, clang::StringRef SearchPath, clang::StringRef RelativePath,
-                              const clang::Module *Imported, clang::SrcMgr::CharacteristicKind FileType) override;
- private:
-     std::string getTokenSpelling(const clang::MacroDefinition &) const;
-diff --git a/src/SourceCompatibilityHelpers.h b/src/SourceCompatibilityHelpers.h
-index 4ea923a2..c1a23a4b 100644
---- a/src/SourceCompatibilityHelpers.h
-+++ b/src/SourceCompatibilityHelpers.h
-@@ -144,6 +144,21 @@ inline bool contains_lower(clang::StringRef haystack, clang::StringRef needle)
- #endif
- }
- 
-+#if LLVM_VERSION_MAJOR >= 15
-+using OptionalFileEntryRef = clang::Optional<clang::FileEntryRef>;
-+#else
-+using OptionalFileEntryRef = const clang::FileEntry*;
-+#endif
-+
-+inline bool isAscii(clang::StringLiteral *lt)
-+{
-+#if LLVM_VERSION_MAJOR >= 15
-+    return lt->isOrdinary();
-+#else
-+    return lt->isAscii();
-+#endif
-+}
-+
- }
- 
- #endif
-diff --git a/src/Utils.cpp b/src/Utils.cpp
-index 3cdf7876..70e0577c 100644
---- a/src/Utils.cpp
-+++ b/src/Utils.cpp
-@@ -25,6 +25,7 @@
- #include "Utils.h"
- #include "StringUtils.h"
- #include "HierarchyUtils.h"
-+#include "SourceCompatibilityHelpers.h"
- #include "StmtBodyRange.h"
- #include "clazy_stl.h"
- 
-@@ -670,7 +671,7 @@ const CXXRecordDecl *Utils::recordForMemberCall(CXXMemberCallExpr *call, string
- bool Utils::isAscii(StringLiteral *lt)
- {
-     // 'é' for some reason has isAscii() == true, so also call containsNonAsciiOrNull
--    return lt && lt->isAscii() && !lt->containsNonAsciiOrNull();
-+    return lt && clazy::isAscii(lt) && !lt->containsNonAsciiOrNull();
- }
- 
- bool Utils::isInDerefExpression(Stmt *s, ParentMap *map)
-diff --git a/src/checkbase.cpp b/src/checkbase.cpp
-index f5936dfd..dcc7c999 100644
---- a/src/checkbase.cpp
-+++ b/src/checkbase.cpp
-@@ -105,7 +105,7 @@ void ClazyPreprocessorCallbacks::MacroDefined(const Token &macroNameTok, const M
- }
- 
- void ClazyPreprocessorCallbacks::InclusionDirective(clang::SourceLocation HashLoc, const clang::Token &IncludeTok, clang::StringRef FileName, bool IsAngled,
--                                                    clang::CharSourceRange FilenameRange, const clang::FileEntry *File, clang::StringRef SearchPath,
-+                                                    clang::CharSourceRange FilenameRange, clazy::OptionalFileEntryRef File, clang::StringRef SearchPath,
-                                                     clang::StringRef RelativePath, const clang::Module *Imported, clang::SrcMgr::CharacteristicKind FileType)
- {
-     check->VisitInclusionDirective(HashLoc, IncludeTok, FileName, IsAngled, FilenameRange, File, SearchPath, RelativePath, Imported, FileType);
-@@ -182,7 +182,7 @@ void CheckBase::VisitEndif(SourceLocation, SourceLocation)
- }
- 
- void CheckBase::VisitInclusionDirective(clang::SourceLocation , const clang::Token &, clang::StringRef , bool ,
--                        clang::CharSourceRange , const clang::FileEntry *, clang::StringRef ,
-+                        clang::CharSourceRange , clazy::OptionalFileEntryRef, clang::StringRef ,
-                         clang::StringRef , const clang::Module *, clang::SrcMgr::CharacteristicKind )
- {
-     // Overriden in derived classes
-diff --git a/src/checkbase.h b/src/checkbase.h
-index c5db2daf..02f6a6bf 100644
---- a/src/checkbase.h
-+++ b/src/checkbase.h
-@@ -91,7 +91,7 @@ public:
-     void Else(clang::SourceLocation loc, clang::SourceLocation ifLoc) override;
-     void Endif(clang::SourceLocation loc, clang::SourceLocation ifLoc) override;
-     void InclusionDirective(clang::SourceLocation HashLoc, const clang::Token &IncludeTok, clang::StringRef FileName, bool IsAngled,
--                            clang::CharSourceRange FilenameRange, const clang::FileEntry *File, clang::StringRef SearchPath,
-+                            clang::CharSourceRange FilenameRange, clazy::OptionalFileEntryRef File, clang::StringRef SearchPath,
-                             clang::StringRef RelativePath, const clang::Module *Imported, clang::SrcMgr::CharacteristicKind FileType) override;
- private:
-     CheckBase *const check;
-@@ -151,7 +151,7 @@ protected:
-     virtual void VisitElse(clang::SourceLocation loc, clang::SourceLocation ifLoc);
-     virtual void VisitEndif(clang::SourceLocation loc, clang::SourceLocation ifLoc);
-     virtual void VisitInclusionDirective(clang::SourceLocation HashLoc, const clang::Token &IncludeTok, clang::StringRef FileName, bool IsAngled,
--                            clang::CharSourceRange FilenameRange, const clang::FileEntry *File, clang::StringRef SearchPath,
-+                            clang::CharSourceRange FilenameRange, clazy::OptionalFileEntryRef File, clang::StringRef SearchPath,
-                             clang::StringRef RelativePath, const clang::Module *Imported, clang::SrcMgr::CharacteristicKind FileType);
- 
-     void enablePreProcessorCallbacks();
-diff --git a/src/checks/manuallevel/qt6-fwd-fixes.cpp b/src/checks/manuallevel/qt6-fwd-fixes.cpp
-index 83bf81ee..c87d9ca0 100644
---- a/src/checks/manuallevel/qt6-fwd-fixes.cpp
-+++ b/src/checks/manuallevel/qt6-fwd-fixes.cpp
-@@ -166,7 +166,7 @@ void Qt6FwdFixes::VisitDecl(clang::Decl *decl)
- }
- 
- void Qt6FwdFixes::VisitInclusionDirective(clang::SourceLocation HashLoc, const clang::Token &IncludeTok, clang::StringRef FileName, bool IsAngled,
--                        clang::CharSourceRange FilenameRange, const clang::FileEntry *File, clang::StringRef SearchPath,
-+                        clang::CharSourceRange FilenameRange, clazy::OptionalFileEntryRef File, clang::StringRef SearchPath,
-                         clang::StringRef RelativePath, const clang::Module *Imported, clang::SrcMgr::CharacteristicKind FileType)
- {
-     auto current_file = m_sm.getFilename(HashLoc);
-diff --git a/src/checks/manuallevel/qt6-fwd-fixes.h b/src/checks/manuallevel/qt6-fwd-fixes.h
-index 37b59d95..bb928ba6 100644
---- a/src/checks/manuallevel/qt6-fwd-fixes.h
-+++ b/src/checks/manuallevel/qt6-fwd-fixes.h
-@@ -47,7 +47,7 @@ public:
-     explicit Qt6FwdFixes(const std::string &name, ClazyContext *context);
-     void VisitDecl(clang::Decl *decl) override;
-     void VisitInclusionDirective(clang::SourceLocation HashLoc, const clang::Token &IncludeTok, clang::StringRef FileName, bool IsAngled,
--                            clang::CharSourceRange FilenameRange, const clang::FileEntry *File, clang::StringRef SearchPath,
-+                            clang::CharSourceRange FilenameRange, clazy::OptionalFileEntryRef File, clang::StringRef SearchPath,
-                             clang::StringRef RelativePath, const clang::Module *Imported, clang::SrcMgr::CharacteristicKind FileType) override;
-     bool m_including_qcontainerfwd = false;
-     std::set<clang::StringRef> m_qcontainerfwd_included_in_files;
-diff --git a/src/checks/manuallevel/qt6-header-fixes.cpp b/src/checks/manuallevel/qt6-header-fixes.cpp
-index d458b77c..aaa28093 100644
---- a/src/checks/manuallevel/qt6-header-fixes.cpp
-+++ b/src/checks/manuallevel/qt6-header-fixes.cpp
-@@ -270,7 +270,7 @@ Qt6HeaderFixes::Qt6HeaderFixes(const std::string &name, ClazyContext *context)
- }
- 
- void Qt6HeaderFixes::VisitInclusionDirective(clang::SourceLocation HashLoc, const clang::Token &IncludeTok, clang::StringRef FileName, bool IsAngled,
--                        clang::CharSourceRange FilenameRange, const clang::FileEntry *File, clang::StringRef SearchPath,
-+                        clang::CharSourceRange FilenameRange, clazy::OptionalFileEntryRef File, clang::StringRef SearchPath,
-                         clang::StringRef RelativePath, const clang::Module *Imported, clang::SrcMgr::CharacteristicKind FileType)
- {
-     if (shouldIgnoreFile(HashLoc))
-diff --git a/src/checks/manuallevel/qt6-header-fixes.h b/src/checks/manuallevel/qt6-header-fixes.h
-index ae09f7ad..8ffbb100 100644
---- a/src/checks/manuallevel/qt6-header-fixes.h
-+++ b/src/checks/manuallevel/qt6-header-fixes.h
-@@ -46,7 +46,7 @@ class Qt6HeaderFixes
- public:
-     explicit Qt6HeaderFixes(const std::string &name, ClazyContext *context);
-     void VisitInclusionDirective(clang::SourceLocation HashLoc, const clang::Token &IncludeTok, clang::StringRef FileName, bool IsAngled,
--                            clang::CharSourceRange FilenameRange, const clang::FileEntry *File, clang::StringRef SearchPath,
-+                            clang::CharSourceRange FilenameRange, clazy::OptionalFileEntryRef File, clang::StringRef SearchPath,
-                             clang::StringRef RelativePath, const clang::Module *Imported, clang::SrcMgr::CharacteristicKind FileType) override;
- 
- };
--- 
-GitLab
-
diff --git a/dev-util/clazy/files/clazy-1.11-fix-llvm-16.patch b/dev-util/clazy/files/clazy-1.11-fix-llvm-16.patch
deleted file mode 100644
index a5759060c112..000000000000
--- a/dev-util/clazy/files/clazy-1.11-fix-llvm-16.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From a05ac7eb6f6198c3f478bd7b5b4bfc062a8d63cc Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ivan=20=C4=8Cuki=C4=87?= <ivan.cukic@kdab.com>
-Date: Tue, 7 Feb 2023 11:06:19 +0100
-Subject: [PATCH] Adapt to API changes in clang/llvm 16
-
----
- src/SourceCompatibilityHelpers.h        | 17 ++++++++++++-----
- src/checkbase.h                         |  1 +
- src/checks/level0/lambda-in-connect.cpp |  2 +-
- 3 files changed, 14 insertions(+), 6 deletions(-)
-
-diff --git a/src/SourceCompatibilityHelpers.h b/src/SourceCompatibilityHelpers.h
-index c1a23a4b..5e2dc606 100644
---- a/src/SourceCompatibilityHelpers.h
-+++ b/src/SourceCompatibilityHelpers.h
-@@ -107,7 +107,11 @@ inline clang::tooling::Replacements& DiagnosticFix(clang::tooling::Diagnostic &d
- 
- inline auto getBuffer(const clang::SourceManager &sm, clang::FileID id, bool *invalid)
- {
--#if LLVM_VERSION_MAJOR >= 12
-+#if LLVM_VERSION_MAJOR >= 16
-+    auto buffer = sm.getBufferOrNone(id);
-+    *invalid = !buffer.has_value();
-+    return buffer;
-+#elif LLVM_VERSION_MAJOR >= 12
-     auto buffer = sm.getBufferOrNone(id);
-     *invalid = !buffer.hasValue();
-     return buffer;
-@@ -116,11 +120,12 @@ inline auto getBuffer(const clang::SourceManager &sm, clang::FileID id, bool *in
- #endif
- }
- 
--#if LLVM_VERSION_MAJOR >= 12
--
-+#if LLVM_VERSION_MAJOR >= 16
-+#define GET_LEXER(id, inputFile, sm, lo) \
-+clang::Lexer(id, inputFile.value(), sm, lo)
-+#elif LLVM_VERSION_MAJOR >= 12
- #define GET_LEXER(id, inputFile, sm, lo) \
- clang::Lexer(id, inputFile.getValue(), sm, lo)
--
- #else
- #define GET_LEXER(id, inputFile, sm, lo) \
- clang::Lexer(id, inputFile, sm, lo)
-@@ -144,7 +149,9 @@ inline bool contains_lower(clang::StringRef haystack, clang::StringRef needle)
- #endif
- }
- 
--#if LLVM_VERSION_MAJOR >= 15
-+#if LLVM_VERSION_MAJOR >= 16
-+using OptionalFileEntryRef = clang::CustomizableOptional<clang::FileEntryRef>;
-+#elif LLVM_VERSION_MAJOR >= 15
- using OptionalFileEntryRef = clang::Optional<clang::FileEntryRef>;
- #else
- using OptionalFileEntryRef = const clang::FileEntry*;
-diff --git a/src/checkbase.h b/src/checkbase.h
-index 02f6a6bf..6a8c634b 100644
---- a/src/checkbase.h
-+++ b/src/checkbase.h
-@@ -93,6 +93,7 @@ public:
-     void InclusionDirective(clang::SourceLocation HashLoc, const clang::Token &IncludeTok, clang::StringRef FileName, bool IsAngled,
-                             clang::CharSourceRange FilenameRange, clazy::OptionalFileEntryRef File, clang::StringRef SearchPath,
-                             clang::StringRef RelativePath, const clang::Module *Imported, clang::SrcMgr::CharacteristicKind FileType) override;
-+
- private:
-     CheckBase *const check;
- };
-diff --git a/src/checks/level0/lambda-in-connect.cpp b/src/checks/level0/lambda-in-connect.cpp
-index b0da926f..1ba1126f 100644
---- a/src/checks/level0/lambda-in-connect.cpp
-+++ b/src/checks/level0/lambda-in-connect.cpp
-@@ -71,7 +71,7 @@ void LambdaInConnect::VisitStmt(clang::Stmt *stmt)
- 
-     for (auto capture : captures) {
-         if (capture.getCaptureKind() == clang::LCK_ByRef) {
--            VarDecl *declForCapture = capture.getCapturedVar();
-+            auto *declForCapture = capture.getCapturedVar();
-             if (declForCapture && declForCapture != receiverDecl && clazy::isValueDeclInFunctionContext(declForCapture))
-                 emitWarning(capture.getLocation(), "captured local variable by reference might go out of scope before lambda is called");
-         }
--- 
-GitLab
-
diff --git a/dev-util/clazy/files/clazy-1.11-fix-llvm-17.patch b/dev-util/clazy/files/clazy-1.11-fix-llvm-17.patch
deleted file mode 100644
index 6550b63a3506..000000000000
--- a/dev-util/clazy/files/clazy-1.11-fix-llvm-17.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From a9aabd821d8be7932c954e1cdd8d4e10f38f8785 Mon Sep 17 00:00:00 2001
-From: Cristian Adam <cristian.adam@gmail.com>
-Date: Mon, 14 Aug 2023 18:16:01 +0200
-Subject: [PATCH] Fix compilation with LLVM 17.0.0 (rc2)
-
-Change-Id: I9d3fc86185c1e7c86145da043e1982d2979b36e9
----
- .../manuallevel/unexpected-flag-enumerator-value.cpp   | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
---- a/src/checks/manuallevel/unexpected-flag-enumerator-value.cpp
-+++ b/src/checks/manuallevel/unexpected-flag-enumerator-value.cpp
-@@ -61,8 +61,13 @@ static bool isIntentionallyNotPowerOf2(E
-     if (val.isMask() && val.countTrailingOnes() >= MinOnesToQualifyAsMask)
-         return true;
- 
-+#if LLVM_VERSION_MAJOR >= 17
-+    if (val.isShiftedMask() && val.popcount() >= MinOnesToQualifyAsMask)
-+        return true;
-+#else
-     if (val.isShiftedMask() && val.countPopulation() >= MinOnesToQualifyAsMask)
-         return true;
-+#endif
- 
-     if (clazy::contains_lower(en->getName(), "mask"))
-         return true;
-@@ -158,7 +163,11 @@ void UnexpectedFlagEnumeratorValue::Visi
- 
-     for (EnumConstantDecl* enumerator : enumerators) {
-         const auto &initVal = enumerator->getInitVal();
-+#if LLVM_VERSION_MAJOR >= 17
-+        if (!initVal.isPowerOf2() && !initVal.isZero() && !initVal.isNegative()) {
-+#else
-         if (!initVal.isPowerOf2() && !initVal.isNullValue() && !initVal.isNegative()) {
-+#endif
-             if (isIntentionallyNotPowerOf2(enumerator))
-                 continue;
-             const auto value = enumerator->getInitVal().getLimitedValue();
diff --git a/dev-util/clazy/files/clazy-1.11-fix-regex-detect.patch b/dev-util/clazy/files/clazy-1.11-fix-regex-detect.patch
deleted file mode 100644
index a60206365ea1..000000000000
--- a/dev-util/clazy/files/clazy-1.11-fix-regex-detect.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 336b54f28250938cc2a8d7bb78e638e79b6467d5 Mon Sep 17 00:00:00 2001
-From: Hannah von Reth <vonreth@kde.org>
-Date: Fri, 8 Jul 2022 11:19:22 +0000
-Subject: [PATCH] Fix regex detection
-
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 434a57c9..3c780b0d 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -81,7 +81,7 @@ endif()
- 
- # Look for std::regex support
- message("Looking for std::regex support...")
--try_run(REGEX_RUN_RESULT COMPILE_RESULT ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_LIST_DIR}/.cmake_has_regex_test.cpp)
-+try_run(REGEX_RUN_RESULT COMPILE_RESULT ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_LIST_DIR}/.cmake_has_regex_test.cpp CXX_STANDARD 17 CXX_STANDARD_REQUIRED true)
- 
- if(NOT REGEX_RUN_RESULT EQUAL 0)
-   message("Using boost::regex instead of std::regex")
--- 
-GitLab
-
diff --git a/dev-util/clazy/files/clazy-1.11-jobs-for-tests.patch b/dev-util/clazy/files/clazy-1.11-jobs-for-tests.patch
deleted file mode 100644
index 372aed3ca09a..000000000000
--- a/dev-util/clazy/files/clazy-1.11-jobs-for-tests.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From ab8993c9e10e09cb24210f76bb5e67f01bb37a9e Mon Sep 17 00:00:00 2001
-From: Pino Toscano <pino@kde.org>
-Date: Thu, 17 Nov 2022 19:09:47 +0100
-Subject: [PATCH] tests: add -j/--jobs option for run_tests.py
-
-This way it is possible to customize the number of parallel jobs to
-spawn for the tests, instead of unconditionally using all available
-CPUs. This can be helpful to run the tests without overloading the
-system.
-
-The default is still the number of available CPUs, so there is no
-behaviour change by default.
----
- tests/run_tests.py | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/tests/run_tests.py b/tests/run_tests.py
-index bf4967d1..ea03ab4c 100755
---- a/tests/run_tests.py
-+++ b/tests/run_tests.py
-@@ -443,6 +443,8 @@ parser.add_argument("--dump-ast", action='store_true',
-                     help='Dump a unit-test AST to file')
- parser.add_argument(
-     "--exclude", help='Comma separated list of checks to ignore')
-+parser.add_argument("-j", "--jobs", type=int, default=multiprocessing.cpu_count(),
-+                    help='Parallel jobs to run (defaults to %(default)s)')
- parser.add_argument("check_names", nargs='*',
-                     help="The name of the check whose unit-tests will be run. Defaults to running all checks.")
- args = parser.parse_args()
-@@ -460,7 +462,7 @@ _verbose = args.verbose
- _no_standalone = args.no_standalone
- _no_fixits = args.no_fixits
- _only_standalone = args.only_standalone
--_num_threads = multiprocessing.cpu_count()
-+_num_threads = args.jobs
- _lock = threading.Lock()
- _was_successful = True
- _qt5_installation = find_qt_installation(
--- 
-2.35.1
-