gentoo auto-resync : 21:02:2023 - 14:24:25

13 files changed, 321 insertions, 3 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 61d93e4d373c..911aea013ff8 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/s6-linux-init/Manifest b/sys-apps/s6-linux-init/Manifest
index e379fc3a2f37..02de109ab0bc 100644
--- a/sys-apps/s6-linux-init/Manifest
+++ b/sys-apps/s6-linux-init/Manifest
@@ -1,5 +1,7 @@
 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
+DIST s6-linux-init-1.1.0.0.tar.gz 58588 BLAKE2B c2560a8decdf0ce1570391f1c6915d2368cf2457f30c8432501121f6bd78752f51bfa00d799d5ec0dbfe09addc6bc3822e723261f5db67558f7f111bd0f3df16 SHA512 4d96a7e9786c085445970290bdb77d763b912f8405fa2ca5ccd01c31e18bee67ca4b420f222a7ea599376a9ab4a89269cb7756ef15138b191168bfd01366c3a6
 EBUILD s6-linux-init-1.0.8.0-r1.ebuild 1578 BLAKE2B 8678965c43548fb62e98f4c0e2627d62fb45003d2fbb1d5a7712b3a4763c2a3c8aca13be12293c2d7be58b2c12172a169798f3de0c3317ad7ead7b3439fc5413 SHA512 64fb980bbf50d0cb6144a09755e87b60e0dddfd0721b84ac809cf609f22a2e43a4e358e65ec4c80d786095ca640d38948aa304d6b08a12a296bf97cca799843a
 EBUILD s6-linux-init-1.0.8.1.ebuild 1611 BLAKE2B 00cfe2328547c02e7741e9bbb4a81465158c88c41b20404e68c93f6c58dbcb1d098a934a6759eac3e80e2fc8638f161b12d7eac62431f98059450b9efb41a2a0 SHA512 0c343e02f8ee44fe9a447781673ca0144bbfa80fa67cd42f7eb3ec5f325f770d1aa15a8be845e3350b6bde4277e6ad7ff5cf82ee0ca7fb6a6295cd39fd15cf6e
+EBUILD s6-linux-init-1.1.0.0.ebuild 1640 BLAKE2B c264e71cb70a797e70977b61b9b9ed2ecfb13d84a353e1335d2cd6e43c723bb131185a704fba370da7d49e40bc45102852f7f1e2064a51cdc47a616314b6e074 SHA512 17534e767950a70b568c9edc13593e31352e7ae90112b6bf91b02cb5423f90afce2057a3b43266eaa9feb6459c0cb1d3d4899fd68db1bc24340cfdf19645c0bd
 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.ebuild
new file mode 100644
index 000000000000..795a17748e77
--- /dev/null
+++ b/sys-apps/s6-linux-init/s6-linux-init-1.1.0.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.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="/$(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 58c2d809abb7..161f94bbe091 100644
--- a/sys-apps/s6-linux-utils/Manifest
+++ b/sys-apps/s6-linux-utils/Manifest
@@ -1,5 +1,7 @@
 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
+DIST s6-linux-utils-2.6.1.0.tar.gz 42798 BLAKE2B b3e858c5755ffc7604e23a8fc08344161a11cad7b52183f5c527cd155c0d15c50f004aa4365cbbb236c5c1e5a48ff8af7787084c10f7517ef0e81d4afcf12c8b SHA512 a9308cf6629439356c7379d7e07e79cd2fa780014f65fa997551b89fe8a7a9490145efea8612490ece4bdaf3b0ae06e07464ec157a1ed1509d4afee2d5722ec1
 EBUILD s6-linux-utils-2.6.0.0.ebuild 966 BLAKE2B a34447f3a84d3eed78eefc5f3c3e7fecc17d3b04ca198c4564e953b1194ef55e9f298338bd4e1e853af4151ba0b95c9208a484c6685c76499cfb28ea61317932 SHA512 9f0f3612ac4a528ccdeb03e7a73c5044a091faf486774c7a5996dd75dd0bd1890be1ee65424c5125879489c538529952438810a97a4abf100a2100ca8d087d71
 EBUILD s6-linux-utils-2.6.0.1.ebuild 988 BLAKE2B bf3af15622b397afc52ce8579c52948bd5bc3b66c50fad8a0b0811829617f62b53d954f56b7c5f3cfbd6e22d840b67fa3f133dd1687669b0ae5447c96016973f SHA512 1c739301b8066ba67624d094af453415702657c4928eae6fe83dceef8789129e873d212c37329d63425ae58be7ac22f4d1535da13f998a77063aa02b9616121e
