15 files changed, 134 insertions, 419 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 237e5da1475a..35617ea82770 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/bitcoin-tx/Manifest b/dev-util/bitcoin-tx/Manifest
deleted file mode 100644
index 9d845ecbec0a..000000000000
--- a/dev-util/bitcoin-tx/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD bitcoin-tx-25.1.ebuild 341 BLAKE2B a0ffc849d879785926c56877c8108e0cafcb78ace9b9c8a01b2eccc89e70664333d7992b7711ff441d3931bb9343b4b504dcb71d3509cd9d5e1061883dfb3866 SHA512 27bc52ea33bcc7d3e4aed91d7c99dc6c37a802b4278b582bf7a2ce0f2534434fdaa7936ab2c2f529fa22cb2b3737b3865bd63f9f6e90e21cb7ce4e73b828ee35
-MISC metadata.xml 545 BLAKE2B 1edf1e74fcee6b62d4814c592f1024243f0f0dcfed513748997423e0235c46814ce28a6bb2bf4ecd669699dc552785b27b75cff2f23e2e344601814477baa780 SHA512 e836dcf394ce09821e47025f118286c1f92aed62167133bf8e7ffcf99c8d369584ae941097f7ff2f01c18d1b79e9a38b25558f16774b60320d4b1d41a969b907
diff --git a/dev-util/bitcoin-tx/bitcoin-tx-25.1.ebuild b/dev-util/bitcoin-tx/bitcoin-tx-25.1.ebuild
deleted file mode 100644
index 4eace497e402..000000000000
--- a/dev-util/bitcoin-tx/bitcoin-tx-25.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Transitional package for net-p2p/bitcoin-core"
-HOMEPAGE="https://bitcoincore.org/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="~net-p2p/bitcoin-core-${PV}"
diff --git a/dev-util/bitcoin-tx/metadata.xml b/dev-util/bitcoin-tx/metadata.xml
deleted file mode 100644
index 9eab793a582a..000000000000
--- a/dev-util/bitcoin-tx/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>luke-jr+gentoobugs@utopios.org</email>
-		<name>Luke Dashjr</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">bitcoin/bitcoin</remote-id>
-		<remote-id type="github">bitcoinknots/bitcoin</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/bugbite-cli/Manifest b/dev-util/bugbite-cli/Manifest
index e4073d1b8665..df09dc1681ca 100644
--- a/dev-util/bugbite-cli/Manifest
+++ b/dev-util/bugbite-cli/Manifest
@@ -1,3 +1,3 @@
 DIST bugbite-cli-0.0.13.tar.xz 22286212 BLAKE2B c906446a89ae2c7346318cffb96c93178585ef42589bba4df4ecdf906e8890a922324d484bbd252e119a8d47370c63816dfb0a55481586de6f30f13d7d3d84bc SHA512 40971032ff4e63416c3383a55418ba7c0c4c85321caace435000018da93176b6b1d83ee04aa4abdfa31646c9b6d1777c9e5acb035b14bca210bfc22ffc7fd90d
-EBUILD bugbite-cli-0.0.13.ebuild 1514 BLAKE2B 7d005974696f09ea8afcfb294131917cf22e321010c5b3d414d73d1774c6c74a8e21dfbe2b03e1dfd05825ae04d2dc8c97f2a1af2154c7a9a9a4f486107da91f SHA512 11e92ab820a65e3430d24458418ddf9a7949d11eb1b25e2486d270f8c2e8d65ec32675bd016358c9a5d2f955f0e2f21d95485b8af7d5886ed5673bdc57a34751
+EBUILD bugbite-cli-0.0.13.ebuild 1585 BLAKE2B 3f3f9424725ad6422a8214ed927ac2c312eae1ffd9d14e7493065f91d312540673fb68cffe91fb22348d41a4537db1a00c68d1690460d40559ea4fe4bf1e5ef3 SHA512 af0423e83f835dc476e29de92cd4836d806bf150741d425dce4c40f07a0948775e13aab54b7230e8ef547ff33c6ab4d82f371bf7b39bf55f80d15a781fb634cd
 MISC metadata.xml 590 BLAKE2B b31588e873fa47581c84c163e00685ee3cd91cb6dea21ac265bbf7a4f4e6ec729414b71ce90d73abd4fd3b4342f751729c9115a2c614a856042047cde0b1bf03 SHA512 721e0da0a31e627e29bdc9ac92bafcdca54b04ff5be4cf08ad0f56154fe43df5acec46d4963773636353fcd6e2c469072aace4b33fda6df151034728106c0a90
diff --git a/dev-util/bugbite-cli/bugbite-cli-0.0.13.ebuild b/dev-util/bugbite-cli/bugbite-cli-0.0.13.ebuild
index a346a3ca7fff..42a9d2a8c8fb 100644
--- a/dev-util/bugbite-cli/bugbite-cli-0.0.13.ebuild
+++ b/dev-util/bugbite-cli/bugbite-cli-0.0.13.ebuild
@@ -1,11 +1,11 @@
-# Copyright 2024 Gentoo Authors
+# Copyright 2024-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 RUST_MIN_VER="1.80.1"
 
