Merge updates from master

33 files changed, 497 insertions, 25 deletions

diff --git a/app-eselect/eselect-rust/eselect-rust-20210703.ebuild b/app-eselect/eselect-rust/eselect-rust-20210703.ebuild
index d1403550df94..18b15d4d3866 100644
--- a/app-eselect/eselect-rust/eselect-rust-20210703.ebuild
+++ b/app-eselect/eselect-rust/eselect-rust-20210703.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == "99999999" ]] ; then
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
-	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 x86"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 DESCRIPTION="Eselect module for management of multiple Rust versions"
diff --git a/dev-lang/execline/Manifest b/dev-lang/execline/Manifest
index 10cb184b599b..928b92978402 100644
--- a/dev-lang/execline/Manifest
+++ b/dev-lang/execline/Manifest
@@ -1 +1,2 @@
 DIST execline-2.8.3.0.tar.gz 98448 BLAKE2B f3dc1a194838f7973044b2d86e6026936697be4f34f9b01f5dfc98ddabfbde3dad7cfe95afd63f65cb266994b922d7d4c94368cf5dca2a2494fd0033b4ed6032 SHA512 40f4697a8165616848ed36dcb31a5859dee55a47439d13908a387550e8f53ca8fffe3bcb3e0462cb93f694c8fb483b14e152f92e6f9d0d536cdab9d94be9c53a
+DIST execline-2.9.0.0.tar.gz 100225 BLAKE2B a0b0bdde6b827272e55a64a58b28b85d4ec0ecf96eae59f553b7914642d184bc77864f31a84e4584d482893c3851eca419270b41ecc3c4f331e8ef768c90b474 SHA512 bd491ef38c439cfe469a3aeda6d462930b1edcbf04a1118851161c30fcd3521e8ec98ef53261f9216c6f210a6816d6dd7cff6dcc853a5d2f28d963f8083aed84
diff --git a/dev-lang/execline/execline-2.8.3.0.ebuild b/dev-lang/execline/execline-2.8.3.0-r1.ebuild
index 2db001f8d0f1..62307e392904 100644
--- a/dev-lang/execline/execline-2.8.3.0.ebuild
+++ b/dev-lang/execline/execline-2.8.3.0-r1.ebuild
@@ -16,7 +16,7 @@ IUSE="static static-libs"
 
 REQUIRED_USE="static? ( static-libs )"
 
-RDEPEND=">=dev-libs/skalibs-2.11.2.0:=[static-libs?]"
+RDEPEND=">=dev-libs/skalibs-2.11.2.0:=[static-libs(-)?]"
 DEPEND="${RDEPEND}"
 
 HTML_DOCS=( doc/. )
diff --git a/dev-lang/execline/execline-2.9.0.0.ebuild b/dev-lang/execline/execline-2.9.0.0.ebuild
new file mode 100644
index 000000000000..7881d1093e25
--- /dev/null
+++ b/dev-lang/execline/execline-2.9.0.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="A non-interactive scripting language"
+HOMEPAGE="https://www.skarnet.org/software/execline/"
+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-libs/skalibs-2.12.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=/usr/$(get_libdir)
+		--libdir=/usr/$(get_libdir)/${PN}
+		--with-dynlib=/usr/$(get_libdir)
+		--with-lib=/usr/$(get_libdir)/skalibs
+		--with-sysdeps=/usr/$(get_libdir)/skalibs
+		--enable-shared
+		--disable-allstatic
+		--disable-static-libc
+	)
+
+	econf "${myconf[@]}"
+}
diff --git a/dev-lang/rust-bin/rust-bin-1.61.0.ebuild b/dev-lang/rust-bin/rust-bin-1.61.0.ebuild
index 42e2c8640c06..1e31f9b3af8b 100644
--- a/dev-lang/rust-bin/rust-bin-1.61.0.ebuild
+++ b/dev-lang/rust-bin/rust-bin-1.61.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="$(rust_all_arch_uris ${MY_P})
 
 LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
 SLOT="stable"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="clippy cpu_flags_x86_sse2 doc prefix rls rust-src rustfmt"
 
 DEPEND=""
