10 files changed, 115 insertions, 263 deletions
diff --git a/dev-util/claude-code/Manifest b/dev-util/claude-code/Manifest
index 7dfb43e7e3c4..699bf0b544f1 100644
--- a/dev-util/claude-code/Manifest
+++ b/dev-util/claude-code/Manifest
@@ -1,2 +1,2 @@
 DIST claude-code-1.0.128.tgz 36011028 BLAKE2B b135f3674f6e42cfa699cbcf8528c745ce495865ab7a2f55d0e61d9e529981375394b0ba27951f751ec730b3cafc831a11e99ee94a4c618b1f4c6b033479944c SHA512 b948397053097de41eb50cc5c3be95a5bae8e83017b2dd8ba6ef1aa19591152a10558bb96520276c1a31696996fc88271d2a8822fb4cc330a8aa6700f63f6b35
-DIST claude-code-2.0.0.tgz 36009899 BLAKE2B ef566f72b1192efe92f3f7b84e9769297add170436da424208ada8d693d514a424ecc3f1ef982b8d0dcf3088d197d542fca085444b4e55872bcc49006a5aa9f5 SHA512 a9468cd5dd8d78eb213997c7ca1e7881a151c13138fa978d847011631533dd03c6e6f6e6da3a7bd2d148346efd95aa0210afcb10ec5e139cf0269c557a9f39eb
+DIST claude-code-2.0.1.tgz 36010034 BLAKE2B 501fcb0abdfd22c08163ede581b22874c765d09d88dcf4a77d7401e10bc241ca8089619383639e3a9f26e44766376d809458c219a27f18af75489af3dc946d1b SHA512 d926e861c749f9db04d8aefce1d6c9e288555a50242d9854ee6646d6579bc86e93bc62d72e18dcdaa4c47c2c5279e9428c91e1221fd890da5ed3abde07822007
diff --git a/dev-util/claude-code/claude-code-2.0.0.ebuild b/dev-util/claude-code/claude-code-2.0.1.ebuild
index 6e3380eb8890..6e3380eb8890 100644
--- a/dev-util/claude-code/claude-code-2.0.0.ebuild
+++ b/dev-util/claude-code/claude-code-2.0.1.ebuild
diff --git a/dev-util/patchutils/Manifest b/dev-util/patchutils/Manifest
index b895d9da037d..779cb271db4b 100644
--- a/dev-util/patchutils/Manifest
+++ b/dev-util/patchutils/Manifest
@@ -1 +1,2 @@
 DIST patchutils-0.4.2.tar.xz 159504 BLAKE2B 3ffcda8497b010a88e8601005871fb691ea8cac6158276862ba8e4192c333a335965288f9b5451c2fbc0a873ef95eb4a485d265387b43b0cec31b6c18d38f88e SHA512 20970d52fd43c09dc7799297b9a9eb6f60ba29ecc750d49381a2dc52273dfe484a47696cddd541f623394fa3486734cf337297cbeab6b1b244511c7740f46897
