gentoo auto-resync : 25:10:2024 - 04:04:26

25 files changed, 320 insertions, 484 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index d7e0e9211b48..6942556ed00f 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/flatpak/Manifest b/sys-apps/flatpak/Manifest
index 234102b4c86b..c787d82291f8 100644
--- a/sys-apps/flatpak/Manifest
+++ b/sys-apps/flatpak/Manifest
@@ -1,14 +1,6 @@
 AUX flatpak-1.14.4-fuse-3-slotted.patch 2044 BLAKE2B 338410cf66583755bcb4924e7b89adcd51a8f78d6e31edc5ea80fe74ec257e0d3d0f1e7802962ec65836ce6152b2a39baed379be335811da70dc5f700105a59e SHA512 eeddad1b19099d3f9f8442ad7c570bea2503ac7118b821152d7ecf7f8b3bb4d40403d5460b3dc20dc745f9c2cadce6045a8a52fac15fcfc370c5bff0a0305697
 AUX flatpak-update.service 215 BLAKE2B 803cd26340f06385a753fe29346e464c97cd5bb8045d75ebf2f48b05cbe16f2eaad6f64186ffcdb72eb8b2747a0b43f620fb5a728531c338063e6f2cd2e5627e SHA512 2391f0eed3b5e9d6a48ae043b3165b75f4ecb2ca51ffccfdc61d5b21b11b96cb677420eb4d886f85f2e8d083833ab6149f8007f905a55ae8323ebc7c490490f2
 AUX flatpak-update.timer 122 BLAKE2B 1a353a6dee620b5b031451c17e53522b9a4f7f19c2ae85b5ed39615645c4572783bc981002eded8d30a438731bd782a2b405d62656ee3336b7e51cf08a8ef411 SHA512 147296decb8f6d0b07065bb67d96388501aadfbc0de19250d2f3ee0c3585e8c1c702b380d40cd06e4a47ab9b683ad62c29e54c955ac26a735fc0c5b2bc9df2ee
-DIST flatpak-1.12.8.tar.xz 1568984 BLAKE2B 6db457eba6b5c03ae4b7037e55f0537821152a80cad8746939fe93008922a9a33ff9f08635613e56a84f2d151826130c497c1e9f7f1e41a5b2dc215882f2eb14 SHA512 5a37d94e12c18a746b222c1ddbd20bddfb22079af1d3a79dc819cdb25f04774c9e4b3a51f9b5ed64f210317e7ec9fb97324ae38ec3430c6a515ba4042805fc57
 DIST flatpak-1.14.10.tar.xz 1647100 BLAKE2B 7a2f8f86c7f9f509e5ea0d45b3171b3fc74d190c1f99d466d31bc032ba2671cc9ecb0b72a3d7993c350a79b9f36bfb76eac39638e165a887214849e0aa8a1858 SHA512 512c8545aea310aa14450f45704a57cd6fbf1d53e9497f210335e4767ac5d8b2030af17f2ee055b33d287ee5c8b761f0cc9c5f10361faab43c2422da2b354a3d
-DIST flatpak-1.14.4.tar.xz 1637484 BLAKE2B cf208c581ad76d46489ba473d290c35907da0d1d473bf2b4792fb56c31e7110cd38f1c6fc4ad04aa3675868d17116ba52a84b028d7b7789c1736cfe26f3cabfe SHA512 3f97096affd4f1de184ded353f1ab403d9f1813b199b9a1595596cc7c5d6b46062aa2ef184255823f50ae95ca60d0542d9b9e520f9a605f9bc51091863bf89b0
-DIST flatpak-1.14.6.tar.xz 1644056 BLAKE2B 68bc8bdaf1d1c8a6046a06f800d41c1603e691e60a90f070c694501d50ee6fba3ad1978e222d22a9f99e2b85de9154e670149227b0f2ea6543483c2d103b5093 SHA512 d858682dbf539afe1b91087b6a0e0ebeea6658a0ef02c96d68259f3d8c58d1e6d02dd8b69db1b3c55f6d5df0f4d7e41c6165f668f09763dd3f9c3beb48f8bcf5
-DIST flatpak-1.14.8.tar.xz 1698728 BLAKE2B aecfe77371ec2479ab12f46035213d6cfb672fe9fb1882a3225ae3ee8d3bd23e96848061bc1c778265f3ff4daf369eb19e584f36f804107543b0287f774997f1 SHA512 a34d539f4ed0682459a22afa282de36da964a3545abd78138d3d86d9464d67cb57479f93bf84d1a9d811b80e72e0ea11f64293cb09a559fd5ec2c957be1729a1
-EBUILD flatpak-1.12.8.ebuild 2525 BLAKE2B 9418a05e30311a3af4656e4957afdd4f700b3a8a57a129ecf59c9f9005fb8d9baca8fb496ee15319343856270bc5cf27c76377f1a5d6a7defd7b1086344bfe9f SHA512 e743fb13d1faf2939eb9a1eb0e9c48d19cc1a69136eb46275251822c2df242dd02c8536511e82a8c3516bdd5386c86f880de87f8f27600aa2240798a0ebb63c0
-EBUILD flatpak-1.14.10.ebuild 2860 BLAKE2B 67c1fe91bcd3ea88b199074a3527d8b2847943ad5cc450580c8346885c627b29f5850a84716dca6dc2b3da2de2777565458f989a2fc93d96069f8cd2c7ddfaa9 SHA512 4fa4bf832a0308bf73b94f45ae3733528b47244075630a22820fcbd5b8d0e4aff8c98a061f8cc389969ec4e92e675df76aadd336d2b54583d8e1d1c4035e1e91
-EBUILD flatpak-1.14.4-r3.ebuild 2752 BLAKE2B 19d048372d4dc159697de9440ea5cbf3c79f42b146e2529d5e0f5192b7c8c9dfe7e266792087034f75a28813b1c4b0de8291567581e2b64b2dab62e3ef78bef8 SHA512 731dd34eb42f8ad8e1dca7ca935b1c2f61e5d6332df88448940cf557aedc5a25411cc7b752cd9380b7845d3a0a4903dfe1eaf1c951e4983150526b99b481b5ee
-EBUILD flatpak-1.14.6.ebuild 2856 BLAKE2B 1e077de7089564809fa33b3fb0c12f66397602ad6c5d0cc2e0aa432b7fde20dc876f47421dfd5e762eda1edb288617c37ada20a4349f0b5b5917209fbe2968d3 SHA512 f7ff2b181d7d1db73162ae03198684a296ea70dd905d322a04aba5e14d0c68e161c146f0f4ee53b244d1fbf73511b90efb37c241271638f9c2d3bb7bc7d1a4b8
-EBUILD flatpak-1.14.8.ebuild 2859 BLAKE2B 821b169e47ec599dd0399bc596cf8139bc1c59f6e3d4615e105407e8ff81a017eb3442e4bb9217a09f41c7f1971380306cc31413b381a92f27b6418ebe519453 SHA512 1996d01dfca540116494a25c038290f8fde19205d8151687e83f1b8d77a5515fa50147e3844307659cca8367a1b67af30f55765d0ab58deb0fc0359d3b4ba141
+EBUILD flatpak-1.14.10.ebuild 2857 BLAKE2B a022a62a5203e5cc08c8260f4aeacbb849cfdc12921db98da6ef4a6da4e675b69642f724d20e3a7e9f3e68d14673e629b7be9cde46e15785414873dbea948f00 SHA512 6645a3cfe010559b61148885675b68b041c040d7994943939707ab6ad50a286240176b444f252a20e3a2bc856085c5870bf4fc6edd5f7323df21bc6a1df2e76c
 MISC metadata.xml 325 BLAKE2B a8ca5c0feaab721a66653a8d5e084d2bba127d75faa0975a4dac7d4d7395801fc69bed88bf13663826188696ee5e25e18afc1b0d5161d27e15f36b9c88487146 SHA512 2736f22e733f2214b80c46b3280f90103e21c3211bea129614bcf372f05803b5d5148d34406e8aa332f7b21090e8aaa698bb1a25d767ccea21d3977f0894f464