diff --git a/dev-lang/rust/rust-1.61.0-r1.ebuild b/dev-lang/rust/rust-1.61.0-r1.ebuild
index 0d78a06e94e3..f2d87f021ce4 100644
--- a/dev-lang/rust/rust-1.61.0-r1.ebuild
+++ b/dev-lang/rust/rust-1.61.0-r1.ebuild
@@ -19,7 +19,7 @@ else
 	SLOT="stable/${ABI_VER}"
 	MY_P="rustc-${PV}"
 	SRC="${MY_P}-src.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 RUST_STAGE0_VERSION="1.$(($(ver_cut 2) - 1)).0"
diff --git a/dev-libs/skalibs/Manifest b/dev-libs/skalibs/Manifest
index 83dba18533cf..46c99821cf68 100644
--- a/dev-libs/skalibs/Manifest
+++ b/dev-libs/skalibs/Manifest
@@ -1 +1,2 @@
 DIST skalibs-2.11.2.0.tar.gz 219085 BLAKE2B a8aeca79890465784cae5e958d73359544416b11ac3ca4fb412ba00e59db28ee041c745653efb9f1553944974579238b0d9e8e5b3696de9a07d4e2e11333d631 SHA512 174e92be03cfb8ee41d9dc78bfd183a435d01481ad9835b74b38e000012cf6fbadd30f97c27203dbc942102641349626f92000510636dc73f413a5aebd7f7942
+DIST skalibs-2.12.0.1.tar.gz 222717 BLAKE2B f094677bbe2efe4c4dcd4359bdfaafa07dc2d436691517a868870e88a360fed8fe81008ebb5ad6f2737d12764a8313b20c31fb52e0c424174744451eca991d9a SHA512 383961588eeb4934ef68e25764d3e258d7d9f19fdd14156490e8d9e2e111050c92b34b1786d007c269d09f82cd234bdcbecb13ef603c101e9439ce4b77a6e635
diff --git a/dev-libs/skalibs/skalibs-2.12.0.1.ebuild b/dev-libs/skalibs/skalibs-2.12.0.1.ebuild
new file mode 100644
index 000000000000..748bda1854a2
--- /dev/null
+++ b/dev-libs/skalibs/skalibs-2.12.0.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="General-purpose libraries from skarnet.org"
+HOMEPAGE="https://www.skarnet.org/software/skalibs/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="doc ipv6"
+
+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=(
+		--datadir=/etc
+		--dynlibdir=/usr/$(get_libdir)
+		--libdir=/usr/$(get_libdir)/${PN}
+		--sysdepdir=/usr/$(get_libdir)/${PN}
+		--enable-clock
+		--enable-shared
+		$(use_enable ipv6)
+	)
+
+	econf "${myconf[@]}"
+}
diff --git a/net-dns/s6-dns/Manifest b/net-dns/s6-dns/Manifest
index 0557975166a4..e8c6d65fd7cd 100644
--- a/net-dns/s6-dns/Manifest
+++ b/net-dns/s6-dns/Manifest
@@ -1 +1,2 @@
 DIST s6-dns-2.3.5.3.tar.gz 84916 BLAKE2B b315e2319c4b15401a6e41847faefc1798c3a945fc78f1601b06ce13ef0a55ddde270549e0585cac0356f9b1558a1433675dc4c636d1cc58aee434b86bd81627 SHA512 f3984913df65823c4edbeddc2f8c534926e74c5b06c357c394b05b25943ac8c6b4154859c93e182c60228f018522eb6173ece0bd2dbeffe8e1cc6fcbe33f6a76
+DIST s6-dns-2.3.5.4.tar.gz 84892 BLAKE2B 3bba411b297b85fdf5da7caf251b3c093d0e7108fdf16321e510a485e750ef37c6ec1a923e627a81a9719f211e2e284c9b8d3bcf60a4e18738d0886f931e380d SHA512 04c8fd40c71c9517f4e8d847a0ddf7d60a7759b4d7075035c2e00b4eb34e81edf4608df562929042c294ed671ab953e613374b577210ff49841ceb27dd563ae5
diff --git a/net-dns/s6-dns/s6-dns-2.3.5.3.ebuild b/net-dns/s6-dns/s6-dns-2.3.5.3-r1.ebuild
index 14abc3c2c212..f5cabf08e349 100644
--- a/net-dns/s6-dns/s6-dns-2.3.5.3.ebuild
+++ b/net-dns/s6-dns/s6-dns-2.3.5.3-r1.ebuild
@@ -16,7 +16,7 @@ IUSE="static static-libs"
 
 REQUIRED_USE="static? ( static-libs )"
 
