gentoo auto-resync : 17:01:2023 - 07:14:19

19 files changed, 308 insertions, 34 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 6d7eac287bb8..44b0f2502243 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/ed/Manifest b/sys-apps/ed/Manifest
index 6c62a0ba0c94..d17659fb6e5c 100644
--- a/sys-apps/ed/Manifest
+++ b/sys-apps/ed/Manifest
@@ -3,5 +3,5 @@ DIST ed-1.18.tar.lz.sig 72 BLAKE2B 9b498f1604d625c6b32ded636e0841ef384bf59c10ff0
 DIST ed-1.19.tar.lz 66448 BLAKE2B 139305a1d64e96f7eadcb462325918e5eee18de229ec8e1b3fac29dc9b8ef58ceea4cd7ffdbd3674fd7f421d90bc0c9e3557318eb57830d7cd46e579828fa95d SHA512 594d5cf895931783110ee1956078f6a77aee022fb67730cbc6f1d30521c120b97820a5eb349278575f85c4c1e17fea0e16a3bc22592edae53c6fd27941ee3d7e
 DIST ed-1.19.tar.lz.sig 72 BLAKE2B ada611148a6347d8953c65669b61f69eb0ed8d48f6dc4ffaab8975dd7e28f1d87e434493a77e817ca05874f741e243309529e60e95f2a7636148fa71c711f5e3 SHA512 03ff7cf2f337fdc94efaa1374ce95d37c29c556b2a9a13f7216e05e8e9e9efc95bcbb554bd05000b5283d5f20884f3f50b16f220fba8e6ff318b1b975c6a44c9
 EBUILD ed-1.18.ebuild 1183 BLAKE2B 23b5cb591455ad1c1dad946876f8b7b4297bc41ddc0cf7a909c83c8585a0f3144506f25495a043c0ade9f5e0501b4d2c7219b086917953059a92ae9f4f523110 SHA512 75bbec07b179c221e7399f709fca3e430a0c856f9acba11d65c5fe9c740c08526629ae85c3d302f2cedb285a071b54158341d7d63b2d6934fca3fe8bd820d5e2
-EBUILD ed-1.19-r1.ebuild 1661 BLAKE2B 7ba0ccb0c127eb2d01392e746a492b127b169ffe4c091f39a4361d9c44d797f2f89248558d8cfca6967904bd8e712cdcc65e3ac46c2708096a1b9b70ea050b48 SHA512 b2deaa5186cdde469d884b996ffa58b326f17f94fde61e502f5f18380bea9f35e47548c76f63e91584908ca6e0879ba72fa7221caf2980af7f559b963d61d3f1
+EBUILD ed-1.19-r1.ebuild 1329 BLAKE2B 376b92f937cdafae376bc9c259a3b00431e9363c6459a693bdf92a297932d3124c4d9f137889dab64fe90e2302561a4480ae2fc5eb943a05d5e5b552df5ccf08 SHA512 f7f31316c09d8423f57d84063e577be55287482e30adb330f720d49c05d36c1d0c87a6e8e3ccd56b847ceb25ceeba88227d29bb73c966478f3daebd2767eacbd
 MISC metadata.xml 337 BLAKE2B 40506db26223e7d375b03972929e04e5684f0ee5d722248819d28d424daf9f2f4effd07a7491cdba9d77185712593fe8fd182c058bff2ff0ba4341aff383dc7d SHA512 5709e973094bd7fda825a3a223c04f8ce04ba9e2f609466c7cf56da4f62d4155562669bbfd808acd2f7db17434ca5871cdc50962a6bfdae3c4edeca1bb4736df
diff --git a/sys-apps/ed/ed-1.19-r1.ebuild b/sys-apps/ed/ed-1.19-r1.ebuild
index e2d63d30eb66..65951958803d 100644
--- a/sys-apps/ed/ed-1.19-r1.ebuild
+++ b/sys-apps/ed/ed-1.19-r1.ebuild
@@ -26,11 +26,6 @@ if [[ ${PV} != *_rc* ]] ; then
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
-# We don't use unpacker_src_uri_depends here right now because:
-# 1. unpacker_src_uri_depends doesn't flatten the deps (bug #891133) and emits
-# several || ( ... ) blocks (4).
-# 2. Portage doesn't handle several repeated identical || ( ...) blocks correctly
-# and takes ages to resolve (bug #891137). It should merge them together.
 BDEPEND="
 	sys-apps/texinfo
 	$(unpacker_src_uri_depends)
