gentoo auto-resync : 17:11:2023 - 16:57:03

19 files changed, 380 insertions, 16 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 5a1b9e2816c7..c5dc5862a9c3 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/pv/Manifest b/sys-apps/pv/Manifest
index 78116e22e4aa..3c62f1140c8f 100644
--- a/sys-apps/pv/Manifest
+++ b/sys-apps/pv/Manifest
@@ -4,5 +4,6 @@ DIST pv-1.8.0.tar.gz 321376 BLAKE2B b7c0cad63514d2a2254e3d0f2c3e883e958d420cd8df
 DIST pv-1.8.0.tar.gz.asc 691 BLAKE2B df0a7d58ae3ba4065a85ab922e2094064ab435ba252013ea98573993572bc14956603cc0341a3966fb867b13fb828a3a53afeea3ffc31b825d3c5f30cf6faf15 SHA512 8fb93fc4f3476f944affb839c28fd36df0adca5ef4adf69ad6604afcd117e0e3d504687992cf9113f10d7829ccda6c368f7bb901545cfe1ff170ada81d73f9ef
 EBUILD pv-1.6.20.ebuild 1456 BLAKE2B 055fc1d118f5f5500e3fb453d94ae40c0db8389425df249cd2cc8d9303db9a113a13d324c1b2f53d993ce455eaaaa695bc542a4c53f5bc2564d314ffbe76721d SHA512 583e35041a54b3123c757acad234afb053d00703e8b8a57efb680fc76d7738485f30d0aed94ad31bbd9d4a4db7356b72a0628ec74fffaa3388af8b7e3abf54a3
 EBUILD pv-1.7.24.ebuild 1364 BLAKE2B bcf84d8ce9ef43828b060ace27d330cf452ae996539181bccc1114c111523650966d83996c7625848bb01693125ef768155ae4d958ebe1abb5e5322c04972e50 SHA512 92251054a71196ce418360c14cbcfdd1d0beec36c1420655a9cfbfb5c9c37016725e1f55f49791f95ec291f01877d937ac9d49b1c8f0c01988cffbca4324d84e
-EBUILD pv-1.8.0.ebuild 1155 BLAKE2B f9778f076e86a7a52ef153642dd72a88e78946e82edffce536a65ba401c9c4fe4396512130916d88a7ccbe5f133c698fc4b36d6c795007a44e470787ae766d43 SHA512 96c86e27d3d423ac0e052a3b41fb5d79000b77d6c2071ad9709861826bcc3304eb434a0051ef88ebbed51ea60ad6acbc15aa062d79088cfe3ebf94d7566404e6
+EBUILD pv-1.8.0.ebuild 1341 BLAKE2B bc3840a70764b5c278fed20f37e5c88d91c36f51cde981e70fbf93c4fc3a337463d94ce3e636ec43cb967f15056c11784298765c1ad38077a2440f2cdc95bd3a SHA512 8fd8771ef3f5aabcc38a5eda3e4ad0d72c35157741e6f94b164e0ef87fd7bbefafd3dfbc467a4de5ab7dbf9204b414c25c76ffe8d1d2bf8e47baee2fa9e02805
+EBUILD pv-9999.ebuild 1286 BLAKE2B d706213997fa9347003871e733498eb6cd7772506d3af209f6d6114827308fe27df92baccdf0285c740fb1d8a792b965d2368bafaf855aef5ee52e804a66b5fd SHA512 435a956dedf403f7fd6710383df5e7dfe8c249b24e795c259c58b5fead2d4dddcd459005badb6ad3fb7d79576ca5d5752152446a2c17b17f2009ce6439353ad3
 MISC metadata.xml 352 BLAKE2B 52ddc86245bfabca6612732be0e84d336ba0601d3b91d17c583025e370aeaaba0ff38ee9f2097eb0b57a434730d1b439835514488507093112d48b8ed7b36ccb SHA512 541a8d15d5810888535bec6d364dc5e319ae3960d44588660e52afafc37232b77f2f5fdbcdfec5e0dae2629f1ca2b9ca72ee1055e152b68d5b3bed8d3eff1d2a