-RDEPEND=">=dev-libs/skalibs-2.11.1.0:=[static-libs?]"
+RDEPEND="=dev-libs/skalibs-2.11*:=[static-libs?]"
 DEPEND="${RDEPEND}"
 
 HTML_DOCS=( doc/. )
diff --git a/net-dns/s6-dns/s6-dns-2.3.5.4.ebuild b/net-dns/s6-dns/s6-dns-2.3.5.4.ebuild
new file mode 100644
index 000000000000..3540fb714148
--- /dev/null
+++ b/net-dns/s6-dns/s6-dns-2.3.5.4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Suite of DNS client programs and libraries for Unix systems"
+HOMEPAGE="https://www.skarnet.org/software/s6-dns/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=dev-libs/skalibs-2.12.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=/usr/$(get_libdir)
+		--libdir=/usr/$(get_libdir)/${PN}
+		--with-dynlib=/usr/$(get_libdir)
+		--with-lib=/usr/$(get_libdir)/skalibs
+		--with-sysdeps=/usr/$(get_libdir)/skalibs
+		--enable-shared
+		--disable-allstatic
+		--disable-static-libc
+	)
+
+	econf "${myconf[@]}"
+}
diff --git a/net-misc/s6-networking/Manifest b/net-misc/s6-networking/Manifest
index f3dca2950b68..e9e03e4c193a 100644
--- a/net-misc/s6-networking/Manifest
+++ b/net-misc/s6-networking/Manifest
@@ -1 +1,2 @@
 DIST s6-networking-2.5.1.0.tar.gz 110443 BLAKE2B 489676bcb050d57482b0901742b53ce6cff00e25c1d8effc5c3d96d8e8ad0d32d42a62c15c73155d3b21fcfe6f310fc0f0c020bf945ac1a4b1c7fb9e9785adf4 SHA512 5d64420811d8d8a0034431dccda82b7ddd546f3b7c40ed02e05565c29c3ec14b75477306fea1a1e4aacc898e66e03718d7ac229b85be82d62bfe26c3ffc5fdf8
+DIST s6-networking-2.5.1.1.tar.gz 110431 BLAKE2B 67776a8aa6b02d20ed73c8b8d45e255677c3688973f9ee5f8dcc0de5cfd26146b7ccdc680b22a57e2523d8ab3c08d6e090252e376d09c1edd971a391632d83a0 SHA512 a9c1970cad5b3aeee447cce7c858e8bd88ee378fe456cc68d032f195373dabf658eacf55d9fa39ec635e893116296c1c614b89d97c5045b90dbe745a52e24021
diff --git a/net-misc/s6-networking/s6-networking-2.5.1.0.ebuild b/net-misc/s6-networking/s6-networking-2.5.1.0-r1.ebuild
index 47a1748d6605..47977f15efc7 100644
--- a/net-misc/s6-networking/s6-networking-2.5.1.0.ebuild
+++ b/net-misc/s6-networking/s6-networking-2.5.1.0-r1.ebuild
@@ -17,16 +17,16 @@ IUSE="ssl static static-libs"
 REQUIRED_USE="static? ( static-libs )
 	ssl? ( !static !static-libs )"
 
-RDEPEND=">=dev-lang/execline-2.8.1.0:=[static-libs?]
-	>=dev-libs/skalibs-2.11.0.0:=[static-libs?]
-	>=sys-apps/s6-2.11.0.0:=[execline,static-libs?]
+RDEPEND=">=dev-lang/execline-2.8.1.0:=[static-libs(-)?]
+	=dev-libs/skalibs-2.11*:=[static-libs?]
+	>=sys-apps/s6-2.11.0.0:=[execline,static-libs(-)?]
 	ssl? ( dev-libs/libretls )
 	!static? (
 		>=net-dns/s6-dns-2.3.5.2:=
 	)
 "
 DEPEND="${RDEPEND}