diff --git a/sys-apps/s6-linux-init/Manifest b/sys-apps/s6-linux-init/Manifest
index bc388505a068..e379fc3a2f37 100644
--- a/sys-apps/s6-linux-init/Manifest
+++ b/sys-apps/s6-linux-init/Manifest
@@ -1,3 +1,5 @@
 DIST s6-linux-init-1.0.8.0.tar.gz 58732 BLAKE2B 15e90b1987729f4771ffd294d2a6b4738e0e2d3438c694c1739c6c8ff8bff3a3b9c31565f446e7387fda226b4f0480c36051a593e2e8081301bc83973f9fcb5e SHA512 b64319bc13a98e5f766a118ebd54ccec93163b38b2afc060fe4034a4f2312bb6ae68019e37706338f84c74aa527e5b2ac1f4b29d39255c2d436eab8608483346
+DIST s6-linux-init-1.0.8.1.tar.gz 59188 BLAKE2B e0f417fb349b3f47dcaa9f36c6f40d8c58066d62ad953b8f797ce6cce14e8c337acd15d34498b49fc0f9455cf4551c948fd7f16b0947f7cdc376e762594afc3a SHA512 df3b5699f9c04ffc89d219dbc9536a64ad3d2fb1d5c5844b2fb9804ac9e223e8b16fe1084baee9b60d3ab61f228de1b57605c3c0f72227758afb16aea1c68340
 EBUILD s6-linux-init-1.0.8.0-r1.ebuild 1578 BLAKE2B 8678965c43548fb62e98f4c0e2627d62fb45003d2fbb1d5a7712b3a4763c2a3c8aca13be12293c2d7be58b2c12172a169798f3de0c3317ad7ead7b3439fc5413 SHA512 64fb980bbf50d0cb6144a09755e87b60e0dddfd0721b84ac809cf609f22a2e43a4e358e65ec4c80d786095ca640d38948aa304d6b08a12a296bf97cca799843a
-MISC metadata.xml 762 BLAKE2B c6fcd5da4965ab30aa041c568356cbe8fefb5df76f5396d5d47264d1463730be034b8a8fa96bfa8961bd27ea253495b340ce07da6f16f59ed1d657da560d36bc SHA512 ef5a96b38cc3b927841a7d7e9bdc27d6609c95f585b93c8e6496c57743cdb3d0335434c63d0634207c4554d8a0aaaebd2c0ec06e953d3065dd119db6972e1666
+EBUILD s6-linux-init-1.0.8.1.ebuild 1611 BLAKE2B 00cfe2328547c02e7741e9bbb4a81465158c88c41b20404e68c93f6c58dbcb1d098a934a6759eac3e80e2fc8638f161b12d7eac62431f98059450b9efb41a2a0 SHA512 0c343e02f8ee44fe9a447781673ca0144bbfa80fa67cd42f7eb3ec5f325f770d1aa15a8be845e3350b6bde4277e6ad7ff5cf82ee0ca7fb6a6295cd39fd15cf6e
+MISC metadata.xml 762 BLAKE2B 57da7dfce946e1566ada1e25b90a5746cf60e5bfc1fb1aa1e3d0f24b5afb8475a1261dba37dbe5e256215c5e2477c1dc415872f9af1e66b08712be59f69e2b3f SHA512 6d1b096d6996c091bbadbea038fdcde9c8c20f7fa44df5355ab46e3d7b80ef0c3e8609dbf326400a0969e42f03300742887c15c6cc2edc5e6a27d35e5ab79a90
diff --git a/sys-apps/s6-linux-init/metadata.xml b/sys-apps/s6-linux-init/metadata.xml
index 1e5f91a033de..037cbc9ac75f 100644
--- a/sys-apps/s6-linux-init/metadata.xml
+++ b/sys-apps/s6-linux-init/metadata.xml
@@ -2,6 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person" proxied="yes">
+		<email>arkamar@atlas.cz</email>
+		<name>Petr Vaněk</name>
+	</maintainer>
+	<maintainer type="person" proxied="yes">
 		<email>samuel@sholland.org</email>
 		<name>Samuel Holland</name>
 	</maintainer>