-inherit cargo edo shell-completion
+inherit cargo edo multiprocessing shell-completion
 
 DESCRIPTION="A command line tool for bug, issue, and ticket mangling"
 HOMEPAGE="https://github.com/radhermit/bugbite"
@@ -44,6 +44,7 @@ src_configure() {
 }
 
 src_test() {
+	local -x NEXTEST_TEST_THREADS="$(makeopts_jobs)"
 	edo cargo nextest run $(usev !debug '--release') --color always --features test --tests ${static_stuff}
 }
 
diff --git a/dev-util/clazy/Manifest b/dev-util/clazy/Manifest
index 944df67222d3..799a54705a1c 100644
--- a/dev-util/clazy/Manifest
+++ b/dev-util/clazy/Manifest
@@ -1,13 +1,7 @@
 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
 AUX clazy-1.12-clazy-install-location.patch 1157 BLAKE2B 05bb8f3167174a073deddc9501f5e120ef3e44863a989e1ffda537610385035706804bd345165c51dad36f665d92258e9462fc4ac8bafb0eb91fada86a2808f6 SHA512 fe0e8765b54dfae606d6613a4dd9f638cd0d665d4b7ab24433fa7aa82059c20eb574978f1f116414955e8a84160d76445abb51ec8ab66b901f11f30207ae4cc4
-AUX clazy-1.12-fix-tests-Qt-detect-1.patch 3388 BLAKE2B 4aace0f453e84a3e00651eda4a30dc1b84032789d22a7cedd1eee7338d5f52f49f03e0e92a1220de187ad90e9a3cf9ab14c8f5e1f57559d8a385f3bd705a771b SHA512 926a8fbfd7134b9e1b553273e39817cb35d5e6b5d29ed43b77b5eedef9faa6d9cde7441923d5bf6eaf2b19b2d7c7a97b23ae866ff1b8b5e3a02754a2234183f6
-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.12.tar.xz 427740 BLAKE2B ad2c78a506132b5fd6b3c22a7e9794c38ddd71242cde6f760e48d0250f6215629007d45303f4b35fdc7717865b8221ab1c2f3c6889a44ea1809e112845f16463 SHA512 7a2b4a753098f15936a4731c82c660c1cd4d81949279435e87f00f7f72bef3e32cb574c8991c0707798581278e9fbcae34d354c1e6b77a15a5e26166d658fa9e
 DIST clazy-1.13.tar.xz 434648 BLAKE2B 2659bec375c9f30021cdd86c12ab4416dfb5250706c2f6254cbd848d07e3e4f220b2a74d23390f235939ad3e5390797ea4b5398948e129a07a66a5de2d33c997 SHA512 4044bddb9e60e227ff2ab7e40c32f087a621e00c985e1706a4f4e2ace20f96cc6e78f00781f7d59da5b066aa49370c645db506e41d955409c0e146771a59ee24
-EBUILD clazy-1.12.ebuild 2236 BLAKE2B 03215cae9ffca622db565dcdc09065dd45f3fbb12f99782837a03d4e8ab753bd3a969c25fee389a6157c8fbee532313490df43a12ce4aa3a73cd65a47c2698ec SHA512 3bbd93a7e315c3de2748956ad31ab268d376cb161bd8771b6ff808ef9e6cfe4c2092dd270c366cc50a548367f975d6529b57e0746f172fc383880aea0b24d4df
 EBUILD clazy-1.13.ebuild 2068 BLAKE2B 4bc603d429192c5f2057d8894fee339d85713a16a956d5688740bbca0648d1eaedc727607c9708249a1a61b45bb9ca998055f99a9f8c62ed10bb99b2e4b73d7c SHA512 b6d6db27336ded79ead209e0b629088bbefd483474c41802cb8225558239da0b4aca8eb362ffb8d76441cb2040ddc7a59a5f25a79e74479aa36409d1282b4b2f
 MISC metadata.xml 398 BLAKE2B e4660f76bcd0cb7b8ba5b6b9e6d91b0c82355c79249c55fa0b1158dcc051421be34ebf2c1705404742c788fde6e7833d14de617ec37279c3d43e83a8dcfd6e24 SHA512 2ecc21860dc45936b34f29a3cd2cbd2aa7f7c2475960ec9cf79bd71b5847c961ead38a8046c347d57dbd6461925949d2d1c4f6b4c47185983928b93ffe946328
