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

4 files changed, 92 insertions, 3 deletions

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