-	>=net-dns/s6-dns-2.3.5.2[static-libs?]
+	>=net-dns/s6-dns-2.3.5.2[static-libs(-)?]
 "
 
 HTML_DOCS=( doc/. )
diff --git a/net-misc/s6-networking/s6-networking-2.5.1.1.ebuild b/net-misc/s6-networking/s6-networking-2.5.1.1.ebuild
new file mode 100644
index 000000000000..9adaf81f7a5d
--- /dev/null
+++ b/net-misc/s6-networking/s6-networking-2.5.1.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Suite of small networking utilities for Unix systems"
+HOMEPAGE="https://www.skarnet.org/software/s6-networking/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~x86"
+IUSE="ssl"
+
+RDEPEND="dev-lang/execline:=
+	>=dev-libs/skalibs-2.12.0.0:=
+	net-dns/s6-dns:=
+	sys-apps/s6:=[execline]
+	ssl? ( dev-libs/libretls )
+"
+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=/usr/$(get_libdir)
+		--libdir=/usr/$(get_libdir)/${PN}
+		--with-dynlib=/usr/$(get_libdir)
+		--with-lib=/usr/$(get_libdir)/s6
+		--with-lib=/usr/$(get_libdir)/s6-dns
+		--with-lib=/usr/$(get_libdir)/skalibs
+		--with-sysdeps=/usr/$(get_libdir)/skalibs
+		--enable-shared
+		--disable-allstatic
+		--disable-static-libc
+		$(use_enable ssl ssl libtls)
+	)
+
+	econf "${myconf[@]}"
+}
diff --git a/profiles/arch/sparc/package.use.force b/profiles/arch/sparc/package.use.force
index 3c53f2a73cfa..1d86050b6044 100644
--- a/profiles/arch/sparc/package.use.force
+++ b/profiles/arch/sparc/package.use.force
@@ -1,6 +1,12 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2022-06-25)
+# dev-lang/rust lacks wiring up to use our custom rust-bin bootstrap
+# tarball, so force system-bootstrap instead (i.e. force using rust-bin
+# or existing installed rust). bug #842246.
+dev-lang/rust system-bootstrap
+
 # Sam James <sam@gentoo.org> (2022-02-19)
 # New enough SpiderMonkey not (yet?) keyworded here, bug #753221
 sys-auth/polkit duktape
diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask
index 6bf3b89c736b..c4dbb925eebf 100644
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@@ -1,6 +1,11 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2022-06-25)
+# We're not (yet?) providing our own tarballs for these and
+# upstream don't offer them for this arch (see bug #769467).
+dev-lang/rust-bin clippy doc rls rustfmt
+
 # Nickolas Raymond Kaczynski <nrk@disroot.org> (2022-04-24)
 # Dependencies are missing keywords
 media-libs/imlib2 svg heif
diff --git a/sys-apps/s6-linux-init/Manifest b/sys-apps/s6-linux-init/Manifest
index 36dedd33a95a..95ec8e071fd8 100644
--- a/sys-apps/s6-linux-init/Manifest
+++ b/sys-apps/s6-linux-init/Manifest
@@ -1 +1,2 @@
 DIST s6-linux-init-1.0.7.3.tar.gz 58607 BLAKE2B 081c452761d96308b496e4ec3281c8b50d6cc1760b34d74647bd27cfef213e73f0cb1e1919c7d238242e8295c91a8fb3bf51638b1216e922516c71eb5718486a SHA512 ff4e1727f7d68ceb72db501de5abc36962b0083baef376899aefa4cd81420852c7966ca1c625339c052d205a28261cc928e87a2e5715854b5fcc4666c56eeff3
