14 files changed, 138 insertions, 340 deletions
diff --git a/sys-apps/firejail/firejail-0.9.76.ebuild b/sys-apps/firejail/firejail-0.9.76.ebuild
index e076cef962bd..b714f57e21d7 100644
--- a/sys-apps/firejail/firejail-0.9.76.ebuild
+++ b/sys-apps/firejail/firejail-0.9.76.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/netblue30/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index c9032e6d4058..8a69514b997a 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -1,3 +1,2 @@
-DIST iproute2-6.15.0.tar.xz 930908 BLAKE2B 50247f293e194601bd138418e55e2dc63421d2a5da863973e9ff78f2c76ba051350523559f2b7b7983af05a827f292135353adbf6c857ea32b7071f69940f73f SHA512 1a438941cd939e1c8e32cfe8c40e6fd826c89185f1bb0c623eaad7380a66afd9fa9e0d7cdc5e5b193d2761b7dbdc78fd0811537eecc500be633730c32ff55ad4
 DIST iproute2-6.16.0.tar.xz 931124 BLAKE2B d1c66f4d63edd6fa2701c92dbc47f8c4388d6a660d541d528e3463e8e261fda64df4a7f8930f510718c71ee82438b5c4859f072eb08c8ff1e4d1d65223108005 SHA512 88930ea1a3a901594a69dc04e533bfd1de0f5b79f176dedb45f11f01035bd680edccc8e04e56d0922ee430580581c646473a3baa941254739878f7ab946f17df
 DIST iproute2-6.17.0.tar.xz 940952 BLAKE2B 49b88fd1eaea34376b086be02e72505ca62f52f3c53f3ee29cd273532521fabe8d38062277852dcc69f78b86b9460b213bbeedc9c51ce20d3bb1fd35d86b6fc8 SHA512 3d83d49233c1d984f15d285a46e2ec0eeb820c7cb84cfc84866921f37e8a57d31bc3953be07e8c79ed6079f326a25c3a85f591b0d67f9f689c0c70ccdb0fef77