+DIST patchutils-0.4.4.tar.xz 424248 BLAKE2B 65a855a5164c193262002dc2a13a5a253d5b308ed431d49fd231ef587df2c9924b26b6c683c6162a9810290aaa65c9a4fba5e3b503517d1f815e0bd30e7be9dc SHA512 26f3ee959d7f8d7d5718ecf361436709559c62d6235114faac9a84442e9df4fb271f85eea5d96dae3969e96d88fdd9c1a9b5246696ef548fad71a8f29a026a84
diff --git a/dev-util/patchutils/patchutils-0.4.4.ebuild b/dev-util/patchutils/patchutils-0.4.4.ebuild
new file mode 100644
index 000000000000..da749ec62987
--- /dev/null
+++ b/dev-util/patchutils/patchutils-0.4.4.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="Collection of tools that operate on patch files"
+HOMEPAGE="https://cyberelk.net/tim/software/patchutils/"
+SRC_URI="https://github.com/twaugh/patchutils/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="pcre"
+
+RDEPEND="pcre? ( dev-libs/libpcre2:= )"
+DEPEND="
+	${RDEPEND}
+	elibc_musl? ( >=sys-libs/error-standalone-2.0 )
+"
+BDEPEND="virtual/pkgconfig"
+RDEPEND+="
+	!<app-shells/bash-completion-2.16.0-r3
+"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	tc-export PKG_CONFIG
+
+	if use elibc_musl; then
+		export CFLAGS="${CFLAGS} $(${PKG_CONFIG} --cflags error-standalone)"
+		export LIBS="${LIBS} $(${PKG_CONFIG} --libs error-standalone)"
+	fi
+
+	econf $(use_with pcre pcre2)
+}
diff --git a/dev-util/pifpaf/Manifest b/dev-util/pifpaf/Manifest
index d3cee1a35014..0b5abbe84dcd 100644
--- a/dev-util/pifpaf/Manifest
+++ b/dev-util/pifpaf/Manifest
@@ -1 +1,2 @@
 DIST pifpaf-3.3.0.tar.gz 185776 BLAKE2B fcc0b4d5d567eaf3cc898c0b2135599048b88909a6c204f5c508c176c0eb93e819be5e16a23797054644c1b4d8df0ad5470e646257ad747cddd9e073700aa90c SHA512 31d3c5570cfcd8f55827441d2d118c34d99e837896eed1abe24ec9860e8b5576f50e471ae44197692655dc92973b622d882e3f5a7f2f8b58e71d81fff08c4aae