@@ -9,10 +13,6 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
-	<maintainer type="person" proxied="yes">
-		<email>arkamar@atlas.cz</email>
-		<name>Petr Vaněk</name>
-	</maintainer>
 	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
diff --git a/sys-apps/s6-linux-init/s6-linux-init-1.0.8.1.ebuild b/sys-apps/s6-linux-init/s6-linux-init-1.0.8.1.ebuild
new file mode 100644
index 000000000000..62c217701a87
--- /dev/null
+++ b/sys-apps/s6-linux-init/s6-linux-init-1.0.8.1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2023 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-2.13.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=/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
+		--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 7f7ac83c6794..58c2d809abb7 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.0.0.tar.gz 39674 BLAKE2B 146b5ef47c00c4e96eb6ea697137cd11732087612df98781e45169ff8503fe3ba9b84cab06e6b96ba373f11c65902f4f5111322d51b0fdb395b3422ba092d836 SHA512 cecd745d473b200e10071d73191d5ec425533818a9775e882a2b8a2fbc98779f2309e17d41f844b171e0625b233804bc7af9585709e8e42dc73ff30afcee06e9
+DIST s6-linux-utils-2.6.0.1.tar.gz 40062 BLAKE2B 41aa8e3f6774383c1400f83c9b743c1abe106a46ae6213dfba799106cdd10ac2a7bac452c5af297e40081c109b043afa2011c194b50ea8aa53df6a96a632ef39 SHA512 52e10411ea2532534c397a07981e5bd79ce97c79c688efe0378edc4e696ce9dfdc4fd3eb942c4a75c06f16a5d7c10b2f8cd396c07d98620e94446fcd10bc5bae
 EBUILD s6-linux-utils-2.6.0.0.ebuild 966 BLAKE2B a34447f3a84d3eed78eefc5f3c3e7fecc17d3b04ca198c4564e953b1194ef55e9f298338bd4e1e853af4151ba0b95c9208a484c6685c76499cfb28ea61317932 SHA512 9f0f3612ac4a528ccdeb03e7a73c5044a091faf486774c7a5996dd75dd0bd1890be1ee65424c5125879489c538529952438810a97a4abf100a2100ca8d087d71
-MISC metadata.xml 624 BLAKE2B 42e42ad932d528935b581814d0c4b07a6cf54d800b44e77eca63f0b8fab7f91d423b6aa8b74ade323f5bf9909b3d5e67af06caacab810bd8a5fad6ce4c127496 SHA512 6516bb423a7b7a18c226f5eab903fee5147d15aaf29bbe3def230ae70d6190c8360b9645fc379acf8163103f986ffad727096729d5feee7610899ad8d98764a9
+EBUILD s6-linux-utils-2.6.0.1.ebuild 988 BLAKE2B bf3af15622b397afc52ce8579c52948bd5bc3b66c50fad8a0b0811829617f62b53d954f56b7c5f3cfbd6e22d840b67fa3f133dd1687669b0ae5447c96016973f SHA512 1c739301b8066ba67624d094af453415702657c4928eae6fe83dceef8789129e873d212c37329d63425ae58be7ac22f4d1535da13f998a77063aa02b9616121e
+MISC metadata.xml 624 BLAKE2B 6bb21b1df5c53a8811ff8a98d86fc5c12343ea057c772ec1f287d38b9ae50a0e758179f7f17ba6f3b243853e0ede843b424803d46a47c4cf359f2026c8305e05 SHA512 6848575ab57d2e24f8efcd0d30e8226574098c4c01d751ed7a9a307a029fb5c6812ddece36c7f8c296c933f0e2fab4ded376bb1d9f6132803ceba0fb3ce70f07
diff --git a/sys-apps/s6-linux-utils/metadata.xml b/sys-apps/s6-linux-utils/metadata.xml
index aed39d3983af..0f616fa5c2bf 100644
--- a/sys-apps/s6-linux-utils/metadata.xml
+++ b/sys-apps/s6-linux-utils/metadata.xml
@@ -2,6 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person" proxied="yes">
+		<email>arkamar@atlas.cz</email>
+		<name>Petr Vaněk</name>
+	</maintainer>
+	<maintainer type="person" proxied="yes">
 		<email>samuel@sholland.org</email>
 		<name>Samuel Holland</name>
 	</maintainer>