+DIST s6-linux-init-1.0.8.0.tar.gz 58732 BLAKE2B 15e90b1987729f4771ffd294d2a6b4738e0e2d3438c694c1739c6c8ff8bff3a3b9c31565f446e7387fda226b4f0480c36051a593e2e8081301bc83973f9fcb5e SHA512 b64319bc13a98e5f766a118ebd54ccec93163b38b2afc060fe4034a4f2312bb6ae68019e37706338f84c74aa527e5b2ac1f4b29d39255c2d436eab8608483346
diff --git a/sys-apps/s6-linux-init/s6-linux-init-1.0.7.3.ebuild b/sys-apps/s6-linux-init/s6-linux-init-1.0.7.3-r1.ebuild
index 01807f8d704e..415a46d9f524 100644
--- a/sys-apps/s6-linux-init/s6-linux-init-1.0.7.3.ebuild
+++ b/sys-apps/s6-linux-init/s6-linux-init-1.0.7.3-r1.ebuild
@@ -16,9 +16,9 @@ IUSE="static static-libs +sysv-utils"
 
 REQUIRED_USE="static? ( static-libs )"
 
-RDEPEND=">=dev-lang/execline-2.8.3.0:=[static-libs?]
-	>=dev-libs/skalibs-2.11.2.0:=[static-libs?]
-	>=sys-apps/s6-2.11.1.0:=[execline,static-libs?]
+RDEPEND=">=dev-lang/execline-2.8.3.0:=[static-libs(-)?]
+	>=dev-libs/skalibs-2.11.2.0:=[static-libs(-)?]
+	>=sys-apps/s6-2.11.1.0:=[execline,static-libs(-)?]
 	sysv-utils? (
 		!sys-apps/systemd[sysv-utils]
 		!sys-apps/sysvinit
diff --git a/sys-apps/s6-linux-init/s6-linux-init-1.0.8.0.ebuild b/sys-apps/s6-linux-init/s6-linux-init-1.0.8.0.ebuild
new file mode 100644
index 000000000000..134f021dac5e
--- /dev/null
+++ b/sys-apps/s6-linux-init/s6-linux-init-1.0.8.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit 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="~amd64 ~arm ~x86"
+IUSE="+sysv-utils"
+
+RDEPEND="dev-lang/execline:=
+	dev-libs/skalibs:=
+	sys-apps/s6:=[execline]
+	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=/usr/$(get_libdir)
+		--skeldir=/etc/s6-linux-init/skel
+		--libdir=/usr/$(get_libdir)/${PN}
+		--with-dynlib=/usr/$(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-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() {
+	einfo "Read ${EROOT}/usr/share/doc/${PF}/html/quickstart.html"
+	einfo "for usage instructions."
+}
diff --git a/sys-apps/s6-linux-utils/Manifest b/sys-apps/s6-linux-utils/Manifest
index da35203b439d..405ffe98d0dc 100644
--- a/sys-apps/s6-linux-utils/Manifest
+++ b/sys-apps/s6-linux-utils/Manifest
@@ -1 +1,2 @@
 DIST s6-linux-utils-2.5.1.7.tar.gz 36574 BLAKE2B 53b5c46e84873df2263eb05ef6dae2321957e2065966854402f819cff6712de991a3a3c480325556e53491c9016deb52c0a437a8b9bcc721dac97e31c98ba501 SHA512 dabe510d0a4d045578309beeec17aa1b4f88acb09513be65c31a7b338bd50fcb7cc809015fa7328c4a310b838f1335e754f49a12dcf369483c83294b5957156c
+DIST s6-linux-utils-2.6.0.0.tar.gz 39674 BLAKE2B 146b5ef47c00c4e96eb6ea697137cd11732087612df98781e45169ff8503fe3ba9b84cab06e6b96ba373f11c65902f4f5111322d51b0fdb395b3422ba092d836 SHA512 cecd745d473b200e10071d73191d5ec425533818a9775e882a2b8a2fbc98779f2309e17d41f844b171e0625b233804bc7af9585709e8e42dc73ff30afcee06e9
diff --git a/sys-apps/s6-linux-utils/s6-linux-utils-2.5.1.7.ebuild b/sys-apps/s6-linux-utils/s6-linux-utils-2.5.1.7-r1.ebuild
index 3a7aed22a1ac..8b385d9a68ab 100644
--- a/sys-apps/s6-linux-utils/s6-linux-utils-2.5.1.7.ebuild
+++ b/sys-apps/s6-linux-utils/s6-linux-utils-2.5.1.7-r1.ebuild
@@ -14,9 +14,9 @@ SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="static"
 
-RDEPEND="!static? ( >=dev-libs/skalibs-2.11.1.0:= )"
+RDEPEND="!static? ( =dev-libs/skalibs-2.11*:= )"
 DEPEND="${RDEPEND}
-	static? ( >=dev-libs/skalibs-2.11.1.0[static-libs] )
+	static? ( =dev-libs/skalibs-2.11*[static-libs] )
 "
 
 HTML_DOCS=( doc/. )
diff --git a/sys-apps/s6-linux-utils/s6-linux-utils-2.6.0.0.ebuild b/sys-apps/s6-linux-utils/s6-linux-utils-2.6.0.0.ebuild
new file mode 100644
index 000000000000..36d949ef12f9
--- /dev/null
+++ b/sys-apps/s6-linux-utils/s6-linux-utils-2.6.0.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 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.12.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=/usr/$(get_libdir)
+		--libdir=/usr/$(get_libdir)/${PN}
+		--with-dynlib=/usr/$(get_libdir)
+		--with-lib=/usr/$(get_libdir)/skalibs
+		--with-sysdeps=/usr/$(get_libdir)/skalibs
+		--disable-allstatic
+		--disable-static-libc
+	)
+
+	econf "${myconf[@]}"
+}
diff --git a/sys-apps/s6-portable-utils/Manifest b/sys-apps/s6-portable-utils/Manifest
index d07d3185682e..bd07d57b5730 100644
--- a/sys-apps/s6-portable-utils/Manifest
+++ b/sys-apps/s6-portable-utils/Manifest
@@ -1 +1,2 @@
 DIST s6-portable-utils-2.2.4.0.tar.gz 50343 BLAKE2B edfbe4ab48914ae485072f220931e6af4d53fc8d1c1dc5e1186bc1688a429e6d14a370b02dbe0a9b641a8204f65e6f6bfb6cb0c0c9318acf89d9f6ad7f7f914f SHA512 35b62aff76b9fbf978e81dad2f343a2542cb4a853530948cc3b446b20e8d5f976d1624194c2aad6e0277b73d23d5cecf2142e3f2916bd152ad62342fc30fe07a