diff --git a/sys-apps/pv/pv-1.8.0.ebuild b/sys-apps/pv/pv-1.8.0.ebuild
index c5442aa977e9..ca01ea55e00a 100644
--- a/sys-apps/pv/pv-1.8.0.ebuild
+++ b/sys-apps/pv/pv-1.8.0.ebuild
@@ -8,14 +8,21 @@ inherit linux-info toolchain-funcs verify-sig
 
 DESCRIPTION="Pipe Viewer: a tool for monitoring the progress of data through a pipe"
 HOMEPAGE="https://www.ivarch.com/programs/pv.shtml https://codeberg.org/a-j-wood/pv"
-SRC_URI="
-	https://www.ivarch.com/programs/sources/${P}.tar.gz
-	verify-sig? ( https://www.ivarch.com/programs/sources/${P}.tar.gz.txt -> ${P}.tar.gz.asc )
-"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://codeberg.org/a-j-wood/pv"
+	inherit autotools git-r3
+else
+	SRC_URI="
+		https://www.ivarch.com/programs/sources/${P}.tar.gz
+		verify-sig? ( https://www.ivarch.com/programs/sources/${P}.tar.gz.txt -> ${P}.tar.gz.asc )
+	"
+
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+fi
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="debug nls"
 
 BDEPEND="verify-sig? ( sec-keys/openpgp-keys-pv )"
@@ -28,6 +35,12 @@ pkg_setup() {
 	fi
 }
 
+src_prepare() {
+	default
+
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
 src_configure() {
 	tc-export AR
 
diff --git a/sys-apps/pv/pv-9999.ebuild b/sys-apps/pv/pv-9999.ebuild
new file mode 100644
index 000000000000..7d003e10536d
--- /dev/null
+++ b/sys-apps/pv/pv-9999.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/pv.asc
+inherit linux-info toolchain-funcs verify-sig
+
+DESCRIPTION="Pipe Viewer: a tool for monitoring the progress of data through a pipe"
+HOMEPAGE="https://www.ivarch.com/programs/pv.shtml https://codeberg.org/a-j-wood/pv"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://codeberg.org/a-j-wood/pv"
+	inherit autotools git-r3
+else
+	SRC_URI="
+		https://www.ivarch.com/programs/sources/${P}.tar.gz
+		verify-sig? ( https://www.ivarch.com/programs/sources/${P}.tar.gz.txt -> ${P}.tar.gz.asc )
+	"
+
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="debug nls"
+
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-pv )"
+
+pkg_setup() {
+	if use kernel_linux; then
+		CONFIG_CHECK="~SYSVIPC"
+		ERROR_SYSVIPC="You will need to enable CONFIG_SYSVIPC in your kernel to use the --remote option."
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	default
+
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	tc-export AR
+
+	econf \
+		$(use_enable debug debugging) \
+		$(use_enable nls)
+}
+
+src_test() {
+	emake -Onone check
+}
diff --git a/sys-apps/s6-linux-init/Manifest b/sys-apps/s6-linux-init/Manifest
index 97309dbdd3d6..739efc5107de 100644
--- a/sys-apps/s6-linux-init/Manifest
+++ b/sys-apps/s6-linux-init/Manifest
@@ -1,5 +1,7 @@
 DIST s6-linux-init-1.1.0.0.tar.gz 58588 BLAKE2B c2560a8decdf0ce1570391f1c6915d2368cf2457f30c8432501121f6bd78752f51bfa00d799d5ec0dbfe09addc6bc3822e723261f5db67558f7f111bd0f3df16 SHA512 4d96a7e9786c085445970290bdb77d763b912f8405fa2ca5ccd01c31e18bee67ca4b420f222a7ea599376a9ab4a89269cb7756ef15138b191168bfd01366c3a6
 DIST s6-linux-init-1.1.1.1.tar.gz 59951 BLAKE2B a906f58f9bef56d6bf0299d23e0fcf6c9a9e2b9c87d8ca5a7b5e3880445983589ab5ded18486e71dbea6778a94c39ae33378639c17f5988d1cb39121c80b0566 SHA512 7f8b81d7fd975c948676c7dad9c1824d304fde58ae660e0bc3256904d8cc53a3fa507428bfbafffcbdb5108b526cfd8d4ba1f2349b3dcf52acd31773ecc770ca
-EBUILD s6-linux-init-1.1.0.0.ebuild 1637 BLAKE2B 4d35a2508f4e5aab6e40e2e2d2426f49d927afb5c8b1cac782585559b4e960a8b9cc3028d54c678c6583295e515c741a7d90e27a472d01570cb9a80b9d8c881e SHA512 ac7d33bd71887fc8402234fbf96fd2fd7811ce9bccf8221dd1b8f30f4bcaa8ed9cd581f354dc85db3b1a5e013aa113863c8ef7195b637f28819951fb1edd6f05
-EBUILD s6-linux-init-1.1.1.1.ebuild 1638 BLAKE2B ff3a7269815cb3aa9978942ea18d609bebd002b5cbff1e5abbad229bbc9f191fe2a07dcea612259bc78284365c4ee8f7df36159b1ed4e59a871c48e61e4e8df9 SHA512 b0bbabe29f5f3cfeabdc3f6450c5590072efb60c35c20803cc8f365213de602685e758065048d37fbba17c063b4f02bb30b846b687076911909c3d5cc3346498
+DIST s6-linux-init-1.1.2.0.tar.gz 60986 BLAKE2B e1becccf2ae54d06e590586c3158ae4ea4ec9a78c942bbdca5aca7320cd3cbbf9fe7e4b711c1c3505027d704dbd5de2185dc4d84bbc2dfc7687ff41c765bb31e SHA512 76376c4d407e665f67f733f1366dbacca58d268ebdbe22a9147cb102d519bd4c5887a345f66db2005d29ed9a841cb5a388c73c7d8df00d984cc4a25b9a813786
+EBUILD s6-linux-init-1.1.0.0-r1.ebuild 1631 BLAKE2B c7b23a7f080f26a7dd07f575e89f5a277b287cae52212513f83ca4597b6cc4c1f20dc67cd8c36a7d271a491733679af384b07bd347f64759d72fb36e93e5ba8a SHA512 1922616ab86b822d0a54ea71de1666a31855ab6f86f2707aa2623f627e3b20c5e10a138b87e8bfb103e85e6dcbb7b8f6a8c497099c39a3a559c0a8cc1772320d
+EBUILD s6-linux-init-1.1.1.1-r1.ebuild 1632 BLAKE2B db96f40ecb0cc87ea68b42ed3f93a49dbe69410366455e553553f60031fdb04c26ddbe32647859d7672ae52a1addfcfb6ad6b0e2f0420eec046eac38a4903bcb SHA512 2676bcffa165f29b713407301c255aa58382689c607e0f1df37e82b0a999230541e22c1b09f01f44f7ff4407c4918bc104c4ba58e4fece54205de3c823d6ec0f
+EBUILD s6-linux-init-1.1.2.0.ebuild 1640 BLAKE2B e619ba186e0afa50bb1177e05951a669c58e47752e09d79baeef154f22bb8b29e0a46b435c9bb72c681efadf8eb123786b7ac5ead86cc2e28f9d3ed1fda86d06 SHA512 2228212db86b3cf4df853f7ee2bf664aed2bf1f111e8536640143974b73e99f4ad5a23472aeb3e4938cc2d6b2c76aecdd51e4e4aa19c631e7469a4ebf1e406d6
 MISC metadata.xml 762 BLAKE2B 57da7dfce946e1566ada1e25b90a5746cf60e5bfc1fb1aa1e3d0f24b5afb8475a1261dba37dbe5e256215c5e2477c1dc415872f9af1e66b08712be59f69e2b3f SHA512 6d1b096d6996c091bbadbea038fdcde9c8c20f7fa44df5355ab46e3d7b80ef0c3e8609dbf326400a0969e42f03300742887c15c6cc2edc5e6a27d35e5ab79a90
diff --git a/sys-apps/s6-linux-init/s6-linux-init-1.1.0.0.ebuild b/sys-apps/s6-linux-init/s6-linux-init-1.1.0.0-r1.ebuild
index efee132d5033..90102a4af725 100644
--- a/sys-apps/s6-linux-init/s6-linux-init-1.1.0.0.ebuild
+++ b/sys-apps/s6-linux-init/s6-linux-init-1.1.0.0-r1.ebuild
@@ -16,7 +16,7 @@ IUSE="+sysv-utils"
 
 RDEPEND="
 	dev-lang/execline:=
-	>=dev-libs/skalibs-2.13.0.0:=
+	dev-libs/skalibs:0/2.13
 	sys-apps/s6:=[execline]
 	sysv-utils? (
 		!sys-apps/openrc[sysv-utils(-)]
diff --git a/sys-apps/s6-linux-init/s6-linux-init-1.1.1.1.ebuild b/sys-apps/s6-linux-init/s6-linux-init-1.1.1.1-r1.ebuild
index 73485c0fdbd4..a4a7b6b594f0 100644
--- a/sys-apps/s6-linux-init/s6-linux-init-1.1.1.1.ebuild
+++ b/sys-apps/s6-linux-init/s6-linux-init-1.1.1.1-r1.ebuild
@@ -16,7 +16,7 @@ IUSE="+sysv-utils"
 
 RDEPEND="
 	dev-lang/execline:=
-	>=dev-libs/skalibs-2.13.0.0:=
+	dev-libs/skalibs:0/2.13
 	sys-apps/s6:=[execline]
 	sysv-utils? (
 		!sys-apps/openrc[sysv-utils(-)]
diff --git a/sys-apps/s6-linux-init/s6-linux-init-1.1.2.0.ebuild b/sys-apps/s6-linux-init/s6-linux-init-1.1.2.0.ebuild
new file mode 100644
index 000000000000..291223de4330
--- /dev/null
+++ b/sys-apps/s6-linux-init/s6-linux-init-1.1.2.0.ebuild
@@ -0,0 +1,75 @@
+# 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.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() {
+	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 64dae88b8bb5..5768b081230b 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.1.2.tar.gz 42886 BLAKE2B 8c25472c0c1d9c47fef2d210fa1d4ab17bba7e8da10a2b8374572dcc4a258f72c87212c70bd6c8151d7612d3fdb7233fc033f382cdb93b6dc4b5c74870ff5159 SHA512 7afb268719410e93c711d20532118d6dcc338ebdf9a12c18ba794e1a23acb9ed264133838e89cc0e26fbed1bfacb0d2eb20efc9dc9bddffa0a74f9bc2c17cdb7
+DIST s6-linux-utils-2.6.2.0.tar.gz 43287 BLAKE2B 2dcad4eac6250f7dfb31946baa8b21068297d6723bfd03abb01389183ca7b586db82e12be37acd9d2016923c0c693865153129fc265dd9e00852c1ba0c39c488 SHA512 b7bc96ef3aa81bc01c6ca2a82591201be0966d8aa2b71545c963f67dba8441a05631e0ea593f0a693ee04d6d2637754e9543eddbfe70ed9c0529ff49081aa54d
 EBUILD s6-linux-utils-2.6.1.2.ebuild 987 BLAKE2B 81eada21d56c4ec744f4fa5516b27b7563d04652739642d68e4388ece92d53a5ecfa4146f8f1f8de0772cfb6b32f841266cdba5fb2f58d098e79c07586fce7bd SHA512 3c99192ff3748caa924e3f3cc44be9d268919d644cbb96f89ca556c521ded1afbe0acc2b23aef60f31a875ed6612d4c3595526ea1a69dc8cedfd97e4893d2e7d
+EBUILD s6-linux-utils-2.6.2.0.ebuild 990 BLAKE2B 482ec79b9d2b931e968fd1617119773763d8354df95fc79f76ce94d95b10a462c4e5c835b4ace9a345722673646fd427069ad3f3c4c6fccc80ec284ae0b5d1e5 SHA512 33e61eaeea16c99b784df48b76048f1b1ce3456be6c9d99454eadf015bbaf897550f744d42eec39a3b4efde9483f24a1f2bc65bc6ca6b65814bde2745f426209
 MISC metadata.xml 624 BLAKE2B 6bb21b1df5c53a8811ff8a98d86fc5c12343ea057c772ec1f287d38b9ae50a0e758179f7f17ba6f3b243853e0ede843b424803d46a47c4cf359f2026c8305e05 SHA512 6848575ab57d2e24f8efcd0d30e8226574098c4c01d751ed7a9a307a029fb5c6812ddece36c7f8c296c933f0e2fab4ded376bb1d9f6132803ceba0fb3ce70f07
diff --git a/sys-apps/s6-linux-utils/s6-linux-utils-2.6.2.0.ebuild b/sys-apps/s6-linux-utils/s6-linux-utils-2.6.2.0.ebuild
new file mode 100644
index 000000000000..43ea27b14a6a
--- /dev/null
+++ b/sys-apps/s6-linux-utils/s6-linux-utils-2.6.2.0.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="/$(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 1b49070dfd37..c1ec66c74c6c 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.2.tar.gz 51106 BLAKE2B a7c55fb99f8d2e46343c14169cd63c5054b5869e1cd2b5cc4b158e1f47035d956aba8faa0cceed3c39dba43945bdac44d9fe3b7ef5edae184c85d9e9e33f7215 SHA512 f918244e8ed5957817d28fc43ae2cdcbbdce600dc208bc0422e262ce42f36d8e8b77002c2143e7741390eea52e9c4bae7a1358c23ebbba3c689c64c7115d4b72
-EBUILD s6-portable-utils-2.3.0.2.ebuild 991 BLAKE2B 1c1a54d8c39cedb3fec4f5efa2f6c4678b60cc35a28711af211e35dedb9705b5d01a6b2b332766c09e4af62906e66382789cb44f3c5cf7142794d0b4bfaf943b SHA512 fcbaabaa168f0d8097f194fb434ce3f993b761c3d66af73caa6eb6c625e23e503f50ae10c807153b274fa5ad8a3823fd5b2bedbfab3108d3701ea2e05c8babab
+DIST s6-portable-utils-2.3.0.3.tar.gz 51186 BLAKE2B 9a0b9f33a89cca730afc8190ab7be7fc25ed286970b430d33d8eb91d5b6e5ac4261e659674ec44c5e5a88b32a324cb62ee63837923f0a7481675c8eaa3e8804c SHA512 f75242ac6c06ffd5bd66b8a35bbdf39938cf3bfa6e79abd214af37e9e4acc732ca1760566862482bc964a5cca05bbce8bd24d7167b02dc66c5f397c85ee0d37f
+EBUILD s6-portable-utils-2.3.0.2-r1.ebuild 985 BLAKE2B b3d271993f5409a63389aad153415e806018b355ccc8bfce7852039039987692d3db798bf4fec11187e04bf2b34e1df14c72b91ff2722b37a60682582b753776 SHA512 925161d16a95bf5e6ac1916872bd2011ec928df7f3a6f146f21807415323a041dd0ae02370abdc9115748de2f8f13fc0e7138077f388d5b6aa621330c4516db7
+EBUILD s6-portable-utils-2.3.0.3.ebuild 994 BLAKE2B fb0e01ab3d096808e0cd7669768e2f79ecb1f9bbf013f4c6075d81e63d87d04e4e1afba1f88acdd12c033eec06340931bb8d04fa2ff5af3a325ac14034610a37 SHA512 3e98b8e9f625a7bc8e533b0558f1e89a4ea6cb63b083dcfca4a6ed8fd55dbf0929ea984f571f77838d347b296a24796b6e9e1571711136745ab0bcfdcf4bbc97
 MISC metadata.xml 624 BLAKE2B 6bb21b1df5c53a8811ff8a98d86fc5c12343ea057c772ec1f287d38b9ae50a0e758179f7f17ba6f3b243853e0ede843b424803d46a47c4cf359f2026c8305e05 SHA512 6848575ab57d2e24f8efcd0d30e8226574098c4c01d751ed7a9a307a029fb5c6812ddece36c7f8c296c933f0e2fab4ded376bb1d9f6132803ceba0fb3ce70f07
diff --git a/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.2.ebuild b/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.2-r1.ebuild
index 820e3f643603..038ce3ba71c2 100644
--- a/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.2.ebuild
+++ b/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.2-r1.ebuild
@@ -13,7 +13,7 @@ LICENSE="ISC"
 SLOT="0"
 KEYWORDS="amd64 arm x86"
 
-RDEPEND=">=dev-libs/skalibs-2.13.0.0:="
+RDEPEND="dev-libs/skalibs:0/2.13"
 DEPEND="${RDEPEND}"
 
 HTML_DOCS=( doc/. )
diff --git a/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.3.ebuild b/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.3.ebuild
new file mode 100644
index 000000000000..e476efbe496e
--- /dev/null
+++ b/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.3.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.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[@]}"
+}
diff --git a/sys-apps/s6-rc/Manifest b/sys-apps/s6-rc/Manifest
index 5e4d75073edd..5c6dd8a3aa09 100644
--- a/sys-apps/s6-rc/Manifest
+++ b/sys-apps/s6-rc/Manifest
@@ -1,3 +1,5 @@
 DIST s6-rc-0.5.4.1.tar.gz 101078 BLAKE2B d85a194712ab63369cb71cbe4c59efd8cbe507a5e74c6bdb1bbe9a0e9123b8b1179850a8abdb0dbc67ef3c09764c9a6fb11c5b366590ecf4922b0d5a0115bc14 SHA512 6b61df9fa1d9bd24430bab4c11bfba009ca79c62a32dd2db3b79a1057645da9f92db4058c66c35bb068d805d958bfdf024399d240559dfdee62f9a6a30cf2086
-EBUILD s6-rc-0.5.4.1.ebuild 1556 BLAKE2B c0c7fb45a47c8bcdb30fe15ce2d237cf6dd17a843046dfb62ddfe2461900700a91984535002e550745f841a5a13a98acb1645015d5096e50f87ec94d9165e9da SHA512 645523c9be142cd08eca2ed2f12345a7c99fef99ade917f511b11e857a389ce0c9e5da625dae2ac9153fac4555ab720ec8240261fba9adeb1bb45022813e7ae6
+DIST s6-rc-0.5.4.2.tar.gz 100896 BLAKE2B d9e6f580a32d27950c7c525a5b657b429616d1c937c71cee302939b847a58bae1d5e209f53113dc82b953b5aa14c6078b206566e4809902a8f06b17c5621205f SHA512 f04e94db957e6d0033e328cc63530f64c9db101815bcafdb00a23205f4e75039dd3e593f93d48e4d9877b0696ea734ca62f672d92ff31e4e07aa19d26d809443
+EBUILD s6-rc-0.5.4.1-r1.ebuild 1562 BLAKE2B d3676498d26c17486b46d25c3971585a7634bb3355761405de397d3f2ccb4c613cfa2797779c2d90b23101bf2f50ba1d8f61c90eb498ee39c97c41ac06fd1065 SHA512 734e50b3899fbd6e0085d482196277fc6bbd93f39cf4ae1d00be693a67a168eb239fb0190eeb05ef93fd661f5b5c40bf5c55a3e884640465e04a20fad37a5871
+EBUILD s6-rc-0.5.4.2.ebuild 1570 BLAKE2B 88c4239eefc08f5aa9dd40d7882337d1964101ca969de800873129377a295543e986b928e77629d94b79c07705d6d8ba6472cd8dee2fac8ab94524815243bc02 SHA512 ff8f5c94a8a4be736f602093d6f160315e57f8e3e653f5b973c4cbb12116d46c88b76c09a0f00852f532b198ff00fcee4869bff131f6e8b985c99992fe3a0cbc
 MISC metadata.xml 624 BLAKE2B 6bb21b1df5c53a8811ff8a98d86fc5c12343ea057c772ec1f287d38b9ae50a0e758179f7f17ba6f3b243853e0ede843b424803d46a47c4cf359f2026c8305e05 SHA512 6848575ab57d2e24f8efcd0d30e8226574098c4c01d751ed7a9a307a029fb5c6812ddece36c7f8c296c933f0e2fab4ded376bb1d9f6132803ceba0fb3ce70f07
diff --git a/sys-apps/s6-rc/s6-rc-0.5.4.1.ebuild b/sys-apps/s6-rc/s6-rc-0.5.4.1-r1.ebuild
index a67dc93f39d8..bb035ef77314 100644
--- a/sys-apps/s6-rc/s6-rc-0.5.4.1.ebuild
+++ b/sys-apps/s6-rc/s6-rc-0.5.4.1-r1.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="amd64 arm x86"
 
 RDEPEND="
 	dev-lang/execline:=
-	dev-libs/skalibs:=
+	<dev-libs/skalibs-2.14:=
 	>=sys-apps/s6-2.11.3.0:=[execline]
 "
 DEPEND="${RDEPEND}"
diff --git a/sys-apps/s6-rc/s6-rc-0.5.4.2.ebuild b/sys-apps/s6-rc/s6-rc-0.5.4.2.ebuild
new file mode 100644
index 000000000000..7d597db9002f
--- /dev/null
+++ b/sys-apps/s6-rc/s6-rc-0.5.4.2.ebuild
@@ -0,0 +1,65 @@
+# 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-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
+}
diff --git a/sys-apps/s6/Manifest b/sys-apps/s6/Manifest
index 6c8ff58c97cf..cf29a9190e51 100644
--- a/sys-apps/s6/Manifest
+++ b/sys-apps/s6/Manifest
@@ -1,3 +1,5 @@
 DIST s6-2.11.3.2.tar.gz 247882 BLAKE2B 67de13e967502f159b6ebc1a4727f16a123ae9a88e1441d30100a952da7b9c2acd53b417d1b4760be9e4082856c30447b9a2f7b60e46e92531ebe0cd20fb7c22 SHA512 fe87c7984905b3eb35d7c91a3f0b6ece5cb0eb2c6d16ea7725655f118c464cf017e10b6ed82b3b12b6deb331538fc5d20afea7f34ff98b85d4c437b09e07371a
-EBUILD s6-2.11.3.2.ebuild 1184 BLAKE2B 3a7f6160c952ec46c2645fcdd3357ede7700cc04d45b004785874b3e0f75486c77fe43bbc2e86005f167a1180c5b8b28cdbc8ed3aded60b3c2abad17d7a47244 SHA512 7b6e50b8d659363e2bf44e56ffce6c2db3d23f12ad2ad96ae299f0b0f52bac261fddb685d272853bf94efecc407874c1d84d780c9ee3dd522f367f0cc6d756bb
+DIST s6-2.12.0.0.tar.gz 255678 BLAKE2B cee3bccbdfb8dee8e38ad2757ed650dea5e940835df463fac447cb71404eedd331444f7f59de4aded98804e0f9b0dde7df19ceec081ee122d38fbf0747318fba SHA512 203de171fa6272c56d322b2ec1cd5b8690841bc4e047eb5118846415541905789a44abd37621f67ae97313f4b0fdfb42fe2c88dd83a0d60f0fe2956990881c96
+EBUILD s6-2.11.3.2-r1.ebuild 1178 BLAKE2B d5105aa0a81a634430c79ab7df4c69e7e4273a09c4269081e73d19396b39a10fcaf4dd2e02f2f757bb3b15b25f056959a82918d6282d2633033eb7bb29a6eefe SHA512 959d008ec52c99fe07de40efee8437585cbdd4b052bda73c5c79b7a12252ac07cab266ebb2de5d1764cbac6ccd210237fc24cffe8babf54ae23174a8dc510764
+EBUILD s6-2.12.0.0.ebuild 1187 BLAKE2B 51f0974eefebb464fea8fff60c1de5f57bafdbf9bae8247c8512095eac745cd2eef71c6264584a41d68bca154f2a7a5a9f55cf44b87ffa5de88b60ee99425961 SHA512 bd172e7a0553f601629d340f842408806ee4564e18da799fa9c6fc1000d5c68ee3833e32b01ec62528e169cb7e17c8ac1c1d4f86ca0c4ad1776b29935cc9975a
 MISC metadata.xml 883 BLAKE2B 9a3dfebf852c277dade51f8f3caa46863c8d0466c7371f70ebe4530818d33c9c3656011c1f45c68c26badd9ab396baa3336b017c6937763fd5de64fcf8da554d SHA512 09e18443d718af2ef9515efb8df03af309ba46c72022322a44c14f99152e0c5d7463c9c23a1ad3756fa40bc6345626999e388201259e943484f26303767b901f
diff --git a/sys-apps/s6/s6-2.11.3.2.ebuild b/sys-apps/s6/s6-2.11.3.2-r1.ebuild
index d38aa94a0fd2..3f47f07910ad 100644
--- a/sys-apps/s6/s6-2.11.3.2.ebuild
+++ b/sys-apps/s6/s6-2.11.3.2-r1.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="amd64 arm ~riscv x86"
 IUSE="+execline"
 
 RDEPEND="
-	>=dev-libs/skalibs-2.13.1.0:=
+	dev-libs/skalibs:0/2.13
 	execline? ( dev-lang/execline:= )
 "
 DEPEND="${RDEPEND}"
diff --git a/sys-apps/s6/s6-2.12.0.0.ebuild b/sys-apps/s6/s6-2.12.0.0.ebuild
new file mode 100644
index 000000000000..165537535fbf
--- /dev/null
+++ b/sys-apps/s6/s6-2.12.0.0.ebuild
@@ -0,0 +1,54 @@
+# 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 ~riscv ~x86"
+IUSE="+execline"
+
+RDEPEND="
+	>=dev-libs/skalibs-2.14.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="/$(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[@]}"
+}