+EBUILD s6-linux-utils-2.6.1.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.1.0.ebuild b/sys-apps/s6-linux-utils/s6-linux-utils-2.6.1.0.ebuild
new file mode 100644
index 000000000000..43ea27b14a6a
--- /dev/null
+++ b/sys-apps/s6-linux-utils/s6-linux-utils-2.6.1.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 db9d1be57f49..b578373d2807 100644
--- a/sys-apps/s6-portable-utils/Manifest
+++ b/sys-apps/s6-portable-utils/Manifest
@@ -1,5 +1,7 @@
 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
+DIST s6-portable-utils-2.3.0.0.tar.gz 51712 BLAKE2B a0a26d2b287629789861df1380ff2903a356a0f461356746c7793b1b99daf5158202b95ee2bdded9a290d3bed8a94286252301329a1d491f47dde44000ab9390 SHA512 1ef0b937e2f698fb1b98440a84be0310e9be44763969ca812744ebc0a91fe75c50d5082067b6bb07c1acd9df1540f71b6d20254b97e4851bb28937815073298c
 EBUILD s6-portable-utils-2.2.5.0.ebuild 970 BLAKE2B db0e01d27af55c7790a0704819648ddfa12ff7378e408b93f740090605e0d9c2a66a6bfbc6c5e6eff3427144dac4555641019b0edf0b6f2e0cb0204e1833d2c1 SHA512 62c7aff22c7ae80799ae3a46e2d83c3e6cb296f97892980244d34d971cb37998f4716effe158cd2475e84b42991446ddebe7e065b18c41070b066ae647eda4ef
 EBUILD s6-portable-utils-2.2.5.1.ebuild 992 BLAKE2B 014e826b0dd2af2bc51120e75a89d162cdc0b2836c6446ff0e8aa4312e0b27d5b943bb069b2aba678f83c6d90f00779b1cd383431241dfbac6d19ca2465206d4 SHA512 3c82d15f5fec8e08e5c766fc790548b4ed32d7bf24a3279645080941bcdf77b622fe15a2594d1b1c6c29813b8008916b7188ab3e02d8ca51c271a2c494b75443
+EBUILD s6-portable-utils-2.3.0.0.ebuild 994 BLAKE2B 7b2c678672b91cfd59de582900ebc76fcc6dc792323789ec5ff166abfa07657de10281f91e9aa186ea3bb2399321b517840ee495379740663f8d94b62380dd9e SHA512 f442fedab4fade4fc2846e0755bebf0099b88f87c4cb7a7c023e530d80a41edf218768c4c2c6a54bd84bcb65d5a159b16cfaa74dec4ce5cd773081ca65bbf2c6
 MISC metadata.xml 624 BLAKE2B 6bb21b1df5c53a8811ff8a98d86fc5c12343ea057c772ec1f287d38b9ae50a0e758179f7f17ba6f3b243853e0ede843b424803d46a47c4cf359f2026c8305e05 SHA512 6848575ab57d2e24f8efcd0d30e8226574098c4c01d751ed7a9a307a029fb5c6812ddece36c7f8c296c933f0e2fab4ded376bb1d9f6132803ceba0fb3ce70f07
diff --git a/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.0.ebuild b/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.0.ebuild
new file mode 100644
index 000000000000..84d119227fea
--- /dev/null
+++ b/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.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 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="/$(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 f8f9f6941bb2..b651cbee10bb 100644
--- a/sys-apps/s6-rc/Manifest
+++ b/sys-apps/s6-rc/Manifest
@@ -1,5 +1,7 @@
 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
