gentoo auto-resync : 05:12:2023 - 17:02:58

20 files changed, 469 insertions, 27 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index a04f93d395b6..78b784035440 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/fwupd-efi/Manifest b/sys-apps/fwupd-efi/Manifest
index 4e16fe4585b0..5dfde251ee09 100644
--- a/sys-apps/fwupd-efi/Manifest
+++ b/sys-apps/fwupd-efi/Manifest
@@ -1,4 +1,6 @@
 AUX fwupd-efi-1.4-efi_ld_override.patch 1219 BLAKE2B f501bd949a82d28bc9daaef5b62e726e18825a081a584b50358e566b5c3af1eb0eaf409d17d5947b85b4f15098bb5d12025037ddb7a74489b88a945fc8eafbbc SHA512 31f966a7babdaa3a232ca86df065ff8e3724829455a9a3ce733bbd8454bd2f45cd3abf0b2526793a6b20b60ed9fce39f87f3528fd89c8c15093d016b65fb3784
+AUX fwupd-efi-1.4-uefi_210_fixes.patch 3716 BLAKE2B 9399f95f71fa1180509320dce8eaa58c136a9365c5484283cc3e519179894cac146e0efb9929277e20c8c5cfb4d46ae6bad67047cb59726a3f8409d65efd32ee SHA512 0f6ac5eef011b0a839c598bdf4dfd7c338a8069486d7e575c6d0b5196609edb24d6b6d02de27f64d04c2f7096d54ce0c6ef2e4a8d5d2134da6799948e3e4153e
 DIST fwupd-efi-1.4.tar.xz 35984 BLAKE2B 24ce9788500781aac5b856740dc17d94bec79cf57f4f1a0359f42e6be4b9600d34259794a88f69bf83aa38ee5976b26228b20813f717edce5cc627c163585b40 SHA512 c330409861a8c1e332a0d4fd49c54ef2c5bf7cdaca99d14de39b50fb35f0c490e9f7f7a4c9dd48181bd509cd358c43eb23659536aea93408c1fefb47629e4991
+EBUILD fwupd-efi-1.4-r1.ebuild 1448 BLAKE2B 88e6c9fdd1060bba21925fc1a8a1012cd69c06ab6af1007f653ce3b485d638590cac28232374014a508bc42ba090fb443d67e936d64ecc1f9da281a507a1ab72 SHA512 088e27e071306e7b8e443e2bd1056fa573b1e818e6482b689ae273dcfcac8a6c7fb7f71cff72ab7bd47b0c90269e1ba4494bdc990219bf45eab4e1847029cd7a
 EBUILD fwupd-efi-1.4.ebuild 1399 BLAKE2B 726e24909760f613d5557fc5503a8658a5828b119173ba587bfb4b30d818991b87870ad5b3459b58d3c889014f6df997adf022d54fbb2296478d35c99cdb0143 SHA512 37343ef8181e59ee67da8f8508c63e601f96695f4bbdd260f2b82587817c2b931de5b8eb54b00183c036f2c3e94205e72881ac2524cb7a0b854c81bd995849bb
 MISC metadata.xml 389 BLAKE2B 130ccd29eddd855aced2084c0d42873449a4a10e3dd65137ce1994669bb65784909ccf004a9aa19b2fc70a49bdfe469977da6acf49b14dd07ed62189a9a34e0c SHA512 843b9301455128a38a366bb5bc2e8b2867664a5a61710f9db4d1ed1fb814203ab8be4bcf64eb339b4af2bd6e5f1522ae61aed38e6f19dbee238a1721c8769a01