+DIST s6-portable-utils-2.2.5.0.tar.gz 50911 BLAKE2B e79d803544e8df6b791ecd22bd61b7c9535945c5557a25d7bc5488f5015967c4a750f1c0a136cc49b30ddd5bf3fbc17927e5ec01184106e44d0c08643e98e41a SHA512 2e90a1390140818268bd83629579098552c22160537874a90d4be94fae157cb9cdb864859c40847e8588fa9f62fb5af7bf89aa12561f1e6678a7cffc0f0a6d68
diff --git a/sys-apps/s6-portable-utils/s6-portable-utils-2.2.4.0.ebuild b/sys-apps/s6-portable-utils/s6-portable-utils-2.2.4.0-r1.ebuild
index 4b3acc96437c..175012649933 100644
--- a/sys-apps/s6-portable-utils/s6-portable-utils-2.2.4.0.ebuild
+++ b/sys-apps/s6-portable-utils/s6-portable-utils-2.2.4.0-r1.ebuild
@@ -14,9 +14,9 @@ SLOT="0"
 KEYWORDS="amd64 ~arm x86"
 IUSE="static"
 
-RDEPEND="!static? ( >=dev-libs/skalibs-2.11.2.0:= )"
+RDEPEND="!static? ( =dev-libs/skalibs-2.11*:= )"
 DEPEND="${RDEPEND}
-	static? ( >=dev-libs/skalibs-2.11.2.0[static-libs] )
+	static? ( =dev-libs/skalibs-2.11*[static-libs] )
 "
 
 HTML_DOCS=( doc/. )