diff --git a/sys-apps/flatpak/flatpak-1.12.8.ebuild b/sys-apps/flatpak/flatpak-1.12.8.ebuild
deleted file mode 100644
index 6bc1f0bd87d5..000000000000
--- a/sys-apps/flatpak/flatpak-1.12.8.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 2020-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{10,11} )
-
-inherit linux-info python-any-r1
-
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz"
-DESCRIPTION="Linux application sandboxing and distribution framework"
-HOMEPAGE="https://flatpak.org/"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE="doc introspection policykit seccomp systemd X"
-RESTRICT="test"
-
-RDEPEND="
-	acct-group/flatpak
-	acct-user/flatpak
-	>=app-arch/libarchive-2.8:=
-	app-arch/zstd:=
-	>=app-crypt/gpgme-1.1.8:=
-	>=dev-libs/appstream-glib-0.5.10:=
-	>=dev-libs/glib-2.56:2=
-	>=dev-libs/libxml2-2.4:=
-	dev-libs/json-glib:=
-	dev-libs/libassuan:=
-	>=dev-util/ostree-2020.8:=[gpg(+)]
-	|| (
-		dev-util/ostree[curl]
-		dev-util/ostree[soup]
-	)
-	>=gnome-base/dconf-0.26:=
-	gnome-base/gsettings-desktop-schemas
-	>=net-libs/libsoup-2.4:2.4=
-	>=sys-apps/bubblewrap-0.5.0
-	sys-apps/dbus
-	>=sys-fs/fuse-2.9.9:0=
-	sys-apps/xdg-dbus-proxy
-	X? (
-		x11-apps/xauth
-		x11-libs/libXau:=
-	)
-	x11-libs/gdk-pixbuf:2=
-	policykit? ( >=sys-auth/polkit-0.98:= )
-	seccomp? ( sys-libs/libseccomp:= )
-	systemd? ( sys-apps/systemd:= )
-"
-
-DEPEND="${RDEPEND}"
-# pyparsing version pinned for https://bugs.gentoo.org/825230
-BDEPEND="
-	>=dev-build/automake-1.13.4
-	>=sys-devel/gettext-0.18.2
-	virtual/pkgconfig
-	dev-util/gdbus-codegen
-	app-alternatives/yacc
-	introspection? ( >=dev-libs/gobject-introspection-1.40 )
-	doc? (
-		>=dev-util/gtk-doc-1.20
-		dev-libs/libxslt
-	)
-	$(python_gen_any_dep 'dev-python/pyparsing[${PYTHON_USEDEP}]')
-"
-
-PDEPEND="sys-apps/xdg-desktop-portal"
-
-python_check_deps() {
-	has_version -b "dev-python/pyparsing[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	local CONFIG_CHECK="~USER_NS"
-	linux-info_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	# This line fails because locales are in /usr/lib/locale/locale-archive.
-	sed -i 's:^cp -r /usr/lib/locale/C.*:#\0:' tests/make-test-runtime.sh || die
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-sandboxed-triggers
-		--localstatedir="${EPREFIX}"/var
-		--with-system-bubblewrap
-		--with-system-dbus-proxy
-		$(use_enable X xauth)
-		$(use_enable doc documentation)
-		$(use_enable doc gtk-doc)
-		$(use_enable introspection)
-		$(use_enable policykit system-helper)
-		$(use_enable seccomp)
-		$(use_with systemd)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	# resolve conflict with acct-user/flatpak for #856706
-	rm -rf "${ED}/usr/lib/sysusers.d"
-}
diff --git a/sys-apps/flatpak/flatpak-1.14.10.ebuild b/sys-apps/flatpak/flatpak-1.14.10.ebuild
index 79a5ad2cbdee..b0d6213c2395 100644
--- a/sys-apps/flatpak/flatpak-1.14.10.ebuild
+++ b/sys-apps/flatpak/flatpak-1.14.10.ebuild
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
 IUSE="doc introspection policykit seccomp systemd X"
 RESTRICT="test"
 