diff --git a/sys-apps/iproute2/iproute2-6.15.0.ebuild b/sys-apps/iproute2/iproute2-6.15.0.ebuild
deleted file mode 100644
index c85303511b2c..000000000000
--- a/sys-apps/iproute2/iproute2-6.15.0.ebuild
+++ /dev/null
@@ -1,215 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit dot-a edo toolchain-funcs flag-o-matic
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git"
-	inherit git-r3
-else
-	SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
-fi
-
-DESCRIPTION="kernel routing and traffic control utilities"
-HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="atm berkdb bpf caps elf +iptables minimal nfs selinux"
-# Needs root
-RESTRICT="test"
-
-# We could make libmnl optional, but it's tiny, so eh
-RDEPEND="
-	!minimal? ( net-libs/libmnl:= )
-	atm? ( net-dialup/linux-atm )
-	berkdb? ( sys-libs/db:= )
-	bpf? ( >=dev-libs/libbpf-0.6:= )
-	caps? ( sys-libs/libcap )
-	elf? ( virtual/libelf:= )
-	iptables? ( >=net-firewall/iptables-1.4.20:= )
-	nfs? ( net-libs/libtirpc:= )
-	selinux? ( sys-libs/libselinux )
-"
-# We require newer linux-headers for ipset support (bug #549948) and some defines (bug #553876)
-DEPEND="
-	${RDEPEND}
-	>=sys-kernel/linux-headers-3.16
-"
-BDEPEND="
-	app-arch/xz-utils
-	>=sys-devel/bison-2.4
-	app-alternatives/lex
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.10.0-musl-2.patch # bug #926341
-	"${FILESDIR}"/${PN}-6.9.0-mtu.patch # bug #291907
-	"${FILESDIR}"/${PN}-6.8.0-configure-nomagic-nolibbsd.patch # bug #643722 & #911727
-	"${FILESDIR}"/${PN}-6.8.0-disable-libbsd-fallback.patch # bug #911727
-)
-
-src_prepare() {
-	default
-
-	# Fix version if necessary
-	local versionfile="include/version.h"
-	if [[ ${PV} != 9999 ]] && ! grep -Fq "${PV}" ${versionfile} ; then
-		einfo "Fixing version string"
-		sed -i "s@\"[[:digit:]\.]\+\"@\"${PV}\"@" \
-			${versionfile} || die
-	fi
-
-	# echo -n is not POSIX compliant
-	sed -i 's@echo -n@printf@' configure || die
-
-	sed -i \
-		-e '/^CC :\?=/d' \
-		-e "/^LIBDIR/s:=.*:=/$(get_libdir):" \
-		-e "s|-O2|${CFLAGS} ${CPPFLAGS}|" \
-		-e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
-		-e "/^DBM_INCLUDE/s:=.*:=${T}:" \
-		Makefile || die
-
-	# Build against system headers
-	rm -r include/netinet || die #include/linux include/ip{,6}tables{,_common}.h include/libiptc
-	sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die
-
-	if use minimal ; then
-		sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile || die
-	fi
-}
-
-src_configure() {
-	tc-export AR CC PKG_CONFIG
-	lto-guarantee-fat
-
-	# This sure is ugly. Should probably move into toolchain-funcs at some point.
-	local setns
-	pushd "${T}" >/dev/null || die
-	printf '#include <sched.h>\nint main(){return setns(0, 0);}\n' > test.c || die
-	if ${CC} ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} test.c >&/dev/null ; then
-		setns=y
-	else
-		setns=n
-	fi
-
-	echo 'int main(){return 0;}' > test.c || die
-	if ! ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null ; then
-		sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile || die
-	fi
-	popd >/dev/null || die
-
-	# build system does not pass CFLAGS to LDFLAGS, as is recommended by GCC upstream
-	# https://gcc.gnu.org/onlinedocs/gcc/Optimize-Options.html#index-flto
-	# https://bugs.gentoo.org/929233
-	append-ldflags ${CFLAGS}
-
-	# run "configure" script first which will create "config.mk"...
-	# Using econf breaks since 5.14.0 (a9c3d70d902a0473ee5c13336317006a52ce8242)
-	eval "local -a EXTRA_ECONF=(${EXTRA_ECONF})"
-	edo ./configure --libbpf_force $(usex bpf on off) "${EXTRA_ECONF[@]}"
-
-	# Remove the definitions made by configure and allow them to be overridden
-	# by USE flags below.
-	# We have to do the cheesy only-sed-if-disabled because otherwise
-	# the *_FLAGS etc stuff found by configure will be used but result
-	# in a broken build.
-	if ! use berkdb ; then
-		sed -i -e '/HAVE_BERKELEY_DB/d' config.mk || die
-	fi
-
-	if ! use caps ; then
-		sed -i -e '/HAVE_CAP/d' config.mk || die
-	fi
-
-	if use minimal ; then
-		sed -i -e '/HAVE_MNL/d' config.mk || die
-	fi
-
-	if ! use elf ; then
-		sed -i -e '/HAVE_ELF/d' config.mk || die
-	fi
-
-	if ! use nfs ; then
-		sed -i -e '/HAVE_RPC/d' config.mk || die
-	fi
-
-	if ! use selinux ; then
-		sed -i -e '/HAVE_SELINUX/d' config.mk || die
-	fi
-
-	# ...Now switch on/off requested features via USE flags
-	# this is only useful if the test did not set other things, per bug #643722
-	# Keep in sync with ifs above, or refactor to be unified.
-	cat <<-EOF >> config.mk
-	TC_CONFIG_ATM := $(usex atm y n)
-	TC_CONFIG_XT  := $(usex iptables y n)
-	TC_CONFIG_NO_XT := $(usex iptables n y)
-	# We've locked in recent enough kernel headers, bug #549948
-	TC_CONFIG_IPSET := y
-	HAVE_BERKELEY_DB := $(usex berkdb y n)
-	HAVE_CAP      := $(usex caps y n)
-	HAVE_MNL      := $(usex minimal n y)
-	HAVE_ELF      := $(usex elf y n)
-	HAVE_RPC      := $(usex nfs y n)
-	HAVE_SELINUX  := $(usex selinux y n)
-	IP_CONFIG_SETNS := ${setns}
-	# Use correct iptables dir, bug #144265, bug #293709
-	IPT_LIB_DIR   := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir)
-	EOF
-}
-
-src_compile() {
-	emake V=1 NETNS_RUN_DIR=/run/netns
-}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	if use minimal ; then
-		into /
-		dosbin tc/tc
-		dobin ip/ip
-		return 0
-	fi
-
-	emake \
-		DESTDIR="${D}" \
-		PREFIX="${EPREFIX}/usr" \
-		LIBDIR="${EPREFIX}"/$(get_libdir) \
-		SBINDIR="${EPREFIX}"/sbin \
-		CONFDIR="${EPREFIX}"/etc/iproute2 \
-		DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \
-		MANDIR="${EPREFIX}"/usr/share/man \
-		ARPDDIR="${EPREFIX}"/var/lib/arpd \
-		install
-
-	dodir /bin
-	mv "${ED}"/{s,}bin/ip || die # bug #330115
-	mv "${ED}"/{s,}bin/ss || die # bug #547264
-
-	dolib.a lib/libnetlink.a
-	insinto /usr/include
-	doins include/libnetlink.h
-
-	# Collides with net-analyzer/ifstat
-	# https://bugs.gentoo.org/868321
-	mv "${ED}"/sbin/ifstat{,-iproute2} || die
-
-	if use berkdb ; then
-		keepdir /var/lib/arpd
-		# bug #47482, arpd doesn't need to be in /sbin
-		dodir /usr/bin
-		mv "${ED}"/sbin/arpd "${ED}"/usr/bin/ || die
-	elif [[ -d "${ED}"/var/lib/arpd ]]; then
-		rmdir --ignore-fail-on-non-empty -p "${ED}"/var/lib/arpd || die
-	fi
-	strip-lto-bytecode
-}
diff --git a/sys-apps/merge-usr/Manifest b/sys-apps/merge-usr/Manifest
index 74189a4f7b19..19d4ec9ff369 100644
--- a/sys-apps/merge-usr/Manifest
+++ b/sys-apps/merge-usr/Manifest
@@ -1 +1,2 @@
 DIST merge-usr-6.tar.gz 9501 BLAKE2B 3cdb769c1f75cb35a941c6ba6fe1d469e38bb0e96ce7aeac6fa6b8cfead4b630a13eac7b03144bb00f35a722a5264b39a504826e442d3c44b12d505c911d14a2 SHA512 57cbf2fadac587747b10f88299224e2c40a7a9375c0fc502ad966f42cf87f034b0b28d195001b275869f90dd1eecf210c47ffce9cd0163cc01b67b7860a680e4
