17 files changed, 367 insertions, 761 deletions
diff --git a/dev-util/bcc/bcc-0.36.1-r1.ebuild b/dev-util/bcc/bcc-0.36.1-r1.ebuild
new file mode 100644
index 000000000000..db01a42d4f9b
--- /dev/null
+++ b/dev-util/bcc/bcc-0.36.1-r1.ebuild
@@ -0,0 +1,214 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1,3,4} luajit )
+DISTUTILS_OPTIONAL=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..14} )
+LLVM_COMPAT=( {16..22} )
+
+inherit cmake linux-info llvm-r1 lua-single distutils-r1 toolchain-funcs
+
+DESCRIPTION="Tools for BPF-based Linux IO analysis, networking, monitoring, and more"
+HOMEPAGE="https://iovisor.github.io/bcc/"
+SRC_URI="https://github.com/iovisor/bcc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE="debuginfod +lua lzma +python static-libs test"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	lua? ( python ${LUA_REQUIRED_USE} )
+"
+
+# tests need root access
+RESTRICT="test"
+
+RDEPEND="
+	app-arch/zstd:=
+	>=dev-libs/elfutils-0.166:=[debuginfod?]
+	dev-libs/libbpf:=
+	dev-libs/libffi:=
+	sys-kernel/linux-headers
+	sys-libs/ncurses:=[tinfo]
+	$(llvm_gen_dep '
+		llvm-core/clang:${LLVM_SLOT}=
+		llvm-core/llvm:${LLVM_SLOT}=
+	')
+	lzma? ( || (
+		app-arch/xz-utils
+		app-arch/lzma
+	) )
+	python? ( ${PYTHON_DEPS} )
+	lua? ( ${LUA_DEPS} )
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		|| (
+			net-misc/iputils[arping]
+			net-analyzer/arping
+		)
+		net-analyzer/netperf
+		net-misc/iperf:*
+	)
+"
+BDEPEND="
+	app-arch/zip
+	sys-devel/flex
+	sys-devel/bison
+	virtual/pkgconfig
+	python? ( ${DISTUTILS_DEPS} )
+"
+
+PATCHES=(
+	"${FILESDIR}/bcc-0.9.0-no-luajit-automagic-dep.patch"
+	"${FILESDIR}/bcc-0.25.0-cmakelists.patch"
+	"${FILESDIR}/bcc-0.23.0-man-compress.patch"
+	"${FILESDIR}/bcc-0.31.0-no-automagic-deps.patch"
+	"${FILESDIR}/bcc-0.36.1-const.patch"
+	"${FILESDIR}/bcc-0.36.1-getUnqual.patch"
+	"${FILESDIR}/bcc-0.36.1-llvm22.patch"
+	"${FILESDIR}/bcc-0.36.1-no-libbpf-git.patch"
+)
+
+pkg_pretend() {
+	local CONFIG_CHECK="~BPF ~BPF_SYSCALL ~NET_CLS_BPF ~NET_ACT_BPF
+		~HAVE_EBPF_JIT ~BPF_EVENTS ~DEBUG_INFO ~FUNCTION_TRACER ~KALLSYMS_ALL
+		~KPROBES"
+
+	check_extra_config
+}
+
+pkg_setup() {
+	llvm-r1_pkg_setup
+	use python && python_setup
+}
+
+bcc_distutils_phase() {
+	if use python; then
+		local python_phase_func="distutils-r1_${EBUILD_PHASE_FUNC}"
+
+		if declare -f "${python_phase_func}" > /dev/null; then
+			pushd "${S}/src/python" > /dev/null || die
+			MY_S="${S}" S="${S}/src/python" "${python_phase_func}"
+			popd > /dev/null || die
+		else
+			die "Called ${FUNCNAME[0]} called in ${EBUILD_PHASE_FUNC}, but ${python_phase_func} doesn't exist"
+		fi
+	fi
+}
+
+src_prepare() {
+	local bpf_link_path
+
+	# this avoids bundling
+	bpf_link_path="$(realpath --relative-to="${S}/src/cc/libbpf" /usr/include/bpf)" || die
+	ln -sfn "${bpf_link_path}" src/cc/libbpf/include || die
+
+	# bug 811288
+	local script scriptname
+	for script in $(find tools/old -type f -name "*.py" || die); do
+		mv "${script}" "tools/old/old-${script##*/}" || die
+	done
+
+	sed -i '/#include <error.h>/d' examples/cpp/KModRetExample.cc || die
+
+	use static-libs || PATCHES+=( "${FILESDIR}/bcc-0.31.0-dont-install-static-libs.patch" )
+
+	# use distutils-r1 eclass funcs rather than letting upstream handle python
+	printf '\n' > src/python/CMakeLists.txt || die
+
+	if use python; then
+		for python_file in $(find "${S}/src/python" -name '*.py.in' || die); do
+			sed "s:@REVISION@:${PV%%_*}:" "${python_file}" > "${python_file%.in}" || die
+		done
+	fi
+
+	cmake_src_prepare
+	bcc_distutils_phase
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DREVISION=${PV%%_*}
+		-DENABLE_LIBDEBUGINFOD=$(usex debuginfod)
+		-DENABLE_LLVM_SHARED=ON
+		-DENABLE_NO_PIE=OFF
+		-DWITH_LZMA=$(usex lzma)
+		-DCMAKE_USE_LIBBPF_PACKAGE=ON
+		-DLIBBPF_INCLUDE_DIRS="$($(tc-getPKG_CONFIG) --cflags-only-I libbpf | sed 's:-I::g')"
+		-DKERNEL_INCLUDE_DIRS="${KERNEL_DIR}"
+		-DNO_BLAZESYM=ON
+		-Wno-dev
+	)
+	if use lua && use lua_single_target_luajit; then
+		mycmakeargs+=( -DWITH_LUAJIT=ON )
+	fi
+
+	cmake_src_configure
+	bcc_distutils_phase
+}
+
+src_compile() {
+	cmake_src_compile
+	bcc_distutils_phase
+}
+
+bcc_tool_name() {
+	local -A rename_tools=(
+		[trace]=1
+		[profile]=1
+		[inject]=1
+		[capable]=1
+	)
+
+	local name="${1}"
+
+	local name="${name##*/}"
+	name="${name%.py}"
+
+	[[ -n ${rename_tools[${name}]} ]] && name=bcc-${name}
+
+	printf -- '%s\n' "${name}"
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	python_scriptinto /usr/sbin
+
+	local tool
+	for tool in $(grep -Elr '#!/usr/bin/(env |)python' "${MY_S}/tools"); do
+		python_newscript "${tool}" "$(bcc_tool_name "${tool}")"
+	done
+}
+
+src_install() {
+	cmake_src_install
+	bcc_distutils_phase
+
+	newenvd "${FILESDIR}"/60bcc.env 60bcc.env
+
+	local tool target
+	for tool in "${ED}"/usr/share/bcc/tools/*; do
+		[[ -d ${tool} || ! -x ${tool} || ${tool} =~ .*[.](c|txt) ]] && continue
+		grep -qE '^#!/usr/bin/(env |)python' "${tool}" && continue
+		sed -e 's:dirname \$0:dirname "$(realpath "$0")":' -i "${tool}" || die
+
+		target="/usr/sbin/$(bcc_tool_name "${tool}")"
+		[[ -e ${ED}${target} ]] && continue
+
+		dosym -r "${tool#${ED}}" "${target}"
+	done
+
+	docompress /usr/share/${PN}/man
+
+	newenvd - "70${P}" <<-_EOF_
+		MANPATH="${EPREFIX}/usr/share/${PN}/man"
+	_EOF_
+}
diff --git a/dev-util/bcc/files/bcc-0.36.1-const.patch b/dev-util/bcc/files/bcc-0.36.1-const.patch
new file mode 100644
index 000000000000..40edb6e006e3
--- /dev/null
+++ b/dev-util/bcc/files/bcc-0.36.1-const.patch
@@ -0,0 +1,24 @@
+https://github.com/iovisor/bcc/pull/5481
+
+--- bcc/src/cc/bcc_perf_map.c
++++ bcc/src/cc/bcc_perf_map.c
+@@ -23,7 +23,7 @@
+ #include "bcc_perf_map.h"
+ 
+ bool bcc_is_perf_map(const char *path) {
+-  char* pos = strstr(path, ".map");
++  const char* pos = strstr(path, ".map");
+   // Path ends with ".map"
+   return (pos != NULL) && (*(pos + 4)== 0);
+ }
+--- bcc/src/cc/libbpf.c
++++ bcc/src/cc/libbpf.c
+@@ -787,7 +787,7 @@ int bcc_prog_load_xattr(enum bpf_prog_ty
+   int ret = 0, name_offset = 0, expected_attach_type = 0;
+   char new_prog_name[BPF_OBJ_NAME_LEN] = {};
+   char mod_name[64] = {};
+-  char *mod_end;
++  const char *mod_end;
+   int mod_len;
+   int fd = -1;
+ 
diff --git a/dev-util/bcc/files/bcc-0.36.1-getUnqual.patch b/dev-util/bcc/files/bcc-0.36.1-getUnqual.patch
new file mode 100644
index 000000000000..52b2fc04d2f1
--- /dev/null
+++ b/dev-util/bcc/files/bcc-0.36.1-getUnqual.patch
@@ -0,0 +1,22 @@
+https://github.com/iovisor/bcc/issues/5472
+
+--- bcc/src/cc/bpf_module_rw_engine.cc
++++ bcc/src/cc/bpf_module_rw_engine.cc
+@@ -286,7 +286,7 @@ string BPFModule::make_reader(Module *mo
+ 
+   string name = "reader" + std::to_string(readers_.size());
+ #if LLVM_VERSION_MAJOR >= 18
+-  vector<Type *> fn_args({B.getPtrTy(), PointerType::getUnqual(type)});
++  vector<Type *> fn_args({B.getPtrTy(), PointerType::getUnqual(type->getContext())});
+ #else
+   vector<Type *> fn_args({B.getInt8PtrTy(), PointerType::getUnqual(type)});
+ #endif
+@@ -354,7 +354,7 @@ string BPFModule::make_writer(Module *mo
+ 
+   string name = "writer" + std::to_string(writers_.size());
+ #if LLVM_VERSION_MAJOR >= 18
+-  vector<Type *> fn_args({B.getPtrTy(), B.getInt64Ty(), PointerType::getUnqual(type)});
++  vector<Type *> fn_args({B.getPtrTy(), B.getInt64Ty(), PointerType::getUnqual(type->getContext())});
+ #else
+   vector<Type *> fn_args({B.getInt8PtrTy(), B.getInt64Ty(), PointerType::getUnqual(type)});
+ #endif
diff --git a/dev-util/bcc/files/bcc-0.36.1-llvm22.patch b/dev-util/bcc/files/bcc-0.36.1-llvm22.patch
new file mode 100644
index 000000000000..58d7ca97d0b8
--- /dev/null
+++ b/dev-util/bcc/files/bcc-0.36.1-llvm22.patch
@@ -0,0 +1,42 @@
+https://github.com/iovisor/bcc/pull/5484
+
+diff --git a/src/cc/frontends/clang/loader.cc b/src/cc/frontends/clang/loader.cc
+index 6f8387a..1f70634 100644
+--- a/src/cc/frontends/clang/loader.cc
++++ b/src/cc/frontends/clang/loader.cc
+@@ -464,7 +464,10 @@ int ClangLoader::do_compile(
+   }
+   invocation0.getFrontendOpts().DisableFree = false;
+ 
+-#if LLVM_VERSION_MAJOR >= 20
++#if LLVM_VERSION_MAJOR >= 22
++  compiler0.setVirtualFileSystem(llvm::vfs::getRealFileSystem());
++  compiler0.createDiagnostics(new IgnoringDiagConsumer());
++#elif LLVM_VERSION_MAJOR >= 20
+   compiler0.createDiagnostics(*llvm::vfs::getRealFileSystem(), new IgnoringDiagConsumer());
+ #else
+   compiler0.createDiagnostics(new IgnoringDiagConsumer());
+@@ -487,7 +490,10 @@ int ClangLoader::do_compile(
+   add_main_input(invocation1, main_path, &*out_buf);
+   invocation1.getFrontendOpts().DisableFree = false;
+ 
+-#if LLVM_VERSION_MAJOR >= 20
++#if LLVM_VERSION_MAJOR >= 22
++  compiler1.setVirtualFileSystem(llvm::vfs::getRealFileSystem());
++  compiler1.createDiagnostics();
++#elif LLVM_VERSION_MAJOR >= 20
+   compiler1.createDiagnostics(*llvm::vfs::getRealFileSystem());
+ #else
+   compiler1.createDiagnostics();
+@@ -517,7 +523,10 @@ int ClangLoader::do_compile(
+   invocation2.getCodeGenOpts().setInlining(CodeGenOptions::NormalInlining);
+   // suppress warnings in the 2nd pass, but bail out on errors (our fault)
+   invocation2.getDiagnosticOpts().IgnoreWarnings = true;
+-#if LLVM_VERSION_MAJOR >= 20
++#if LLVM_VERSION_MAJOR >= 22
++  compiler2.setVirtualFileSystem(llvm::vfs::getRealFileSystem());
++  compiler2.createDiagnostics();
++#elif LLVM_VERSION_MAJOR >= 20
+   compiler2.createDiagnostics(*llvm::vfs::getRealFileSystem());
+ #else
+   compiler2.createDiagnostics();
diff --git a/dev-util/bcc/files/bcc-0.36.1-no-libbpf-git.patch b/dev-util/bcc/files/bcc-0.36.1-no-libbpf-git.patch
new file mode 100644
index 000000000000..729988b32b45
--- /dev/null
+++ b/dev-util/bcc/files/bcc-0.36.1-no-libbpf-git.patch
@@ -0,0 +1,53 @@
+Do not try to update the tarball-bundled libbpf with git, which only
+throws confusing errors.
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8e497e6..62ef3fc 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -43,45 +39,6 @@ if(NOT NO_BLAZESYM)
+   endif()
+ endif()
+ 
+-# populate submodules (libbpf)
+-if(NOT CMAKE_USE_LIBBPF_PACKAGE)
+-  execute_process(COMMAND git config --global --add safe.directory ${CMAKE_CURRENT_SOURCE_DIR}/src/cc/libbpf
+-                  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+-                  RESULT_VARIABLE CONFIG_RESULT)
+-  if(CONFIG_RESULT AND NOT CONFIG_RESULT EQUAL 0)
+-    message(WARNING "Failed to add libbpf source directory to safe.directory")
+-  endif()
+-  execute_process(COMMAND git config --global --add safe.directory ${CMAKE_CURRENT_SOURCE_DIR}/libbpf-tools/bpftool
+-                  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+-                  RESULT_VARIABLE CONFIG_RESULT)
+-  if(CONFIG_RESULT AND NOT CONFIG_RESULT EQUAL 0)
+-    message(WARNING "Failed to add bpftool source directory to safe.directory")
+-  endif()
+-
+-  if(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/src/cc/libbpf/src)
+-    execute_process(COMMAND git submodule update --init --recursive
+-                    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+-                    RESULT_VARIABLE UPDATE_RESULT)
+-    if(UPDATE_RESULT AND NOT UPDATE_RESULT EQUAL 0)
+-      message(WARNING "Failed to update submodule libbpf")
+-    endif()
+-  else()
+-    execute_process(COMMAND git diff --shortstat ${CMAKE_CURRENT_SOURCE_DIR}/src/cc/libbpf/
+-                    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+-                    OUTPUT_VARIABLE DIFF_STATUS)
+-    if("${DIFF_STATUS}" STREQUAL "")
+-      execute_process(COMMAND git submodule update --init --recursive
+-                      WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+-                      RESULT_VARIABLE UPDATE_RESULT)
+-      if(UPDATE_RESULT AND NOT UPDATE_RESULT EQUAL 0)
+-        message(WARNING "Failed to update submodule libbpf")
+-      endif()
+-    else()
+-      message(WARNING "submodule libbpf dirty, so no sync")
+-    endif()
+-  endif()
+-endif()
+-
+ # It's possible to use other kernel headers with
+ # KERNEL_INCLUDE_DIRS build variable, like:
+ #  $ cd <kernel-dir>
diff --git a/dev-util/cargo-vendor-filterer/cargo-vendor-filterer-0.5.18.ebuild b/dev-util/cargo-vendor-filterer/cargo-vendor-filterer-0.5.18.ebuild
index c832da46adcb..be008a5402e6 100644
--- a/dev-util/cargo-vendor-filterer/cargo-vendor-filterer-0.5.18.ebuild
+++ b/dev-util/cargo-vendor-filterer/cargo-vendor-filterer-0.5.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2025 Gentoo Authors
+# Copyright 2025-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ HOMEPAGE="https://github.com/coreos/cargo-vendor-filterer/"
 SRC_URI="
 	https://github.com/coreos/cargo-vendor-filterer/archive/refs/tags/v${PV}.tar.gz
 		-> ${P}.tar.gz
-	https://dev.gentoo.org/~ionen/distfiles/${P}-vendor.tar.xz
+	https://distfiles.gentoo.org/pub/dev/ionen@gentoo.org/${P}-vendor.tar.xz
 "
 
 LICENSE="Apache-2.0"
diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index 7a5b0d6b21d0..da43dbc856ac 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -1,5 +1,4 @@
-DIST diffoscope-309.tar.bz2 3153219 BLAKE2B fc5089e914d1a1a1eb8507a7b696a0d4331c3c7e11c31e5ad19a3128310d817ae1612670a5b4e6636b65b6e221c4f097d5d4f878941d725dbe33639c1e751eb1 SHA512 ef254966348fb9e78cbb1926160b27bf61e5ddc501a4ac174914b0101b246b0574012b0b23e8ca9ca0a58c2a51eff7bf97a5fa343eae9763bf5b72f6729a8062
-DIST diffoscope-312.tar.bz2 3152749 BLAKE2B bbf377d0959e895d3f4ef3aaf3b9707b3c6aa2a01a1e102ea7b60fd1220d838fca96814e88517bc70d82f04ce0cc7e308a0f232db570af4f4816b038a0698a9a SHA512 ecca8ca58f5521a4a4ca56c48b2f0508f69eb900507a704527e64bf613d021317bf32fcd19dea55d0895bb4203b24738564d0f227eaed5ca2d945c42a058d260
-DIST diffoscope-312.tar.bz2.asc 833 BLAKE2B ddeed6f5da5fea3c939233d8de96a50510a018e839cf06c3f54d9b1816027cf9ae61921345dd19fe8811d21ce0ec038a4a4a16ad3218ea801ae4e02f4350688a SHA512 ec5bd2c07c8b71988a646b0fa751a56d5543d273ee96f657262b6a82a582a1c83aeee2e979e53109dd5d5b5aa9ecbda675bb3b265c38b63f8213a985b21d4c19
 DIST diffoscope-313.tar.bz2 3152852 BLAKE2B 736a672a59609271923a95a43c98bbcc12c7db56b5e2c4a056238b04758bb4d1111621b4674952b2fdbbc7b1fcc07e705a4efea6a126cd7d7a8f08e8be7fdc01 SHA512 0551f0a7083817c3db47fec286405b5456b3141ccf17694a1bf26c9e85652ce854181e00c90bb0e5ff5e6e5726b70b75ccf5b20a14739b7a0f2ca0733356e1dc
 DIST diffoscope-313.tar.bz2.asc 833 BLAKE2B 77176766114622e89a75f0e3ceedb938557cf8cf5341f505810a191d10140727530ecdb4b2bea829644dd5cf973b1c852b3d10c68e10a5e29386a29dec11bf2d SHA512 257448a678064f58052795e0f8acef01827a2e22db81f33985348df85db8cd0cba94030b14591abe7d3da6829f84de811290fa3fe4b54cb1e012f33a59c3b1f2
+DIST diffoscope-316.tar.bz2 3151140 BLAKE2B 080b2ff8098bd1ff43b84aaef855eb437940dbb481f52dd0028e34136f2f1f49b05f03ff4f556dc10649c39ae65b7d00c10eaaab43405742e15df5aca167979c SHA512 a69a188f6e8af3b61c4d2a1554756ae17fb329ceafca53c5f1ccb7e5fdec21cd9f5b58aa3299aee57fa22bb90c38650139de7e11a13355963d900494bb5e547e
+DIST diffoscope-316.tar.bz2.asc 833 BLAKE2B f34f79ef8d697c166aefc53c1e5967611adde143e8682033e25957f59aef0ca8a07c39cea34414ae29d4e8fcd3d80bf53ef6c461cdab1a1b8ed219fa60c8d937 SHA512 e55d413808845dedd044169f729b9b9516875eb5f9d1dd687a2d46d2bdd816cc117920c31c3d07f9c4bd5d3e9e4efd3818c8cf63831077dd01f54a5f0b2b8d8f
diff --git a/dev-util/diffoscope/diffoscope-309.ebuild b/dev-util/diffoscope/diffoscope-309.ebuild
deleted file mode 100644
index 8cb1c303541a..000000000000
--- a/dev-util/diffoscope/diffoscope-309.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 2022-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..14} )
-PYTHON_REQ_USE="ncurses"
-inherit distutils-r1 toolchain-funcs
-
-DESCRIPTION="Will try to get to the bottom of what makes files or directories different"
-HOMEPAGE="https://diffoscope.org/ https://pypi.org/project/diffoscope/"
-# We could use pypi, but upstream provide distribution tarballs, so let's use those.
-# TODO: verify-sig
-SRC_URI="https://diffoscope.org/archive/${P}.tar.bz2"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86"
-IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file
-find gettext gif gpg haskell hdf5 hex imagemagick iso java llvm lzma
-mono opendocument pascal pdf postscript R rpm sqlite squashfs
-ssh tar test tcpdump zip zlib zstd"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	|| (
-		dev-python/python-magic[${PYTHON_USEDEP}]
-		sys-apps/file[python,${PYTHON_USEDEP}]
-	)
-	dev-python/libarchive-c[${PYTHON_USEDEP}]
-	dev-python/distro[${PYTHON_USEDEP}]
-	dev-python/python-tlsh[${PYTHON_USEDEP}]
-	acl? ( sys-apps/acl )
-	binutils? ( sys-devel/binutils )
-	bzip2? ( app-arch/bzip2 )
-	libcaca? ( media-libs/libcaca )
-	colord? ( x11-misc/colord )
-	cpio? ( app-alternatives/cpio )
-	diff? ( sys-apps/diffutils )
-	docx? ( app-text/docx2txt )
-	dtc? ( sys-apps/dtc )
-	e2fsprogs? ( sys-fs/e2fsprogs )
-	file? ( sys-apps/file )
-	find? ( sys-apps/findutils )
-	gettext? ( sys-devel/gettext )
-	gif? ( media-libs/giflib )
-	gpg? ( app-crypt/gnupg )
-	haskell? ( dev-lang/ghc )
-	hdf5? ( sci-libs/hdf5 )
-	hex? ( app-editors/vim-core )
-	imagemagick? ( media-gfx/imagemagick )
-	iso? ( app-cdr/cdrtools )
-	java? ( virtual/jdk )
-	llvm? ( llvm-core/llvm )
-	lzma? ( app-arch/xz-utils )
-	mono? ( dev-lang/mono )
-	opendocument? ( app-text/odt2txt )
-	pascal? ( dev-lang/fpc )
-	pdf? (
-		app-text/pdftk
-		app-text/poppler
-		dev-python/pypdf[${PYTHON_USEDEP}]
-	)
-	postscript? ( app-text/ghostscript-gpl )
-	R? ( dev-lang/R )
-	rpm? ( app-arch/rpm )
-	sqlite? ( dev-db/sqlite:3 )
-	squashfs? ( sys-fs/squashfs-tools )
-	ssh? ( virtual/openssh )
-	tar? ( app-arch/tar )
-	tcpdump? ( net-analyzer/tcpdump )
-	zip? ( app-arch/unzip )
-	zlib? ( app-arch/gzip )
-	zstd? ( app-arch/zstd )
-"
-
-# pull in optional tools for tests:
-# img2txt: bug #797688
-# docx2txt: bug #797688
-BDEPEND="
-	test? (
-		|| (
-			>=app-arch/7zip-24.09[symlink(+)]
-			app-arch/p7zip
-		)
-		app-text/docx2txt
-		app-text/html2text
-		media-libs/libcaca
-		virtual/imagemagick-tools[jpeg]
-	)
-"
-
-EPYTEST_DESELECT=(
-	# Test seems to use different tarball
-	tests/test_presenters.py::test_text_proper_indentation
-
-	# Needs triage
-	tests/comparators/test_binary.py::test_with_compare_details_and_tool_not_found
-	tests/comparators/test_rlib.py::test_item3_deflate_llvm_bitcode
-	tests/comparators/test_gif.py::test_has_visuals
-
-	# img2txt based failures, bug #797688
-	tests/comparators/test_ico_image.py::test_diff
-	tests/comparators/test_ico_image.py::test_diff_meta
-	tests/comparators/test_ico_image.py::test_diff_meta2
-	tests/comparators/test_ico_image.py::test_has_visuals
-	tests/comparators/test_jpeg_image.py::test_diff
-	tests/comparators/test_jpeg_image.py::test_compare_non_existing
-	tests/comparators/test_jpeg_image.py::test_diff_meta
-	tests/comparators/test_jpeg_image.py::test_has_visuals
-
-	# docx2txt based falures, bug #797688
-	tests/comparators/test_docx.py::test_diff
-
-	# Formatting
-	tests/test_source.py::test_code_is_black_clean
-
-	# Fails on ZFS
-	tests/test_main.py::test_non_unicode_filename
-
-	# Fails on (unreleased) LLVM 16 with minor difference
-	#tests/comparators/test_macho.py::test_llvm_diff
-	#tests/comparators/test_elf.py::test_libmix_differences
-)
-
-distutils_enable_tests pytest
-
-src_test() {
-	case $(tc-get-ptr-size) in
-		4)
-			EPYTEST_IGNORE+=(
-				# Needs fixing in Perl itself (bug #934443)
-				tests/comparators/test_epub.py
-				tests/comparators/test_zip.py
-			)
-			;;
-		*)
-			;;
-	esac
-
-	distutils-r1_src_test
-}
diff --git a/dev-util/diffoscope/diffoscope-313.ebuild b/dev-util/diffoscope/diffoscope-313.ebuild
index 1d391be565c2..5d04063cf4cb 100644
--- a/dev-util/diffoscope/diffoscope-313.ebuild
+++ b/dev-util/diffoscope/diffoscope-313.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86"
 IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file
 find gettext gif gpg haskell hdf5 hex imagemagick iso java llvm lzma
 mono opendocument pascal pdf postscript R rpm sqlite squashfs
diff --git a/dev-util/diffoscope/diffoscope-312.ebuild b/dev-util/diffoscope/diffoscope-316.ebuild
index 5d04063cf4cb..6cbdee4de467 100644
--- a/dev-util/diffoscope/diffoscope-312.ebuild
+++ b/dev-util/diffoscope/diffoscope-316.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file
 find gettext gif gpg haskell hdf5 hex imagemagick iso java llvm lzma
 mono opendocument pascal pdf postscript R rpm sqlite squashfs
diff --git a/dev-util/ruff/Manifest b/dev-util/ruff/Manifest
index ac849e8ab757..ac89f2707f03 100644
--- a/dev-util/ruff/Manifest
+++ b/dev-util/ruff/Manifest
@@ -1,25 +1,13 @@
 DIST lsp-types-3512a9f33eadc5402cfab1b8f7340824c8ca1439.gh.tar.gz 71124 BLAKE2B b2ea1c8fdd96dcc78ea48be71d1a4870fe1ff7f6a03dfe96479e0cba5f6b13ea68381d0a85fcb79a1ec2345eab7032c76cf567a813885128f94ac0c47c3de7bf SHA512 3362f9db4e78261825ae17b3429f9c54dc1b32a8b6a275ecff7bbe457c610d27ac37e68be3e9e27378f5f54c786dee787fd87b33c102f2507a46cf7290390ab5
 DIST lsp-types-e15db0593f0ecbbd80599c3f5880e4bf5da1ca0c.gh.tar.gz 71166 BLAKE2B 5f451f169b56e49b372c5d2e152ea522fa494e6a7d410d4c7418cf3d8cd15cfd6e3d576a41c5e90568b26f990f1ffaf5ff40844d62e47fe9b9df98184d499932 SHA512 097e4371ebde03c5f80e4f2c0eaf8354ce53c0472170536df5a155b33d19a4c20a498aa67684c7a764af31115cae02ec42c463044972d4dece7449ea241d6970
-DIST ruff-0.13.1-crates.tar.xz 22289184 BLAKE2B c750396641652e538ba34081f62da40338ddcc02bcf2c131f77f759bb45637db2c8824ad5d290cbc55a7a3d04b7b9950caea4a03db6a109f8089ab339c34c375 SHA512 42c967ba063fecde8e48d69261c355952095d0ba748695305fb090bc4ea07eeb2c3a7c673438dbd2ba7690808f07cb1fc3438300cf8a15344b3fbdc41dedae89
-DIST ruff-0.13.1.gh.tar.gz 7990401 BLAKE2B 0c24b65c1212791e06c7ec4d153ca030f20bea75bd55be78314c07237f62060d24544dc45d7928e660f94284f8e45379a7d2f4b30863133b72fcf617ec0a2777 SHA512 f6461b23743144d5c21f83dafed89561514f143d5acfbee1c453f445e27b4d6638299123bdd13031741c8cc410376b111e7c25aab9fec30e7f2f190760ffae04
 DIST ruff-0.14.14-crates.tar.xz 27166656 BLAKE2B 2195359d2c7e2d81d2b529c9758b2648e801471f44b4817905dee9863eb71a546c54bf6b48f438f73dc7de17c71d388dd96b07f30e1c3162000226c9e81a05a5 SHA512 1257b788e753c52600f2de8c96d609175ccc6bb6b86f280592af53037f33f10669dd0d264dfeb813ce6f694cbf3dd5c9c3ca7cc7782a6eac730d5769413397d4
 DIST ruff-0.14.14.gh.tar.gz 10790863 BLAKE2B a2c528031f7a4d7722d2b3ed2e21e8866f847538275357c66667f98e963e3c37002cd44ef8d57d48a5c68ec9c69c538cc29fa62e65f0cbf7ceb210341488d135 SHA512 f0e0350034c745dd8dfad81b7a61ba3895674bbc3aa0ec3c552470fe24363e729c959cd8916cb216ea90cf3c6682bed1bad22e740eff8525b9b27c7bac1da10b
 DIST ruff-0.14.9-crates.tar.xz 23756736 BLAKE2B 096331190e95db7701bd80ef61d38dbc2f40dd551ed47381376ec7b7ab6cca2660d0bf3991e436643bab8e8c76b21d0b250b3229f6718a5b9ae8cf062167fb88 SHA512 69a2784950322b8d99abcfc7a08b6205e26ba58c7c91a7978069fec734e8668c32e59d1142c0921eec0e65b7fd6b7eb25ad5c9f623e547f4ee41045bcad92447
 DIST ruff-0.14.9.gh.tar.gz 10435624 BLAKE2B 8a11be76ac46750c97efd6f8bfdafd1d2bdeac81302b85f2d04feba59165fe9ed1b24c465a9df0d8d415325af6e9c6e020d21f295ef94c52f24681359c00bb3a SHA512 67c58eff480232871041156ddd8448a856b0e3c9bb68ca82577d34f353a711b85e3b1e032f98ed0abe5d0fff2855a109380e59e8909dd2742c3bb6b96dc972d4
-DIST ruff-0.15.1-crates.tar.xz 27160512 BLAKE2B c59aca33f25cbee3970e1f05a0f4d6fd4411e8b9968eb682f29e2775ae17db10c8acd3e1de69a3aaff162a368e2af1d18c007e0d53cedcf65d2fc78096c6d8b2 SHA512 61e24937d6efce02013b2484c21c3eebe9f74d1bda740dfa9771e93846a8dd1d18039b6d9b905441af35062f5550a3d62342b5d4c63b479152d3de92abea6048
-DIST ruff-0.15.1.gh.tar.gz 10974921 BLAKE2B fbae4979a96a443dfb9b9492c4346d89ad6a8412a23934acf068b84972256de7d3a4e857e99064d29157ee2eaae15ac1d4ceec97861be66b59034a79f0adc221 SHA512 e8fa0bb254714a5d361a1d49aadd0633a6989d91c098c4dc2689991634960aff369f3e987546f1d9018de2920a4af40233f52fb8091f992a90d34a99be8ad855
-DIST ruff-0.15.4-crates.tar.xz 27914628 BLAKE2B 2dfdbd4461f7bd1e1536d28e6ef24e3cbb0c02b9d64e77514eb0825528f26e66c861ebe9a4f4d673c93b9979c919cb5629601be794f7008c5a22a30abe8a21ef SHA512 42cb1153400321542e29f3f082e23877ab41672718d9005753910e26b6bb38f54ee483c9b46b0072294bddbdf43e67fd67f0bedbd68e759e00ab2a8c22518a17
-DIST ruff-0.15.4.gh.tar.gz 11086140 BLAKE2B ee15559befc4df91ee556c5e6fd4e9af6eed398e0d2f0ca663aedfe5ff476d6fde3536cf93f7fa822a89ac8cf51f1d12d3f7f0e4c6f0aca20af0e9c7128b091f SHA512 7a05f6dae5872fa6446adba2fe6a1cb207a7107f56d479567afb7abca164def43f9bc5c9ea2469204edebef050f3a5b2cf9a7e6b9b95cccc2227293117b35df4
-DIST ruff-0.15.5-crates.tar.xz 27905772 BLAKE2B 6c0ebda283e033b895797142a5aa6d9e1fddab182aa3907dffee1877e6934e376f80e3068548e27abd2ddd597dff2b58c96692b6a74ac55c7312ca93737ff473 SHA512 69c82273b4e3e7b6b1d6c94e6dea912f1662617f8388a8273e1b341304f6a02dc83bf0138c29ba37e92814bd12236298283be9d837ff08ecd3f876c4bc99c99c
-DIST ruff-0.15.5.gh.tar.gz 11172273 BLAKE2B 49d0a9c5d4bb05ac5d4d6c289e68f2a12e5a8c2f91f7f2a8ab8b3c644169ced0db57517f89381ac7d057e9aa7489d4c88972a176791611cc57b0dfc069d5708b SHA512 da823b14abdc0251576677425f0b05101256c693341f04b36c789bf0dd9ba4b7cd444b5d7bf9960bf52f350108c15e95852ed7c0b26a0b51289b0747472dd038
-DIST ruff-0.15.6-crates.tar.xz 28141740 BLAKE2B 35a5f6f8052e31b41aa2b30bf51cb9b32e977dbffcfc870cb2677193f2406dbfd762e6320e7417a72b05026abae94afcd691fc632f88cad55a23d15e6d125556 SHA512 9315eb8222448024e133d4fad06843202964db5f8b03086bdfbf31f4c14bc8eeb70a8591cc163f6035a3918e206bac1a51dc02e9880f18b539c9aa03ab6eec8a
-DIST ruff-0.15.6.gh.tar.gz 11238118 BLAKE2B 633cb6e811ed48a4fddc9db27a9b0eb61bcc9cfcc965d4314ad784fca8b5dccadda01239ca9115bf29a5a08fe527879307e1393bc959fad81eb18707672baa9b SHA512 1fbce9aca6a8f8599bbc09d0d2f3fc9513b6273e3e2b0d7bf9bd8c1b2b11d1e137e8f822dd05fda0033f2b17c3ebf20d9d595d63b930fbf9746e2f4f2ef4d6cb
-DIST ruff-0.15.7-crates.tar.xz 27536700 BLAKE2B df3367d06df5d698b720b39fdc67f2fb014d77109169b487c72b0bc52f645d3e4989443c28490b1b2e9157348c8413242c98cd6f641ea6c68d8b2eb48e966591 SHA512 4ada88f705687e2b364c7f1e758834f14c6c322f23a6d49285ebc6b3534d4c5103a845991c4fd85fcfc2be7b445fc5801895486fd68002726409537523d3ef25
-DIST ruff-0.15.7.gh.tar.gz 11275556 BLAKE2B 86bd8ba4ab15488d8eff99aed59a9f971a5afb9e66dd7f1c2d41897cfd5e15f94861dae6fbcba35267900f02c6670918c4d6a2e0e1d1e523595f0883204ab370 SHA512 4f72fd3e16781ff2029b7da813209ca86024c2b38545d1540890b9b1cfcba13bfd729f02202c1efd9414e27ebb5533ed5c641dd0ff6663467f6f7dd44a3a3023
 DIST ruff-0.15.8-crates.tar.xz 27533848 BLAKE2B 1f76cc4b0a8e8fd10ea8d8fc1919d6ceaf8bef3e6531b68f836800e9016ac2022d08a211bbe9ab43ef33c17df5fd62ee6cd845f93dece6dd88df3e567d13a84a SHA512 58399d4a87916cf8d6221bc26c43e594c9f78620b8e9ec38b9d467b0c1a5482e72678235e0e8dab4f335c1b90d4cf4504f0f92d647202d0bfc288dbedeaa16bf
 DIST ruff-0.15.8.gh.tar.gz 11339555 BLAKE2B 8bf1da708278459807ab120e17d762c128f7a10f5a6103881ca650b278eb938815f9ee9b2c22e755e1c38fd525269932138f5849dafdbdda930ec45e76273790 SHA512 868d8946a1f6d89f042a97a7cf21b99b4e56238a0020913e4a23a1cd3b617615ba556462a1dd7a6cf5cdae289d3fcc5291eedf0e7381a01b425f69d381dc799a
+DIST ruff-0.15.9-crates.tar.xz 27352792 BLAKE2B 140953d256d46bcd0928c3502e36da87cfa35ab7a14a82fd81bf520250b75cc9837ee71e8b744c720c1202e8a26dca173f79baecfe87d212dd251f2d06f0c99a SHA512 dd666997648769a48d5d8020e69af1b7fa13378149f68eb2d260c252ce7a057ff6795a5642790a70fcea3430a6ee2ef3abc1f2f8bee78c7d9492e9f1471f1ebb
+DIST ruff-0.15.9.gh.tar.gz 11389702 BLAKE2B 81d4e7577559a2d82e1c4293706a5229c8b3b0ee3fdd701ab372be3cac6a37c0edcb0743bbefc443310024730d41e87e3059df1c0a4aaeef3e6ea1b86ecea834 SHA512 aadb010020b5fe4c5f9b550af094f62a9c583efe96fadd0c8fa952167cd4ebeec42440d89759d911019581bb5637d11b7fa37996251c4e64d845ecd04b3dd7ae
 DIST salsa-2f687a17ceea8ec7aaa605561ccbde938ccef086.gh.tar.gz 743865 BLAKE2B 8c0cf9e079e896e811708bf08ac0cb3817de21e0632c79e6a684bb10c87b13c760b72b13b2ec87457b2c7b1c36ff7870621f7b21933644f5e5fdbeca2505cab2 SHA512 8299b53c94ffa67dcd8fb903247469375c04efa6e581d4696576b02f5b325ca84f14b12c0b9f93a4792900983356613de489dbdab886b0396b74967b26bd114d
-DIST salsa-3713cd7eb30821c0c086591832dd6f59f2af7fe7.gh.tar.gz 717350 BLAKE2B 3db412c1ce2953fdde9f182e9611d8dfe09b197be36c69ebf77344fbdf1efb542b94ca61c5cbcc39fdb3df8ec1e374d19e1e1116174f63f907e28b51f14f19cf SHA512 49bcdede05f7f681d075739b685e1807e978d8160374b2d6176246b90255d72c202205e7591af76ce362706793ca8c15f1a3854849c63b466313eaf363ad8c61
-DIST salsa-53421c2fff87426fa0bb51cab06632b87646de13.gh.tar.gz 742301 BLAKE2B 90a53f87b823c360fce95c32fa573650892e40d4f7b260b52efa9bd96da903342ba5cd8adfffed34f168e546a9a1c140ecf22c80731d458cd8e06c84bd6c4d24 SHA512 4471203f3a2a6db0766ce2d426583f9c55277987200bf863c31b1ef09f9ede77091d47ad3a971ae2653d34a02cb2f79b5fb0e6da7a0860dca6636ebba1651ae6
 DIST salsa-55e5e7d32fa3fc189276f35bb04c9438f9aedbd1.gh.tar.gz 731425 BLAKE2B ce720abaa295b46c7e1fa06a73e2ad9a48a6b9da7f2b4a91edba38a28bb9a63a1661886fc7c5d6dbc915f589f2e055731a544cdf18afb4dd7b3f6815c59e543b SHA512 91942cfc6bbfb7f07366cdd3d42e5296bff877ee723b24868ff3c278defd0ef247f03e957332bc0696553f0f1977a41c18d08efe7887f5bda3a1cb98543bddbd
 DIST salsa-9860ff6ca0f1f8f3a8d6b832020002790b501254.gh.tar.gz 738416 BLAKE2B a80aea2f5e89bbadd5aecd7bf728355f2ffd84793b2e3581e94ba10e32c68fa7b9eb2663b17e47089ba60f5b6019776f794f91771435a9e8d10876f4e38b4d97 SHA512 ed1080daa458a77dc1634381863c671f3facd34e048c952358253be950bc87eb4d11079566be8caa90eb1f704e1dbc3591418a03ed10f1b7147222afcf44fe63
diff --git a/dev-util/ruff/ruff-0.13.1.ebuild b/dev-util/ruff/ruff-0.13.1.ebuild
deleted file mode 100644
index 376e69fd7149..000000000000
--- a/dev-util/ruff/ruff-0.13.1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 2024-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Autogenerated by pycargoebuild 0.15.0
-
-EAPI=8
-
-CRATES="
-"
-
-declare -A GIT_CRATES=(
-	[lsp-types]='https://github.com/astral-sh/lsp-types;3512a9f33eadc5402cfab1b8f7340824c8ca1439;lsp-types-%commit%'
-	[salsa-macro-rules]='https://github.com/salsa-rs/salsa;3713cd7eb30821c0c086591832dd6f59f2af7fe7;salsa-%commit%/components/salsa-macro-rules'
-	[salsa-macros]='https://github.com/salsa-rs/salsa;3713cd7eb30821c0c086591832dd6f59f2af7fe7;salsa-%commit%/components/salsa-macros'
-	[salsa]='https://github.com/salsa-rs/salsa;3713cd7eb30821c0c086591832dd6f59f2af7fe7;salsa-%commit%'
-)
-
-RUST_MIN_VER="1.88.0"
-
-inherit shell-completion cargo
-
-DESCRIPTION="An extremely fast Python linter, written in Rust"
-HOMEPAGE="
-	https://docs.astral.sh/ruff/
-	https://github.com/astral-sh/ruff
-"
-SRC_URI="
-	${CARGO_CRATE_URIS}
-	https://github.com/astral-sh/ruff/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz
-	https://github.com/gentoo-crate-dist/${PN}/releases/download/${PV}/${P}-crates.tar.xz
-"
-
-LICENSE="MIT"
-# Dependent crate licenses
-LICENSE+="
-	Apache-2.0 BSD CC0-1.0 ISC MIT MPL-2.0 PSF-2 Unicode-3.0
-	Unicode-DFS-2016 WTFPL-2 ZLIB
-"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~loong ~riscv"
-
-RDEPEND="
-	!elibc_musl? ( !elibc_Darwin? ( !elibc_bionic? ( dev-libs/jemalloc:= ) ) )
-	app-arch/zstd
-"
-DEPEND="
-	${RDEPEND}
-"
-
-QA_FLAGS_IGNORED="usr/bin/.*"
-
-DOCS=(
-	BREAKING_CHANGES.md
-	CODE_OF_CONDUCT.md
-	CONTRIBUTING.md
-	README.md
-	assets
-	docs
-)
-
-src_prepare() {
-	default
-
-	# Experimental cruft cleaner. These crates are not used by the ruff binary,
-	# and when they are removed in the git repo, the lockfile is regenerated
-	# and gets quite a bit smaller. Hence pycargoebuild also produces much
-	# smaller CRATES= variables. Less for the user to download, fewer distfiles
-	# to mirror.
-	pushd crates >/dev/null || die
-	rm -r ruff_{benchmark,dev} ty{,_{ide,project,server}} *_wasm || die
-	popd > /dev/null || die
-
-	# tests that hang in the ebuild environment
-	rm crates/ruff_annotate_snippets/tests/examples.rs || die
-}
-
-src_configure() {
-	export RUSTFLAGS="${RUSTFLAGS}"
-	cargo_src_configure
-}
-
-src_compile() {
-	local -x ZSTD_SYS_USE_PKG_CONFIG=1
-	# Gentoo bug #927338
-	if use !elibc_musl && use !elibc_Darwin && use !elibc_bionic; then
-		local -x CARGO_FEATURE_UNPREFIXED_MALLOC_ON_SUPPORTED_PLATFORMS=1
-		local -x JEMALLOC_OVERRIDE="${ESYSROOT}/usr/$(get_libdir)"/libjemalloc.so
-	fi
-	cargo_src_compile --bin ruff
-
-	local releasedir
-	releasedir=$(cargo_target_dir)
-
-	${releasedir}/ruff generate-shell-completion bash > ruff-completion.bash || die
-	${releasedir}/ruff generate-shell-completion zsh > ruff-completion.zsh || die
-}
-
-src_test() {
-	local -x ZSTD_SYS_USE_PKG_CONFIG=1
-	# Gentoo bug #927338
-	if use !elibc_musl && use !elibc_Darwin && use !elibc_bionic; then
-		local -x CARGO_FEATURE_UNPREFIXED_MALLOC_ON_SUPPORTED_PLATFORMS=1
-		local -x JEMALLOC_OVERRIDE="${ESYSROOT}/usr/$(get_libdir)"/libjemalloc.so
-	fi
-	cargo_src_test --target-dir "${PWD}"/tested-target/
-}
-
-src_install() {
-	local releasedir=$(cargo_target_dir)
-
-	dobin ${releasedir}/ruff
-
-	newbashcomp ruff-completion.bash ruff
-	newzshcomp ruff-completion.zsh _ruff
-
-	dodoc -r "${DOCS[@]}"
-}
diff --git a/dev-util/ruff/ruff-0.15.1.ebuild b/dev-util/ruff/ruff-0.15.1.ebuild
deleted file mode 100644
index c9365b4e5002..000000000000
--- a/dev-util/ruff/ruff-0.15.1.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 2024-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Autogenerated by pycargoebuild 0.15.1
-
-EAPI=8
-
-CRATES="
-"
-
-declare -A GIT_CRATES=(
-	[lsp-types]='https://github.com/astral-sh/lsp-types;3512a9f33eadc5402cfab1b8f7340824c8ca1439;lsp-types-%commit%'
-	[salsa-macro-rules]='https://github.com/salsa-rs/salsa;53421c2fff87426fa0bb51cab06632b87646de13;salsa-%commit%/components/salsa-macro-rules'
-	[salsa-macros]='https://github.com/salsa-rs/salsa;53421c2fff87426fa0bb51cab06632b87646de13;salsa-%commit%/components/salsa-macros'
-	[salsa]='https://github.com/salsa-rs/salsa;53421c2fff87426fa0bb51cab06632b87646de13;salsa-%commit%'
-)
-
-RUST_MIN_VER="1.91.0"
-
-inherit shell-completion cargo
-
-DESCRIPTION="An extremely fast Python linter, written in Rust"
-HOMEPAGE="
-	https://docs.astral.sh/ruff/
-	https://github.com/astral-sh/ruff
-"
-SRC_URI="
-	${CARGO_CRATE_URIS}
-	https://github.com/astral-sh/ruff/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz
-	https://github.com/gentoo-crate-dist/${PN}/releases/download/${PV}/${P}-crates.tar.xz
-"
-
-LICENSE="MIT"
-# Dependent crate licenses
-LICENSE+="
-	Apache-2.0 BSD CC0-1.0 ISC MIT MPL-2.0 PSF-2 Unicode-3.0
-	Unicode-DFS-2016 WTFPL-2 ZLIB
-"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~loong ~riscv"
-
-RDEPEND="
-	!elibc_musl? ( !elibc_Darwin? ( !elibc_bionic? ( dev-libs/jemalloc:= ) ) )
-	app-arch/zstd
-"
-DEPEND="
-	${RDEPEND}
-"
-
-QA_FLAGS_IGNORED="usr/bin/.*"
-
-DOCS=(
-	BREAKING_CHANGES.md
-	CODE_OF_CONDUCT.md
-	CONTRIBUTING.md
-	README.md
-	assets
-	docs
-)
-
-src_prepare() {
-	default
-
-	# Experimental cruft cleaner. These crates are not used by the ruff binary,
-	# and when they are removed in the git repo, the lockfile is regenerated
-	# and gets quite a bit smaller. Hence pycargoebuild also produces much
-	# smaller CRATES= variables. Less for the user to download, fewer distfiles
-	# to mirror.
-	pushd crates >/dev/null || die
-	rm -r ruff_{benchmark,dev} ty{,_{server,completion_eval}} *_wasm || die
-	popd > /dev/null || die
-
-	# tests that hang in the ebuild environment
-	rm crates/ruff_annotate_snippets/tests/examples.rs || die
-}
-
-src_configure() {
-	export RUSTFLAGS="${RUSTFLAGS}"
-	cargo_src_configure
-}
-
-src_compile() {
-	local -x ZSTD_SYS_USE_PKG_CONFIG=1
-	# Gentoo bug #927338
-	if use !elibc_musl && use !elibc_Darwin && use !elibc_bionic; then
-		local -x CARGO_FEATURE_UNPREFIXED_MALLOC_ON_SUPPORTED_PLATFORMS=1
-		local -x JEMALLOC_OVERRIDE="${ESYSROOT}/usr/$(get_libdir)"/libjemalloc.so
-	fi
-	cargo_src_compile --bin ruff
-
-	local releasedir
-	releasedir=$(cargo_target_dir)
-
-	${releasedir}/ruff generate-shell-completion bash > ruff-completion.bash || die
-	${releasedir}/ruff generate-shell-completion fish > ruff-completion.fish || die
-	${releasedir}/ruff generate-shell-completion zsh > ruff-completion.zsh || die
-}
-
-src_test() {
-	local -x ZSTD_SYS_USE_PKG_CONFIG=1
-	# Gentoo bug #927338
-	if use !elibc_musl && use !elibc_Darwin && use !elibc_bionic; then
-		local -x CARGO_FEATURE_UNPREFIXED_MALLOC_ON_SUPPORTED_PLATFORMS=1
-		local -x JEMALLOC_OVERRIDE="${ESYSROOT}/usr/$(get_libdir)"/libjemalloc.so
-	fi
-	cargo_src_test --target-dir "${PWD}"/tested-target/
-}
-
-src_install() {
-	local releasedir=$(cargo_target_dir)
-
-	dobin ${releasedir}/ruff
-
-	newbashcomp ruff-completion.bash ruff
-	newfishcomp ruff-completion.fish ruff.fish
-	newzshcomp ruff-completion.zsh _ruff
-
-	dodoc -r "${DOCS[@]}"
-}
diff --git a/dev-util/ruff/ruff-0.15.4.ebuild b/dev-util/ruff/ruff-0.15.4.ebuild
deleted file mode 100644
index c9365b4e5002..000000000000
--- a/dev-util/ruff/ruff-0.15.4.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 2024-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Autogenerated by pycargoebuild 0.15.1
-
-EAPI=8
-
-CRATES="
-"
-
-declare -A GIT_CRATES=(
-	[lsp-types]='https://github.com/astral-sh/lsp-types;3512a9f33eadc5402cfab1b8f7340824c8ca1439;lsp-types-%commit%'
-	[salsa-macro-rules]='https://github.com/salsa-rs/salsa;53421c2fff87426fa0bb51cab06632b87646de13;salsa-%commit%/components/salsa-macro-rules'
-	[salsa-macros]='https://github.com/salsa-rs/salsa;53421c2fff87426fa0bb51cab06632b87646de13;salsa-%commit%/components/salsa-macros'
-	[salsa]='https://github.com/salsa-rs/salsa;53421c2fff87426fa0bb51cab06632b87646de13;salsa-%commit%'
-)
-
-RUST_MIN_VER="1.91.0"
-
-inherit shell-completion cargo
-
-DESCRIPTION="An extremely fast Python linter, written in Rust"
-HOMEPAGE="
-	https://docs.astral.sh/ruff/
-	https://github.com/astral-sh/ruff
-"
-SRC_URI="
-	${CARGO_CRATE_URIS}
-	https://github.com/astral-sh/ruff/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz
-	https://github.com/gentoo-crate-dist/${PN}/releases/download/${PV}/${P}-crates.tar.xz
-"
-
-LICENSE="MIT"
-# Dependent crate licenses
-LICENSE+="
-	Apache-2.0 BSD CC0-1.0 ISC MIT MPL-2.0 PSF-2 Unicode-3.0
-	Unicode-DFS-2016 WTFPL-2 ZLIB
-"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~loong ~riscv"
-
-RDEPEND="
-	!elibc_musl? ( !elibc_Darwin? ( !elibc_bionic? ( dev-libs/jemalloc:= ) ) )
-	app-arch/zstd
-"
-DEPEND="
-	${RDEPEND}
-"
-
-QA_FLAGS_IGNORED="usr/bin/.*"
-
-DOCS=(
-	BREAKING_CHANGES.md
-	CODE_OF_CONDUCT.md
-	CONTRIBUTING.md
-	README.md
-	assets
-	docs
-)
-
-src_prepare() {
-	default
-
-	# Experimental cruft cleaner. These crates are not used by the ruff binary,
-	# and when they are removed in the git repo, the lockfile is regenerated
-	# and gets quite a bit smaller. Hence pycargoebuild also produces much
-	# smaller CRATES= variables. Less for the user to download, fewer distfiles
-	# to mirror.
-	pushd crates >/dev/null || die
-	rm -r ruff_{benchmark,dev} ty{,_{server,completion_eval}} *_wasm || die
-	popd > /dev/null || die
-
-	# tests that hang in the ebuild environment
-	rm crates/ruff_annotate_snippets/tests/examples.rs || die
-}
-
-src_configure() {
-	export RUSTFLAGS="${RUSTFLAGS}"
-	cargo_src_configure
-}
-
-src_compile() {
-	local -x ZSTD_SYS_USE_PKG_CONFIG=1
-	# Gentoo bug #927338
-	if use !elibc_musl && use !elibc_Darwin && use !elibc_bionic; then
-		local -x CARGO_FEATURE_UNPREFIXED_MALLOC_ON_SUPPORTED_PLATFORMS=1
-		local -x JEMALLOC_OVERRIDE="${ESYSROOT}/usr/$(get_libdir)"/libjemalloc.so
-	fi
-	cargo_src_compile --bin ruff
-
-	local releasedir
-	releasedir=$(cargo_target_dir)
-
-	${releasedir}/ruff generate-shell-completion bash > ruff-completion.bash || die
-	${releasedir}/ruff generate-shell-completion fish > ruff-completion.fish || die
-	${releasedir}/ruff generate-shell-completion zsh > ruff-completion.zsh || die
-}
-
-src_test() {
-	local -x ZSTD_SYS_USE_PKG_CONFIG=1
-	# Gentoo bug #927338
-	if use !elibc_musl && use !elibc_Darwin && use !elibc_bionic; then
-		local -x CARGO_FEATURE_UNPREFIXED_MALLOC_ON_SUPPORTED_PLATFORMS=1
-		local -x JEMALLOC_OVERRIDE="${ESYSROOT}/usr/$(get_libdir)"/libjemalloc.so
-	fi
-	cargo_src_test --target-dir "${PWD}"/tested-target/
-}
-
-src_install() {
-	local releasedir=$(cargo_target_dir)
-
-	dobin ${releasedir}/ruff
-
-	newbashcomp ruff-completion.bash ruff
-	newfishcomp ruff-completion.fish ruff.fish
-	newzshcomp ruff-completion.zsh _ruff
-
-	dodoc -r "${DOCS[@]}"
-}
diff --git a/dev-util/ruff/ruff-0.15.5.ebuild b/dev-util/ruff/ruff-0.15.5.ebuild
deleted file mode 100644
index 6e241282a906..000000000000
--- a/dev-util/ruff/ruff-0.15.5.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 2024-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Autogenerated by pycargoebuild 0.15.1
-
-EAPI=8
-
-CRATES="
-"
-
-declare -A GIT_CRATES=(
-	[lsp-types]='https://github.com/astral-sh/lsp-types;e15db0593f0ecbbd80599c3f5880e4bf5da1ca0c;lsp-types-%commit%'
-	[salsa-macro-rules]='https://github.com/salsa-rs/salsa;53421c2fff87426fa0bb51cab06632b87646de13;salsa-%commit%/components/salsa-macro-rules'
-	[salsa-macros]='https://github.com/salsa-rs/salsa;53421c2fff87426fa0bb51cab06632b87646de13;salsa-%commit%/components/salsa-macros'
-	[salsa]='https://github.com/salsa-rs/salsa;53421c2fff87426fa0bb51cab06632b87646de13;salsa-%commit%'
-)
-
-RUST_MIN_VER="1.91.0"
-
-inherit shell-completion cargo
-
-DESCRIPTION="An extremely fast Python linter, written in Rust"
-HOMEPAGE="
-	https://docs.astral.sh/ruff/
-	https://github.com/astral-sh/ruff
-"
-SRC_URI="
-	${CARGO_CRATE_URIS}
-	https://github.com/astral-sh/ruff/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz
-	https://github.com/gentoo-crate-dist/${PN}/releases/download/${PV}/${P}-crates.tar.xz
-"
-
-LICENSE="MIT"
-# Dependent crate licenses
-LICENSE+="
-	Apache-2.0 BSD CC0-1.0 ISC MIT MPL-2.0 PSF-2 Unicode-3.0
-	Unicode-DFS-2016 WTFPL-2 ZLIB
-"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~loong ~riscv"
-
-RDEPEND="
-	!elibc_musl? ( !elibc_Darwin? ( !elibc_bionic? ( dev-libs/jemalloc:= ) ) )
-	app-arch/zstd
-"
-DEPEND="
-	${RDEPEND}
-"
-
-QA_FLAGS_IGNORED="usr/bin/.*"
-
-DOCS=(
-	BREAKING_CHANGES.md
-	CODE_OF_CONDUCT.md
-	CONTRIBUTING.md
-	README.md
-	assets
-	docs
-)
-
-src_prepare() {
-	default
-
-	# Experimental cruft cleaner. These crates are not used by the ruff binary,
-	# and when they are removed in the git repo, the lockfile is regenerated
-	# and gets quite a bit smaller. Hence pycargoebuild also produces much
-	# smaller CRATES= variables. Less for the user to download, fewer distfiles
-	# to mirror.
-	pushd crates >/dev/null || die
-	rm -r ruff_{benchmark,dev} ty{,_{server,completion_eval}} *_wasm || die
-	popd > /dev/null || die
-
-	# tests that hang in the ebuild environment
-	rm crates/ruff_annotate_snippets/tests/examples.rs || die
-}
-
-src_configure() {
-	export RUSTFLAGS="${RUSTFLAGS}"
-	cargo_src_configure
-}
-
-src_compile() {
-	local -x ZSTD_SYS_USE_PKG_CONFIG=1
-	# Gentoo bug #927338
-	if use !elibc_musl && use !elibc_Darwin && use !elibc_bionic; then
-		local -x CARGO_FEATURE_UNPREFIXED_MALLOC_ON_SUPPORTED_PLATFORMS=1
-		local -x JEMALLOC_OVERRIDE="${ESYSROOT}/usr/$(get_libdir)"/libjemalloc.so
-	fi
-	cargo_src_compile --bin ruff
-
-	local releasedir
-	releasedir=$(cargo_target_dir)
-
-	${releasedir}/ruff generate-shell-completion bash > ruff-completion.bash || die
-	${releasedir}/ruff generate-shell-completion fish > ruff-completion.fish || die
-	${releasedir}/ruff generate-shell-completion zsh > ruff-completion.zsh || die
-}
-
-src_test() {
-	local -x ZSTD_SYS_USE_PKG_CONFIG=1
-	# Gentoo bug #927338
-	if use !elibc_musl && use !elibc_Darwin && use !elibc_bionic; then
-		local -x CARGO_FEATURE_UNPREFIXED_MALLOC_ON_SUPPORTED_PLATFORMS=1
-		local -x JEMALLOC_OVERRIDE="${ESYSROOT}/usr/$(get_libdir)"/libjemalloc.so
-	fi
-	cargo_src_test --target-dir "${PWD}"/tested-target/
-}
-
-src_install() {
-	local releasedir=$(cargo_target_dir)
-
-	dobin ${releasedir}/ruff
-
-	newbashcomp ruff-completion.bash ruff
-	newfishcomp ruff-completion.fish ruff.fish
-	newzshcomp ruff-completion.zsh _ruff
-
-	dodoc -r "${DOCS[@]}"
-}
diff --git a/dev-util/ruff/ruff-0.15.6.ebuild b/dev-util/ruff/ruff-0.15.6.ebuild
deleted file mode 100644
index 6e241282a906..000000000000
--- a/dev-util/ruff/ruff-0.15.6.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 2024-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Autogenerated by pycargoebuild 0.15.1
-
-EAPI=8
-
-CRATES="
-"
-
-declare -A GIT_CRATES=(
-	[lsp-types]='https://github.com/astral-sh/lsp-types;e15db0593f0ecbbd80599c3f5880e4bf5da1ca0c;lsp-types-%commit%'
-	[salsa-macro-rules]='https://github.com/salsa-rs/salsa;53421c2fff87426fa0bb51cab06632b87646de13;salsa-%commit%/components/salsa-macro-rules'
-	[salsa-macros]='https://github.com/salsa-rs/salsa;53421c2fff87426fa0bb51cab06632b87646de13;salsa-%commit%/components/salsa-macros'
-	[salsa]='https://github.com/salsa-rs/salsa;53421c2fff87426fa0bb51cab06632b87646de13;salsa-%commit%'
-)
-
-RUST_MIN_VER="1.91.0"
-
-inherit shell-completion cargo
-
-DESCRIPTION="An extremely fast Python linter, written in Rust"
-HOMEPAGE="
-	https://docs.astral.sh/ruff/
-	https://github.com/astral-sh/ruff
-"
-SRC_URI="
-	${CARGO_CRATE_URIS}
-	https://github.com/astral-sh/ruff/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz
-	https://github.com/gentoo-crate-dist/${PN}/releases/download/${PV}/${P}-crates.tar.xz
-"
-
-LICENSE="MIT"
-# Dependent crate licenses
-LICENSE+="
-	Apache-2.0 BSD CC0-1.0 ISC MIT MPL-2.0 PSF-2 Unicode-3.0
-	Unicode-DFS-2016 WTFPL-2 ZLIB
-"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~loong ~riscv"
-
-RDEPEND="
-	!elibc_musl? ( !elibc_Darwin? ( !elibc_bionic? ( dev-libs/jemalloc:= ) ) )
-	app-arch/zstd
-"
-DEPEND="
-	${RDEPEND}
-"
-
-QA_FLAGS_IGNORED="usr/bin/.*"
-
-DOCS=(
-	BREAKING_CHANGES.md
-	CODE_OF_CONDUCT.md
-	CONTRIBUTING.md
-	README.md
-	assets
-	docs
-)
-
-src_prepare() {
-	default
-
-	# Experimental cruft cleaner. These crates are not used by the ruff binary,
-	# and when they are removed in the git repo, the lockfile is regenerated
-	# and gets quite a bit smaller. Hence pycargoebuild also produces much
-	# smaller CRATES= variables. Less for the user to download, fewer distfiles
-	# to mirror.
-	pushd crates >/dev/null || die
-	rm -r ruff_{benchmark,dev} ty{,_{server,completion_eval}} *_wasm || die
-	popd > /dev/null || die
-
-	# tests that hang in the ebuild environment
-	rm crates/ruff_annotate_snippets/tests/examples.rs || die
-}
-
-src_configure() {
-	export RUSTFLAGS="${RUSTFLAGS}"
-	cargo_src_configure
-}
-
-src_compile() {
-	local -x ZSTD_SYS_USE_PKG_CONFIG=1
-	# Gentoo bug #927338
-	if use !elibc_musl && use !elibc_Darwin && use !elibc_bionic; then
-		local -x CARGO_FEATURE_UNPREFIXED_MALLOC_ON_SUPPORTED_PLATFORMS=1
-		local -x JEMALLOC_OVERRIDE="${ESYSROOT}/usr/$(get_libdir)"/libjemalloc.so
-	fi
-	cargo_src_compile --bin ruff
-
-	local releasedir
-	releasedir=$(cargo_target_dir)
-
-	${releasedir}/ruff generate-shell-completion bash > ruff-completion.bash || die
-	${releasedir}/ruff generate-shell-completion fish > ruff-completion.fish || die
-	${releasedir}/ruff generate-shell-completion zsh > ruff-completion.zsh || die
-}
-
-src_test() {
-	local -x ZSTD_SYS_USE_PKG_CONFIG=1
-	# Gentoo bug #927338
-	if use !elibc_musl && use !elibc_Darwin && use !elibc_bionic; then
-		local -x CARGO_FEATURE_UNPREFIXED_MALLOC_ON_SUPPORTED_PLATFORMS=1
-		local -x JEMALLOC_OVERRIDE="${ESYSROOT}/usr/$(get_libdir)"/libjemalloc.so
-	fi
-	cargo_src_test --target-dir "${PWD}"/tested-target/
-}
-
-src_install() {
-	local releasedir=$(cargo_target_dir)
-
-	dobin ${releasedir}/ruff
-
-	newbashcomp ruff-completion.bash ruff
-	newfishcomp ruff-completion.fish ruff.fish
-	newzshcomp ruff-completion.zsh _ruff
-
-	dodoc -r "${DOCS[@]}"
-}
diff --git a/dev-util/ruff/ruff-0.15.7.ebuild b/dev-util/ruff/ruff-0.15.9.ebuild
index 2db9559fe971..2602ab360b37 100644
--- a/dev-util/ruff/ruff-0.15.7.ebuild
+++ b/dev-util/ruff/ruff-0.15.9.ebuild
@@ -10,12 +10,12 @@ CRATES="
 
 declare -A GIT_CRATES=(
 	[lsp-types]='https://github.com/astral-sh/lsp-types;e15db0593f0ecbbd80599c3f5880e4bf5da1ca0c;lsp-types-%commit%'
-	[salsa-macro-rules]='https://github.com/salsa-rs/salsa;53421c2fff87426fa0bb51cab06632b87646de13;salsa-%commit%/components/salsa-macro-rules'
-	[salsa-macros]='https://github.com/salsa-rs/salsa;53421c2fff87426fa0bb51cab06632b87646de13;salsa-%commit%/components/salsa-macros'
-	[salsa]='https://github.com/salsa-rs/salsa;53421c2fff87426fa0bb51cab06632b87646de13;salsa-%commit%'
+	[salsa-macro-rules]='https://github.com/salsa-rs/salsa;2f687a17ceea8ec7aaa605561ccbde938ccef086;salsa-%commit%/components/salsa-macro-rules'
+	[salsa-macros]='https://github.com/salsa-rs/salsa;2f687a17ceea8ec7aaa605561ccbde938ccef086;salsa-%commit%/components/salsa-macros'
+	[salsa]='https://github.com/salsa-rs/salsa;2f687a17ceea8ec7aaa605561ccbde938ccef086;salsa-%commit%'
 )
 
-RUST_MIN_VER="1.91.0"
+RUST_MIN_VER="1.92"
 
 inherit shell-completion cargo