@@ -9,10 +13,6 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
-	<maintainer type="person" proxied="yes">
-		<email>arkamar@atlas.cz</email>
-		<name>Petr Vaněk</name>
-	</maintainer>
 	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
diff --git a/sys-apps/s6-linux-utils/s6-linux-utils-2.6.0.1.ebuild b/sys-apps/s6-linux-utils/s6-linux-utils-2.6.0.1.ebuild
new file mode 100644
index 000000000000..d93443a16c11
--- /dev/null
+++ b/sys-apps/s6-linux-utils/s6-linux-utils-2.6.0.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2023 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=/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
+		--disable-static-libc
+	)
+
+	econf "${myconf[@]}"
+}
diff --git a/sys-apps/s6-portable-utils/Manifest b/sys-apps/s6-portable-utils/Manifest
index 5983ca3b30a4..db9d1be57f49 100644
--- a/sys-apps/s6-portable-utils/Manifest
+++ b/sys-apps/s6-portable-utils/Manifest
@@ -1,3 +1,5 @@
 DIST s6-portable-utils-2.2.5.0.tar.gz 50911 BLAKE2B e79d803544e8df6b791ecd22bd61b7c9535945c5557a25d7bc5488f5015967c4a750f1c0a136cc49b30ddd5bf3fbc17927e5ec01184106e44d0c08643e98e41a SHA512 2e90a1390140818268bd83629579098552c22160537874a90d4be94fae157cb9cdb864859c40847e8588fa9f62fb5af7bf89aa12561f1e6678a7cffc0f0a6d68
+DIST s6-portable-utils-2.2.5.1.tar.gz 51814 BLAKE2B ce4f38d7fb7c632f0e8c10c2990d10eb4f5af38330f29aa3b6e6b97fcce5687eb06a7ee241be5f92f093d5edf5a523da993f140c697ec0dbcef46aacb7f88f87 SHA512 814ab6467034657d3b46e5b933786a2eab1f9cb630c6d67c91ee635facac7d82b5871b94e53445d57fd466c98cc21ea2df4b74c8d48acc0f0c96e14fb827f613
 EBUILD s6-portable-utils-2.2.5.0.ebuild 970 BLAKE2B db0e01d27af55c7790a0704819648ddfa12ff7378e408b93f740090605e0d9c2a66a6bfbc6c5e6eff3427144dac4555641019b0edf0b6f2e0cb0204e1833d2c1 SHA512 62c7aff22c7ae80799ae3a46e2d83c3e6cb296f97892980244d34d971cb37998f4716effe158cd2475e84b42991446ddebe7e065b18c41070b066ae647eda4ef
