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

4 files changed, 81 insertions, 4 deletions

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