diff --git a/sys-apps/s6-portable-utils/s6-portable-utils-2.2.5.0.ebuild b/sys-apps/s6-portable-utils/s6-portable-utils-2.2.5.0.ebuild
new file mode 100644
index 000000000000..34e4528aaa94
--- /dev/null
+++ b/sys-apps/s6-portable-utils/s6-portable-utils-2.2.5.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit 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.12.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=/usr/$(get_libdir)
+		--libdir=/usr/$(get_libdir)/${PN}
+		--with-dynlib=/usr/$(get_libdir)
+		--with-lib=/usr/$(get_libdir)/skalibs
+		--with-sysdeps=/usr/$(get_libdir)/skalibs
+		--disable-allstatic
+		--disable-static-libc
+	)
+
+	econf "${myconf[@]}"
+}
diff --git a/sys-apps/s6-rc/Manifest b/sys-apps/s6-rc/Manifest
index 02ff2c9df2b7..0e557733c2b1 100644
--- a/sys-apps/s6-rc/Manifest
+++ b/sys-apps/s6-rc/Manifest
@@ -1,2 +1,3 @@
 DIST s6-rc-0.5.3.0.tar.gz 99155 BLAKE2B 8d65ba95b9d3b9b68a9830c79b3c419513e00aff87fb7b9fa18e007107afd8f41c561ac37db9ff28b3fa5b0bf5656aa5053f4337cf24b0fcbc1ce7138712edf1 SHA512 0b5dda996d96761f1df192675ed117f2acff9f2ad24e6c1405f3eaa46fdd2767178005582fbc9938152232f85ff01b008efedab6c80051bc65f1193d468a56f1
 DIST s6-rc-0.5.3.1.tar.gz 99212 BLAKE2B 6f2bb8b25669dd0a87f716842c6a3018f8157e5193530fa84ce622169db5e8bb14cc145c64e4ea23d1905933b47411ad5b2b059e81435881c117c0377037be63 SHA512 1e181604510f39d0b10a3552c13e25d9a379552daa1c174c8856ce2e24ecbfb3271bd0236e1744de3a55053b1e96d550b816dbfff7aa3f75e0642003ab8e8bc9
+DIST s6-rc-0.5.3.2.tar.gz 99249 BLAKE2B 5719823edf9e9bece6a3efdb5072c4555fc796c48144a0d1da52c609aef8d7437afc9c30924636891a829a307c30017a85140644fb7836b380adb8afbd49b35b SHA512 72963b2aa8e338503918d063102653d392cbd701823e35f87b45d9777fd512f7ad49ab47b94df0f9e5ef50a0dad5162f6f3526fa77dfaa3afb48ad8db4097051
diff --git a/sys-apps/s6-rc/s6-rc-0.5.3.0.ebuild b/sys-apps/s6-rc/s6-rc-0.5.3.0-r1.ebuild
index 6feff233b4ae..4c6c8d4c1bca 100644
--- a/sys-apps/s6-rc/s6-rc-0.5.3.0.ebuild
+++ b/sys-apps/s6-rc/s6-rc-0.5.3.0-r1.ebuild
@@ -16,9 +16,9 @@ IUSE="static static-libs"
 
 REQUIRED_USE="static? ( static-libs )"
 
-RDEPEND=">=dev-lang/execline-2.8.2.0:=[static-libs?]
-	>=dev-libs/skalibs-2.11.1.0:=[static-libs?]
-	>=sys-apps/s6-2.11.0.1:=[execline,static-libs?]
+RDEPEND=">=dev-lang/execline-2.8.2.0:=[static-libs(-)?]
+	>=dev-libs/skalibs-2.11.1.0:=[static-libs(-)?]
+	>=sys-apps/s6-2.11.0.1:=[execline,static-libs(-)?]
 "
 DEPEND="${RDEPEND}"
 
diff --git a/sys-apps/s6-rc/s6-rc-0.5.3.1.ebuild b/sys-apps/s6-rc/s6-rc-0.5.3.1-r1.ebuild
index 6feff233b4ae..4c6c8d4c1bca 100644
--- a/sys-apps/s6-rc/s6-rc-0.5.3.1.ebuild
+++ b/sys-apps/s6-rc/s6-rc-0.5.3.1-r1.ebuild
@@ -16,9 +16,9 @@ IUSE="static static-libs"
 
 REQUIRED_USE="static? ( static-libs )"
 
-RDEPEND=">=dev-lang/execline-2.8.2.0:=[static-libs?]
-	>=dev-libs/skalibs-2.11.1.0:=[static-libs?]
-	>=sys-apps/s6-2.11.0.1:=[execline,static-libs?]
+RDEPEND=">=dev-lang/execline-2.8.2.0:=[static-libs(-)?]
+	>=dev-libs/skalibs-2.11.1.0:=[static-libs(-)?]
+	>=sys-apps/s6-2.11.0.1:=[execline,static-libs(-)?]
 "
 DEPEND="${RDEPEND}"
 