-EBUILD s6-rc-0.5.3.3.ebuild 1145 BLAKE2B 43e9477e7219cd45a89cc12f9ba6eda63f0e9272217ef8d70bd397b03d8c6cb7962af026566294317e8a5b1ae66b11635a82d15b181c6a95fd30c77965433f39 SHA512 fede378d5d7ce1849f23fe64645f9edb386f2f1fd63e5493d806808e60fa2680321b9b499fde3716a8f16326cb2b6f298de5d5d525250aefc976c4dfee68370a
+DIST s6-rc-0.5.4.0.tar.gz 101034 BLAKE2B b3b8a5c3bfdb76870aad4f4bb100a3c0b48ec30c9edd24c87c990d3274e48dc05ef3fd765471509886daa8a123a98bb9aeb455c25510f8efd6ea545b5b4d26b4 SHA512 04e5fb73fca713f2dd01113fa70fc9a0f1d4bb600c7cbb0cbd6133a5d6641c07ce8774ce07f78854de5baae5be93b106f38a0687a07fff5e62744261a4d4ea70
+EBUILD s6-rc-0.5.3.2.ebuild 1497 BLAKE2B fd9d5b56b05c9f1b44625b3af94e8740f41094924e2e398e83858fac3e50022ba8aca12eb95997b3b42d1a77a44a101300bf6c0827ad8f0d17dfd964574d62e1 SHA512 775808ecfe3c2a577fd9bbab7371d9b1a912e0bdd54d37d1f77cf55391ece8edc63acc373b74324e79a9ee583a494ebea68f6002a7ffb5a4706ee9dc5f999963
+EBUILD s6-rc-0.5.3.3.ebuild 1530 BLAKE2B 7804a8eb8ccccf4f80fa7d540622d4b138df5b1c4cadf4a96c299f3a567c285d551b2141d7c3cfdb941cc460eef1b3986bbc034962b2d233821dac2ab074e45f SHA512 efa73a1c1016a9ec8fa8dee910ad36b9ce372991e1b057d08eebee98d9401fee83905660a4e411f082ac4f10fe6336cc8da6cc6713ce00b7dbd25dd7649265d3
+EBUILD s6-rc-0.5.4.0.ebuild 1559 BLAKE2B e890a4cea424776f5ad320d9672b522dd26af218c100ae4076e7b677cb2e6200314399a9c3521137c1295d627f3bb5cfc9eed8b66c8292f8e0fe2d6d42c0cfa5 SHA512 06597688ad3b06f1b0d46e90bf37953926df9617404c677084c82a95b5f1b578c09465d2b659f3a447a3a05cfae33fd741e685883f52154cc1a05184052d2f09
 MISC metadata.xml 624 BLAKE2B 6bb21b1df5c53a8811ff8a98d86fc5c12343ea057c772ec1f287d38b9ae50a0e758179f7f17ba6f3b243853e0ede843b424803d46a47c4cf359f2026c8305e05 SHA512 6848575ab57d2e24f8efcd0d30e8226574098c4c01d751ed7a9a307a029fb5c6812ddece36c7f8c296c933f0e2fab4ded376bb1d9f6132803ceba0fb3ce70f07
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
index 9950834606c2..47fe23696e6f 100644
--- a/sys-apps/s6-rc/s6-rc-0.5.3.2.ebuild
+++ b/sys-apps/s6-rc/s6-rc-0.5.3.2.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
@@ -49,3 +49,14 @@ src_configure() {
 
 	econf "${myconf[@]}"
 }
+
+pkg_postinst() {
+	for ver in ${REPLACING_VERSIONS}; do
+		if ver_test "${ver}" -ge "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 downgrading from newer"
+			elog "version."
+		fi
+	done
+}
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
index 58f87ce13f36..a64dada495c4 100644
--- a/sys-apps/s6-rc/s6-rc-0.5.3.3.ebuild
+++ b/sys-apps/s6-rc/s6-rc-0.5.3.3.ebuild
@@ -50,3 +50,14 @@ src_configure() {
 
 	econf "${myconf[@]}"
 }