diff --git a/sys-apps/flatpak/flatpak-1.14.4-r3.ebuild b/sys-apps/flatpak/flatpak-1.14.4-r3.ebuild
deleted file mode 100644
index 56f002420b8c..000000000000
--- a/sys-apps/flatpak/flatpak-1.14.4-r3.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 2020-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{10,11} )
-
-inherit linux-info python-any-r1 systemd
-
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz"
-DESCRIPTION="Linux application sandboxing and distribution framework"
-HOMEPAGE="https://flatpak.org/"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-IUSE="doc introspection policykit seccomp systemd X"
-RESTRICT="test"
-
-RDEPEND="
-	acct-group/flatpak
-	acct-user/flatpak
-	>=app-arch/libarchive-2.8:=
-	app-arch/zstd:=
-	>=app-crypt/gpgme-1.1.8:=
-	>=dev-libs/appstream-0.12:=
-	>=dev-libs/appstream-glib-0.5.10:=
-	>=dev-libs/glib-2.56:2=
-	>=dev-libs/libxml2-2.4:=
-	dev-libs/json-glib:=
-	dev-libs/libassuan:=
-	>=dev-util/ostree-2020.8:=[gpg(+)]
-	dev-util/ostree[curl]
-	>=gnome-base/dconf-0.26:=
-	gnome-base/gsettings-desktop-schemas
-	net-misc/curl:=
-	>=sys-apps/bubblewrap-0.5.0
-	sys-apps/dbus
-	>=sys-fs/fuse-3.1.1:3=
-	sys-apps/xdg-dbus-proxy
-	X? (
-		x11-apps/xauth
-		x11-libs/libXau:=
-	)
-	x11-libs/gdk-pixbuf:2=
-	policykit? ( >=sys-auth/polkit-0.98:= )
-	seccomp? ( sys-libs/libseccomp:= )
-	systemd? ( sys-apps/systemd:= )
-"
-
-DEPEND="${RDEPEND}"
-BDEPEND="
-	>=dev-build/automake-1.13.4
-	>=sys-devel/gettext-0.18.2
-	virtual/pkgconfig
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	app-alternatives/yacc
-	$(python_gen_any_dep 'dev-python/pyparsing[${PYTHON_USEDEP}]')
-	introspection? ( >=dev-libs/gobject-introspection-1.40 )
-	doc? (
-		app-text/xmlto
-		dev-libs/libxslt
-	)
-"
-
-PDEPEND="sys-apps/xdg-desktop-portal"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.14.4-fuse-3-slotted.patch
-)
-
-python_check_deps() {
-	python_has_version "dev-python/pyparsing[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	local CONFIG_CHECK="~USER_NS"
-	linux-info_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	# This line fails because locales are in /usr/lib/locale/locale-archive.
-	sed -i 's:^cp -r /usr/lib/locale/C.*:#\0:' tests/make-test-runtime.sh || die
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-sandboxed-triggers
-		--localstatedir="${EPREFIX}"/var
-		--with-system-bubblewrap
-		--with-system-dbus-proxy
-		$(use_enable X xauth)
-		$(use_enable doc documentation)
-		$(use_enable doc docbook-docs)
-		$(use_enable introspection)
-		$(use_enable policykit system-helper)
-		$(use_enable seccomp)
-		$(use_with systemd)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	# https://projects.gentoo.org/qa/policy-guide/installed-files.html#pg0303
-	find "${ED}" -name '*.la' -delete || die
-	# resolve conflict with acct-user/flatpak for #856706
-	rm -rf "${ED}/usr/lib/sysusers.d"
-
-	if use systemd; then
-	   systemd_dounit "${FILESDIR}"/flatpak-update.{service,timer}
-	fi
-}
diff --git a/sys-apps/flatpak/flatpak-1.14.6.ebuild b/sys-apps/flatpak/flatpak-1.14.6.ebuild
deleted file mode 100644
index 885f0b2ae068..000000000000
--- a/sys-apps/flatpak/flatpak-1.14.6.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 2020-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit linux-info python-any-r1 systemd tmpfiles
-
-DESCRIPTION="Linux application sandboxing and distribution framework"
-HOMEPAGE="https://flatpak.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="doc introspection policykit seccomp systemd X"
-RESTRICT="test"
-
-RDEPEND="
-	acct-group/flatpak
-	acct-user/flatpak
-	>=app-arch/libarchive-2.8:=
-	app-arch/zstd:=
-	>=app-crypt/gpgme-1.1.8:=
-	>=dev-libs/appstream-0.12:=
-	>=dev-libs/appstream-glib-0.5.10:=
-	>=dev-libs/glib-2.56:2=
-	>=dev-libs/libxml2-2.4:=
-	dev-libs/json-glib:=
-	dev-libs/libassuan:=
-	>=dev-util/ostree-2020.8:=[gpg(+)]
-	dev-util/ostree[curl]
-	>=gnome-base/dconf-0.26:=
-	gnome-base/gsettings-desktop-schemas
-	net-misc/curl:=
-	>=sys-apps/bubblewrap-0.5.0
-	sys-apps/dbus
-	>=sys-fs/fuse-3.1.1:3=
-	sys-apps/xdg-dbus-proxy
-	X? (
-		x11-apps/xauth
-		x11-libs/libXau:=
-	)
-	x11-libs/gdk-pixbuf:2=
-	policykit? ( >=sys-auth/polkit-0.98:= )
-	seccomp? ( sys-libs/libseccomp:= )
-	systemd? ( sys-apps/systemd:= )
-"
-
-DEPEND="${RDEPEND}"
-BDEPEND="
-	>=dev-build/automake-1.13.4
-	>=sys-devel/gettext-0.18.2
-	virtual/pkgconfig
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	app-alternatives/yacc
-	$(python_gen_any_dep 'dev-python/pyparsing[${PYTHON_USEDEP}]')
-	introspection? ( >=dev-libs/gobject-introspection-1.40 )
-	doc? (
-		app-text/xmlto
-		dev-libs/libxslt
-	)
-"
-
-PDEPEND="sys-apps/xdg-desktop-portal"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.14.4-fuse-3-slotted.patch
-)
-
-python_check_deps() {
-	python_has_version "dev-python/pyparsing[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	local CONFIG_CHECK="~USER_NS"
-	linux-info_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	# This line fails because locales are in /usr/lib/locale/locale-archive.
-	sed -i 's:^cp -r /usr/lib/locale/C.*:#\0:' tests/make-test-runtime.sh || die
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-sandboxed-triggers
-		--localstatedir="${EPREFIX}"/var
-		--with-system-bubblewrap
-		--with-system-dbus-proxy
-		--with-tmpfilesdir="/usr/lib/tmpfiles.d"
-		$(use_enable X xauth)
-		$(use_enable doc documentation)
-		$(use_enable doc docbook-docs)
-		$(use_enable introspection)
-		$(use_enable policykit system-helper)
-		$(use_enable seccomp)
-		$(use_with systemd)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	# https://projects.gentoo.org/qa/policy-guide/installed-files.html#pg0303
-	find "${ED}" -name '*.la' -delete || die
-	# resolve conflict with acct-user/flatpak for #856706
-	rm -rf "${ED}/usr/lib/sysusers.d"
-
-	if use systemd; then
-	   systemd_dounit "${FILESDIR}"/flatpak-update.{service,timer}
-	fi
-}
-
-pkg_postinst() {
-	tmpfiles_process flatpak.conf
-}
diff --git a/sys-apps/flatpak/flatpak-1.14.8.ebuild b/sys-apps/flatpak/flatpak-1.14.8.ebuild
deleted file mode 100644
index 71f8492997bb..000000000000
--- a/sys-apps/flatpak/flatpak-1.14.8.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 2020-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit linux-info python-any-r1 systemd tmpfiles
-
-DESCRIPTION="Linux application sandboxing and distribution framework"
-HOMEPAGE="https://flatpak.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="doc introspection policykit seccomp systemd X"
-RESTRICT="test"
-
-RDEPEND="
-	acct-group/flatpak
-	acct-user/flatpak
-	>=app-arch/libarchive-2.8:=
-	app-arch/zstd:=
-	>=app-crypt/gpgme-1.1.8:=
-	>=dev-libs/appstream-0.12:=
-	>=dev-libs/appstream-glib-0.5.10:=
-	>=dev-libs/glib-2.56:2=
-	>=dev-libs/libxml2-2.4:=
-	dev-libs/json-glib:=
-	dev-libs/libassuan:=
-	>=dev-util/ostree-2020.8:=[gpg(+)]
-	dev-util/ostree[curl]
-	>=gnome-base/dconf-0.26:=
-	gnome-base/gsettings-desktop-schemas
-	net-misc/curl:=
-	>=sys-apps/bubblewrap-0.5.0
-	sys-apps/dbus
-	>=sys-fs/fuse-3.1.1:3=
-	sys-apps/xdg-dbus-proxy
-	X? (
-		x11-apps/xauth
-		x11-libs/libXau:=
-	)
-	x11-libs/gdk-pixbuf:2=
-	policykit? ( >=sys-auth/polkit-0.98:= )
-	seccomp? ( sys-libs/libseccomp:= )
-	systemd? ( sys-apps/systemd:= )
-"
-
-DEPEND="${RDEPEND}"
-BDEPEND="
-	>=dev-build/automake-1.13.4
-	>=sys-devel/gettext-0.18.2
-	virtual/pkgconfig
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	app-alternatives/yacc
-	$(python_gen_any_dep 'dev-python/pyparsing[${PYTHON_USEDEP}]')
-	introspection? ( >=dev-libs/gobject-introspection-1.40 )
-	doc? (
-		app-text/xmlto
-		dev-libs/libxslt
-	)
-"
-
-PDEPEND="sys-apps/xdg-desktop-portal"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.14.4-fuse-3-slotted.patch
-)
-
-python_check_deps() {
-	python_has_version "dev-python/pyparsing[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	local CONFIG_CHECK="~USER_NS"
-	linux-info_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	# This line fails because locales are in /usr/lib/locale/locale-archive.
-	sed -i 's:^cp -r /usr/lib/locale/C.*:#\0:' tests/make-test-runtime.sh || die
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-sandboxed-triggers
-		--localstatedir="${EPREFIX}"/var
-		--with-system-bubblewrap
-		--with-system-dbus-proxy
-		--with-tmpfilesdir="/usr/lib/tmpfiles.d"
-		$(use_enable X xauth)
-		$(use_enable doc documentation)
-		$(use_enable doc docbook-docs)
-		$(use_enable introspection)
-		$(use_enable policykit system-helper)
-		$(use_enable seccomp)
-		$(use_with systemd)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	# https://projects.gentoo.org/qa/policy-guide/installed-files.html#pg0303
-	find "${ED}" -name '*.la' -delete || die
-	# resolve conflict with acct-user/flatpak for #856706
-	rm -rf "${ED}/usr/lib/sysusers.d"
-
-	if use systemd; then
-	   systemd_dounit "${FILESDIR}"/flatpak-update.{service,timer}
-	fi
-}
-
-pkg_postinst() {
-	tmpfiles_process flatpak.conf
-}
diff --git a/sys-apps/fwupd-efi/Manifest b/sys-apps/fwupd-efi/Manifest
index ea47a1f18c95..bc34a3854be0 100644
--- a/sys-apps/fwupd-efi/Manifest
+++ b/sys-apps/fwupd-efi/Manifest
@@ -1,4 +1,4 @@
 DIST fwupd-efi-1.6.tar.xz 39940 BLAKE2B 906f90a3187fb7d180dab22941d255220e3d56c2058ff6a5a260b0cd62c90e9c784a7c091da376111f23d02561abdec71958afec63c54134a77aac71deec20bc SHA512 37d3c1348bdead620e626a3e602dc6cd774c47d24ca18a3bf6aee071300d658bc4d37e6ec74fcd20f9b345141d69ea3343d44b9408af4759ad65ef10b72ead69
