gentoo resync : 20.03.2022

3 files changed, 78 insertions, 2 deletions

diff --git a/sys-apps/s6-linux-init/Manifest b/sys-apps/s6-linux-init/Manifest
index db7b63d66143..64b9275941fc 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.4.2.tar.gz 52731 BLAKE2B d9565921c7e3a786c3c9cdd1aae5cc8c1b0939d857b1da668443e756f39c5e454a618d6fc572490e37a01581dae44b799f8df6972701b8d91a947a05695ab604 SHA512 31dfe6911f6de527c43120097bd711cfb84cdec6f056ccaa03d48a1bcecb852caacdbaabddf0188ea30c4827abe3293acb8ebff8dfe80ea8665934802fac0e53
 DIST s6-linux-init-1.0.7.1.tar.gz 58373 BLAKE2B 02d2a3898882a41adea85dfcc3f0e03636dac16758aea88c09bb0309d61fa86526d8e678e0a24b915949d7b76e77b558809be65ccc7b0c0156b852c3d1a587ba SHA512 92ef82c00cd8e6de92adccfe1c61ef23130458f912a6c9a7d52447584a775660446bdef1954bbff3042ecba3de9587fb2dab8e329bc96a8e55b486668b4aaf64
+DIST s6-linux-init-1.0.7.3.tar.gz 58607 BLAKE2B 081c452761d96308b496e4ec3281c8b50d6cc1760b34d74647bd27cfef213e73f0cb1e1919c7d238242e8295c91a8fb3bf51638b1216e922516c71eb5718486a SHA512 ff4e1727f7d68ceb72db501de5abc36962b0083baef376899aefa4cd81420852c7966ca1c625339c052d205a28261cc928e87a2e5715854b5fcc4666c56eeff3
 EBUILD s6-linux-init-1.0.4.2.ebuild 1792 BLAKE2B 13834f7a4794db95f5cca7b98b8e2a119d5ba341a81a256ea953987c04994224d7108c43a0e375cf003821089f5973640e2399f3ce656d636abef7f3ed58fbed SHA512 83a8813ae4d6d6fe87d23c74e8093a999e52d29d4b4433172ff13dc55ecbb750da5729aa8f899b874ab0fbdea82eb21b5f82a4d975fc75de45c37422b64d0d83
-EBUILD s6-linux-init-1.0.7.1.ebuild 1736 BLAKE2B 736e8e0bc1819b1f692a28650150e3f0640aeadd0a253e956f5021d26478d05fe63e03542a63b69a84e16f6539026bc7eec03150dfc40b227ab896c84f48562f SHA512 6dbfa536593eabaee85109e68f0122e005997c7395081e517ad175e5731d7a3b287c6a9ff09432b7e80520e32e748a0335cf5a5aaf96a256ed47a09a62fc42b6
+EBUILD s6-linux-init-1.0.7.1.ebuild 1735 BLAKE2B e51d817eca7b4bb5a384309551029d5a79c584579fafc8fba909e38e566d0980829585e9ba0fb1042d337e6fd39e59c33226611c1068cd6526c62538f3eb06c2 SHA512 68766c6a3edf3368810cd029d24cbe1e20fea33006f2e2022c6418c2cf802a8c30b7eb4506eba6c2ffb8b9feb40b8ab138ee7e27006cee59cb93f1346825e20d
+EBUILD s6-linux-init-1.0.7.3.ebuild 1736 BLAKE2B c4726a5a52c2f662471f13bdcd644b5c3260b299a9a49dad3bf2948e9ce0aaa7d12ba9a52a6b8ec09a16e3fef96dad03c990636c181e77c4495cd7d77f8bb38a SHA512 ba7b39e4e7a14c03de166fd3bd9fdcecd97e71e06466108bfb692a0d02cd2e1e3fa81e8f9d84de3d9ce54985867f5a93b5dfe6da7aeb8d3373dbc55cd08b294a
 MISC metadata.xml 762 BLAKE2B c6fcd5da4965ab30aa041c568356cbe8fefb5df76f5396d5d47264d1463730be034b8a8fa96bfa8961bd27ea253495b340ce07da6f16f59ed1d657da560d36bc SHA512 ef5a96b38cc3b927841a7d7e9bdc27d6609c95f585b93c8e6496c57743cdb3d0335434c63d0634207c4554d8a0aaaebd2c0ec06e953d3065dd119db6972e1666
diff --git a/sys-apps/s6-linux-init/s6-linux-init-1.0.7.1.ebuild b/sys-apps/s6-linux-init/s6-linux-init-1.0.7.1.ebuild
index 2ce334d05831..13438c848234 100644
--- a/sys-apps/s6-linux-init/s6-linux-init-1.0.7.1.ebuild
+++ b/sys-apps/s6-linux-init/s6-linux-init-1.0.7.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm x86"
 IUSE="static static-libs +sysv-utils"
 
 REQUIRED_USE="static? ( static-libs )"
diff --git a/sys-apps/s6-linux-init/s6-linux-init-1.0.7.3.ebuild b/sys-apps/s6-linux-init/s6-linux-init-1.0.7.3.ebuild
new file mode 100644
index 000000000000..3d6d31aec21b
--- /dev/null
+++ b/sys-apps/s6-linux-init/s6-linux-init-1.0.7.3.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2022 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="static static-libs +sysv-utils"
+
+REQUIRED_USE="static? ( static-libs )"
+
+RDEPEND=">=dev-lang/execline-2.8.3.0:=[static-libs?]
+	>=dev-libs/skalibs-2.11.2.0:=[static-libs?]
+	>=sys-apps/s6-2.11.1.0:=[execline,static-libs?]
+	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=/usr/$(get_libdir)
+		--skeldir=/etc/s6-linux-init/skel
+		--libdir=/usr/$(get_libdir)/${PN}
+		--with-dynlib=/usr/$(get_libdir)
+		--with-lib=/usr/$(get_libdir)/s6
+		--with-lib=/usr/$(get_libdir)/skalibs
+		--with-sysdeps=/usr/$(get_libdir)/skalibs
+		--enable-shared
+		$(use_enable static allstatic)
+		$(use_enable static static-libc)
+		$(use_enable static-libs static)
+	)
+
+	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."
+}