+DIST merge-usr-7.tar.gz 9518 BLAKE2B 2361a3571e23fd17bcda2072ace49ca66a9febc1900213544b52323d149322408a56429c5966afd2dc20f091bb0b557d7f07df7d88f36b57ee965265422776c7 SHA512 eb29f0a86d8b15002315eff071c4bba039a0f1f5c09de9fe70ef750f24d0d290f81bc963fe02bbf5bf4b661b2631602f8ce947f0f022506a59db9e0e23e08542
diff --git a/sys-apps/merge-usr/merge-usr-7.ebuild b/sys-apps/merge-usr/merge-usr-7.ebuild
new file mode 100644
index 000000000000..566847afdccc
--- /dev/null
+++ b/sys-apps/merge-usr/merge-usr-7.ebuild
@@ -0,0 +1,23 @@
+# Copyright 2022-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{11..14} )
+inherit python-single-r1
+
+DESCRIPTION="Script to migrate from split-usr to merged-usr"
+HOMEPAGE="https://github.com/floppym/merge-usr"
+SRC_URI="https://github.com/floppym/merge-usr/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+BDEPEND="${PYTHON_DEPS}"
+RDEPEND="${PYTHON_DEPS}"
+
+src_install() {
+	python_doscript merge-usr
+}
diff --git a/sys-apps/moor/Manifest b/sys-apps/moor/Manifest
index 5e1ac1e0bde2..e80d055f56ed 100644
--- a/sys-apps/moor/Manifest
+++ b/sys-apps/moor/Manifest
@@ -1,8 +1,4 @@
-DIST moar-1.33.0-deps.tar.xz 1455220 BLAKE2B 6cba60dd76f756aa1f7886908167980bdf07834940ef0843e20f7bf75b18860dac1ef5b4196c5b4215e91e6152656e12676ae061f1ca05b2c28553a153a9f278 SHA512 dbc1c19aec4188a07bfd676bf798ede215cf1c453204a9f2774772b5cc539e05d459f1fdf12f28bc61f0b079791c5fb8c6d0e5096d2b57db403090297def16f3
-DIST moar-1.33.0.tar.gz 2870767 BLAKE2B 51f52d23245eed30951d0ba12ed3cff5b441d4d15ae308ede6324da64bbf7c46205b5ba1b1ebb1391af6e12f083297990dc412670262354285700f31d4e9ed23 SHA512 a24272f23da523c2fc0eb0887652c317a9d66d7fb757adcb22a5f1c61c0677480c85fe5ae16f385f15832f102bf248c357806323a006d52f519beabb5a529b20
 DIST moor-2.4.1-deps.tar.xz 1461024 BLAKE2B bcdccd79020a6c461ccc81a4e65af3d7efcd2c0c2101ac2896f779efd8ddd1272fac20125522d9a1528c21949783fe87046f15aef2088c6abcc0aeaa4f446583 SHA512 1f854a03fb58b82baf9ba5be6750c0a043c9d1460e75d775d2ae1acca1574927b5da25270247464ace182b7e2e46d3e447e3f36d345e5da957905b7ddebed14b
 DIST moor-2.4.1.tar.gz 3016333 BLAKE2B dbeae7a1f2d65f83e88c677490332a4c8480367c9934acd3b0277abc495905428934281faf03ab060f1abe0068dfb51d3d9c51121013ff40efa938421ec2f9c7 SHA512 3dcc3b48401853791ad6c38e2fb249c0dd45cd96b33b2e4bc765455b358d658f06ba9732214a778370cc33949d48fe7806445354913df23225d32c9657dd1fd0