-EBUILD fwupd-efi-1.6-r1.ebuild 1332 BLAKE2B 0368d1956928cc48a3d68036ed1e457f6e92520a4a3afb739ab17af7577d87a89cbdb8e0c398e2839e165111d6088d718931a43803cef94282ea58f43380b280 SHA512 7d611f04ffe2aabd57b545cd675151290ac0830babba3f7c3aec672dc1e75a7201127ca5d1daad1ecab1e4d1c682ede512e5545010be3666cfb2fb4b7e096bc6
+EBUILD fwupd-efi-1.6-r1.ebuild 1330 BLAKE2B 7d531b65f97a899a92c5e803a8361f49ff6994041b2fa8bbc2526e703d1ad48465ef33c0cf3eb4c804786c029a1d0929a458368f7df5db2de2081c2a49c69e4a SHA512 df3a65b805c2f56a0baa95de6ffef8681b0876add2d4163273553fb863c20314e3614b491b7ae5a10362c4b48d292ee1a348aa8afb96dfb774d70a9aace9923a
 EBUILD fwupd-efi-1.6.ebuild 1330 BLAKE2B 4d2da70e00f480eab73d32e3fe0cbfc85e3610ab77d21c1a2c592dd0061e95d477fbfbefb7dff2b473f51deec6f2ba7cc2802dc75e651d07d1b8d5d5dc168f38 SHA512 64ef4230409cbd29d21286d950ed5d2c3dc641322c110aa355aec4c634767bd4fa588e55287f289f0596d0a5b846c85df86e4eddca52b1a95745488e07855035
 MISC metadata.xml 542 BLAKE2B d6450de7092700354813ce3018126ffa6ef34c0f7c1bf5eea4725c38b1bb10b21197d5d0df490519da7912c99e75c21580cdcd6d3f3ac994c1fa09cd3b87fdbc SHA512 dfd428948fb52e82ac9ddf595601bd434ed1cbc3a8eb1affb99c5ec1c23e53994c006182e06291fed7b754619cdfa0121faa8027a6e73e9334a713886d919cf9
diff --git a/sys-apps/fwupd-efi/fwupd-efi-1.6-r1.ebuild b/sys-apps/fwupd-efi/fwupd-efi-1.6-r1.ebuild
index 7406eca63ae0..be453697ddda 100644
--- a/sys-apps/fwupd-efi/fwupd-efi-1.6-r1.ebuild
+++ b/sys-apps/fwupd-efi/fwupd-efi-1.6-r1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = *9999 ]]; then
 	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 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 fi
 
 LICENSE="LGPL-2.1+"
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index 1e7a817b8232..588ad45ea57b 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -3,5 +3,5 @@ AUX fwupd-r2 308 BLAKE2B 4494e69515347569965f0966ce2fe0779a6273df18412b4f6045c61
 DIST fwupd-1.9.23.tar.xz 4300104 BLAKE2B d084244f99b5edccf4bf6a783846623876e9b4344c05bfe3cd412235bcde63d1f36db5528572e371fd0bde27f72c2bd61ba7b6472504ade4c9a068a00e34ca4e SHA512 379adcc79d40795f4895749bc944689ffee6fadc7c3dd1974df98c15120ca47d020ad4efabc68d0371cb36ebd3b549698c05a81bee0a673745a867bb32c4eeb5
 DIST fwupd-1.9.24.tar.xz 4305048 BLAKE2B 5ac7bbc5cdcee13a39fe25cd5b83dfbb9615e6349cd39e8b25cc654c0318870de603c1f6ce550da6662d3f9cd7d275cf6254058f6b71dcb9f7916329147ab771 SHA512 2f9935bbfc3ffc49bf0939a75dd52861eea9108d8f7026dbcdf4c07ad234f70f0b1cb6740eefe555dc2a49aba1ea4d65a78427aad7a0ba9de1fe318734255bfe
 EBUILD fwupd-1.9.23.ebuild 5381 BLAKE2B 38ada083d022ac68cdaa9c40b04ed6c649f78eebab0253d65ad5e03a1793d06447a3c01ed83a71bb996ecffbceb9c5102ef84a05c1d55d147e135f2aa5ab042f SHA512 72f48d900e3bfadd4b81fd68abf172647c17bf206dba8e8afbd92fc78807793039d9af1c28935522ad2ef85f3b7f18ff5861d6365f37cd57274be6372eff3e6e
-EBUILD fwupd-1.9.24.ebuild 5384 BLAKE2B 7b53c04b0ef8ed45490ed0053169827e4eb901f285ea641448ac34ce995744108485e4eda15277abc8fef28d2284881675a07b704c618e6f2774bbc9d2121270 SHA512 1432bdaa43f7835f55295853bf5165a301a1d8b1b284d4cc7686649e2b63e2ca68de41f58ae70c8f5259cc404177bd4f2fc34fc54a37fc990f1d7b3cd30c6f14
+EBUILD fwupd-1.9.24.ebuild 5381 BLAKE2B 3bfa54ed795adc8c200dd888891a88c72b4f32576a11d42e859629f43c0b099c9e04a9f183ae4870834c788ecda39b9c5a12391e19421a2a1c12e0e40cf8ab69 SHA512 5250d74f29a7fbabb25d3b42837e4f379069b88d6d597d64321fab7f1db52032cb12bce7826a8a311889ea6d27ebc0503768a8314fe8e170538907f774ecfdf0
 MISC metadata.xml 1674 BLAKE2B b451d794c2be5515f1f5889a88e5c512ab5e8c62f53105b68374cd07007f0032fdb5f99bf2c0c403f4f6ac558fc3fc4513a06cb1acb06dbd321e1e4814c220bf SHA512 e176cca39887ad3eaccf7699c8d8fb8bb76587bec0e797f1952ce8d83bd259e43334870232f9660fe29cf177a2abaa1ca8e8e5527e88ade43e6a7a022510c025