diff --git a/dev-util/clazy/clazy-1.12.ebuild b/dev-util/clazy/clazy-1.12.ebuild
deleted file mode 100644
index e99a8da7633f..000000000000
--- a/dev-util/clazy/clazy-1.12.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( {15..18} )
-PYTHON_COMPAT=( python3_{10..13} )
-inherit cmake llvm-r1 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="
-	$(llvm_gen_dep 'llvm-core/clang:${LLVM_SLOT}')
-	$(llvm_gen_dep 'llvm-core/llvm:${LLVM_SLOT}')
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	test? (
-		${PYTHON_DEPS}
-		dev-qt/qtbase:6[network,xml]
-		dev-qt/qtmultimedia:6
-		dev-qt/qtnetworkauth:6
-		dev-qt/qtscxml:6[qml]
-		dev-qt/qtsvg:6
-	)
-"
-
-PATCHES=(
-	# git master
-	"${FILESDIR}"/${P}-fix-tests-Qt-detect-{1,2}.patch
-	"${FILESDIR}"/${P}-llvm-18.patch
-	# Pending: https://invent.kde.org/sdk/clazy/-/merge_requests/131
-	"${FILESDIR}"/${P}-clang-16-no-src-root.patch
-
-	"${FILESDIR}"/${P}-LIBRARY_DIRS.patch
-	"${FILESDIR}"/${P}-INCLUDE_DIRS.patch
-	"${FILESDIR}"/${P}-standalone-install-location.patch
-	"${FILESDIR}"/${P}-clazy-install-location.patch
-)
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-	llvm-r1_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() {
-	local -x LLVM_ROOT="$(get_llvm_prefix -d)"
-
-	export CI_JOB_NAME_SLUG="qt6"
-
-	cmake_src_configure
-}
-
-src_test() {
-	# clazy-standalone wants to be installed in the directory of the clang binary,
-	# so it can find the llvm/clang via relative paths.
-	# Requires the standalone-install-location.patch.
-	# Setup the directories and symlink the system include dir for that.
-	local -x LLVM_ROOT="$(get_llvm_prefix -d)"
-	local -x CLANG_ROOT="${LLVM_ROOT//llvm/clang}"
-	mkdir -p "${BUILD_DIR}${CLANG_ROOT}" || die
-
-	ln -s "${CLANG_ROOT}/include" "${BUILD_DIR}${CLANG_ROOT}/include" || die
-
-	# Run tests against built copy, not installed
-	# bug #811723
-	local -x PATH="${BUILD_DIR}/${LLVM_ROOT}/bin:${BUILD_DIR}/bin:${PATH}"
-	local -x LD_LIBRARY_PATH="${BUILD_DIR}/lib"
-
-	chmod +x "${BUILD_DIR}/bin/clazy" || die
-
-	cmake_src_test
-}
diff --git a/dev-util/clazy/files/clazy-1.12-clang-16-no-src-root.patch b/dev-util/clazy/files/clazy-1.12-clang-16-no-src-root.patch
deleted file mode 100644
index ca88efeaf6cd..000000000000
--- a/dev-util/clazy/files/clazy-1.12-clang-16-no-src-root.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 4fa1ded456626f9c13f1f77212754d6349d12a8a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Christoph=20Gr=C3=BCninger?= <foss@grueninger.de>
-Date: Tue, 27 Feb 2024 21:14:19 +0100
-Subject: [PATCH] [cmake] Adjust for non-installed LLVM
-
-In LLVM 16 llvm-config got --src-root removed.
-Adjust include path for Clang include
----
- cmake/FindClang.cmake | 8 ++++++--
- cmake/FindLLVM.cmake  | 6 +++++-
- 2 files changed, 11 insertions(+), 3 deletions(-)
-
-diff --git a/cmake/FindClang.cmake b/cmake/FindClang.cmake
-index e438ea5c..b4f0b0a1 100644
---- a/cmake/FindClang.cmake
-+++ b/cmake/FindClang.cmake
-@@ -86,8 +86,12 @@ if(CLANG_FOUND)
-   set(CLANG_INCLUDE_DIRS ${LLVM_INCLUDE_DIRS})
- 
-   # check whether llvm-config comes from an install prefix
-+  set(LLVM_CONFIG_INCLUDE_FLAG "--src-root")
-+  if (${LLVM_VERSION} VERSION_GREATER_EQUAL 16)
-+    set(LLVM_CONFIG_INCLUDE_FLAG "--includedir")
-+  endif()
-   execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --src-root
-+    COMMAND ${LLVM_CONFIG_EXECUTABLE} ${LLVM_CONFIG_INCLUDE_FLAG}
-     OUTPUT_VARIABLE _llvmSourceRoot
-     OUTPUT_STRIP_TRAILING_WHITESPACE
-   )
-@@ -96,7 +100,7 @@ if(CLANG_FOUND)
-     message(STATUS "Detected that llvm-config comes from a build-tree, adding more include directories for Clang")
-     list(APPEND CLANG_INCLUDE_DIRS
-          "${LLVM_INSTALL_PREFIX}/tools/clang/include" # build dir
--         "${_llvmSourceRoot}/tools/clang/include"     # source dir
-+         "${_llvmSourceRoot}/../../clang/include"     # source dir
-     )
-   endif()
- 
-diff --git a/cmake/FindLLVM.cmake b/cmake/FindLLVM.cmake
-index da02e006..c625eeb5 100644
---- a/cmake/FindLLVM.cmake
-+++ b/cmake/FindLLVM.cmake
-@@ -131,8 +131,12 @@ if (LLVM_FOUND)
-   endif()
- 
-   # potentially add include dir from binary dir for non-installed LLVM
-+  set(LLVM_CONFIG_INCLUDE_FLAG "--src-root")
-+  if (${LLVM_VERSION} VERSION_GREATER_EQUAL 16)
-+    set(LLVM_CONFIG_INCLUDE_FLAG "--includedir")
-+  endif()
-   execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --src-root
-+    COMMAND ${LLVM_CONFIG_EXECUTABLE} ${LLVM_CONFIG_INCLUDE_FLAG}
-     OUTPUT_VARIABLE _llvmSourceRoot
-     OUTPUT_STRIP_TRAILING_WHITESPACE
-   )
--- 
-GitLab
-
diff --git a/dev-util/clazy/files/clazy-1.12-fix-tests-Qt-detect-1.patch b/dev-util/clazy/files/clazy-1.12-fix-tests-Qt-detect-1.patch
deleted file mode 100644
index bca03b24dff4..000000000000
--- a/dev-util/clazy/files/clazy-1.12-fix-tests-Qt-detect-1.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From 61b03a0d9cb319173766383216deee74fd6d800e Mon Sep 17 00:00:00 2001
-From: Alexander Lohnau <alexander.lohnau@gmx.de>
-Date: Sat, 7 Sep 2024 11:31:22 +0200
-Subject: [PATCH] Make tests work when clang library is different from system
- default
-
-If we have found the clang folder, we can resolve the executable from there.
-In my case, I was compiling against clang16, but my system default was clang 14.
-The stacktrace is really confusing and hard to understand. Using the
-absolute path makes the log also better to understand and to reproduce
-the test results.
----
- ClazyTests.generated.cmake |  5 ++++-
- cmake/FindLLVM.cmake       | 13 +++++++++++++
- dev-scripts/generate.py    |  5 ++++-
- 3 files changed, 21 insertions(+), 2 deletions(-)
-
-diff --git a/ClazyTests.generated.cmake b/ClazyTests.generated.cmake
-index 204f0e5b..49b0f69e 100644
---- a/ClazyTests.generated.cmake
-+++ b/ClazyTests.generated.cmake
-@@ -2,8 +2,11 @@
- 
- macro(add_clazy_test name)
-   add_test(NAME ${name} COMMAND python3 run_tests.py ${name} --verbose WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests/)
-+  if (CLANG_EXECUTABLE_PATH)
-+    set(CLANG_CXX_TEST "CLANGXX=${CLANG_EXECUTABLE_PATH};")
-+  endif()
-   set_property(TEST ${name} PROPERTY
--    ENVIRONMENT "CLAZYPLUGIN_CXX=$<TARGET_FILE:ClazyPlugin>;CLAZYSTANDALONE_CXX=$<TARGET_FILE:clazy-standalone>;$<$<BOOL:${HAS_STD_FILESYSTEM}>:CLAZY_HAS_FILESYSTEM=>"
-+    ENVIRONMENT "${CLANG_CXX_TEST}CLAZYPLUGIN_CXX=$<TARGET_FILE:ClazyPlugin>;CLAZYSTANDALONE_CXX=$<TARGET_FILE:clazy-standalone>;$<$<BOOL:${HAS_STD_FILESYSTEM}>:CLAZY_HAS_FILESYSTEM=>"
-   )
- endmacro()
- 
-diff --git a/cmake/FindLLVM.cmake b/cmake/FindLLVM.cmake
-index a1fd9e3f..da02e006 100644
---- a/cmake/FindLLVM.cmake
-+++ b/cmake/FindLLVM.cmake
-@@ -117,6 +117,19 @@ if (LLVM_FOUND)
-     OUTPUT_STRIP_TRAILING_WHITESPACE
-   )
- 
-+  execute_process(
-+    COMMAND ${LLVM_CONFIG_EXECUTABLE} --bindir
-+    OUTPUT_VARIABLE LLVM_BIN_DIR
-+    OUTPUT_STRIP_TRAILING_WHITESPACE
-+  )
-+  set(CLANG_EXECUTABLE_PATH "${LLVM_BIN_DIR}/clang")
-+  if(EXISTS ${CLANG_EXECUTABLE_PATH})
-+    message(STATUS "Clang found: ${CLANG_EXECUTABLE_PATH}")
-+    set(CLANG_EXECUTABLE ${CLANG_EXECUTABLE_PATH})
-+  else()
-+    message(WARNING "Clang not found in LLVM bin directory: ${LLVM_BIN_DIR}")
-+  endif()
-+
-   # potentially add include dir from binary dir for non-installed LLVM
-   execute_process(
-     COMMAND ${LLVM_CONFIG_EXECUTABLE} --src-root
-diff --git a/dev-scripts/generate.py b/dev-scripts/generate.py
-index 2678aaba..11fc5bfc 100755
---- a/dev-scripts/generate.py
-+++ b/dev-scripts/generate.py
-@@ -468,8 +468,11 @@ def generate_ctest(checks):
-     contents = """# This file was autogenerated by running: ./dev-scripts/generate.py --generate\n
- macro(add_clazy_test name)
-   add_test(NAME ${name} COMMAND python3 run_tests.py ${name} --verbose WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests/)
-+  if (CLANG_EXECUTABLE_PATH)
-+    set(CLANG_CXX_TEST "CLANGXX=${CLANG_EXECUTABLE_PATH};")
-+  endif()
-   set_property(TEST ${name} PROPERTY
--    ENVIRONMENT "CLAZYPLUGIN_CXX=$<TARGET_FILE:ClazyPlugin>;CLAZYSTANDALONE_CXX=$<TARGET_FILE:clazy-standalone>;$<$<BOOL:${HAS_STD_FILESYSTEM}>:CLAZY_HAS_FILESYSTEM=>"
-+    ENVIRONMENT "${CLANG_CXX_TEST}CLAZYPLUGIN_CXX=$<TARGET_FILE:ClazyPlugin>;CLAZYSTANDALONE_CXX=$<TARGET_FILE:clazy-standalone>;$<$<BOOL:${HAS_STD_FILESYSTEM}>:CLAZY_HAS_FILESYSTEM=>"
-   )
- endmacro()\n
- """
--- 
-GitLab
-
diff --git a/dev-util/clazy/files/clazy-1.12-fix-tests-Qt-detect-2.patch b/dev-util/clazy/files/clazy-1.12-fix-tests-Qt-detect-2.patch
deleted file mode 100644
index 9e5276644ad7..000000000000
--- a/dev-util/clazy/files/clazy-1.12-fix-tests-Qt-detect-2.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-From fc058479b1d0ab8498b23a68dcbb56be1b38c793 Mon Sep 17 00:00:00 2001
-From: Alexander Lohnau <alexander.lohnau@gmx.de>
-Date: Sat, 7 Sep 2024 14:25:45 +0200
-Subject: [PATCH] Only look for Qt5/Qt6 installs if respective CI job is
- running
-
-We may have a qt6 installation even on a Qt5 image
-
-But in any case, we should only run them on the dedicated im age and not waste CI time otherwise
----
- ClazyTests.generated.cmake |  8 +++++++-
- dev-scripts/generate.py    |  8 +++++++-
- tests/run_tests.py         | 22 ++++++++++++++--------
- 3 files changed, 28 insertions(+), 10 deletions(-)
-
-diff --git a/ClazyTests.generated.cmake b/ClazyTests.generated.cmake
-index 49b0f69e..9babc7c5 100644
---- a/ClazyTests.generated.cmake
-+++ b/ClazyTests.generated.cmake
-@@ -1,7 +1,13 @@
- # This file was autogenerated by running: ./dev-scripts/generate.py --generate
- 
-+if ($ENV{CI_JOB_NAME_SLUG} MATCHES "qt5")
-+    set(TEST_VERSION_OPTION "--qt-versions=5")
-+elseif($ENV{CI_JOB_NAME_SLUG} MATCHES "qt6")
-+    set(TEST_VERSION_OPTION "--qt-versions=6")
-+endif()
-+
- macro(add_clazy_test name)
--  add_test(NAME ${name} COMMAND python3 run_tests.py ${name} --verbose WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests/)
-+  add_test(NAME ${name} COMMAND python3 run_tests.py ${name} --verbose ${TEST_VERSION_OPTION} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests/)
-   if (CLANG_EXECUTABLE_PATH)
-     set(CLANG_CXX_TEST "CLANGXX=${CLANG_EXECUTABLE_PATH};")
-   endif()
-diff --git a/dev-scripts/generate.py b/dev-scripts/generate.py
-index 11fc5bfc..a1233698 100755
---- a/dev-scripts/generate.py
-+++ b/dev-scripts/generate.py
-@@ -466,8 +466,14 @@ def generate_ctest(checks):
-     filename = clazy_source_path() + 'ClazyTests.generated.cmake'
- 
-     contents = """# This file was autogenerated by running: ./dev-scripts/generate.py --generate\n
-+if ($ENV{CI_JOB_NAME_SLUG} MATCHES "qt5")
-+    set(TEST_VERSION_OPTION "--qt-versions=5")
-+elseif($ENV{CI_JOB_NAME_SLUG} MATCHES "qt6")
-+    set(TEST_VERSION_OPTION "--qt-versions=6")
-+endif()
-+
- macro(add_clazy_test name)
--  add_test(NAME ${name} COMMAND python3 run_tests.py ${name} --verbose WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests/)
-+  add_test(NAME ${name} COMMAND python3 run_tests.py ${name} --verbose ${TEST_VERSION_OPTION} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests/)
-   if (CLANG_EXECUTABLE_PATH)
-     set(CLANG_CXX_TEST "CLANGXX=${CLANG_EXECUTABLE_PATH};")
-   endif()
-diff --git a/tests/run_tests.py b/tests/run_tests.py
-index 9fb9d5dc..da54e45a 100755
---- a/tests/run_tests.py
-+++ b/tests/run_tests.py
-@@ -457,6 +457,8 @@ parser.add_argument("--only-standalone", action='store_true',
-                     help='Only run clazy-standalone')
- parser.add_argument("--dump-ast", action='store_true',
-                     help='Dump a unit-test AST to file')
-+parser.add_argument("--qt-versions", type=int, choices=[5, 6], nargs='+', default=[5, 6],
-+                    help='Specify one or more Qt versions to use (default: 5 and 6)')
- parser.add_argument(
-     "--exclude", help='Comma separated list of checks to ignore')
- parser.add_argument("-j", "--jobs", type=int, default=multiprocessing.cpu_count(),
-@@ -481,10 +483,14 @@ _only_standalone = args.only_standalone
- _num_threads = args.jobs
- _lock = threading.Lock()
- _was_successful = True
--_qt6_installation = find_qt_installation(
--    6, ["QT_SELECT=6 qmake", "qmake-qt6", "qmake", "qmake6"])
--_qt5_installation = find_qt_installation(
--    5, ["QT_SELECT=5 qmake", "qmake-qt5", "qmake", "qmake5"])
-+if 6 in args.qt_versions:
-+    _qt6_installation = find_qt_installation(6, ["QT_SELECT=6 qmake", "qmake-qt6", "qmake", "qmake6"])
-+else:
-+    _qt6_installation = None
-+if 5 in args.qt_versions:
-+    _qt5_installation = find_qt_installation(5, ["QT_SELECT=5 qmake", "qmake-qt5", "qmake", "qmake5"])
-+else:
-+    _qt5_installation = None
- _excluded_checks = args.exclude.split(',') if args.exclude is not None else []
- 
- # -------------------------------------------------------------------------------
-@@ -697,6 +703,8 @@ def run_unit_test(test, is_standalone, cppStandard, qt_major_version):
-         return True
- 
-     qt = qt_installation(qt_major_version)
-+    if qt == None:
-+        return True # silently skip
- 
-     if _verbose:
-         print("Qt major versions required by the test: " + str(test.qt_major_versions))
-@@ -709,14 +717,12 @@ def run_unit_test(test, is_standalone, cppStandard, qt_major_version):
- 
-     if qt.int_version < test.minimum_qt_version or qt.int_version > test.maximum_qt_version or CLANG_VERSION < test.minimum_clang_version:
-         if (_verbose):
--            print("Skipping " + printableName +
--                  " because required version is not available")
-+            print("Skipping " + printableName + " because required version is not available")
-         return True
- 
-     if test.requires_std_filesystem and not _hasStdFileSystem:
-         if (_verbose):
--            print("Skipping " + printableName +
--                  " because it requires std::filesystem")
-+            print("Skipping " + printableName + " because it requires std::filesystem")
-         return True
- 
-     if _platform in test.blacklist_platforms:
--- 
-GitLab
-
diff --git a/dev-util/clazy/files/clazy-1.12-llvm-18.patch b/dev-util/clazy/files/clazy-1.12-llvm-18.patch
deleted file mode 100644
index d1f2bea9ffbf..000000000000
--- a/dev-util/clazy/files/clazy-1.12-llvm-18.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 0d87de91457c3bf2338b997555694953d45e17a4 Mon Sep 17 00:00:00 2001
-From: Alexander Lohnau <alexander.lohnau@gmx.de>
-Date: Tue, 10 Sep 2024 13:50:56 +0200
-Subject: [PATCH] rule-of-three: Fix destructor not being found and thus
- causing false positive
-
-This works fine in clang 14, but apparently not in later versions
-
-The false positive caused a CI failure in https://invent.kde.org/libraries/qca/-/merge_requests/116
----
- src/checks/level2/rule-of-three.cpp | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/src/checks/level2/rule-of-three.cpp b/src/checks/level2/rule-of-three.cpp
-index 6996ee1e..f18ff999 100644
---- a/src/checks/level2/rule-of-three.cpp
-+++ b/src/checks/level2/rule-of-three.cpp
-@@ -56,7 +56,14 @@ void RuleOfThree::VisitDecl(clang::Decl *decl)
- 
-     CXXConstructorDecl *copyCtor = Utils::copyCtor(record);
-     CXXMethodDecl *copyAssign = Utils::copyAssign(record);
--    CXXDestructorDecl *destructor = record->getDestructor();
-+    CXXDestructorDecl *destructor = nullptr;
-+    // Getting the destructor using record->getDestructor() does not work for later clang versions, e.g. clang 16
-+    for (auto *decl : record->decls()) {
-+        if (auto *destructorDecl = dyn_cast<CXXDestructorDecl>(decl)) {
-+            destructor = destructorDecl;
-+            break;
-+        }
-+    }
-     const bool dtorDefaultedByUser = destructor && destructor->isDefaulted() && !destructor->isImplicit();
- 
-     const bool hasUserCopyCtor = copyCtor && copyCtor->isUserProvided();
--- 
-GitLab
-
diff --git a/dev-util/pkgcruft/Manifest b/dev-util/pkgcruft/Manifest
index 0b99bf5bf60a..db161a8387e8 100644
--- a/dev-util/pkgcruft/Manifest
+++ b/dev-util/pkgcruft/Manifest
@@ -1,10 +1,12 @@
+DIST pkgcruft-0.0.10.tar.xz 32193612 BLAKE2B d0f28f63e0b4f1d1309156309331feb0daa0cd52c6f0491f918d49f76c425b36a47fd02060554cd4398ac3490d6e21009b7421cb0ca14a821093fca7f57087bc SHA512 14812be27345a737d91281c869bc8149581bf3802b3bddca19908bfb687013cd1ee751213e86c7c277850f07eff2b58358930c74cbe2e3f4b370929de518097e
 DIST pkgcruft-0.0.4.tar.xz 24507420 BLAKE2B 89e127bd6f22686c4e0335817ed050bf3edcd8b0247a372531ab5daf020e526721d6e10080c8e1230026d87762e769535187d30a9ff86bbfe4c2f1865a322324 SHA512 464eef7c19313e97eac59367e286181c441e04a76deaa75f551b3866da5dcdb7bfa7703552143b6b32afee5beac85df72af48fe627f8a3838cb823f672f50d84
 DIST pkgcruft-0.0.6.tar.xz 24528884 BLAKE2B 88b476920661076dbe70bd0ba0fd84d355dc77d579496702c43f8e55384ea6dce3fe305ef861ecc5c4bcd4e1046d8b672ce1ca0dbc83c7560191c1818761e63a SHA512 f978e1d398c00580990a8026ea6cec5d32825e2e0e831ea059462a3a808899b7a94064bcc91ee6901f55d1085641ccb96211603cac3a30e32a8567706f339fd1
 DIST pkgcruft-0.0.8.tar.xz 30828500 BLAKE2B 1e20bd2029d03f56d7454daccbf06e327a5f95b56dbec52c12713f3b32b3423aac89d40c6bb7a0677b5977a06bb2a708bcea669056d78664f605278a0253c82e SHA512 4f791b2d1570fd0b68ca16cd4dd129b6fcfec825a748e2bf80c731eb2f70689ca515b640ca2f65c61673b0d5b766eae64ecbff05e8ad629b65ed38cf43590820
 DIST pkgcruft-0.0.9.tar.xz 30898984 BLAKE2B 72b3a86f58b7e2d15fff933a34e99462d58a29041120bef5bcfcdd50582127c2a35e432546bbd6513512b328cc6bec6ca2f5cd4aa57db97f1249b71ce9766668 SHA512 9d39d4db90ca1b8be7a1b6712f6ff731f4bfd681022d8f91a200f3563a6c5c0db3432b8dec8e09f912e2dbe2bfba82cf524107d83a6c26660da8e062140186dd
+EBUILD pkgcruft-0.0.10.ebuild 2929 BLAKE2B 0be9d003042d52aa73c7ede8464bba3728091582dea8b741a27a8b70dd61f506cad5d566f106806f3b6b5bd24e97a4e322ee41c52425d3c508fc8d8528cb24d0 SHA512 0f66f5744e6b7cc570c97c0479429808c9e29f8b45b5feafc484fd18b262aef8dd61863f209a4d6378a189b90a2a016eaa51d5b4984402c07e8c7cf29d6a045a
 EBUILD pkgcruft-0.0.4.ebuild 1367 BLAKE2B 4275680972e21d9a218fa2409b44401bedb7cda325b678830257e04f636cab0db1c4e43c3f55285352753ad97c1295122e4f01070c5c0c03b6268632c25f7e2c SHA512 021c31e0f618882a854679bc9ae49ba34b48fa3b3de555906044ac9344f747b6a6ab729ecd5e4a161d69bc09e89bf4e5f251bea737407eb331ae34cef4b2106c
 EBUILD pkgcruft-0.0.6.ebuild 1367 BLAKE2B 4275680972e21d9a218fa2409b44401bedb7cda325b678830257e04f636cab0db1c4e43c3f55285352753ad97c1295122e4f01070c5c0c03b6268632c25f7e2c SHA512 021c31e0f618882a854679bc9ae49ba34b48fa3b3de555906044ac9344f747b6a6ab729ecd5e4a161d69bc09e89bf4e5f251bea737407eb331ae34cef4b2106c
 EBUILD pkgcruft-0.0.8.ebuild 1553 BLAKE2B 2e13539e2c9959257c759b29d42db588fab51926b9bfbc8da37cc177ccb2a131f17dd66b14cdbd6824114e675a94b9e0b33ee397d5ddbeec9708a0398631ef3a SHA512 2cc4ffb8d0a9ae5635b5e7553ca36849cfe09c0185c1a9a2469b54742c8cd62fec39f04b4c840ce806b97016e7eb438f8afae178a4edc813f53d3946c93d9a00
 EBUILD pkgcruft-0.0.9.ebuild 1441 BLAKE2B 927bda94771290019115b9670a4d27c0f5e410164d86673edddfdbacd586368134f56c56e0e87e7183a38f98a2a8027c8b92a91f7345396fb3e6f7fa37a6f638 SHA512 d665583fd88897452d7f59ebf67c9b1573d6d324ed954def02f982aa1a78aa60d3701151b41924fc8fea4267d20317cb488119309f4ee14ff70821526ff91375
-EBUILD pkgcruft-9999.ebuild 1511 BLAKE2B 61efaa065108e9135c4636123a866ce966e0f9cd19c57d5a2940da3d8cbef5c2c9b4d5472df7e042e314c9edd028087195b8d29bff7ff7725b89509388eb76e8 SHA512 81c37306cc8f7c6292e454b40fd91d7be2de39ef9b38e1f6c6e46cc423d2f8946a8f74a97879901d0a0cf64c8cd82aab8b24c51abeb8ff49f668b246cc4a1aef
+EBUILD pkgcruft-9999.ebuild 1600 BLAKE2B 9cc9faa33cdd27a53ba9276a88363e5963950a4fe2a4107b74c2c359164426fc45e8256c351cfed2e2673fab4a66753cb7b6e0730817c6a6196e110ddd9e1ad6 SHA512 d02f2da34a431f2d519478358ccc206aeeceed3a1d22e6053e8ece9859e61aa86e17d9f38c1790d4d917f52110c89c576f5c060790ce78930a1ca0d671a9b827
 MISC metadata.xml 322 BLAKE2B b0ee0fc53eb8b4b485f74806a78b5560aaf53f1772d7bd3e5af4e03385b3f3aed18fc52462c2d49de6c0d735db0cae3fab175b8adc0e5f7c4baa89e28973776f SHA512 9343cd5028750182fe9325c44f4c4c7df0976b79e0422b66e0fd16f94be76eaa203e8ecad5ec2cbed3535f455f038e51968850ced9afb27af9a98b6b968df88a
diff --git a/dev-util/pkgcruft/pkgcruft-0.0.10.ebuild b/dev-util/pkgcruft/pkgcruft-0.0.10.ebuild
new file mode 100644
index 000000000000..911e226eef4d
--- /dev/null
+++ b/dev-util/pkgcruft/pkgcruft-0.0.10.ebuild
@@ -0,0 +1,122 @@
+# Copyright 2023-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES=" "
+LLVM_COMPAT=( {17..19} )
+RUST_MIN_VER="1.82.0"
+
+inherit cargo edo llvm-r2 multiprocessing shell-completion toolchain-funcs
+
+DESCRIPTION="QA library and tools based on pkgcraft"
+HOMEPAGE="https://pkgcraft.github.io/"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/pkgcraft/pkgcraft"
+	inherit git-r3
+
+	S="${WORKDIR}"/${P}/crates/${PN}
+else
+	SRC_URI="https://github.com/pkgcraft/pkgcraft/releases/download/${P}/${P}.tar.xz"
+
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="MIT"
+# Dependent crate licenses
+LICENSE+="
+	Apache-2.0 BSD-2 BSD CC0-1.0 GPL-3+ ISC MIT MPL-2.0 Unicode-DFS-2016
+"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# clang needed for bindgen
+BDEPEND+="
+	$(llvm_gen_dep '
+		llvm-core/clang:${LLVM_SLOT}
+	')
+	test? ( dev-util/cargo-nextest )
+"
+
+QA_FLAGS_IGNORED="usr/bin/pkgcruft"
+
+pkg_setup() {
+	llvm-r2_pkg_setup
+	rust_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+		cargo_live_src_unpack
+	else
+		cargo_src_unpack
+	fi
+}
+
+src_compile() {
+	# For scallop building bash
+	tc-export AR CC
+
+	cargo_src_compile
+
+	if [[ ${PV} == 9999 ]] ; then
+		# https://github.com/pkgcraft/pkgcraft/issues/258
+		edo cargo run --features shell --bin pkgcruft-shell-comp -p pkgcruft
+	fi
+}
+
+src_test() {
+	unset CLICOLOR CLICOLOR_FORCE
+
+	# TODO: Maybe move into eclass (and maybe have a cargo_enable_tests
+	# helper)
+	local -x NEXTEST_TEST_THREADS="$(makeopts_jobs)"
+
+	# The test failures appear ebuild-related
+	edo cargo nextest run $(usev !debug '--release') \
+		--color always \
+		--all-features \
+		--tests \
+		--no-fail-fast \
+		-- \
+		--skip 'commands::tests::check' \
+		--skip 'dependency::tests::check' \
+		--skip 'dependency_slot_missing::tests::check' \
+		--skip 'eapi_stale::tests::check' \
+		--skip 'eapi_status::tests::check' \
+		--skip 'ebuild_name::tests::check' \
+		--skip 'eclass::tests::check' \
+		--skip 'filesdir::tests::check' \
+		--skip 'header::tests::check' \
+		--skip 'homepage::tests::check' \
+		--skip 'ignore::tests::check' \
+		--skip 'iuse::tests::check' \
+		--skip 'keywords::tests::check' \
+		--skip 'keywords_dropped::tests::check' \
+		--skip 'license::tests::check' \
+		--skip 'live::tests::check' \
+		--skip 'manifest::tests::check' \
+		--skip 'metadata::tests::check' \
+		--skip 'properties::tests::check' \
+		--skip 'python_update::tests::check' \
+		--skip 'repo_layout::tests::check' \
+		--skip 'restrict::tests::check' \
+		--skip 'restrict_test_missing::tests::check' \
+		--skip 'ruby_update::tests::check' \
+		--skip 'src_uri::tests::check' \
+		--skip 'unstable_only::tests::check' \
+		--skip 'use_local::tests::check' \
+		--skip 'variable_order::tests::check' \
+		--skip 'whitespace::tests::check'
+}
+
+src_install() {
+	cargo_src_install
+
+	newbashcomp shell/pkgcruft.bash ${PN}
+	dozshcomp shell/_pkgcruft
+	dofishcomp shell/pkgcruft.fish
+}
diff --git a/dev-util/pkgcruft/pkgcruft-9999.ebuild b/dev-util/pkgcruft/pkgcruft-9999.ebuild
index df5d0d4e8e53..736d076f4caa 100644
--- a/dev-util/pkgcruft/pkgcruft-9999.ebuild
+++ b/dev-util/pkgcruft/pkgcruft-9999.ebuild
@@ -61,7 +61,11 @@ src_compile() {
 	tc-export AR CC
 
 	cargo_src_compile
-	edo cargo run --features shell --bin pkgcruft-shell-comp -p pkgcruft
+
+	if [[ ${PV} == 9999 ]] ; then
+		# https://github.com/pkgcraft/pkgcraft/issues/258
+		edo cargo run --features shell --bin pkgcruft-shell-comp -p pkgcruft
+	fi
 }
 
 src_test() {