-DIST moor-2.8.2-deps.tar.xz 1461024 BLAKE2B bcdccd79020a6c461ccc81a4e65af3d7efcd2c0c2101ac2896f779efd8ddd1272fac20125522d9a1528c21949783fe87046f15aef2088c6abcc0aeaa4f446583 SHA512 1f854a03fb58b82baf9ba5be6750c0a043c9d1460e75d775d2ae1acca1574927b5da25270247464ace182b7e2e46d3e447e3f36d345e5da957905b7ddebed14b
-DIST moor-2.8.2.tar.gz 3028081 BLAKE2B b88abcdc7b29653dc89c8a2040f35b24de74d358ce6415b9c89e5a7a1d7c69123c2de5a67f7be090cfa45945bccdee9d7d305b9d193bf350e84e1ffab84246d2 SHA512 cf503489e5d397103276b51fbd1b62525a8f09a94e4584692b275728a8fcf44b899ea5f7e896aece87fcbc9dddbb9ef1228d3c0d62cc97c682b45206078e09af
 DIST moor-2.9.1-deps.tar.xz 1498364 BLAKE2B f12ea0bb6c4748398e18c741ece3fb8c66905096f62813ff9cf44e27b5c472fb56bd93e06fae8cd7802424707902d5b4cd7852fd4b3819cbe812d9e691aa2bac SHA512 84c491303b8a19d9fb086e9abfbe1f1b1c776877ed1a99ac1328152f62049fe7282ce436758adcf2ef07749c06386b7e7d6d75a84d977985c5a5772d695016df
 DIST moor-2.9.1.tar.gz 3031521 BLAKE2B 70e8c01bf3c8d91af458393877c80072d0e1a2d38c286f0b6d77cf9a527c290c806f65f446eaddb93860a57cfa7fd3db561448e8d89f9b729a6354d00a62d0ee SHA512 ce1e01b651341b1257fd12f22d89d437596f282355fd604c9720be057d0bb1abe0054a5e67ba2f9d06adfce133bbee3bbc0a3a3c1bca91d51efeda786e47c3c0