diff --git a/sys-apps/fwupd/fwupd-1.9.24.ebuild b/sys-apps/fwupd/fwupd-1.9.24.ebuild
index 27af56f8a6be..b9207dbe5c14 100644
--- a/sys-apps/fwupd/fwupd-1.9.24.ebuild
+++ b/sys-apps/fwupd/fwupd-1.9.24.ebuild
@@ -13,7 +13,7 @@ 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"
+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 )
diff --git a/sys-apps/moar/Manifest b/sys-apps/moar/Manifest
index 1218afd45e9d..11e4fbf720a9 100644
--- a/sys-apps/moar/Manifest
+++ b/sys-apps/moar/Manifest
@@ -9,5 +9,5 @@ DIST moar-1.27.2.tar.gz 2843838 BLAKE2B 600b070ac47a002cb96f4b87bc5f48a9d6ad5920
 EBUILD moar-1.24.6.ebuild 1141 BLAKE2B 6837c1c68e6c64e83a6fc3d51e0699676444231359a74e55e8229a83d41cbb59d30d22cf381c722cc34b857bb1680d104f83e0bf6163496be8538b1f85dafcd9 SHA512 4674a8715b00da1fa5ef4a3497c7df1cad6bb239445fd58ca4cd0883fc4a90bd095fc443555ad956f57b0070035bf1397ad93ca87e90db5e7d2f7f242e45cce6
 EBUILD moar-1.26.0.ebuild 1141 BLAKE2B 6837c1c68e6c64e83a6fc3d51e0699676444231359a74e55e8229a83d41cbb59d30d22cf381c722cc34b857bb1680d104f83e0bf6163496be8538b1f85dafcd9 SHA512 4674a8715b00da1fa5ef4a3497c7df1cad6bb239445fd58ca4cd0883fc4a90bd095fc443555ad956f57b0070035bf1397ad93ca87e90db5e7d2f7f242e45cce6
 EBUILD moar-1.27.1.ebuild 1143 BLAKE2B 3b995dadce97cddd595cc95ebcc290651b0c94255eae7d6fd36e9b8029764fb981dab2728a3ed808f9438080f5b3f0727474fe4051bd2f704e21df48a3437b90 SHA512 c29255a40fdec0fd4f37afd2d899e4ff9ed435ec5b5b14656ddbc4039572c56196dd597f61e444963096d1e0051f7e83a0ad2c4e5bc863cb8a141e134b4b1071
-EBUILD moar-1.27.2.ebuild 1143 BLAKE2B 3b995dadce97cddd595cc95ebcc290651b0c94255eae7d6fd36e9b8029764fb981dab2728a3ed808f9438080f5b3f0727474fe4051bd2f704e21df48a3437b90 SHA512 c29255a40fdec0fd4f37afd2d899e4ff9ed435ec5b5b14656ddbc4039572c56196dd597f61e444963096d1e0051f7e83a0ad2c4e5bc863cb8a141e134b4b1071
+EBUILD moar-1.27.2.ebuild 1142 BLAKE2B 7e5d94151856eca77b12bb2b77d138b7b9738bbeb761506cc35764f52ed5e40f8d6639d1d15e4b2b7326bd72f52a995f006b62550620806191384101fd6b3cdb SHA512 678d682d88836fd220beb13336f1ac6b5508901fb041076d6a19e5cc0a653fa28780fbe8041d5245caab854661903c56f5968503efd4617217e53ae67b4270d2
 MISC metadata.xml 316 BLAKE2B 19b5d071afbcad1f05744cca494156dc634f3fc35afaf4828dcf1e691e75a0f47f162b6cf548e5a333441f25327970f6a71d6acb436b60a68deeb7fb44659d45 SHA512 44155ffd972d79d47e41fe2ed38583e41eaaeb9f6b0de7e52b666930906f561e73d1f604acf602750ae1bed50e516dbbe36327b47ba2005813438e0d2db070e1
diff --git a/sys-apps/moar/moar-1.27.2.ebuild b/sys-apps/moar/moar-1.27.2.ebuild
index 928e03d26244..991f5c4a008e 100644
--- a/sys-apps/moar/moar-1.27.2.ebuild
+++ b/sys-apps/moar/moar-1.27.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-deps.tar
 
 LICENSE="BSD-2 BSD MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-apps/pcmciautils/Manifest b/sys-apps/pcmciautils/Manifest
index 608880935869..59a6934a2bce 100644
--- a/sys-apps/pcmciautils/Manifest
+++ b/sys-apps/pcmciautils/Manifest
@@ -4,5 +4,5 @@ DIST pcmciautils_018-14.debian.tar.xz 11516 BLAKE2B f023fce015a71a09b4b012c0d739
 DIST pcmciautils_018-18.debian.tar.xz 12184 BLAKE2B 88d6d394dddd6973f9d18d1437a541851606a5f7ad5fe2cb1279cbe79bfb624e2d68829dc3733e13b90bc6d45e48ad29ea7b68ddde8f2d597196a2badd1c3d19 SHA512 2081bf550f16aa9e976ea4f8e88c7a3519dfe16935a0165563e070652791ef1ee89bf18e7bdf1fff64027cea2663e1c2531c1802149a47381f51a3764079e442
 DIST pcmciautils_018.orig.tar.gz 48516 BLAKE2B 0b197cdd7d0940e5c0eee2da961f0f4dd972a3178ba5d07a6492185d0ab156cd61f5343c8f9d812cff402f04af76a15baa3db564d14317d3817e5325dd8811fb SHA512 f0af1fc6155686ae61c1c85a6451b032088a3880dfbc05c1d1ed33ca8e975745f9d4bedb0f3ee0a1252461aa008bed8014c73ff850cddd89d930524a6d68d47d
 EBUILD pcmciautils-018_p14.ebuild 1811 BLAKE2B 2b5f3d6d50ed6241504e256bcaffb1663d26ae4bef6559f49b733f7155893ee1cb82478d16a094d491ff95a0edc2ad85e996f87c9ddc634e89204459b1c429ea SHA512 7a58eaf2c5f53f4feb323e4ed7162c661ce0c5f50bf7a0ecd2014edcabb663f6796fd754f2e8dddc31cfbce71708f502cb185654f00ac5a1511d176cf9cdbae2
-EBUILD pcmciautils-018_p18.ebuild 1819 BLAKE2B d1e6bddd97487fc089a3f0f8645166d90b5f25fae1d5397cc0961a704c2df191f470796193333c3a6427471ad2c737c837966909cd7a72946d3a6837cfeb0a9a SHA512 6133e4513a0b558f54049a52bcb423638a5f86785c8d62d334775ea2adce0910be5ee4c5021649aef8317f5ade2548c94ecc758e5027373efd28ead731a8a51b
+EBUILD pcmciautils-018_p18.ebuild 1816 BLAKE2B 0652992782e0f61eb25bf5480750b8687ca6706e166a52130e0727be99165b8f7ccf98c365374f6c6687870d8305f279914951772e339b372b8e4e8ad9ce2cbc SHA512 ff3cc57435d888629fec21b7518c04ef44ef75ae22ffa233140271c0149ebcf6fed684d03ec224960d9a4c548121bc63c75b70ac9d0975871f742314db882dc6
 MISC metadata.xml 245 BLAKE2B 7c3776457ba60210a6b5e9b1a0d81ca8fa5cebad8aa6b06001104cf7bbe9dc65ca4fe70b827f3423fc6d0f6de56d8bb5484580e47331655fd4b07e58e2ced33c SHA512 e05491fb93b9ea6296bd0ebdbf9a8027b413e9d8d798a815c65c566b44cfb76b601a82b6da42a5bcea6d8b9ff31d721248d944891abd71cff844537dd4e50cc4
diff --git a/sys-apps/pcmciautils/pcmciautils-018_p18.ebuild b/sys-apps/pcmciautils/pcmciautils-018_p18.ebuild
index b72fbf77e118..b0151132ddde 100644
--- a/sys-apps/pcmciautils/pcmciautils-018_p18.ebuild
+++ b/sys-apps/pcmciautils/pcmciautils-018_p18.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}"/${PN}-${MY_PV}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ppc ~riscv x86"
 IUSE="debug staticsocket"
 
 RDEPEND="sys-apps/kmod[tools]"