diff --git a/sys-apps/fwupd-efi/files/fwupd-efi-1.4-uefi_210_fixes.patch b/sys-apps/fwupd-efi/files/fwupd-efi-1.4-uefi_210_fixes.patch
new file mode 100644
index 000000000000..d4de5f174857
--- /dev/null
+++ b/sys-apps/fwupd-efi/files/fwupd-efi-1.4-uefi_210_fixes.patch
@@ -0,0 +1,107 @@
+From bd958f2e8f03a85a7e1fe40a3ca7b78e0b24b79f Mon Sep 17 00:00:00 2001
+From: Callum Farmer <gmbr3@opensuse.org>
+Date: Sat, 11 Feb 2023 15:39:06 +0000
+Subject: [PATCH] UEFI 2.10 fixes
+
+Revert "Align sections to 512 bytes"
+
+This is not permitted according to the Microsoft
+guidelines which require section alignment to be
+the same as the page size of the architecture which
+for all supported archs is the default in Binutils
+
+https://techcommunity.microsoft.com/t5/hardware-dev-center/new-uefi-ca-memory-mitigation-requirements-for-signing/ba-p/3608714
+
+This reverts commit c60c0b8dfda71275ab40bdb316a6ca650c7a8948.
+
+Keep .areloc ARM32 section
+
+This is the psuedo .reloc section but renamed only on ARM32 to avoid
+a bad RELSZ value (gnu-efi 3.0.18+)
+
+Only use 4KiB pages on aarch64
+
+Binutils is currently configured by default
+to use 64KiB pages on aarch64, however this
+is not allowed by the UEFI specification
+
+Check if crt0 contains .note.GNU-stack section
+
+We need the .note.GNU-stack section for NX
+compat. If we don't have a new enough
+gnu-efi, error as the gnu-efi libraries
+themselves must have been built as NX
+for this to work
+
+Signed-off-by: Callum Farmer <gmbr3@opensuse.org>
+---
+ efi/crt0/meson.build   |  1 +
+ efi/generate_binary.py |  4 ++--
+ efi/meson.build        | 12 +++++++++++-
+ 3 files changed, 14 insertions(+), 3 deletions(-)
+
+diff --git a/efi/crt0/meson.build b/efi/crt0/meson.build
+index f5f45c5..fbd943e 100644
+--- a/efi/crt0/meson.build
++++ b/efi/crt0/meson.build
+@@ -1,3 +1,4 @@
++arch_crt_source = 'crt0-efi-@0@.S'.format(gnu_efi_path_arch)
+ o_crt0 = custom_target('efi_crt0',
+                        input : arch_crt_source,
+                        output : arch_crt,
+diff --git a/efi/generate_binary.py b/efi/generate_binary.py
+index bd2d959..e27f926 100755
+--- a/efi/generate_binary.py
++++ b/efi/generate_binary.py
+@@ -31,9 +31,9 @@ def _run_objcopy(args):
+         "-j",
+         ".rodata",
+         "-j",
++        ".areloc",
++        "-j",
+         ".rel*",
+-        "--section-alignment",
+-        "512",
+         args.infile,
+         args.outfile,
+     ]
+diff --git a/efi/meson.build b/efi/meson.build
+index 1931855..a476884 100644
+--- a/efi/meson.build
++++ b/efi/meson.build
+@@ -95,6 +95,11 @@ else
+         coff_header_in_crt0 = false
+ endif
+ 
++# For NX compat, we must ensure we have .note.GNU-stack
++if run_command('grep', '-q', '.note.GNU-stack', join_paths(efi_crtdir, arch_crt), check: false).returncode() != 0
++    error('Cannot find NX section in @0@, update to gnu-efi 3.0.15+'.format(join_paths(efi_crtdir, arch_crt)))
++endif
++
+ # older objcopy for Aarch64 and ARM32 are not EFI capable.
+ # Use 'binary' instead, and add required symbols manually.
+ if host_cpu == 'arm' or (host_cpu == 'aarch64' and (objcopy_version.version_compare ('< 2.38') or coff_header_in_crt0))
+@@ -119,7 +124,6 @@ endif
+ # is the system crt0 for arm and aarch64 new enough to know about SBAT?
+ if objcopy_manualsymbols
+   if get_option('efi_sbat_distro_id') != ''
+-    arch_crt_source = 'crt0-efi-@0@.S'.format(gnu_efi_path_arch)
+     cmd = run_command('grep', '-q', 'sbat', join_paths(efi_crtdir, arch_crt))
+     if cmd.returncode() != 0
+       warning('Cannot find SBAT section in @0@, using local copy'.format(join_paths(efi_crtdir, arch_crt)))
+@@ -187,6 +191,12 @@ efi_ldflags = ['-T',
+                '-L', efi_libdir,
+                join_paths(efi_crtdir, arch_crt)]
+ 
++if host_cpu == 'aarch64'
++# Don't use 64KiB pages
++  efi_ldflags += ['-z', 'common-page-size=4096']
++  efi_ldflags += ['-z', 'max-page-size=4096']
++endif
++
+ if objcopy_manualsymbols
+   # older objcopy for Aarch64 and ARM32 are not EFI capable.
+   # Use 'binary' instead, and add required symbols manually.
+-- 
+2.34.1
+
diff --git a/sys-apps/fwupd-efi/fwupd-efi-1.4-r1.ebuild b/sys-apps/fwupd-efi/fwupd-efi-1.4-r1.ebuild
new file mode 100644
index 000000000000..5a890daf01a9
--- /dev/null
+++ b/sys-apps/fwupd-efi/fwupd-efi-1.4-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit meson python-any-r1 secureboot toolchain-funcs
+
+DESCRIPTION="EFI executable for fwupd"
+HOMEPAGE="https://fwupd.org"
+
+if [[ ${PV} = *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/fwupd/fwupd-efi.git"
+else
+	SRC_URI="https://github.com/fwupd/${PN}/releases/download/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+IUSE=""
+
+BDEPEND="$(python_gen_any_dep '
+		dev-python/pefile[${PYTHON_USEDEP}]
+	')
+	virtual/pkgconfig"
+
+DEPEND="sys-boot/gnu-efi"
+
+RDEPEND="!<sys-apps/fwupd-1.6.0"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4-efi_ld_override.patch	# Bug #892339
+	"${FILESDIR}"/${PN}-1.4-uefi_210_fixes.patch
+)
+
+python_check_deps() {
+	python_has_version "dev-python/pefile[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	secureboot_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	python_fix_shebang "${S}/efi"
+}
+
+src_configure() {
+	local emesonargs=(
+		-Defi-ld="$(tc-getLD)"
+		-Defi-libdir="${EPREFIX}"/usr/$(get_libdir)
+		-Defi_sbat_distro_id="gentoo"
+		-Defi_sbat_distro_summary="Gentoo GNU/Linux"
+		-Defi_sbat_distro_pkgname="${PN}"
+		-Defi_sbat_distro_version="${PVR}"
+		-Defi_sbat_distro_url="https://packages.gentoo.org/packages/${CATEGORY}/${PN}"
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	secureboot_auto_sign
+}
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index 75e8ca2a7ab5..5e14b4d37972 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -1,7 +1,9 @@
 AUX fwupd-1.9.6-fragile_tests.patch 1051 BLAKE2B 01ae6cae17b911d055eb820a041329e4347eb26533e372a540f08d6a7ab521118550e97c0ae3762d2532a9131a3ecdcfd719f6c1af6fb4c674688ee170c92581 SHA512 f1f22997477589f5a1fe18c7cca56309a365ff472aee0eaeaa1831a24b878d7301519f46e0b36e70fe5c0729b792fbeaa4430eee43c0169bcdbef8d1171bc107
 AUX fwupd-r2 308 BLAKE2B 4494e69515347569965f0966ce2fe0779a6273df18412b4f6045c6186730dc8088f85eb029347b01c22897662d9205f98871752dee99690871a39cbb26db3899 SHA512 0f5070dc73cb6e0cfad7a66781afb85c695faffd05685e9df8c9798b94d55b31c0977134015d0d5418f5815d10529d79c898ae0efb2bdf0dc9ee44b696d5fdd7
+DIST fwupd-1.9.10.tar.xz 3901816 BLAKE2B d8a0931188bf494e1b916f5bdebaf290b8e4b81a314e899f7b7e2aeec2dc37240b40c9fbf6259662fd2d92abca477460d630af0d8d95363027aa00ce46021789 SHA512 308bcd3af84d82157492a2ee8dc6fa4d7df6a66cca64e45b3dff9b46d0367f7d3122671388b627f67ab59a69bac1cb36feeccd1668cce0487fe466736dd8b8cc
 DIST fwupd-1.9.3.tar.xz 3807376 BLAKE2B 2652bc0bb56419bf443476081eb4af2900f24dbf489970bed058f91958902c0fdc301ac163ddc106250a85f3de8fc2a4ca9518d5498efb3793ffbc6ba85fc0cb SHA512 53a3c7e0cebbc8726f07590b26a9d0a4443ff9b048304ed1bff403de532d64eec83b19e51907d39449d9afa78c1f78a139808cdc6249b7e76a1e3a179692acb0
 DIST fwupd-1.9.6.tar.xz 3863452 BLAKE2B 8b54efef5947dc4766a24b8501100f7e24707944b5c9aae3c3fcd88dfce230667507af8816203b0ececa0510485661f5f599c1cdc2285df72683ede4b7a6d15c SHA512 c65d795268e0e36fd2572ce3d4f2fb811412c16d583fa5463bee017a70b5d0f8b1b92460efa977a7d70bb5e3f6b5b02756e795e5f8ab7e7ac7874dc1ab5a0bfb
+EBUILD fwupd-1.9.10.ebuild 5347 BLAKE2B a1c19246740bc5935302224db1444558ac3b9bb34f7f0763978b7331bedca471e9f88b33f335fbcf69acf05c18ba5ba7d9683555512518901a8e002b3ca74002 SHA512 eb7c3d3fd19fe3c0dd0056daee1328232f2647060bf829bc0ae2b10f383e7578780c1013d583d309b5dad6b04ad16bd37756fdbb71a8dfc8d7e415b4d96592ac
 EBUILD fwupd-1.9.3.ebuild 5011 BLAKE2B 05c0fba2e7da70aef0c2e1adedf1727a458caf1c0b9094ce0a7f83f8a270b196432addbe7ae812cebc04ed3634c958cb8c5aed525173c370ad795543fe0423d1 SHA512 f7f251b020c0624c1fac209bc7e63334a75c006967295b5fcf91d132e5736bd23dc5bd32ce1127b5ef5d2afa21c80e71afa5e4abf53a64cc8a9ddfe05f6c4076
 EBUILD fwupd-1.9.6.ebuild 5306 BLAKE2B b2df9606b7c594a2706c9fe7ee6bb02db30fb7f68ad006b3f020ac9ac5947454225424beae14ef233100fbdcb77928a64c33a58e8ebd069879799d1cc6a89114 SHA512 77baf0b7bd81ad2c2d4cd1d80e495e9ae10238626dcf75d30ef0b1b61ef7993c6b0cb6fe774e1edc0a9ac3dcbfd680bdeaac49343ca1a6c9a7d473770397a48e
 MISC metadata.xml 1522 BLAKE2B 61d725acff9a4079ef8d5056190eda100d2f2712f387f8d9141c66b37fc64be8df509c3fafb50e0e52b84515633b2bd6e40a1c471a12ef0b3aafa535d0526f52 SHA512 e668b0796899d8d6a83717d769bfc16438fd7ffbf52445d34df370cc3f3aefba21a7edabac22f709a4b70feeeef1bdcb1518cd01ab00c43b10578b1cbd163a42
diff --git a/sys-apps/fwupd/fwupd-1.9.10.ebuild b/sys-apps/fwupd/fwupd-1.9.10.ebuild
new file mode 100644
index 000000000000..3534e06223e3
--- /dev/null
+++ b/sys-apps/fwupd/fwupd-1.9.10.ebuild
@@ -0,0 +1,208 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit meson python-single-r1 vala udev xdg
+
+DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable"
+HOMEPAGE="https://fwupd.org"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="amdgpu amt +archive bash-completion bluetooth cbor elogind fastboot flashrom gnutls gtk-doc +gusb introspection logitech lzma minimal modemmanager nvme policykit spi +sqlite synaptics systemd test test-full tpm uefi"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	^^ ( elogind minimal systemd )
+	fastboot? ( gusb )
+	logitech? ( gusb )
+	minimal? ( !introspection )
+	modemmanager? ( gusb )
+	spi? ( lzma )
+	synaptics? ( gnutls )
+	test? ( archive gusb )
+	test-full? ( test )
+	uefi? ( gnutls )
+"
+RESTRICT="!test? ( test )"
+
+BDEPEND="$(vala_depend)
+	$(python_gen_cond_dep '
+		dev-python/jinja[${PYTHON_USEDEP}]
+	')
+	>=dev-util/meson-0.60.0
+	virtual/pkgconfig
+	gtk-doc? (
+		$(python_gen_cond_dep '
+			>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
+		')
+		>=dev-util/gi-docgen-2021.1
+	)
+	bash-completion? ( >=app-shells/bash-completion-2.0 )
+	introspection? ( dev-libs/gobject-introspection )
+	test? (
+		net-libs/gnutls[tools]
+		test-full? ( dev-util/umockdev )
+	)
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=app-arch/gcab-1.0
+	app-arch/xz-utils
+	>=dev-libs/glib-2.68:2
+	>=dev-libs/json-glib-1.6.0
+	>=dev-libs/libgudev-232:=
+	>=dev-libs/libjcat-0.1.4[gpg,pkcs7]
+	>=dev-libs/libxmlb-0.3.6:=[introspection?]
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
+	')
+	>=net-misc/curl-7.62.0
+	archive? ( app-arch/libarchive:= )
+	cbor? ( >=dev-libs/libcbor-0.7.0:= )
+	elogind? ( >=sys-auth/elogind-211 )
+	flashrom? ( >=sys-apps/flashrom-1.2-r3 )
+	gnutls? ( >=net-libs/gnutls-3.6.0 )
+	gusb? ( >=dev-libs/libgusb-0.3.8[introspection?] )
+	logitech? ( dev-libs/protobuf-c:= )
+	lzma? ( app-arch/xz-utils )
+	modemmanager? ( net-misc/modemmanager[mbim,qmi] )
+	policykit? ( >=sys-auth/polkit-0.114 )
+	sqlite? ( dev-db/sqlite )
+	systemd? ( >=sys-apps/systemd-211 )
+	tpm? ( app-crypt/tpm2-tss:= )
+	uefi? (
+		sys-apps/fwupd-efi
+		sys-boot/efibootmgr
+		sys-fs/udisks
+		sys-libs/efivar
+	)
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	sys-apps/dbus
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	x11-libs/pango[introspection]
+	amdgpu? (
+		sys-kernel/linux-headers
+		x11-libs/libdrm[video_cards_amdgpu]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.9.6-fragile_tests.patch
+)
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != buildonly ]]; then
+		if use test-full && has sandbox ${FEATURES}; then
+			ewarn "Certain ${PN} tests are fragile with sandboxing enabled,"
+			ewarn "see https://github.com/fwupd/fwupd/issues/1414."
+			ewarn "When in doubt, emerge ${PN} with USE=-test-full."
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+
+	vala_setup
+
+	sed -e "/install_dir.*'doc'/s/doc/gtk-doc/" \
+		-i docs/meson.build || die
+
+	python_fix_shebang "${S}"/contrib/*.py
+}
+
+src_configure() {
+	local plugins=(
+		-Dplugin_gpio="enabled"
+		$(meson_feature amdgpu plugin_amdgpu)
+		$(meson_feature amt plugin_intel_me)
+		$(meson_feature fastboot plugin_fastboot)
+		$(meson_feature flashrom plugin_flashrom)
+		$(meson_feature gusb plugin_uf2)
+		$(meson_feature logitech plugin_logitech_bulkcontroller)
+		$(meson_feature modemmanager plugin_modem_manager)
+		$(meson_feature nvme plugin_nvme)
+		$(meson_use spi plugin_intel_spi)
+		$(meson_feature synaptics plugin_synaptics_mst)
+		$(meson_feature synaptics plugin_synaptics_rmi)
+		$(meson_feature tpm plugin_tpm)
+		$(meson_feature uefi plugin_uefi_capsule)
+		$(meson_use uefi plugin_uefi_capsule_splash)
+		$(meson_feature uefi plugin_uefi_pk)
+	)
+	if use ppc64 || use riscv ; then
+		plugins+=( -Dplugin_msr="disabled" )
+	fi
+
+	local emesonargs=(
+		--localstatedir "${EPREFIX}"/var
+		-Dbuild="$(usex minimal standalone all)"
+		-Dconsolekit="disabled"
+		-Dcurl="enabled"
+		-Defi_binary="false"
+		-Dman="true"
+		-Dsupported_build="enabled"
+		-Dudevdir="${EPREFIX}$(get_udevdir)"
+		$(meson_feature archive libarchive)
+		$(meson_use bash-completion bash_completion)
+		$(meson_feature bluetooth bluez)
+		$(meson_feature cbor)
+		$(meson_feature elogind)
+		$(meson_feature gnutls)
+		$(meson_feature gtk-doc docs)
+		$(meson_feature gusb)
+		$(meson_feature lzma)
+		$(meson_feature introspection)
+		$(meson_feature policykit polkit)
+		$(meson_feature sqlite)
+		$(meson_feature systemd)
+		$(meson_use test tests)
+		$(meson_use test-full)
+
+		${plugins[@]}
+	)
+	use uefi && emesonargs+=( -Defi_os_dir="gentoo" )
+	export CACHE_DIRECTORY="${T}"
+	meson_src_configure
+}
+
+src_test() {
+	LC_ALL="C" meson_src_test
+}
+
+src_install() {
+	meson_src_install
+
+	if ! use minimal ; then
+		newinitd "${FILESDIR}"/${PN}-r2 ${PN}
+	fi
+
+	if use test; then
+		# Preventing tests from being installed in the first place is a moving target,
+		# just axe them all afterwards.
+		rm -rf "${ED}"/etc/fwupd/remotes.d/fwupd-tests.conf \
+			"${ED}"/usr/libexec/installed-tests \
+			"${ED}"/usr/share/fwupd/device-tests \
+			"${ED}"/usr/share/fwupd/host-emulate.d/thinkpad-p1-iommu.json.gz \
+			"${ED}"/usr/share/installed-tests \
+		|| die
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	use minimal || udev_reload
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	use minimal || udev_reload
+}
diff --git a/sys-apps/s6-linux-init/Manifest b/sys-apps/s6-linux-init/Manifest
index 5bb6a2aaa5a3..6736d509322d 100644
--- a/sys-apps/s6-linux-init/Manifest
+++ b/sys-apps/s6-linux-init/Manifest
@@ -3,5 +3,5 @@ DIST s6-linux-init-1.1.1.1.tar.gz 59951 BLAKE2B a906f58f9bef56d6bf0299d23e0fcf6c
 DIST s6-linux-init-1.1.2.0.tar.gz 60986 BLAKE2B e1becccf2ae54d06e590586c3158ae4ea4ec9a78c942bbdca5aca7320cd3cbbf9fe7e4b711c1c3505027d704dbd5de2185dc4d84bbc2dfc7687ff41c765bb31e SHA512 76376c4d407e665f67f733f1366dbacca58d268ebdbe22a9147cb102d519bd4c5887a345f66db2005d29ed9a841cb5a388c73c7d8df00d984cc4a25b9a813786
 EBUILD s6-linux-init-1.1.0.0-r1.ebuild 1631 BLAKE2B c7b23a7f080f26a7dd07f575e89f5a277b287cae52212513f83ca4597b6cc4c1f20dc67cd8c36a7d271a491733679af384b07bd347f64759d72fb36e93e5ba8a SHA512 1922616ab86b822d0a54ea71de1666a31855ab6f86f2707aa2623f627e3b20c5e10a138b87e8bfb103e85e6dcbb7b8f6a8c497099c39a3a559c0a8cc1772320d
 EBUILD s6-linux-init-1.1.1.1-r1.ebuild 1632 BLAKE2B db96f40ecb0cc87ea68b42ed3f93a49dbe69410366455e553553f60031fdb04c26ddbe32647859d7672ae52a1addfcfb6ad6b0e2f0420eec046eac38a4903bcb SHA512 2676bcffa165f29b713407301c255aa58382689c607e0f1df37e82b0a999230541e22c1b09f01f44f7ff4407c4918bc104c4ba58e4fece54205de3c823d6ec0f
-EBUILD s6-linux-init-1.1.2.0.ebuild 1647 BLAKE2B 2809669bafaf82c50775b674154279bfc9e2ec3ea391eb3426b83cd13896654ce8966201c401747844ae52ca59cd6e5ba4e46e098d935e8726b5487e535a1324 SHA512 c4854027059fa7edf32891fe50b58fbf6d8fb2fc2455b477e507c84fd1ca040616f5c51e5920b6cff452076c3cc73048f8450fdcbbcf0c0ef78f5bb596d228fc
+EBUILD s6-linux-init-1.1.2.0.ebuild 1762 BLAKE2B 7142c093ed74399295fe2b12f1763b3ef366c6a327658150ec54a966ebc87f59d196c308659374c37cbb45ea046803d79f5d746c4c3ad3300f47e6483fcdfdea SHA512 08d174695ccb2cbe996aa807597d4e44c1f25e42ee0630ea38cb076aa8871500b732f61f6a3c0cd30a42ba316bde76b25d4121674971c395e5852f406a6bfc09
 MISC metadata.xml 750 BLAKE2B b0b1508188b05b09ab4c8ea338d7db19a41ee23bb0ae69916add81ddd0cd9a6a6591c4b53c9fb92ea88510e9b93fa1cdcfa2d89be51acaa6e3260465311d1c10 SHA512 c2cae5bd406eb008667b178636e96fd44707e1468140fc7c088afdf0fcb9fdcaab6c02a791409985c0425c13cdaa12a222d135a6406aef432b1b3bf2d83da1e6
diff --git a/sys-apps/s6-linux-init/s6-linux-init-1.1.2.0.ebuild b/sys-apps/s6-linux-init/s6-linux-init-1.1.2.0.ebuild
index 984e24dfe6b7..2b8244fbaef4 100644
--- a/sys-apps/s6-linux-init/s6-linux-init-1.1.2.0.ebuild
+++ b/sys-apps/s6-linux-init/s6-linux-init-1.1.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit toolchain-funcs
+inherit optfeature toolchain-funcs
 
 DESCRIPTION="Generates an init binary for s6-based init systems"
 HOMEPAGE="https://www.skarnet.org/software/s6-linux-init/"
@@ -70,6 +70,10 @@ src_install() {
 }
 
 pkg_postinst() {
-	einfo "Read ${EROOT}/usr/share/doc/${PF}/html/quickstart.html"
-	einfo "for usage instructions."
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "Read ${EROOT}/usr/share/doc/${PF}/html/quickstart.html"
+		elog "for usage instructions."
+	fi
+
+	optfeature "man pages" app-doc/s6-linux-init-man-pages
 }
diff --git a/sys-apps/s6-portable-utils/Manifest b/sys-apps/s6-portable-utils/Manifest
index ab84d033b3de..000d011f2df6 100644
--- a/sys-apps/s6-portable-utils/Manifest
+++ b/sys-apps/s6-portable-utils/Manifest
@@ -1,5 +1,5 @@
 DIST s6-portable-utils-2.3.0.2.tar.gz 51106 BLAKE2B a7c55fb99f8d2e46343c14169cd63c5054b5869e1cd2b5cc4b158e1f47035d956aba8faa0cceed3c39dba43945bdac44d9fe3b7ef5edae184c85d9e9e33f7215 SHA512 f918244e8ed5957817d28fc43ae2cdcbbdce600dc208bc0422e262ce42f36d8e8b77002c2143e7741390eea52e9c4bae7a1358c23ebbba3c689c64c7115d4b72
 DIST s6-portable-utils-2.3.0.3.tar.gz 51186 BLAKE2B 9a0b9f33a89cca730afc8190ab7be7fc25ed286970b430d33d8eb91d5b6e5ac4261e659674ec44c5e5a88b32a324cb62ee63837923f0a7481675c8eaa3e8804c SHA512 f75242ac6c06ffd5bd66b8a35bbdf39938cf3bfa6e79abd214af37e9e4acc732ca1760566862482bc964a5cca05bbce8bd24d7167b02dc66c5f397c85ee0d37f
 EBUILD s6-portable-utils-2.3.0.2-r1.ebuild 985 BLAKE2B b3d271993f5409a63389aad153415e806018b355ccc8bfce7852039039987692d3db798bf4fec11187e04bf2b34e1df14c72b91ff2722b37a60682582b753776 SHA512 925161d16a95bf5e6ac1916872bd2011ec928df7f3a6f146f21807415323a041dd0ae02370abdc9115748de2f8f13fc0e7138077f388d5b6aa621330c4516db7
-EBUILD s6-portable-utils-2.3.0.3.ebuild 994 BLAKE2B fb0e01ab3d096808e0cd7669768e2f79ecb1f9bbf013f4c6075d81e63d87d04e4e1afba1f88acdd12c033eec06340931bb8d04fa2ff5af3a325ac14034610a37 SHA512 3e98b8e9f625a7bc8e533b0558f1e89a4ea6cb63b083dcfca4a6ed8fd55dbf0929ea984f571f77838d347b296a24796b6e9e1571711136745ab0bcfdcf4bbc97
+EBUILD s6-portable-utils-2.3.0.3.ebuild 1085 BLAKE2B 96a0288cae9cd4475b238a0bcadd6e2c7c5653ac95f187564edacc0d13f346aaba984d5df21dd20a07c0d7b19067daac5964a7998785b38b99b9dbd0991c1f1e SHA512 b6ce814ab6e204158268bb26921f9e6e68e565285c1c7902110dbefbbc434147e6c8841e0e8067ffb5a5f452eebb8b325ca47cef1d96c75bd011899d483b2c0e
 MISC metadata.xml 612 BLAKE2B 5512fe794ae7362a22aab418fd82bcc6f0fc4713dee0657166f045f9c6d0a06e15a1d97ddae56556d996c887a93c401e0874c999b8b5e6bc7a6bb5815ab3921f SHA512 787bcdaaf32e0bda6270e0d21eb0a98e8105055bfe7f681b1bde6ec286df6036a4f4c40641c94341a95d74ff289b7d922774e88605907d64a8f2b1ef5963c689
diff --git a/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.3.ebuild b/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.3.ebuild
index e476efbe496e..a5a3fc10c8b3 100644
--- a/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.3.ebuild
+++ b/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit toolchain-funcs
+inherit optfeature toolchain-funcs
 
 DESCRIPTION="Set of tiny portable unix utilities"
 HOMEPAGE="https://www.skarnet.org/software/s6-portable-utils/"
@@ -44,3 +44,7 @@ src_configure() {
 
 	econf "${myconf[@]}"
 }
+
+pkg_postinst() {
+	optfeature "man pages" app-doc/s6-portable-utils-man-pages
+}
diff --git a/sys-apps/s6-rc/Manifest b/sys-apps/s6-rc/Manifest
index 7fbaa4d68f05..bb84a8dfad93 100644
--- a/sys-apps/s6-rc/Manifest
+++ b/sys-apps/s6-rc/Manifest
@@ -1,5 +1,5 @@
 DIST s6-rc-0.5.4.1.tar.gz 101078 BLAKE2B d85a194712ab63369cb71cbe4c59efd8cbe507a5e74c6bdb1bbe9a0e9123b8b1179850a8abdb0dbc67ef3c09764c9a6fb11c5b366590ecf4922b0d5a0115bc14 SHA512 6b61df9fa1d9bd24430bab4c11bfba009ca79c62a32dd2db3b79a1057645da9f92db4058c66c35bb068d805d958bfdf024399d240559dfdee62f9a6a30cf2086
 DIST s6-rc-0.5.4.2.tar.gz 100896 BLAKE2B d9e6f580a32d27950c7c525a5b657b429616d1c937c71cee302939b847a58bae1d5e209f53113dc82b953b5aa14c6078b206566e4809902a8f06b17c5621205f SHA512 f04e94db957e6d0033e328cc63530f64c9db101815bcafdb00a23205f4e75039dd3e593f93d48e4d9877b0696ea734ca62f672d92ff31e4e07aa19d26d809443
 EBUILD s6-rc-0.5.4.1-r1.ebuild 1562 BLAKE2B d3676498d26c17486b46d25c3971585a7634bb3355761405de397d3f2ccb4c613cfa2797779c2d90b23101bf2f50ba1d8f61c90eb498ee39c97c41ac06fd1065 SHA512 734e50b3899fbd6e0085d482196277fc6bbd93f39cf4ae1d00be693a67a168eb239fb0190eeb05ef93fd661f5b5c40bf5c55a3e884640465e04a20fad37a5871
-EBUILD s6-rc-0.5.4.2.ebuild 1570 BLAKE2B 88c4239eefc08f5aa9dd40d7882337d1964101ca969de800873129377a295543e986b928e77629d94b79c07705d6d8ba6472cd8dee2fac8ab94524815243bc02 SHA512 ff8f5c94a8a4be736f602093d6f160315e57f8e3e653f5b973c4cbb12116d46c88b76c09a0f00852f532b198ff00fcee4869bff131f6e8b985c99992fe3a0cbc
+EBUILD s6-rc-0.5.4.2.ebuild 1630 BLAKE2B 76af8526fa65b666b7a7569a117feb757dc5a1903212976ca6b6997899a1c2719fbf9ba8237fba62e0b5d70327bdd2fb3c7024efe94cc4d569e7b605c889be7d SHA512 8e951af29ec815066962f10dfa802486b4fc6450f77ecb9651e22958ad3d856d50b24ff1840500e1e32a2359fb687bf017d6a0e90b450132a8fb85087aaf6285
 MISC metadata.xml 612 BLAKE2B 5512fe794ae7362a22aab418fd82bcc6f0fc4713dee0657166f045f9c6d0a06e15a1d97ddae56556d996c887a93c401e0874c999b8b5e6bc7a6bb5815ab3921f SHA512 787bcdaaf32e0bda6270e0d21eb0a98e8105055bfe7f681b1bde6ec286df6036a4f4c40641c94341a95d74ff289b7d922774e88605907d64a8f2b1ef5963c689
diff --git a/sys-apps/s6-rc/s6-rc-0.5.4.2.ebuild b/sys-apps/s6-rc/s6-rc-0.5.4.2.ebuild
index 7d597db9002f..7424fbbd67e7 100644
--- a/sys-apps/s6-rc/s6-rc-0.5.4.2.ebuild
+++ b/sys-apps/s6-rc/s6-rc-0.5.4.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit toolchain-funcs
+inherit optfeature toolchain-funcs
 
 DESCRIPTION="Service manager for the s6 supervision suite"
 HOMEPAGE="https://www.skarnet.org/software/s6-rc/"
@@ -62,4 +62,6 @@ pkg_postinst() {
 			elog "version."
 		fi
 	done
+
+	optfeature "man pages" app-doc/s6-rc-man-pages
 }
diff --git a/sys-apps/s6/Manifest b/sys-apps/s6/Manifest
index cf916db607ae..56baeaccfdcc 100644
--- a/sys-apps/s6/Manifest
+++ b/sys-apps/s6/Manifest
@@ -3,5 +3,5 @@ DIST s6-2.12.0.0.tar.gz 255678 BLAKE2B cee3bccbdfb8dee8e38ad2757ed650dea5e940835
 DIST s6-2.12.0.2.tar.gz 255801 BLAKE2B 5aa4ecf28cbde17ce9f80849508989607a0e7340bbb1fb0ae92cf021d887cc6870f53700b384dbcb42d757268ec9c372229f41facf04e812cd02cdb64dd48e37 SHA512 55f6590801df51bbbc3feb467c67df1587b9c1ade4fbfccb4852238e16713c7f2a163468fabe114e4632e812e7daa1020c0dda14d02a26e86b085b61552e4f73
 EBUILD s6-2.11.3.2-r1.ebuild 1178 BLAKE2B d5105aa0a81a634430c79ab7df4c69e7e4273a09c4269081e73d19396b39a10fcaf4dd2e02f2f757bb3b15b25f056959a82918d6282d2633033eb7bb29a6eefe SHA512 959d008ec52c99fe07de40efee8437585cbdd4b052bda73c5c79b7a12252ac07cab266ebb2de5d1764cbac6ccd210237fc24cffe8babf54ae23174a8dc510764
 EBUILD s6-2.12.0.0.ebuild 1194 BLAKE2B 069d086ee3bf37ea017b5a2f8c7d3d411dd6778ff404280ca776232475adbd859a127480a35c237fd00237cf15c66ccd10145a01e83398ba66d35200b3349d56 SHA512 1c5082bffd7ee81f8d98661c0c48892adc214eb86ec6db69d3d2335eb7c81f4b31eb09d909c92abf93124ab35bb0ac81036043d263a5a26cebe110f52f799652
-EBUILD s6-2.12.0.2.ebuild 1194 BLAKE2B 069d086ee3bf37ea017b5a2f8c7d3d411dd6778ff404280ca776232475adbd859a127480a35c237fd00237cf15c66ccd10145a01e83398ba66d35200b3349d56 SHA512 1c5082bffd7ee81f8d98661c0c48892adc214eb86ec6db69d3d2335eb7c81f4b31eb09d909c92abf93124ab35bb0ac81036043d263a5a26cebe110f52f799652
+EBUILD s6-2.12.0.2.ebuild 1270 BLAKE2B 11a4e9a754e9c95e1a7a3fb9f67957e059631bdd7f4f0f2700a107abd8430624ed1500a560aeb35ac75a72bcaa19866a3661838807313d4805c1965b76d641e3 SHA512 c1460219a2c64a212bcc0805dd21fc9f8b1c388b2eaab0dda1076eadfa27f2f0624338e54ad15b749731c6cd19a3a61097c5304d6b0907f573d9a1494a638b24
 MISC metadata.xml 871 BLAKE2B 2e6ef16a61c8b9d55bb520adc30479837aae5b85fb2e4ab8e18e0d162ae1e7370dc5823c9a711e92c73620fcc20e4e4a159bd6270f29fe99382163a96dac8c75 SHA512 e1e741d4b13338fb41e1b9fda15e308d84bdd7490a7f98063de4052307703303ac4d313e6ea0673d4095f27041bb62539f986e4ce3ff0ee7133ff319f37d63d9
diff --git a/sys-apps/s6/s6-2.12.0.2.ebuild b/sys-apps/s6/s6-2.12.0.2.ebuild
index 8ac261aaceea..2512f211e17b 100644
--- a/sys-apps/s6/s6-2.12.0.2.ebuild
+++ b/sys-apps/s6/s6-2.12.0.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit toolchain-funcs
+inherit optfeature toolchain-funcs
 
 DESCRIPTION="skarnet.org's small and secure supervision software suite"
 HOMEPAGE="https://www.skarnet.org/software/s6/"
@@ -52,3 +52,7 @@ src_configure() {
 
 	econf "${myconf[@]}"
 }
+
+pkg_postinst() {
+	optfeature "man pages" app-doc/s6-man-pages
+}
diff --git a/sys-apps/syd/Manifest b/sys-apps/syd/Manifest
index ab720700751c..cde66fa0c5d0 100644
--- a/sys-apps/syd/Manifest
+++ b/sys-apps/syd/Manifest
@@ -71,6 +71,7 @@ DIST rusty_pool-0.7.0.crate 25301 BLAKE2B dd4e9ad11fd02b637b0cd6250a89b3b7813e5d
 DIST ryu-1.0.15.crate 46906 BLAKE2B 6d6949e43aaa27fba0ec6002fa11ba859af8d867f87c90d88413267186abbf6302b817985bca3d577ab3fab2e319e11756f144473a16330dfd8fc7b604cdc4b3 SHA512 4655b5647f919082a9b84b889539ae7fb23a1201057cf280efe79c58cb5f040864efb7812cda5021bf6d34838a15d173ac8bdb0fb9fa2dba85173d3efa5a826b
 DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
 DIST scopeguard-1.2.0.crate 11619 BLAKE2B 8b7e9ed6cefef9ee55407fb9690d57a2a98bb93e5105aeebdb475a52485e9e185255249e1dce8f83cd80534e7402d485aac3efa7e8493b13135de27550cd4bc4 SHA512 6247719a15fe1e4e2d179127b9a934bd2f99367724f41175ed9522f58824b6bc69b35002eae66b35880375ff61d77ac43ddaa78cbde7160a35183a1da32d3fbb
+DIST sendfd-0.4.3.crate 11120 BLAKE2B 5f9e1d170ffd45f3012facead052267a868cf95790e606b6ed9b06b664c3abd703d90470356de604a3b52653634844ae15d275902c5ca5c157741f1ff965c3b3 SHA512 0c17bcad760b74000dc7bf8d4a5b4c4ef68246693997c47b5e7b503cc592fca72ebe3b617da7b2c3aa02fd6afed0aa3b92cb3f36cecced53acbb78a377069849
 DIST serde-1.0.193.crate 76863 BLAKE2B 163097e85b5542451896d7381607aa297e3b0342a2641887a01689b13122c6c1ca566fcb7f32f51bb0ecc861aed014f1467edfe21338223d5361555f870425a3 SHA512 82259ca302f42116ecffca3c88bc1212785ce5430f9d29390a9041d4e5943c13b13de119fde644a583960102c4b6e850a16f962d36dc76ac69fc2297ed65a506
 DIST serde_derive-1.0.193.crate 55692 BLAKE2B eeb2a2fbcd0daf5fee1bd6a4f584fed330db58cbd786073311d6a94308c63dfc6b7c2dfbc4b8980064ed66509f0127525b79d99aa96ca0134226fe21715999bb SHA512 05efb144aeee293a0e7dc7540106eb8c4920b2d8dfc25771d73afa8ffcba330104643430a6e396ea2adabbed4ccb23591251479b75449b9c8322799f91d38c41
 DIST serde_json-1.0.108.crate 146476 BLAKE2B 9c0ceae5566a4e0ce7a6264939862f9dd920bb47d18acebb179798b036c376d97a4e9b0717092903ab90cfbf6fb73d37518e3cc25f3217af010296f5644de396 SHA512 7d8d1b74515388d99983ffbc5696cba022305cf4c797d3ff5d2959fc8fc8f4ce01cc4c9e7ccae7097b06b5acf5307027f6b7315df1fd8f58e681cc5968e79fb6
@@ -78,8 +79,8 @@ DIST slab-0.4.9.crate 17108 BLAKE2B 8e5288c4d00efa915e7be27b55f2204850968624f0d8
 DIST smallvec-1.11.2.crate 34801 BLAKE2B 58645e99db8f02db64d02c75860c7ea41836c427c03ee3b0b23365e73a406e4fd6ac312bf13fc5faef8bb6111c10fcfd5f839d5b3686e9b34d1626f8469fc327 SHA512 5cfb427c3b99b0dbd71f6154ed899abcde9d7d2992977ac7b2ef3a4c3ff51e4efafd133071a69609b4ed6cb269bdc26b79eb72e1988f10dfcaef8185d950cd1d
 DIST strum-0.25.0.crate 5539 BLAKE2B 9c031e5ce19e2ecaa63e63118197c740ae9295b8881f6280ad92847b99fca6fb08b0d395ab1b2a66e25c8374cd18866d8436540538e3c0f1f047fd2235971b40 SHA512 a3522df79547e94518f25a0e29248f67f1d7e2586a7a424d7d996cb6bfe5d98fcc4fc44da7ddcd4e35a1127b2816bee55107f30cb2a559f5b9bbb1346139544a
 DIST strum_macros-0.25.3.crate 22570 BLAKE2B 511af0d1f0f76df7ad1528c79987b6e09390bfb33e1c34078fb5450171aca7f169afb83fa2f2338a861ded6842c8535ea6e4cdb0d31f341edab0a06d7eeac16c SHA512 e6ebc00943d9f88104815a5bd6a302a391a06fb0ed5ff836e01d341150628684e00e5e2e5b3f6466ece92d376985246f818243a0d1d775cfa55d1c50c0ec0c62
-DIST syd-3.7.0.tar.gz 316219 BLAKE2B 730f58d2395cc4931f10fb2e1412ec2b7b1073e8209eadf95f33fbedff39cc8e03b60628f3bc5b42e05b20523c3428919adf97920d53dcecfe86b8f87da73612 SHA512 ddcd61226212d8a182a3288485c557a7aaee11d76d889fb2848956f61971da32e69d883b330f2ad0e1b14569dbcafb45b327b60451b7ae9aa7f28588a63af6bd
 DIST syd-3.7.3.tar.gz 317232 BLAKE2B a42863e247cd836712e4fd9602f8e77a31c97c93a8200a3564343c53f88ffe1b2620964239c12226e3f06a4ee481ef1559ee0be9d94cf341da9bf06ac77e39c7 SHA512 401867b901dd559ae36a2aea539f7c9d27b06b4fdaf134e5b8b01074472d93c7e9b77c2e25e502e1d7cb17c05f1d6b66c691a27f59e3079d0fbd3f8f2eae25b1
+DIST syd-3.8.0.tar.gz 324078 BLAKE2B 597cdbc889a272dca386402fd00f109f1e129a80a0c42c3704931c594dc518a0939e09c961ed1eb26f5edc4d49ed828d5405dd83052fa259a03d86a5d3dcc051 SHA512 e4b22bb936588f81b9020bb475644a07c8becea95f1bcc6de216be213767bbca1eff235175a9b10ec5fdd5e0865a4950fdfab22e65fdcef362f6de02530d8b63
 DIST syn-2.0.39.crate 244129 BLAKE2B 2cff6626624d03f70f1662af45a8644c28a9f92e2dfe38999bef3ba4a4c1ce825ae598277e9cb7abd5585eebfb17b239effc8d0bbf1c6ac196499f0d288e5e01 SHA512 96cc347cfdb0f9ca0b6c7289279a1cad8fc401625783742292564f7ceca8237ced8d9a3f62069696f6132ed06092dff2baaf4be09ef53b21260d93785b0e27c3
 DIST tempfile-3.8.1.crate 32164 BLAKE2B abccff7939df8cd223a5a8ee61e5af7c35335f1cd61b3e72fed9a8565465c293e99938d57b50743141aace3cd20422ad5d3090507ed66561cb0155771fe0a5ec SHA512 b257bfb70793575d59ec4cf4b7492aff83dafb68b367a48594211f476a3b1d4800b69bddc405d8749d8b320c30cbe71be1261a60b4bbc862663b37a6c7d97a3a
 DIST tinytemplate-1.2.1.crate 26490 BLAKE2B af39d96f33f63238e455a4e38fde1d1730fd9661ae68be7b05df6ef9d2ab1a04db1332cc4ec9deb6da3a8e22b124df81b0fa8916d8491b808742bb733c8e48be SHA512 0cc080057e096f0796e72004343e1a8332c2e8a12e43f6ade150ebf632e9c29c7ad04de0b940cd57df81efdc4d07a6607da9b86a30d8383e39ac3d7be185edb9
@@ -107,6 +108,6 @@ DIST windows_x86_64_gnullvm-0.48.5.crate 418486 BLAKE2B 12a2199d434617c1df1a839e
 DIST windows_x86_64_gnullvm-0.52.0.crate 430165 BLAKE2B af9345a1f6e0ed1392ca1534c68d23f3be0fbb6a42b3c5518cee14373e645038526da15e849d14abe45c53766a30c6c2042a626482ba4a05409f325eb6aa36b1 SHA512 e88af35fd1c694dc189783e5c81aafa61aeffbddce4d7130e1125d0ce3d932fafeb345990ffd98477c41b578b7f5090f4f9c0457b02146309b95549c9f8f44f0
 DIST windows_x86_64_msvc-0.48.5.crate 798412 BLAKE2B 8abc0721e2fb337fe17c91d278947d36122d9045b839ba0cf3e690202d242265b676f23cc301da5f9d98c56ca4ecb76f7d6f072ee71bf986a1deca87020b90e5 SHA512 fa1c5cd14ca2ff0082e2504cf59d317dc4dc6f7138d35c12f95d4476a9c13d8b7f5537d0ee251eee7c99411ad31b22263171b7fbd391daa5d3ea3488ceaa61a0
 DIST windows_x86_64_msvc-0.52.0.crate 821600 BLAKE2B cc448b65f98fc0fc4949ae622b7020d2dae927ae45310649f6ef71809740eda9d3db0fc035676c201fd9ab9639e9e7f21e2e992b4c789542f12b419d2c752179 SHA512 3aaee31533a1a48a6ab5cd15b3cadfbd906a93a153e53919d0aa74e440d11e29830554e4e014c215f5b88a475bb733fa8ba4ce9d773d3e23a40ea9ad37ddd0a7
-EBUILD syd-3.7.0.ebuild 3152 BLAKE2B 23c1cd68b68957ab3822f1d2694fd38a7964b917aba9a31ce45bed4d421dfc2eb1e36c4f51b4ef707603486649d60f47a9ec69945acf2309bc3d510b2d051bad SHA512 6c4a645113dae3c045553e770f2137b6217f604dba27d3fa98f61b19e925dc3b47744272dc386f10d8457d1a369639da4faf6c9f7bda926afcd8f0e0c90924c6
 EBUILD syd-3.7.3.ebuild 3152 BLAKE2B 23c1cd68b68957ab3822f1d2694fd38a7964b917aba9a31ce45bed4d421dfc2eb1e36c4f51b4ef707603486649d60f47a9ec69945acf2309bc3d510b2d051bad SHA512 6c4a645113dae3c045553e770f2137b6217f604dba27d3fa98f61b19e925dc3b47744272dc386f10d8457d1a369639da4faf6c9f7bda926afcd8f0e0c90924c6
+EBUILD syd-3.8.0.ebuild 3166 BLAKE2B a215dbf0e4ff9c68ae82a3613f3e145a3541180ace5ed4fb91edbf4cb57cc21d5e4317cc29694106d40709a9d9371fff74e0b3cfb0454d98d7275a4a2009dfba SHA512 7cd1e92cbdcff72aeb3cdb2c244caec28ffc94cde3d0623d394d032d37e127f7884edce0beaf0c4254bc447a10f0b50c05816aac829c0c827db8dacb674577ff
 MISC metadata.xml 254 BLAKE2B 0e6d918ec0aa523a1d7ff2da1c9081d8257c2a83396bc5c7033412341b400364ee2d9b155d9d1df05da92b11f6a940dcda2adae7c158e479d082ce4a0583971b SHA512 24b045489397ba3bcd9dc48dbbc8a26189c1220053c04f09035dd735d2a3fb2ad6a55791f943f4502fee20c633c4a30983b76093f31ce752994f424fbb3cd21b
diff --git a/sys-apps/syd/syd-3.7.0.ebuild b/sys-apps/syd/syd-3.8.0.ebuild
index 8aeb7ae9750d..c2ef909d6061 100644
--- a/sys-apps/syd/syd-3.7.0.ebuild
+++ b/sys-apps/syd/syd-3.8.0.ebuild
@@ -79,6 +79,7 @@ CRATES="
 	ryu@1.0.15
 	same-file@1.0.6
 	scopeguard@1.2.0
+	sendfd@0.4.3
 	serde@1.0.193
 	serde_derive@1.0.193
 	serde_json@1.0.108
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index 35b5c28faca2..b1fc279135fd 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -14,9 +14,9 @@ DIST util-linux-2.39.2.tar.sign 833 BLAKE2B 7d804e1e1f162c176cd7f826f505590ed5fc
 DIST util-linux-2.39.2.tar.xz 8362220 BLAKE2B 963c257b86f8a025a3452f102656f479382b9e03dd8ce39b9561302b484c595005aa0bbce9b91422d9be038037143772483363c2a1eec569355316fc8d5d5765 SHA512 cebecdd62749d0aeea2c4faf7ad1606426eff03ef3b15cd9c2df1126f216a4ed546d8fc3218c649fa95944eb87a98bb6a7cdd0bea31057c481c5cf608ffc19a3
 DIST util-linux-2.39.3.tar.sign 833 BLAKE2B 433b9ad6e97d9e2ffbd516addf8406587d009d9c7661ac126ae89b370f22a39f1f1243e86ef383133d656833d3ad35054397d60e0e0c67bd1e9402939903570b SHA512 d9993d7a77531ca8fe3e58458d65e7d721c38aa53838547479fea169941a69b1c07fb02ac90ed5a0360025814b0999167621dbc4215348810584947a9e67756d
 DIST util-linux-2.39.3.tar.xz 8526168 BLAKE2B cd7b2b3c820e920d4a6ecd46fd807e018fc8e54439292f5e62c5f6863dd0f2505df3ec02c470d9be255a437c6ee8e4077908ac78d19a0d1273854d99eb571df0 SHA512 a2de1672f06ca5d2d431db1265a8499808770c3781019ec4a3a40170df4685826d8e3ca120841dcc5df4681ca8c935a993317bd0dc70465b21bf8e0efef65afa
-EBUILD util-linux-2.38.1-r2.ebuild 10526 BLAKE2B b66ce8e3835a86921652c43ae6416d7129cb8c22e2d16eac3977eae36301353d9fde97228f841209832e3777017541f4fe64af8d98a063f34c040ff8f6067f72 SHA512 b9e4773e6154059c5781149b3ceb5017b0d6b72295af11689ae4977658454d45ee3d99f13fdad43c7d880df00107380470d3ab8ca2aef19fc43d206327447604
+EBUILD util-linux-2.38.1-r3.ebuild 10645 BLAKE2B 7fab19810c7c8457592a7fbc1177b85157977cb1c0becc3a1d67f501938d92ec855d562ef8fdf0cd6ee22e611a6585f9074720015603cd0206bd3c7f339a771b SHA512 b9bd8c93df46fdb91b82c36d49b2ab0c6cc1f9ba3a76ebdc919cb49f98dff0d314643852a57cf15401e5a60f45833086cd01c0b531d856e25ef5f0a2a6734513
 EBUILD util-linux-2.39.1-r1.ebuild 10970 BLAKE2B 8dff56f232b8d39da5376b2d10e329ab5736496f8d077157db144e97bdb256a25e310a834d88bb8cc2021a4b56f87f8fb93bd499f3b469001a01a311edcb8713 SHA512 3bf85fa3b465b73dffd698727cb49506bbc159c00bbd6bd1ee04788f885fe4b99cf3adf7d7ab9c39e4d7e3dc0a650d789ff833b9acb96a0cd0b8925cfcf20132
-EBUILD util-linux-2.39.2.ebuild 10708 BLAKE2B 8f90f1561ae95b7bccd252b33ce1d970d985ee086a534b53f48307a793de2548878e8b261dad934c1bc4baa7cc8a37e30fcb0f789e857531dc3c22cbead267c1 SHA512 951d129039e84b9d0fa891fd8b0532a5bff96903c6416b5d2076270cbcf13e4aa1ede86a4bcb29a701bd3b4a8840b2e0999723517ea763e36ed289b8f3d6c182
-EBUILD util-linux-2.39.3.ebuild 10709 BLAKE2B 0fabdce799eae82edee258f586fe5b9770384d3e9aa457d53d5fb9fba107ccaa107b835ee2629b0a014c156872739909c9640c8195aa13db9e581697f6d93518 SHA512 6d69a332f9bb776e0e29a4ea5afd0075031a745660aeaf7dafcca4c83ca0a02fb74d76c48c628984657cf53860c918342250b8af173901696a78e8f6e3c83609
+EBUILD util-linux-2.39.2-r1.ebuild 10827 BLAKE2B 42f3f2ba29b3f079c4873014fcf24e926379844740fee5cbd7787d812d74b0dd3b168c2ad9573c085fefea99ebe138964980683d1460818bab527307756083df SHA512 cb1f6c120746eb64ebd994a8573a3e28b9432aec8884bb841e90d4ca90bbde109694c9b1885c7eb612cdc55d6ed33662afd556a4a1aa0f7406c8878f6f078c98
+EBUILD util-linux-2.39.3-r1.ebuild 10828 BLAKE2B 3f16a8b6c1f628066914694ade75aedb190013cfdad52c56f816984ce83e41b754d36791920028ee98fbb25bfa233497637cc491c2dfd4cf26998d9b541299e9 SHA512 6914bedd1e2ecac1d94516c80e5257b797eb4caab7838e3fa014b372473e3f6258530284abceae9a660f3aa180a6c2f874f4541061657f3f59b7d30d6219f81c
 EBUILD util-linux-9999.ebuild 10457 BLAKE2B b18f1badfd72af441dea9804749f6ff8d1aa36e1baca9e4145590ae9f2d6f49210795d47334bb58583639f41fca86cbc4d143331707a804e8ddb3ea2cc070ffa SHA512 67a55693d33b02b238796ebee9be191258ab420b2b6ac0e160f4f1fce9d2dc3f840a58cef8d67bf5ab67908e6717c619075731e7918ad0804d07049ad9e190c5
 MISC metadata.xml 1553 BLAKE2B 1c4a18f6d91be4c90bf2505745cae42f6d249a1295c6a46fc1b8ea08297842b4d3a2aa232e679a167af9fef26730ed71f651b2f71b58cbfe66bd7a5cd3743c3b SHA512 e01d390c983ac47b9a6684f70b11cc796cde1355ae7d4c12406b3d6fc5b0897a9471720844e74fceee1648f4c7d685e6b12f157adc1ad951506acefb7441635c
diff --git a/sys-apps/util-linux/util-linux-2.38.1-r2.ebuild b/sys-apps/util-linux/util-linux-2.38.1-r3.ebuild
index 48a7610afb48..dd3d6ec43259 100644
--- a/sys-apps/util-linux/util-linux-2.38.1-r2.ebuild
+++ b/sys-apps/util-linux/util-linux-2.38.1-r3.ebuild
@@ -55,8 +55,10 @@ RDEPEND="
 	rtas? ( sys-libs/librtas )
 	selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] )
 	slang? ( sys-libs/slang )
-	!build? ( systemd? ( sys-apps/systemd ) )
-	udev? ( virtual/libudev:= )"
+	!build? (
+		systemd? ( sys-apps/systemd )
+		udev? ( virtual/libudev:= )
+	)"
 BDEPEND="
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )
@@ -207,8 +209,6 @@ multilib_src_configure() {
 		$(multilib_native_use_enable suid makeinstall-setuid)
 		$(multilib_native_use_with readline)
 		$(multilib_native_use_with slang)
-		$(multilib_native_use_with systemd)
-		$(multilib_native_use_with udev)
 		$(multilib_native_usex ncurses "$(use_with magic libmagic)" '--without-libmagic')
 		$(multilib_native_usex ncurses "$(use_with unicode ncursesw)" '--without-ncursesw')
 		$(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses')
@@ -221,6 +221,18 @@ multilib_src_configure() {
 		$(use_with selinux)
 	)
 
+	if use build ; then
+		myeconfargs+=(
+			--without-systemd
+			--without-udev
+		)
+	else
+		myeconfargs+=(
+			$(multilib_native_use_with systemd)
+			$(multilib_native_use_with udev)
+		)
+	fi
+
 	if multilib_is_native_abi ; then
 		myeconfargs+=(
 			--disable-chfn-chsh
diff --git a/sys-apps/util-linux/util-linux-2.39.2.ebuild b/sys-apps/util-linux/util-linux-2.39.2-r1.ebuild
index 1996b460e1b3..f1a98bd3395c 100644
--- a/sys-apps/util-linux/util-linux-2.39.2.ebuild
+++ b/sys-apps/util-linux/util-linux-2.39.2-r1.ebuild
@@ -55,8 +55,10 @@ RDEPEND="
 	rtas? ( sys-libs/librtas )
 	selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] )
 	slang? ( sys-libs/slang )
-	!build? ( systemd? ( sys-apps/systemd ) )
-	udev? ( virtual/libudev:= )
+	!build? (
+		systemd? ( sys-apps/systemd )
+		udev? ( virtual/libudev:= )
+	)
 "
 BDEPEND="
 	virtual/pkgconfig
@@ -220,8 +222,6 @@ multilib_src_configure() {
 		$(multilib_native_use_enable suid makeinstall-setuid)
 		$(multilib_native_use_with readline)
 		$(multilib_native_use_with slang)
-		$(multilib_native_use_with systemd)
-		$(multilib_native_use_with udev)
 		$(multilib_native_usex ncurses "$(use_with magic libmagic)" '--without-libmagic')
 		$(multilib_native_usex ncurses "$(use_with unicode ncursesw)" '--without-ncursesw')
 		$(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses')
@@ -235,6 +235,18 @@ multilib_src_configure() {
 		$(use_with selinux)
 	)
 
+	if use build ; then
+		myeconfargs+=(
+			--without-systemd
+			--without-udev
+		)
+	else
+		myeconfargs+=(
+			$(multilib_native_use_with systemd)
+			$(multilib_native_use_with udev)
+		)
+	fi
+
 	if multilib_is_native_abi ; then
 		myeconfargs+=(
 			--disable-chfn-chsh
diff --git a/sys-apps/util-linux/util-linux-2.39.3.ebuild b/sys-apps/util-linux/util-linux-2.39.3-r1.ebuild
index 6655149f15a6..8c83d7e9c777 100644
--- a/sys-apps/util-linux/util-linux-2.39.3.ebuild
+++ b/sys-apps/util-linux/util-linux-2.39.3-r1.ebuild
@@ -55,8 +55,10 @@ RDEPEND="
 	rtas? ( sys-libs/librtas )
 	selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] )
 	slang? ( sys-libs/slang )
-	!build? ( systemd? ( sys-apps/systemd ) )
-	udev? ( virtual/libudev:= )
+	!build? (
+		systemd? ( sys-apps/systemd )
+		udev? ( virtual/libudev:= )
+	)
 "
 BDEPEND="
 	virtual/pkgconfig
@@ -220,8 +222,6 @@ multilib_src_configure() {
 		$(multilib_native_use_enable suid makeinstall-setuid)
 		$(multilib_native_use_with readline)
 		$(multilib_native_use_with slang)
-		$(multilib_native_use_with systemd)
-		$(multilib_native_use_with udev)
 		$(multilib_native_usex ncurses "$(use_with magic libmagic)" '--without-libmagic')
 		$(multilib_native_usex ncurses "$(use_with unicode ncursesw)" '--without-ncursesw')
 		$(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses')
@@ -235,6 +235,18 @@ multilib_src_configure() {
 		$(use_with selinux)
 	)
 
+	if use build ; then
+		myeconfargs+=(
+			--without-systemd
+			--without-udev
+		)
+	else
+		myeconfargs+=(
+			$(multilib_native_use_with systemd)
+			$(multilib_native_use_with udev)
+		)
+	fi
+
 	if multilib_is_native_abi ; then
 		myeconfargs+=(
 			--disable-chfn-chsh