diff --git a/sys-apps/moor/moor-1.33.0.ebuild b/sys-apps/moor/moor-1.33.0.ebuild
deleted file mode 100644
index b3e21230ef8c..000000000000
--- a/sys-apps/moor/moor-1.33.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 2023-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-env go-module
-
-DESCRIPTION="Pager designed to do the right thing without any configuration"
-HOMEPAGE="https://github.com/walles/moor"
-SRC_URI="https://github.com/walles/moor/archive/refs/tags/v${PV}.tar.gz -> moar-${PV}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/moar/moar-${PV}-deps.tar.xz"
-S="${WORKDIR}"/moar-${PV}
-
-LICENSE="BSD-2 BSD MIT"
-# Dependent licenses
-LICENSE+="  Apache-2.0 BSD BSD-2 MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# moarvm: https://github.com/walles/moar/issues/143
-RDEPEND="!dev-lang/moarvm"
-BDEPEND="
-	test? (
-		app-arch/bzip2
-		app-arch/xz-utils
-	)
-"
-
-src_unpack() {
-	default
-
-	if [[ -d "${WORKDIR}"/vendor ]] ; then
-		mv "${WORKDIR}"/vendor "${S}"/vendor || die
-	fi
-	go-env_set_compile_environment
-}
-
-src_compile() {
-	# https://github.com/walles/moar/blob/master/build.sh#L28
-	ego build -ldflags="-w -X main.versionString=${PV}" -o moar
-}
-
-src_test() {
-	# From test.sh (we don't run that because it has some linting etc)
-	ego test -timeout 20s ./...
-}
-
-src_install() {
-	dobin moar
-	doman moar.1
-	einstalldocs
-}
diff --git a/sys-apps/moor/moor-2.8.2-r1.ebuild b/sys-apps/moor/moor-2.8.2-r1.ebuild
deleted file mode 100644
index cf510da05e60..000000000000
--- a/sys-apps/moor/moor-2.8.2-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 2023-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-env go-module eapi9-ver
-
-DESCRIPTION="Pager designed to do the right thing without any configuration"
-HOMEPAGE="https://github.com/walles/moor"
-SRC_URI="https://github.com/walles/moor/archive/refs/tags/v${PV}.tar.gz -> moor-${PV}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/moor/moor-${PV}-deps.tar.xz"
-
-LICENSE="BSD-2 BSD MIT"
-# Dependent licenses
-LICENSE+="  Apache-2.0 BSD BSD-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
-IUSE="test l10n_ru"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? (
-		app-arch/bzip2
-		app-arch/xz-utils
-	)
-"
-
-src_unpack() {
-	default
-
-	if [[ -d "${WORKDIR}"/vendor ]] ; then
-		mv "${WORKDIR}"/vendor "${S}"/vendor || die
-	fi
-	go-env_set_compile_environment
-}
-
-src_compile() {
-	# https://github.com/walles/moor/blob/master/build.sh#L28
-	ego build -ldflags="-w -X main.versionString=${PV}" -o moor ./cmd/moor
-}
-
-src_test() {
-	# From test.sh (we don't run that because it has some linting etc)
-	ego test -timeout 20s ./...
-}
-
-src_install() {
-	dobin moor
-	doman moor.1
-	einstalldocs
-}
-
-pkg_postinst() {
-	if use l10n_ru ; then
-		ewarn "This package does not work out of the box with all Russian locales."
-		ewarn "If using ru_RU.UTF-8, it will not startup. Please see bug #964663."
-	fi
-
-	if ver_replacing -lt 2 ; then
-		ewarn "moar has been renamed to moor, please update any scripts."
-	fi
-}
diff --git a/sys-apps/nvme-cli/nvme-cli-2.16.ebuild b/sys-apps/nvme-cli/nvme-cli-2.16.ebuild
index a4dc43b8dee6..6223a6ecf68c 100644
--- a/sys-apps/nvme-cli/nvme-cli-2.16.ebuild
+++ b/sys-apps/nvme-cli/nvme-cli-2.16.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/linux-nvme/nvme-cli/archive/v${PV}.tar.gz -> ${P}.gh
 
 LICENSE="GPL-2 GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm64 ~loong ppc64 ~riscv ~sparc x86"
 IUSE="+json pdc"
 
 RDEPEND="