-MISC metadata.xml 624 BLAKE2B 42e42ad932d528935b581814d0c4b07a6cf54d800b44e77eca63f0b8fab7f91d423b6aa8b74ade323f5bf9909b3d5e67af06caacab810bd8a5fad6ce4c127496 SHA512 6516bb423a7b7a18c226f5eab903fee5147d15aaf29bbe3def230ae70d6190c8360b9645fc379acf8163103f986ffad727096729d5feee7610899ad8d98764a9
+EBUILD s6-portable-utils-2.2.5.1.ebuild 992 BLAKE2B 014e826b0dd2af2bc51120e75a89d162cdc0b2836c6446ff0e8aa4312e0b27d5b943bb069b2aba678f83c6d90f00779b1cd383431241dfbac6d19ca2465206d4 SHA512 3c82d15f5fec8e08e5c766fc790548b4ed32d7bf24a3279645080941bcdf77b622fe15a2594d1b1c6c29813b8008916b7188ab3e02d8ca51c271a2c494b75443
+MISC metadata.xml 624 BLAKE2B 6bb21b1df5c53a8811ff8a98d86fc5c12343ea057c772ec1f287d38b9ae50a0e758179f7f17ba6f3b243853e0ede843b424803d46a47c4cf359f2026c8305e05 SHA512 6848575ab57d2e24f8efcd0d30e8226574098c4c01d751ed7a9a307a029fb5c6812ddece36c7f8c296c933f0e2fab4ded376bb1d9f6132803ceba0fb3ce70f07
diff --git a/sys-apps/s6-portable-utils/metadata.xml b/sys-apps/s6-portable-utils/metadata.xml
index aed39d3983af..0f616fa5c2bf 100644
--- a/sys-apps/s6-portable-utils/metadata.xml
+++ b/sys-apps/s6-portable-utils/metadata.xml
@@ -2,6 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person" proxied="yes">
+		<email>arkamar@atlas.cz</email>
+		<name>Petr Vaněk</name>
+	</maintainer>
+	<maintainer type="person" proxied="yes">
 		<email>samuel@sholland.org</email>
 		<name>Samuel Holland</name>
 	</maintainer>
@@ -9,10 +13,6 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
-	<maintainer type="person" proxied="yes">
-		<email>arkamar@atlas.cz</email>
-		<name>Petr Vaněk</name>
-	</maintainer>
 	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
diff --git a/sys-apps/s6-portable-utils/s6-portable-utils-2.2.5.1.ebuild b/sys-apps/s6-portable-utils/s6-portable-utils-2.2.5.1.ebuild
new file mode 100644
index 000000000000..caffbee14be2
--- /dev/null
+++ b/sys-apps/s6-portable-utils/s6-portable-utils-2.2.5.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2023 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.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=/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
+		--disable-static-libc
+	)
+
+	econf "${myconf[@]}"
+}
diff --git a/sys-apps/s6-rc/Manifest b/sys-apps/s6-rc/Manifest
index 1c2194608bae..f8f9f6941bb2 100644
--- a/sys-apps/s6-rc/Manifest
+++ b/sys-apps/s6-rc/Manifest
@@ -1,3 +1,5 @@
 DIST s6-rc-0.5.3.2.tar.gz 99249 BLAKE2B 5719823edf9e9bece6a3efdb5072c4555fc796c48144a0d1da52c609aef8d7437afc9c30924636891a829a307c30017a85140644fb7836b380adb8afbd49b35b SHA512 72963b2aa8e338503918d063102653d392cbd701823e35f87b45d9777fd512f7ad49ab47b94df0f9e5ef50a0dad5162f6f3526fa77dfaa3afb48ad8db4097051
+DIST s6-rc-0.5.3.3.tar.gz 100554 BLAKE2B b7ce91c27da4ded6a18879c1034fd9b7a9dbe50b4bf81b8e7ad8c932895124f0fad2d3f96c879841e51467549ee0beef2a9d35c0231d0f4a9a8352660ee3df3e SHA512 9ff86c1490c3ccb904126ad745a45628104880e04f3e95e2d899c8e5cc951d52f38885e85a4edc1f6962a741ca229aba6bf7878b1ef193efe2f307eeda8f262b
 EBUILD s6-rc-0.5.3.2.ebuild 1112 BLAKE2B 57b7d1952d033986e449bcf98f62edef28c16d11368b578f3dd687b936222903b993cff39a7808e919edd3b69380badf4875f8d18d670faddcd4e2632a6b9afb SHA512 87f557f653e5e296e30256245c8504cc9f2610f7b9639798bb7c5e9f733406e7a7b462894a226faab16c6cedc0de8df8550680f5b1f9b78060c016d8aa2eaed9
