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

3 files changed, 69 insertions, 2 deletions

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
+}