diff --git a/sys-apps/s6-rc/s6-rc-0.5.3.2.ebuild b/sys-apps/s6-rc/s6-rc-0.5.3.2.ebuild
new file mode 100644
index 000000000000..9304b3decb02
--- /dev/null
+++ b/sys-apps/s6-rc/s6-rc-0.5.3.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit 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:=
+	sys-apps/s6:=[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=/usr/$(get_libdir)
+		--libdir=/usr/$(get_libdir)/${PN}
+		--with-dynlib=/usr/$(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-libc
+	)
+
+	econf "${myconf[@]}"
+}
diff --git a/sys-apps/s6/Manifest b/sys-apps/s6/Manifest
index a9f6ac81ca9e..6eaa14d7d718 100644
--- a/sys-apps/s6/Manifest
+++ b/sys-apps/s6/Manifest
@@ -1 +1,2 @@
 DIST s6-2.11.1.0.tar.gz 228745 BLAKE2B 872ac1f736337a8e6617c46af92f8e894c06a4b40501ebf58568dc6a58cb594fdf36654cdb8cfd8e922431c17f9b4f82441296a3ce8031ba8b1f27fa1ba8a051 SHA512 ab3cb4a61fae21537eacffdaa427a0a6b23b12088586f0cd8dc993e0de29e9863d04c8706cb044acdc08254002b19eb5f894262d37348d467f8c713d8124e738
+DIST s6-2.11.1.1.tar.gz 228878 BLAKE2B c94c18b66862c7945a317ab76d933d40fc360847b71c6fb3d507535ee41637d60327a05486a93ab7aec630a0c8ead61d6c17bfc064bd9f94b39a7cc56f76cb49 SHA512 f5fc903c11b57b2a83d9e120a51f64b63984a2af9b772dd6fd64f268b512a083350abedcae04c926deb6751b5ae30e992d6a4128ddf4ab1d49c548ef8f3d7752
diff --git a/sys-apps/s6/s6-2.11.1.0.ebuild b/sys-apps/s6/s6-2.11.1.0-r1.ebuild
index ab9cc3bb0e38..65697c3d13b7 100644
--- a/sys-apps/s6/s6-2.11.1.0.ebuild
+++ b/sys-apps/s6/s6-2.11.1.0-r1.ebuild
@@ -16,8 +16,8 @@ IUSE="+execline static static-libs"
 
 REQUIRED_USE="static? ( static-libs )"
 
-RDEPEND="execline? ( >=dev-lang/execline-2.8.3.0:=[static-libs?] )
-	>=dev-libs/skalibs-2.11.2.0:=[static-libs?]
+RDEPEND="execline? ( >=dev-lang/execline-2.8.3.0:=[static-libs(-)?] )
+	>=dev-libs/skalibs-2.11.2.0:=[static-libs(-)?]
 "
 DEPEND="${RDEPEND}"
 
diff --git a/sys-apps/s6/s6-2.11.1.1.ebuild b/sys-apps/s6/s6-2.11.1.1.ebuild
new file mode 100644
index 000000000000..dcdeeef35af5
--- /dev/null
+++ b/sys-apps/s6/s6-2.11.1.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit 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="~amd64 ~arm ~x86"
+IUSE="+execline"
+
+RDEPEND="dev-libs/skalibs:=
+	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=/usr/$(get_libdir)
+		--libdir=/usr/$(get_libdir)/${PN}
+		--with-dynlib=/usr/$(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-libc
+		$(use_enable execline)
+	)
+
+	econf "${myconf[@]}"
+}
diff --git a/virtual/rust/rust-1.61.0.ebuild b/virtual/rust/rust-1.61.0.ebuild
index 27c4c62c8441..b7da1d054aa3 100644
--- a/virtual/rust/rust-1.61.0.ebuild
+++ b/virtual/rust/rust-1.61.0.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Virtual for Rust language compiler"
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="rustfmt"
 
 BDEPEND=""