diff --git a/sys-apps/s6-linux-init/Manifest b/sys-apps/s6-linux-init/Manifest
index 82e6ccd02045..939286a8cede 100644
--- a/sys-apps/s6-linux-init/Manifest
+++ b/sys-apps/s6-linux-init/Manifest
@@ -1,3 +1,5 @@
 DIST s6-linux-init-1.1.2.0.tar.gz 60986 BLAKE2B e1becccf2ae54d06e590586c3158ae4ea4ec9a78c942bbdca5aca7320cd3cbbf9fe7e4b711c1c3505027d704dbd5de2185dc4d84bbc2dfc7687ff41c765bb31e SHA512 76376c4d407e665f67f733f1366dbacca58d268ebdbe22a9147cb102d519bd4c5887a345f66db2005d29ed9a841cb5a388c73c7d8df00d984cc4a25b9a813786
+DIST s6-linux-init-1.1.2.1.tar.gz 61073 BLAKE2B ae5d71b3817ef8b2c09d06fb34a8b170a3d63ffd31333bc136f320d31bdcca093915d9711ea018caab85cef0677ef98cd75101671f9a4d72eaba92cbb22c38a8 SHA512 343b6a9bdcf3b1abb544409bb2d7a6c8a1dbcb07d1b941ae74e8800e48ad605c6427f724d7692569b3ade4829948d0e57024c764c18a60c3bb2eb2efefedb622
 EBUILD s6-linux-init-1.1.2.0.ebuild 1765 BLAKE2B 0872560322a1463f204ce7cf0013fd1d94d66a38574da40ae8940f8a06df5eba67661ec5840ff0800f9694bfa689b0d5d132e465fce55549af2f6cbb5627d04f SHA512 22377c3138ca2de279502b50b0d82dc2a7ad7145f69d4f5289fb44ac65dc0efb9153938596108b4ee0cabbfa15b94e200e1ff22c7428d43e8fbee75313710a08
+EBUILD s6-linux-init-1.1.2.1.ebuild 1768 BLAKE2B e57f65dff3ea99cce55f8fa52a493c0c4dfca15d30bc7b2fe31b660ea4b3956109065ae70b170fc7e2d5bcbc675a82385df17619723a47d6dd78fec06ad6ad1c SHA512 4ae68df97ea515f31dde7aaf7d775d604f5e46e98b037d08af89436d2544cd68ed65143c8bc80f6fc591a1099f32b4fd53f4ffa61fc5576a1024231e071b74a0
 MISC metadata.xml 750 BLAKE2B b0b1508188b05b09ab4c8ea338d7db19a41ee23bb0ae69916add81ddd0cd9a6a6591c4b53c9fb92ea88510e9b93fa1cdcfa2d89be51acaa6e3260465311d1c10 SHA512 c2cae5bd406eb008667b178636e96fd44707e1468140fc7c088afdf0fcb9fdcaab6c02a791409985c0425c13cdaa12a222d135a6406aef432b1b3bf2d83da1e6