+DIST pifpaf-3.4.0.tar.gz 185857 BLAKE2B ad424084373a99db46f07d82ad4ca5aaea06902998deb0fec960e12314a0479633c6c9138110583381ef1fb28cf5ac433de65503451af367d0e9552deaeba778 SHA512 ecc07d79782a0dc132b7f1b18e8ce2b488985897a938cee4246fdbc3069f23dcd0b0112b22206c3808c326dd5772a763554c6e7a0661678f4ab09121b2c4fc63
diff --git a/dev-util/pifpaf/pifpaf-3.4.0.ebuild b/dev-util/pifpaf/pifpaf-3.4.0.ebuild
new file mode 100644
index 000000000000..cb193fc2f24b
--- /dev/null
+++ b/dev-util/pifpaf/pifpaf-3.4.0.ebuild
@@ -0,0 +1,70 @@
+# Copyright 2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9,10,11,12,13} )
+DISTUTILS_USE_PEP517=setuptools
+inherit click-app distutils-r1 pypi
+
+DESCRIPTION="Suite of tools and fixtures to manage daemons for testing"
+HOMEPAGE="
+	https://pypi.org/project/pifpaf/
+	https://github.com/jd/pifpaf
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/click[${PYTHON_USEDEP}]
+	dev-python/daiquiri[${PYTHON_USEDEP}]
+	dev-python/fixtures[${PYTHON_USEDEP}]
+	dev-python/jinja2[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		|| (
+			dev-python/pyxattr[${PYTHON_USEDEP}]
+			dev-python/xattr[${PYTHON_USEDEP}]
+		)'
+	)
+"
+BDEPEND="
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
+	test? (
+		app-admin/consul
+		app-admin/vault
+		dev-db/etcd[server]
+		dev-db/postgresql[server]
+		dev-db/redis
+		dev-python/httpbin[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/testtools[${PYTHON_USEDEP}]
+		<net-misc/kafka-bin-4.0
+		net-misc/memcached
+		net-misc/rabbitmq-server
+		sys-cluster/ceph
+		dev-db/mariadb
+	)
+"
+
+EPYTEST_PLUGINS=( )
+EPYTEST_DESELECT=(
+	# Drivers need fixes
+	pifpaf/tests/test_drivers.py::TestDrivers::test_influxdb
+	pifpaf/tests/test_drivers.py::TestDrivers::test_mongodb
+	pifpaf/tests/test_drivers.py::TestDrivers::test_redis_sentinel
+)
+
+distutils_enable_tests pytest
+
+click-app_enable_completions pifpaf
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+python_test() {
+	# RabbitMQ wrappers installed to /usr/sbin require to be run as root.
+	local -x PATH="${BUILD_DIR}/install${EPREFIX}/usr/bin:${BROOT}/usr/libexec/rabbitmq:${PATH}"
+	epytest
+}
diff --git a/dev-util/schroot/Manifest b/dev-util/schroot/Manifest
index be46effe1082..4e50ee7918b2 100644
--- a/dev-util/schroot/Manifest
+++ b/dev-util/schroot/Manifest
@@ -1,3 +1,2 @@
 DIST schroot-1.6.13.tar.gz 687581 BLAKE2B 5054407e545f39258df7598dbc233a836f6a86a02b4d0f3368109fd3edaea543fde6f81cfc6fedcdd6124490a3d5bc4d3a7e113ebe5ba2cfe7ec2c204f9cd0f4 SHA512 a250a02eb2384f1c27a9ff6479b77647a7a19b96b3b4e9d63e32a5dabe6ef3a3b1e2efaf98ddd9db93ded50fc93595ce545b0f0247c4a9e481349adafe806c2d
-DIST schroot_1.6.13-2.debian.tar.xz 110752 BLAKE2B 77c877e13541968ffd4edaa04c1a846e9deb19a3670088c19cdf3a217acfc2521d2b8d8dec7b8e6188b107f793af6152d5724fd596a9c62f6c9b57f2c30d57b0 SHA512 8fd7e7f95131285ec49bda3d9ccc6ba025976009c382998ef183142d2e3e288b7936e2c8ec6532870b601f62b460d577920d9a801b789f0d1bf7ee31b45356c3
 DIST schroot_1.6.13-7.debian.tar.xz 120000 BLAKE2B 2b83cf53afbb5a2191f158cc9fdd7d0c46c0c4e6a1c0be96bb9c81574088471abfa4cda295108391b480c15d32d61f410f1ab9160f0d9d8a5b8ef6c300fcb60f SHA512 720519bb63642d675c3f301f2e9c31365712dea870806aa2e8b4aa437523413a4a2a5f06bccce1030d96cbf4d7b2fd0fb19f304d129d41b03e97e4e81165d9fe
diff --git a/dev-util/schroot/files/schroot-1.6.13_p2-build-fixes.patch b/dev-util/schroot/files/schroot-1.6.13_p2-build-fixes.patch
deleted file mode 100644
index b10b8b191f96..000000000000
--- a/dev-util/schroot/files/schroot-1.6.13_p2-build-fixes.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-https://codeberg.org/shelter/reschroot/pulls/5
-https://bugs.gentoo.org/739034
-https://bugs.gentoo.org/715514
-
-From 56b0c8ac846c18002e32e93629ae04a0a6281706 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Mon, 26 Sep 2022 20:52:54 +0100
-Subject: [PATCH 1/3] Fix libcxx build without <tr1/*> (use <memory> if
- available)
-
-With Clang & libcxx 15, tr1/* doesn't seem to be available,
-which is fine, as we can use the proper <memory> header
-instead.
-
-We already do this in several other locations. Fall back
-to tr1 and Boost as before.
-
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/bin/schroot-base/schroot-base-options.h
-+++ b/bin/schroot-base/schroot-base-options.h
-@@ -27,7 +27,9 @@
- #include <string>
- #include <stdexcept>
- 
--#ifdef HAVE_TR1_MEMORY
-+#ifdef HAVE_MEMORY_SHARED_PTR
-+#include <memory>
-+#elif HAVE_TR1_MEMORY
- #include <tr1/memory>
- #elif HAVE_BOOST_SHARED_PTR_HPP
- #include <boost/shared_ptr.hpp>
---- a/bin/schroot/schroot-options-base.h
-+++ b/bin/schroot/schroot-options-base.h
-@@ -27,7 +27,9 @@
- #include <string>
- #include <vector>
- 
--#ifdef HAVE_TR1_MEMORY
-+#ifdef HAVE_MEMORY_SHARED_PTR
-+#include <memory>
-+#elif HAVE_TR1_MEMORY
- #include <tr1/memory>
- #elif HAVE_BOOST_SHARED_PTR_HPP
- #include <boost/shared_ptr.hpp>
-From 04a35b2c57b84e098c9cad75d36675a958e9075e Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Mon, 26 Sep 2022 20:54:16 +0100
-Subject: [PATCH 2/3] Fix localename type
-
-Needs to be a string.
-
-Fixes error:
-```
-/var/tmp/portage/dev-util/schroot-1.6.10_p7/work/schroot-1.6.10/sbuild/sbuild-basic-keyfile.tcc:217:18: error: no viable overloaded '='
-      localename = std::locale::classic();
-      ~~~~~~~~~~ ^ ~~~~~~~~~~~~~~~~~~~~~~
-/usr/lib/gcc/x86_64-pc-linux-gnu/10.2.0/include/g++-v10/bits/basic_string.h:665:7: note: candidate function not viable: no known conversion from 'const std::locale' to 'const std::__cxx11::basic_string<char>' for 1st argument
-      operator=(const basic_string& __str)
-      ^
-[...]
-```
-
-Bug: https://bugs.gentoo.org/739034
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/sbuild/sbuild-basic-keyfile.tcc
-+++ b/sbuild/sbuild-basic-keyfile.tcc
-@@ -214,7 +214,7 @@ sbuild::basic_keyfile<K, P>::get_locale_string (group_name_type const& group,
-     }
-   catch (std::runtime_error const& e) // Invalid locale
-     {
--      localename = std::locale::classic();
-+      localename = std::locale::classic().name();
-     }
-   std::string::size_type pos;
-   bool status = false;
-From 5b00d06a567fe71328124ea53b92ddbd1bd8c6fd Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Mon, 26 Sep 2022 20:54:45 +0100
-Subject: [PATCH 3/3] Add <libintl.h> include for musl
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fixes error:
-```
-/var/tmp/portage/dev-util/schroot-1.6.10_p7/work/schroot-1.6.10/sbuild/sbuild-feature.cc: In static member function ‘static std::ostream& sbuild::feature::print_features(std::ostream&)’:
-/var/tmp/portage/dev-util/schroot-1.6.10_p7/work/schroot-1.6.10/sbuild/sbuild-feature.cc:48:40: error: ‘gettext’ was not declared in this scope
-   48 |       stream << feature % pos->first % gettext(pos->second.c_str());
-      |                                        ^~~~~~~
-```
-
-Bug: https://bugs.gentoo.org/715514
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/sbuild/sbuild-feature.cc
-+++ b/sbuild/sbuild-feature.cc
-@@ -19,6 +19,7 @@
- #include <config.h>
- 
- #include <iostream>
-+#include <libintl.h>
- 
- #include "sbuild-feature.h"
- 
diff --git a/dev-util/schroot/schroot-1.6.13_p2-r1.ebuild b/dev-util/schroot/schroot-1.6.13_p2-r1.ebuild
deleted file mode 100644
index 6fd261d36585..000000000000
--- a/dev-util/schroot/schroot-1.6.13_p2-r1.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 cmake pam tmpfiles
-
-MY_P=${PN}_${PV/_p/-}
-
-DESCRIPTION="Utility to execute commands in a chroot environment"
-HOMEPAGE="https://codeberg.org/shelter/reschroot"
-SRC_URI="https://codeberg.org/shelter/reschroot/archive/release/re${P/%_p*}.tar.gz -> ${P/%_p*}.tar.gz
-	mirror://debian/pool/main/${PN::1}/${PN}/${MY_P}.debian.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
-IUSE="btrfs +dchroot debug doc lvm nls pam test zfs"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	dev-libs/boost:=
-	>=sys-apps/util-linux-2.16
-	btrfs? ( >=sys-fs/btrfs-progs-0.19-r2 )
-	lvm? ( sys-fs/lvm2 )
-	pam? ( sys-libs/pam )
-	zfs? ( sys-fs/zfs )
-"
-
-DEPEND="${COMMON_DEPEND}
-	app-arch/xz-utils
-	sys-apps/groff
-	doc? (
-		app-text/doxygen
-		media-gfx/graphviz
-	)
-	nls? (
-		>=app-text/po4a-0.40
-		sys-devel/gettext
-	)
-	test? ( >=dev-util/cppunit-1.10.0 )
-"
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/debianutils
-	dchroot? ( !sys-apps/dchroot )
-	nls? ( virtual/libintl )
-"
-
-S="${WORKDIR}/re${PN}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.6.13_p2-build-fixes.patch
-
-	# https://codeberg.org/shelter/reschroot/pulls/6
-	"${FILESDIR}"/${PN}-1.6.13-resize-reserve.patch
-
-	"${FILESDIR}"/${PN}-1.6.13_p2-boost-1.85.0.patch
-)
-
-src_unpack() {
-	unpack "${P/%_p*}".tar.gz
-	cd "${S}"
-	unpack ${MY_P}.debian.tar.xz
-}
-
-src_prepare() {
-	sed -i -e 's/warn(/message(WARNING /' man/CMakeLists.txt || die
-	eapply "${S}"/debian/patches/*.patch
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-Dbtrfs-snapshot=$(usex btrfs)
-		-Ddchroot=$(usex dchroot)
-		-Ddchroot-dsa=$(usex dchroot)
-		-Ddebug=$(usex debug)
-		-Ddoxygen=$(usex doc)
-		-Dlvm-snapshot=$(usex lvm)
-		-Dnls=$(usex nls)
-		-Dpam=$(usex pam)
-		-Dtest=$(usex test)
-		-Dzfs-snapshot=$(usex zfs)
-		-Dbash_completion_dir="$(get_bashcompdir)"
-		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
-		-DCMAKE_INSTALL_LOCALSTATEDIR="${EPREFIX}/var"
-		-DSCHROOT_MOUNT_DIR="${EPREFIX}/run/${PN}/mount"
-		-DBoost_NO_BOOST_CMAKE=ON # https://bugs.gentoo.org/791712 and https://bugs.gentoo.org/752120
-	)
-	if ! use nls; then
-		mycmakeargs+=(-DPO4A_EXECUTABLE=NOTFOUND)
-	fi
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile all $(usev doc)
-}
-
-src_test() {
-	if [[ ${EUID} -ne 0 ]]; then
-		ewarn "Disabling tests because you are not root"
-		return 0
-	fi
-	# -j1 to prevent race between test/setup-test-data and test/cleanup-test-data
-	cmake_src_test -j1
-}
-
-src_install() {
-	cmake_src_install
-
-	# debian-stype PS1 for chroot
-	# checks for /etc/debian_chroot file, which is created by schroot
-	insinto /etc/bash/bashrc.d
-	doins "${FILESDIR}/schroot_prompt.sh"
-
-	# gentoo /var/tmp/portage handler
-	# e.g. portage.base.tmpdir=/var/tmp/portage in config file
-	# will use a subdirectory of hosts $PORTAGE_TMPDIR
-	exeinto /etc/schroot/setup.d
-	doexe "${FILESDIR}/11gentoo"
-
-	# support for zfs clone options.
-	# zfs.clone.options=com.sun:auto-snapshot=false
-	if use zfs; then
-		exeinto /etc/schroot/setup.d
-		doexe "${FILESDIR}/06zfscloneopts"
-	fi
-
-	keepdir /var/lib/schroot/{session,unpack,union/{overlay,underlay}}
-
-	docinto contrib/setup.d
-	dodoc contrib/setup.d/05customdir contrib/setup.d/09fsck contrib/setup.d/10mount-ssh
-
-	newdoc debian/schroot.NEWS NEWS.debian
-
-	newinitd "${FILESDIR}"/schroot.initd schroot
-	newconfd "${FILESDIR}"/schroot.confd schroot
-	newtmpfiles "${FILESDIR}"/schroot.tmpfilesd schroot.conf
-
-	if use doc; then
-		docinto html/sbuild
-		dodoc "${BUILD_DIR}"/doc/sbuild/html/*
-		docinto html/schroot
-		dodoc "${BUILD_DIR}"/doc/schroot/html/*
-	fi
-
-	if use pam; then
-		rm -f "${ED}"/etc/pam.d/schroot
-		pamd_mimic_system schroot auth account session
-	fi
-}
-
-pkg_postinst() {
-	tmpfiles_process ${PN}.conf
-}
diff --git a/dev-util/schroot/schroot-1.6.13_p7-r1.ebuild b/dev-util/schroot/schroot-1.6.13_p7-r1.ebuild
index 7fa8027ef1af..0f3668ae1d29 100644
--- a/dev-util/schroot/schroot-1.6.13_p7-r1.ebuild
+++ b/dev-util/schroot/schroot-1.6.13_p7-r1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/re${PN}"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 IUSE="btrfs +dchroot debug doc lvm nls pam test zfs"
 RESTRICT="!test? ( test )"