+
+pkg_postinst() {
+	for ver in ${REPLACING_VERSIONS}; do
+		if ver_test "${ver}" -ge "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 downgrading from newer"
+			elog "version."
+		fi
+	done
+}
diff --git a/sys-apps/s6-rc/s6-rc-0.5.4.0.ebuild b/sys-apps/s6-rc/s6-rc-0.5.4.0.ebuild
new file mode 100644
index 000000000000..30a021e291ff
--- /dev/null
+++ b/sys-apps/s6-rc/s6-rc-0.5.4.0.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:=
+	>=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 8d29ce88122e..ae2034c28bdc 100644
--- a/sys-apps/s6/Manifest
+++ b/sys-apps/s6/Manifest
@@ -1,5 +1,7 @@
 DIST s6-2.11.1.2.tar.gz 229092 BLAKE2B 672321d1b9b1b66e7c920a9c587d2ad3a3ca66be7bac0e3f9b4d8290c9d716a3e90ccaac709dbe7ac6525b972ef95429c776805fce3e36fc5b197e9cc826d258 SHA512 31feb2b1704d9561aff9fccdcb284e13f4ceb0f530214db8a393bdc10267801fbe1fc30b4271ad9bdf189dc52e2844f3db40f8f3e9cd438ac12415a51661f17d
 DIST s6-2.11.2.0.tar.gz 246294 BLAKE2B c11fc25b9a209195a12cb12cb03560673c196c97cf5a0a66c850ed251dd387cdc1c6a002c9867ff9ad99faf1d8da42b4bb867074410d043c7cd2a8e8f1a2d44a SHA512 6666283d833f300d6d01984ffcc912e2ab49f88b756dc1748a2b997324c17494ad0e9dd40c0b0af8d367eaea99ab33be2d7afb070fa44e1991eb33776172e8a5
+DIST s6-2.11.3.0.tar.gz 247736 BLAKE2B a409e2f759e7096fa95c4cc60294b89b7625a712b95901fc3336d6c14af007a0a603db1f43db9a5e379657af3f2b0f4a995897a519346ee8a61e63ad5519fd19 SHA512 764981bb54c6add6bff7c77b41c6c61055fd8b9ba284c7b41e13e4103c8d5a3dddd442145d8eb572e5be6883ab6a9e3025c064d946e8e273e956d404528c5479
 EBUILD s6-2.11.1.2-r1.ebuild 1128 BLAKE2B 4956cbd823eacfb0fce11609edbc80e83fd1443db0d79753542fea0e33b9b21ab681d05f417b222a6e6e677854c9ca88fb03ed82790e338a12dd68041b78126b SHA512 c8a279fbf4ff83378c735e23ebc626c85d7618d9d25f6caba867079146c857fbce774cef57fb0f59abcf20069a999f881674a50f6ebe874c0ec45fe066453bb1
 EBUILD s6-2.11.2.0.ebuild 1158 BLAKE2B 75cba59b6609935f240ba947a7edb706f4e98e2aea39b18d12016959368c4567c38ebd42acb9eb8287ea19edd84da4edc362eb4c332d24880bb7aa2bf3f1656d SHA512 6b5ea3be51fd2c0308eeef57a550965d3a136b7c229c1102460e5014cea7e5c2a21a374d3d8be869289b58ce0f50db0435e5b0448f0714a5dff2eb16d72c2882
+EBUILD s6-2.11.3.0.ebuild 1187 BLAKE2B 4d63f1395fd7ec89db7ad2d2936b316487f4ab942e170ecf770fc4b99e962cbe937b773a7b129b03d9dae7ed2a938fb6ce5ee7b7af89d06376458f9b793e988d SHA512 48f8b564833e422c3c4a75198b556a664cad8d5c7e10f706ff5b2469e1657e3bf014339d055d03e6aa33ffd2e747844c1ffbea3eb17b5d5c713682676bf1b291
 MISC metadata.xml 883 BLAKE2B 9a3dfebf852c277dade51f8f3caa46863c8d0466c7371f70ebe4530818d33c9c3656011c1f45c68c26badd9ab396baa3336b017c6937763fd5de64fcf8da554d SHA512 09e18443d718af2ef9515efb8df03af309ba46c72022322a44c14f99152e0c5d7463c9c23a1ad3756fa40bc6345626999e388201259e943484f26303767b901f
diff --git a/sys-apps/s6/s6-2.11.3.0.ebuild b/sys-apps/s6/s6-2.11.3.0.ebuild
new file mode 100644
index 000000000000..589e48f8ebb4
--- /dev/null
+++ b/sys-apps/s6/s6-2.11.3.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.13.1.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[@]}"
+}