diff --git a/sys-apps/s6-linux-init/s6-linux-init-1.1.2.1.ebuild b/sys-apps/s6-linux-init/s6-linux-init-1.1.2.1.ebuild
new file mode 100644
index 000000000000..a444a4733a4d
--- /dev/null
+++ b/sys-apps/s6-linux-init/s6-linux-init-1.1.2.1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit optfeature toolchain-funcs
+
+DESCRIPTION="Generates an init binary for s6-based init systems"
+HOMEPAGE="https://www.skarnet.org/software/s6-linux-init/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~mips ~x86"
+IUSE="+sysv-utils"
+
+RDEPEND="
+	dev-lang/execline:=
+	>=dev-libs/skalibs-2.14.0.0:=
+	sys-apps/s6:=[execline]
+	sysv-utils? (
+		!sys-apps/openrc[sysv-utils(-)]
+		!sys-apps/systemd[sysv-utils]
+		!sys-apps/sysvinit
+	)
+"
+DEPEND="${RDEPEND}"
+
+HTML_DOCS=( doc/. )
+
+src_prepare() {
+	default
+
+	# Avoid QA warning for LDFLAGS addition
+	sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
+
+	sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
+}
+
+src_configure() {
+	tc-export AR CC RANLIB
+
+	local myconf=(
+		--bindir=/bin
+		--dynlibdir="/$(get_libdir)"
+		--skeldir=/etc/s6-linux-init/skel
+		--libdir="/usr/$(get_libdir)/${PN}"
+		--libexecdir=/lib/s6
+		--with-dynlib="/$(get_libdir)"
+		--with-lib="/usr/$(get_libdir)/s6"
+		--with-lib="/usr/$(get_libdir)/skalibs"
+		--with-sysdeps="/usr/$(get_libdir)/skalibs"
+		--enable-shared
+		--disable-allstatic
+		--disable-static
+		--disable-static-libc
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	if use sysv-utils ; then
+		"${D}/bin/s6-linux-init-maker" -f "${D}/etc/s6-linux-init/skel" "${T}/dir" || die
+		into /
+		dosbin "${T}/dir/bin"/{halt,poweroff,reboot,shutdown,telinit}
+	fi
+}
+
+pkg_postinst() {
+	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-linux-utils/Manifest b/sys-apps/s6-linux-utils/Manifest
index 7e4e0ab1f1f2..1da8d2b2e7ea 100644
--- a/sys-apps/s6-linux-utils/Manifest
+++ b/sys-apps/s6-linux-utils/Manifest
@@ -1,3 +1,5 @@
 DIST s6-linux-utils-2.6.2.0.tar.gz 43287 BLAKE2B 2dcad4eac6250f7dfb31946baa8b21068297d6723bfd03abb01389183ca7b586db82e12be37acd9d2016923c0c693865153129fc265dd9e00852c1ba0c39c488 SHA512 b7bc96ef3aa81bc01c6ca2a82591201be0966d8aa2b71545c963f67dba8441a05631e0ea593f0a693ee04d6d2637754e9543eddbfe70ed9c0529ff49081aa54d
+DIST s6-linux-utils-2.6.2.1.tar.gz 43317 BLAKE2B d566bcd781d473f59e5e22e55e24897a51c0877f41a9d4357f665273cb85fd1647929bddb2bde7d5dbbb0f353cea675250151cdd8c4f59d0571e8b26587fb8f1 SHA512 d3f796c1edc0de6e289b7b82e8c97ea58e80d0bcb2e4731a5c2c25cf4abfbd91318e33ab48956bc6e7b2f188c622bb33def72e96f22f9448778ede5ac829c940
 EBUILD s6-linux-utils-2.6.2.0.ebuild 987 BLAKE2B 1428d69cccf59932cefb2fc6ac029e79876232601b0395f3dd6ec1a7904137eb7220daec0f4014db377b79c8bcd8ac7d971ff75676f0097d173ffb9fc37ece87 SHA512 dffadb2657af4d31c4b8ec388550661860338dad49dc847a2c7009d37f72eb14f5551bfd94aa194e30b6164a0c44bd62a322d81fc040f9b0ee2fda36f82b7601
+EBUILD s6-linux-utils-2.6.2.1.ebuild 990 BLAKE2B 0fd263e54a81400207488ad72bfc739b30c8cc0c7eda52ec88b0422c74996b6e2ab542319bf678dfc3b51a3dc3e001d6919b54039b73249a8763efbd300dcbbc SHA512 3479dded19129cfb7705de0ad90628a52fd04ff1f46cbf4f7c226ead4e8cccec75ad308576ac822817169cc6154d808917d09af8aee3919be88dd4ecf9203651
 MISC metadata.xml 612 BLAKE2B 5512fe794ae7362a22aab418fd82bcc6f0fc4713dee0657166f045f9c6d0a06e15a1d97ddae56556d996c887a93c401e0874c999b8b5e6bc7a6bb5815ab3921f SHA512 787bcdaaf32e0bda6270e0d21eb0a98e8105055bfe7f681b1bde6ec286df6036a4f4c40641c94341a95d74ff289b7d922774e88605907d64a8f2b1ef5963c689
diff --git a/sys-apps/s6-linux-utils/s6-linux-utils-2.6.2.1.ebuild b/sys-apps/s6-linux-utils/s6-linux-utils-2.6.2.1.ebuild
new file mode 100644
index 000000000000..07b45502749c
--- /dev/null
+++ b/sys-apps/s6-linux-utils/s6-linux-utils-2.6.2.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Set of tiny linux utilities"
+HOMEPAGE="https://www.skarnet.org/software/s6-linux-utils/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND=">=dev-libs/skalibs-2.13.0.0:="
+DEPEND="${RDEPEND}"
+
+HTML_DOCS=( doc/. )
+
+src_prepare() {
+	default
+
+	# Avoid QA warning for LDFLAGS addition
+	sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
+
+	sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
+}
+
+src_configure() {
+	tc-export AR CC RANLIB
+
+	local myconf=(
+		--bindir=/bin
+		--dynlibdir="/$(get_libdir)"
+		--libdir="/usr/$(get_libdir)/${PN}"
+		--with-dynlib="/$(get_libdir)"
+		--with-lib="/usr/$(get_libdir)/skalibs"
+		--with-sysdeps="/usr/$(get_libdir)/skalibs"
+		--disable-allstatic
+		--disable-static
+		--disable-static-libc
+	)
+
+	econf "${myconf[@]}"
+}
diff --git a/sys-apps/s6-portable-utils/Manifest b/sys-apps/s6-portable-utils/Manifest
index 21d2f43a4dc5..bdbe8d14719a 100644
--- a/sys-apps/s6-portable-utils/Manifest
+++ b/sys-apps/s6-portable-utils/Manifest
@@ -1,3 +1,5 @@
 DIST s6-portable-utils-2.3.0.3.tar.gz 51186 BLAKE2B 9a0b9f33a89cca730afc8190ab7be7fc25ed286970b430d33d8eb91d5b6e5ac4261e659674ec44c5e5a88b32a324cb62ee63837923f0a7481675c8eaa3e8804c SHA512 f75242ac6c06ffd5bd66b8a35bbdf39938cf3bfa6e79abd214af37e9e4acc732ca1760566862482bc964a5cca05bbce8bd24d7167b02dc66c5f397c85ee0d37f
+DIST s6-portable-utils-2.3.0.4.tar.gz 51121 BLAKE2B 7b6ad87ba07f99f0b7b1bf32f966d9a45c0c4aca51b37271136c13c0f2e655c95e850189ec8b210ef0878e89916fc6b1f1e6afd30451462598d98afeec7bcd5d SHA512 0da4fb637f414d870e0476a01c08448b021d2c20c9a4746ab1c6c700e8eeb055d57f6e8326228694463483cd307e308f8fe148a615232039f32dcf351d5060ec
 EBUILD s6-portable-utils-2.3.0.3.ebuild 1082 BLAKE2B 49afb8e6580d1e811336769d58073d1c3bdebf3e0c57d71ea8adae200027085e6832bbf008aa69320e1730297fae600fce426e0ff20bbdb0ba4869a6bec572d3 SHA512 74dee334d85ba63f20acd47414d55a4dd9380b360966f04f431e3e3b416d149b299f03bd1467b0041ca5f975ec13758c1070b5aa8096f174a1dfca76666b87f7
+EBUILD s6-portable-utils-2.3.0.4.ebuild 1085 BLAKE2B 30c42cd8802753b9415b84fb5636a2fc0c4c7c72dbe363338b0616a4a645f3b5ba042e460ead2c09f1f64a261e2d7332ccdf42e44cf5b70135186b6a62c86d47 SHA512 3644f0ff31e821692ed049d0fa5448df12060c9bd73fa9bc2f8e1d40b26ad2fe9f06321cebe11885be173997a58db859426a8de910e12e5ecf2b5687762a9228
 MISC metadata.xml 612 BLAKE2B 5512fe794ae7362a22aab418fd82bcc6f0fc4713dee0657166f045f9c6d0a06e15a1d97ddae56556d996c887a93c401e0874c999b8b5e6bc7a6bb5815ab3921f SHA512 787bcdaaf32e0bda6270e0d21eb0a98e8105055bfe7f681b1bde6ec286df6036a4f4c40641c94341a95d74ff289b7d922774e88605907d64a8f2b1ef5963c689
diff --git a/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.4.ebuild b/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.4.ebuild
new file mode 100644
index 000000000000..c342cbb05383
--- /dev/null
+++ b/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.4.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit optfeature toolchain-funcs
+
+DESCRIPTION="Set of tiny portable unix utilities"
+HOMEPAGE="https://www.skarnet.org/software/s6-portable-utils/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+RDEPEND=">=dev-libs/skalibs-2.14.0.0:="
+DEPEND="${RDEPEND}"
+
+HTML_DOCS=( doc/. )
+
+src_prepare() {
+	default
+
+	# Avoid QA warning for LDFLAGS addition
+	sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
+
+	sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
+}
+
+src_configure() {
+	tc-export AR CC RANLIB
+
+	local myconf=(
+		--bindir=/bin
+		--dynlibdir="/$(get_libdir)"
+		--libdir="/usr/$(get_libdir)/${PN}"
+		--with-dynlib="/$(get_libdir)"
+		--with-lib="/usr/$(get_libdir)/skalibs"
+		--with-sysdeps="/usr/$(get_libdir)/skalibs"
+		--disable-allstatic
+		--disable-static
+		--disable-static-libc
+	)
+
+	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 cb1b1fdea673..ce7d55a49df9 100644
--- a/sys-apps/s6-rc/Manifest
+++ b/sys-apps/s6-rc/Manifest
@@ -1,3 +1,5 @@
 DIST s6-rc-0.5.4.3.tar.gz 101738 BLAKE2B fbf69bff42c999af063810fd92467de5357d9405dbb3767064ab1aa12bda1262f5622884a1d547ca4d2c03cb9714f0f53acc4389949c65f606780837dcd0ccf7 SHA512 7a54a32ea1261de79b9494adde74b50dbefce831f5a00f9d3772c9b64fd71918ce54a16dff828de0fb762633255226ca935357f9f31c4264716b7041a5f5f8bb
+DIST s6-rc-0.5.5.0.tar.gz 101915 BLAKE2B 3d6126b72fadd0597e38369b1439e5bdfe6bbfe1c1ada044d98ed83379d94e16e9cc06f99fc5e056b4304fac0cde9f0421ddde9852772588600f5e8b382fea1a SHA512 8769c71eaf1416fb1d2040865585e0c3c7abb0c9732313d3534f82be8f50417500796cda41a434e8a521bff77960ba23009e51080892700a158ae61537303081
 EBUILD s6-rc-0.5.4.3.ebuild 1627 BLAKE2B 9b7f35d16fa9e955d310d9fe0ad39a1da58365709a624b325cfc94a391b5e6e3313aa8012d1a9a937f227c5e130751235c6ce3dab5252abf97623233f8b79c82 SHA512 86a5f5b1ef6aba4a10a7d6d01593eeb2e509568ef7e445cc445dccc534faeddd75c1ade25d15a9afa231223b1bdfe80f4c04930a15299579d2c7dcbb71797588
+EBUILD s6-rc-0.5.5.0.ebuild 1630 BLAKE2B 8201e6c4347b112520ea63c4f0896e6827fe3eac65f2f4de606511d313dfcde4afb52b0601d75c18f0f1aa22704e948d930dbcc77362904d4e8a385e035326ea SHA512 d1b07a88300e79e44e818f3316186009eac0328e63dc3172036d870b22158c233c560d6f4dc17167b91247a24b174960ddf56eef9bbaa8232e8a6974055fcade
 MISC metadata.xml 612 BLAKE2B 5512fe794ae7362a22aab418fd82bcc6f0fc4713dee0657166f045f9c6d0a06e15a1d97ddae56556d996c887a93c401e0874c999b8b5e6bc7a6bb5815ab3921f SHA512 787bcdaaf32e0bda6270e0d21eb0a98e8105055bfe7f681b1bde6ec286df6036a4f4c40641c94341a95d74ff289b7d922774e88605907d64a8f2b1ef5963c689
diff --git a/sys-apps/s6-rc/s6-rc-0.5.5.0.ebuild b/sys-apps/s6-rc/s6-rc-0.5.5.0.ebuild
new file mode 100644
index 000000000000..0a8af8cd7296
--- /dev/null
+++ b/sys-apps/s6-rc/s6-rc-0.5.5.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit optfeature toolchain-funcs
+
+DESCRIPTION="Service manager for the s6 supervision suite"
+HOMEPAGE="https://www.skarnet.org/software/s6-rc/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~x86"
+
+RDEPEND="
+	dev-lang/execline:=
+	>=dev-libs/skalibs-2.14.0.0:=
+	>=sys-apps/s6-2.11.3.0:=[execline]
+"
+DEPEND="${RDEPEND}"
+
+HTML_DOCS=( doc/. )
+
+src_prepare() {
+	default
+
+	# Avoid QA warning for LDFLAGS addition
+	sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
+
+	sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
+}
+
+src_configure() {
+	tc-export AR CC RANLIB
+
+	local myconf=(
+		--bindir=/bin
+		--dynlibdir="/$(get_libdir)"
+		--libdir="/usr/$(get_libdir)/${PN}"
+		--libexecdir=/lib/s6
+		--with-dynlib="/$(get_libdir)"
+		--with-lib="/usr/$(get_libdir)/execline"
+		--with-lib="/usr/$(get_libdir)/s6"
+		--with-lib="/usr/$(get_libdir)/skalibs"
+		--with-sysdeps="/usr/$(get_libdir)/skalibs"
+		--enable-shared
+		--disable-allstatic
+		--disable-static
+		--disable-static-libc
+	)
+
+	econf "${myconf[@]}"
+}
+
+pkg_postinst() {
+	for ver in ${REPLACING_VERSIONS}; do
+		if ver_test "${ver}" -lt "0.5.4.0"; then
+			elog "Location of helper utilities was changed from /usr/libexec to /lib/s6 in"
+			elog "version 0.5.4.0. It is necessary to recompile and update s6-rc database and"
+			elog "restart s6rc-oneshot-runner service because you are upgrading from older"
+			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 7b23780edf35..b16d04f91982 100644
--- a/sys-apps/s6/Manifest
+++ b/sys-apps/s6/Manifest
@@ -1,3 +1,5 @@
 DIST s6-2.13.0.0.tar.gz 256126 BLAKE2B 08c20a6e2268bcecea39f7066f8fcbb61723c4c0ae3772af5362b68f53ed65494b824827779d44d64d204688f03634bdd079f08def5b41a5170d88888e2fbc8a SHA512 b54d334496d79d1b845552f5e7763c536d6f253c9bb2d61802695ea1a596af918562daa230f09f4cbfc06614eff70930d0963439d7d84ec8ae0388291912ca9d
+DIST s6-2.13.1.0.tar.gz 256614 BLAKE2B 806a79e293d50180695beed5c397d60b23e9434dfc48d4bdd835e35e073ef8be2c2105cb421e3329a93ec9855fe86275bf745cffb973a02898d99a58e21b674c SHA512 89912f627d239e9d0b830c97e3b35b0358ac3ea1b3b958de091318e19ee9ca0bac0a008f114682bc0ed8388e15592ffd683c4bbf1128fe7109cad16f18a1065b
 EBUILD s6-2.13.0.0.ebuild 1285 BLAKE2B 13581fc3b1cdc76b9d731ef67e4809b83bc66fed693f96a24fce76f6e0f7a0fb8aa87544b3e4215a93b696709f0fbce9428c7840605e3d13b3cea8b4f9095d0c SHA512 b670466a50c47a978ca8fa9af1bcc188cf15880afa123ec2d51954c0a3a46e4d9923056b0a71bc28501e0942c2a24cf1c31ee3e0759eb0b11387f8607ae31071
+EBUILD s6-2.13.1.0.ebuild 1288 BLAKE2B 19f699ed1a0c334375ef83c6926a54dd2a9f627049478a283dd2907a048096dbd6f2ca868cead060deddbcb75287f2a57e8368bf9e47db0c14168a9a1e4efa09 SHA512 f8014375a11a223e6fe487128c6394e19b35f9696134c32bf3990b35b873453b3e8f58616c61b990f3a6bd205d638db1503b0b56228e7024c724aa6dbfd29fd1
 MISC metadata.xml 871 BLAKE2B 2e6ef16a61c8b9d55bb520adc30479837aae5b85fb2e4ab8e18e0d162ae1e7370dc5823c9a711e92c73620fcc20e4e4a159bd6270f29fe99382163a96dac8c75 SHA512 e1e741d4b13338fb41e1b9fda15e308d84bdd7490a7f98063de4052307703303ac4d313e6ea0673d4095f27041bb62539f986e4ce3ff0ee7133ff319f37d63d9
diff --git a/sys-apps/s6/s6-2.13.1.0.ebuild b/sys-apps/s6/s6-2.13.1.0.ebuild
new file mode 100644
index 000000000000..2dc850cad795
--- /dev/null
+++ b/sys-apps/s6/s6-2.13.1.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit optfeature toolchain-funcs
+
+DESCRIPTION="skarnet.org's small and secure supervision software suite"
+HOMEPAGE="https://www.skarnet.org/software/s6/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+execline"
+
+RDEPEND="
+	>=dev-libs/skalibs-2.14.3.0:=
+	execline? ( dev-lang/execline:= )
+"
+DEPEND="${RDEPEND}"
+
+HTML_DOCS=( doc/. )
+
+src_prepare() {
+	default
+
+	# Avoid QA warning for LDFLAGS addition
+	sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
+
+	sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
+}
+
+src_configure() {
+	tc-export AR CC RANLIB
+
+	local myconf=(
+		--bindir=/bin
+		--dynlibdir="/$(get_libdir)"
+		--libdir="/usr/$(get_libdir)/${PN}"
+		--libexecdir=/lib/s6
+		--with-dynlib="/$(get_libdir)"
+		--with-lib="/usr/$(get_libdir)/execline"
+		--with-lib="/usr/$(get_libdir)/skalibs"
+		--with-sysdeps="/usr/$(get_libdir)/skalibs"
+		--enable-shared
+		--disable-allstatic
+		--disable-static
+		--disable-static-libc
+		$(use_enable execline)
+	)
+
+	econf "${myconf[@]}"
+}
+
+pkg_postinst() {
+	optfeature "man pages" app-doc/s6-man-pages
+}