diff --git a/sys-apps/pcsc-lite/files/pcsc-lite-2.4.0-systemd-fixes.patch b/sys-apps/pcsc-lite/files/pcsc-lite-2.4.0-systemd-fixes.patch
new file mode 100644
index 000000000000..0d8332cfc413
--- /dev/null
+++ b/sys-apps/pcsc-lite/files/pcsc-lite-2.4.0-systemd-fixes.patch
@@ -0,0 +1,97 @@
+https://github.com/LudovicRousseau/PCSC/commit/504e3ba2d81d801fee45b97fbe9e7a5b0d0c24cd
+https://github.com/LudovicRousseau/PCSC/commit/448dbe2aa10780775d361ad38b0dd3cd18530bec
+
+From 504e3ba2d81d801fee45b97fbe9e7a5b0d0c24cd Mon Sep 17 00:00:00 2001
+From: Stephan Guilloux <stephan.guilloux@crisalid.com>
+Date: Fri, 5 Dec 2025 16:33:29 +0100
+Subject: [PATCH] systemd Fails to parse boolean value.
+
+My host is installed with a Rocky Linux 9.x
+It should be the same with other distros.
+
+When PCSC is started, I can observe the following in /var/log/messages:
+```
+...
+Dec 05 16:22:43 Host-9A38CE systemd[1]: /usr/lib/systemd/system/pcscd.service:32: Failed to parse boolean value, ignoring: identity
+                                                                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+...
+```
+
+This comes from the following line, in pcscd.service:
+```
+RuntimeDirectoryPreserve=true
+```
+
+When `true` is replaced by `yes`, the error is no more seen.
+By the way, the rest of pcscd.service is already using `yes`.
+---
+ etc/pcscd.service.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/etc/pcscd.service.in b/etc/pcscd.service.in
+index 14ab8442..874a03dc 100644
+--- a/etc/pcscd.service.in
++++ b/etc/pcscd.service.in
+@@ -10,7 +10,7 @@ ExecReload=@sbindir_exp@/pcscd --hotplug
+ EnvironmentFile=-@sysconfdir@/default/pcscd
+ User=pcscd
+ RuntimeDirectory=pcscd
+-RuntimeDirectoryPreserve=true
++RuntimeDirectoryPreserve=yes
+ PIDFile=@ipcdir@/pcscd.pid
+ 
+ # Paths
+
+From 448dbe2aa10780775d361ad38b0dd3cd18530bec Mon Sep 17 00:00:00 2001
+From: Ludovic Rousseau <ludovic.rousseau@free.fr>
+Date: Wed, 10 Dec 2025 15:55:29 +0100
+Subject: [PATCH] meson: install systemd files even if libsystemd is not used
+
+---
+ meson.build | 14 ++++++++------
+ 1 file changed, 8 insertions(+), 6 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 4d4d2bf9..1b2926f4 100644
+--- a/meson.build
++++ b/meson.build
+@@ -127,11 +127,19 @@ if get_option('polkit')
+   features += 'polkit'
+ endif
+ 
++systemdunit = get_option('systemdunit')
+ if get_option('libsystemd')
+   systemd_dep = dependency('libsystemd')
+   pcscd_dep += systemd_dep
+   conf_data.set('USE_LIBSYSTEMD', true)
+   features += 'systemd'
++
++  systemd = dependency('systemd')
++  systemdsystemunitdir = systemd.get_variable(pkgconfig : 'systemd' + systemdunit + 'unitdir')
++  sysusersdir = systemd.get_variable(pkgconfig : 'sysusersdir')
++else
++  systemdsystemunitdir = get_option('prefix') / 'lib' / 'systemd' / systemdunit
++  sysusersdir = get_option('prefix') / 'sysusers.d'
+ endif
+ 
+ # architecture
+@@ -291,11 +299,6 @@ configure_file(output : 'pcsclite.h',
+ configure_file(output : 'pcscd.h',
+   input : 'src/pcscd.h.in',
+   configuration : confgen_data)
+-if get_option('libsystemd')
+-  systemd = dependency('systemd')
+-  unit = get_option('systemdunit')
+-  systemdsystemunitdir = systemd.get_variable(pkgconfig : 'systemd' + unit + 'unitdir')
+-  sysusersdir = systemd.get_variable(pkgconfig : 'sysusersdir')
+ configure_file(output : 'pcscd.socket',
+   input : 'etc/pcscd.socket.in',
+   install_dir : systemdsystemunitdir,
+@@ -306,7 +309,6 @@ configure_file(output : 'pcscd.service',
+   configuration : confgen_data)
+ install_data('etc/pcscd-sysusers.conf',
+   install_dir : sysusersdir)
+-endif
+ configure_file(output : 'pcscd.8',
+   input : 'doc/pcscd.8.in',
+   install_dir : join_paths(get_option('mandir'), 'man8'),
diff --git a/sys-apps/pcsc-lite/files/pcsc-lite-2.4.0-systemd-sysusers-fixup.patch b/sys-apps/pcsc-lite/files/pcsc-lite-2.4.0-systemd-sysusers-fixup.patch
new file mode 100644
index 000000000000..0504123d89e9
--- /dev/null
+++ b/sys-apps/pcsc-lite/files/pcsc-lite-2.4.0-systemd-sysusers-fixup.patch
@@ -0,0 +1,11 @@
+--- a/meson.build
++++ b/meson.build
+@@ -139,7 +139,7 @@ if get_option('libsystemd')
+   sysusersdir = systemd.get_variable(pkgconfig : 'sysusersdir')
+ else
+   systemdsystemunitdir = get_option('prefix') / 'lib' / 'systemd' / systemdunit
+-  sysusersdir = get_option('prefix') / 'sysusers.d'
++  sysusersdir = get_option('prefix') / 'lib' / 'sysusers.d'
+ endif
+ 
+ # architecture
diff --git a/sys-apps/pcsc-lite/pcsc-lite-2.4.0.ebuild b/sys-apps/pcsc-lite/pcsc-lite-2.4.0-r1.ebuild
index bf05706c1d1f..a259a978ee17 100644
--- a/sys-apps/pcsc-lite/pcsc-lite-2.4.0.ebuild
+++ b/sys-apps/pcsc-lite/pcsc-lite-2.4.0-r1.ebuild
@@ -44,6 +44,8 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.4.0-change-setup-spy-script-location.patch
+	"${FILESDIR}"/${PN}-2.4.0-systemd-fixes.patch
+	"${FILESDIR}"/${PN}-2.4.0-systemd-sysusers-fixup.patch
 )
 
 multilib_src_configure() {
diff --git a/sys-apps/systemd-utils/systemd-utils-256.17.ebuild b/sys-apps/systemd-utils/systemd-utils-256.17.ebuild
index c8195708e031..c2cbf555153a 100644
--- a/sys-apps/systemd-utils/systemd-utils-256.17.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-256.17.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_COMPAT=( python3_{11..14} )
 
 QA_PKGCONFIG_VERSION=$(ver_cut 1)
 
diff --git a/sys-apps/usbutils/usbutils-019.ebuild b/sys-apps/usbutils/usbutils-019.ebuild
index 6cae87a85967..8f482e1833d4 100644
--- a/sys-apps/usbutils/usbutils-019.ebuild
+++ b/sys-apps/usbutils/usbutils-019.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/usb/${PN}/${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"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="python usbreset"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"