-MISC metadata.xml 624 BLAKE2B 42e42ad932d528935b581814d0c4b07a6cf54d800b44e77eca63f0b8fab7f91d423b6aa8b74ade323f5bf9909b3d5e67af06caacab810bd8a5fad6ce4c127496 SHA512 6516bb423a7b7a18c226f5eab903fee5147d15aaf29bbe3def230ae70d6190c8360b9645fc379acf8163103f986ffad727096729d5feee7610899ad8d98764a9
+EBUILD s6-rc-0.5.3.3.ebuild 1145 BLAKE2B 43e9477e7219cd45a89cc12f9ba6eda63f0e9272217ef8d70bd397b03d8c6cb7962af026566294317e8a5b1ae66b11635a82d15b181c6a95fd30c77965433f39 SHA512 fede378d5d7ce1849f23fe64645f9edb386f2f1fd63e5493d806808e60fa2680321b9b499fde3716a8f16326cb2b6f298de5d5d525250aefc976c4dfee68370a
+MISC metadata.xml 624 BLAKE2B 6bb21b1df5c53a8811ff8a98d86fc5c12343ea057c772ec1f287d38b9ae50a0e758179f7f17ba6f3b243853e0ede843b424803d46a47c4cf359f2026c8305e05 SHA512 6848575ab57d2e24f8efcd0d30e8226574098c4c01d751ed7a9a307a029fb5c6812ddece36c7f8c296c933f0e2fab4ded376bb1d9f6132803ceba0fb3ce70f07
diff --git a/sys-apps/s6-rc/metadata.xml b/sys-apps/s6-rc/metadata.xml
index aed39d3983af..0f616fa5c2bf 100644
--- a/sys-apps/s6-rc/metadata.xml
+++ b/sys-apps/s6-rc/metadata.xml
@@ -2,6 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person" proxied="yes">
+		<email>arkamar@atlas.cz</email>
+		<name>Petr Vaněk</name>
+	</maintainer>
+	<maintainer type="person" proxied="yes">
 		<email>samuel@sholland.org</email>
 		<name>Samuel Holland</name>
 	</maintainer>
@@ -9,10 +13,6 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
-	<maintainer type="person" proxied="yes">
-		<email>arkamar@atlas.cz</email>
-		<name>Petr Vaněk</name>
-	</maintainer>
 	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
diff --git a/sys-apps/s6-rc/s6-rc-0.5.3.3.ebuild b/sys-apps/s6-rc/s6-rc-0.5.3.3.ebuild
new file mode 100644
index 000000000000..58f87ce13f36
--- /dev/null
+++ b/sys-apps/s6-rc/s6-rc-0.5.3.3.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2023 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-2.11.2.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=/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
+		--disable-static-libc
+	)
+
+	econf "${myconf[@]}"
+}
diff --git a/sys-apps/s6/Manifest b/sys-apps/s6/Manifest
index 99beb828c7fd..1080014db016 100644
--- a/sys-apps/s6/Manifest
+++ b/sys-apps/s6/Manifest
@@ -1,3 +1,5 @@
 DIST s6-2.11.1.2.tar.gz 229092 BLAKE2B 672321d1b9b1b66e7c920a9c587d2ad3a3ca66be7bac0e3f9b4d8290c9d716a3e90ccaac709dbe7ac6525b972ef95429c776805fce3e36fc5b197e9cc826d258 SHA512 31feb2b1704d9561aff9fccdcb284e13f4ceb0f530214db8a393bdc10267801fbe1fc30b4271ad9bdf189dc52e2844f3db40f8f3e9cd438ac12415a51661f17d
-EBUILD s6-2.11.1.2.ebuild 1118 BLAKE2B b050af19fda87b5b8c838b66556561b1737a80c8b5965819a5325bd773cde69bba17cfd093476a13a45b52d16e3dd0ac74f6fca6730d917b7232effc60600f35 SHA512 64796d17a3f502ce5f3cc9e8aa5e77244799bef0ab1f94d60df48aba4a96c4863b940de2c3bb13f153aa9574ddca43a054a5f56d86ebcb3d8dc03eb57a8636a5
-MISC metadata.xml 883 BLAKE2B 501518e15b1abd7badfd84007057b30f5ce972d7da8997ebbc218db6aa4001e06500f3b42f88ff259324bd3ba732231275cd33f27baa1588e28b9b80098befa9 SHA512 98b763747501225ebb0a5a1b8fb8a49757bb64c792c572f01c84dbdfe62ae83f03f72cb4ccfb905f58f9d24f06ded96a158602528ee26c1979c017477a4be183
+DIST s6-2.11.2.0.tar.gz 246294 BLAKE2B c11fc25b9a209195a12cb12cb03560673c196c97cf5a0a66c850ed251dd387cdc1c6a002c9867ff9ad99faf1d8da42b4bb867074410d043c7cd2a8e8f1a2d44a SHA512 6666283d833f300d6d01984ffcc912e2ab49f88b756dc1748a2b997324c17494ad0e9dd40c0b0af8d367eaea99ab33be2d7afb070fa44e1991eb33776172e8a5
+EBUILD s6-2.11.1.2-r1.ebuild 1128 BLAKE2B 4956cbd823eacfb0fce11609edbc80e83fd1443db0d79753542fea0e33b9b21ab681d05f417b222a6e6e677854c9ca88fb03ed82790e338a12dd68041b78126b SHA512 c8a279fbf4ff83378c735e23ebc626c85d7618d9d25f6caba867079146c857fbce774cef57fb0f59abcf20069a999f881674a50f6ebe874c0ec45fe066453bb1
+EBUILD s6-2.11.2.0.ebuild 1151 BLAKE2B a1f2756265691a2b12de411b65a88172caf559d01b77f57df619201b7675261f77561c7b8bc2dca2980f7064357015a15b2f2b6d0dc02819896b9311f448f31b SHA512 3802a7f2e808e5a3c4ec8a821aa21cabe677226b7e89a3d2d3a05da354e27d0efec658e72c8fa59b947c160979ad9b274d0797648529369306fa1f6e72034020
+MISC metadata.xml 883 BLAKE2B 9a3dfebf852c277dade51f8f3caa46863c8d0466c7371f70ebe4530818d33c9c3656011c1f45c68c26badd9ab396baa3336b017c6937763fd5de64fcf8da554d SHA512 09e18443d718af2ef9515efb8df03af309ba46c72022322a44c14f99152e0c5d7463c9c23a1ad3756fa40bc6345626999e388201259e943484f26303767b901f
diff --git a/sys-apps/s6/metadata.xml b/sys-apps/s6/metadata.xml
index 405713375b37..1c3da2e84df9 100644
--- a/sys-apps/s6/metadata.xml
+++ b/sys-apps/s6/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>arkamar@atlas.cz</email>
+		<name>Petr Vaněk</name>
+	</maintainer>
 	<maintainer type="person">
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
@@ -9,10 +13,6 @@
 		<email>samuel@sholland.org</email>
 		<name>Samuel Holland</name>
 	</maintainer>
-	<maintainer type="person" proxied="yes">
-		<email>arkamar@atlas.cz</email>
-		<name>Petr Vaněk</name>
-	</maintainer>
 	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
diff --git a/sys-apps/s6/s6-2.11.1.2.ebuild b/sys-apps/s6/s6-2.11.1.2-r1.ebuild
index 3dae363c48c3..a9240e9e4205 100644
--- a/sys-apps/s6/s6-2.11.1.2.ebuild
+++ b/sys-apps/s6/s6-2.11.1.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ SLOT="0/$(ver_cut 1-2)"
 KEYWORDS="amd64 arm x86"
 IUSE="+execline"
 
-RDEPEND="dev-libs/skalibs:=
+RDEPEND="<dev-libs/skalibs-2.13.0.0:=
 	execline? ( dev-lang/execline:= )
 "
 DEPEND="${RDEPEND}"
diff --git a/sys-apps/s6/s6-2.11.2.0.ebuild b/sys-apps/s6/s6-2.11.2.0.ebuild
new file mode 100644
index 000000000000..446c90bc9cc4
--- /dev/null
+++ b/sys-apps/s6/s6-2.11.2.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2023 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-2.13.0.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=/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
+		--disable-static-libc
+		$(use_enable execline)
+	)
+
+	econf "${myconf[@]}"
+}