gentoo resync : 02.02.2022

7 files changed, 50 insertions, 222 deletions

diff --git a/sys-apps/s6-linux-init/Manifest b/sys-apps/s6-linux-init/Manifest
index 99bbc8506d35..db7b63d66143 100644
--- a/sys-apps/s6-linux-init/Manifest
+++ b/sys-apps/s6-linux-init/Manifest
@@ -1,11 +1,5 @@
-DIST s6-linux-init-0.3.1.1.tar.gz 25955 BLAKE2B 46e8e88c9c48fd00819cd0f437eea7ca6a5c08751aa3196dda24a8d3a22fdb14270ae99c74134ab0e123dde65bf3cc86c7916a157e447a72428db9b3870ffe3f SHA512 b8a44e09fc6770e91f1ffeed3267bf5fb83cf857653727d52773674db5942fbbc010355bdf24e456d2b2df5a1ac72888b78b2ec502c0d42770af58aaaec00648
-DIST s6-linux-init-0.4.0.0.tar.gz 26744 BLAKE2B d56ba8def4e4a0158721fd9b9c4f19aa2e13e615e7e598fdced2b7c341820f31830c021d9181792bfd324e70163fed826c691a80fbbb7ae6f30be46eeb6330b9 SHA512 5b53d3afad28b476d366d649f9989de79adaaa3b7d255323bb121a6f8e6fef051306cd6368ddcc3745b6472bf4ac2ccb7f4088f6addeb6d52ebc40e703dcbb44
-DIST s6-linux-init-1.0.2.0.tar.gz 47666 BLAKE2B 95b092d624db23c0a31a3af8d381e471221f7e7608cad4b49e07ef1e12f6526532e912bd75ef9dd739e14dc1ca99f4aa80e8923ac31beee42828cdcc9c71030d SHA512 1140434b07bf85956382a43bc8f58fa32cbefc43e40a48825b9e938d7950d988585e872667b79ba1bd44f0befb69202bcb7347c0e722ab5d20dc9304cd1be843
-DIST s6-linux-init-1.0.3.1.tar.gz 48888 BLAKE2B 0633b66840396029686c32e13223527436db118a59abab5800d59c0baad8788c0dd4ff5e97704f680fce2182a64212394dc6a8e7dab6ae8028dbd8cfbf72dd4d SHA512 71b380ff0eaa1d297bf6af5a1c979efdf34d10ec1e440fd1ee3fcab8ddf2c5d7c903d151986ecb5f01a9e0135bedc8021e5fbf82a3fd66abfebcb5e3cbf19242
 DIST s6-linux-init-1.0.4.2.tar.gz 52731 BLAKE2B d9565921c7e3a786c3c9cdd1aae5cc8c1b0939d857b1da668443e756f39c5e454a618d6fc572490e37a01581dae44b799f8df6972701b8d91a947a05695ab604 SHA512 31dfe6911f6de527c43120097bd711cfb84cdec6f056ccaa03d48a1bcecb852caacdbaabddf0188ea30c4827abe3293acb8ebff8dfe80ea8665934802fac0e53
-EBUILD s6-linux-init-0.3.1.1.ebuild 1469 BLAKE2B 282b8558bd05147da619ed33e946cf65ada8e71dc8e2f7796d8e769c42b674b770f423198d51a8f73b0f14792d6dc5057ff747eb6ea4ced02727952e818ee501 SHA512 01077c8c6e2ae648ffa2447d4d4fb8d60ed98473194620517434b3755f91e7a6a25a79f80c729ba90d74fd76dd5b9a1e46522192076b821a2d34fe29d860146e
-EBUILD s6-linux-init-0.4.0.0.ebuild 1469 BLAKE2B c487b424ba9ff48c8b1f93de50793e803b406a6a64581cb47c0fd6172f20df4572ff2292af29be03cb4b19e9d8485cd51a6629e37a9a77e108c89c00ae117080 SHA512 48436969300b301de32133f9dd2f16fd5ea5be56f405c2eb3db7ebe4d7be7002385014a6ab10fe85ddc88c79235dd90355a2a0d5be863c67de653a1d5de858e6
-EBUILD s6-linux-init-1.0.2.0.ebuild 1670 BLAKE2B 8232e58ef6708936d98b6b3ed12ca25155174c7307cf7dd5cdd245625a89d74f2361ee2cbba1f5811f509c1fe2591343f6625bf51b3b481ade8fb9f86fd777d9 SHA512 ffef1f4e994d727ec80bb23fe2f2fb42b2950010753d83ba459071984c8880f5085bb083c623f39289a93604231014d9d8a02cf0faeae923477915e0f5fe513c
-EBUILD s6-linux-init-1.0.3.1.ebuild 1675 BLAKE2B b2ba090a18a25b3469153fb2f480d81529baf33ae7e002e595a89f3f303b532ed68cf3d7371c501f0d98cb871e8adf7ac6d6f0aa838f0bde4f6f1c1d97bca64c SHA512 ff438cdc3b7393689f8e1088a10323eb372813adbe5f5f1b3317139cf42b10d7ef7b688a214aa63438dd179bcea043694cb966b2b989a1e0314697131318f49b
-EBUILD s6-linux-init-1.0.4.2.ebuild 1684 BLAKE2B 87a4f9184c55aff9b1390c22bc72abbcf71b38451fda08c503c479800d89eabb8c5afc9663bf931800f1c92cdd3cc0e61ae0f0f9abce6114b2723a5c8cda79f1 SHA512 ab6701ff5a1f1f53d48f93c300aaf7f449149e53a0966afd77921ead2f58a3d2b3359f25ccb3b4d86d504afff518e60b5f069fd2f0a70045a6e421401914c465
-MISC metadata.xml 511 BLAKE2B d218dc0ece152edf9f1a095eb54c4ac640982b27eb9cb3fd2fda65cb20fb9072bc0a6d74966d39d57213e614d34392b59c8fce0f97128128fc0ab58bc8d63b05 SHA512 5086acc3437117b7cb49ce2af720e4847d8d50357076723b6dc200daa1a624caf4a791752fe0bc13635e66c92cf1bd8a00b37f3a5339d4b4c30373698057941e
+DIST s6-linux-init-1.0.7.1.tar.gz 58373 BLAKE2B 02d2a3898882a41adea85dfcc3f0e03636dac16758aea88c09bb0309d61fa86526d8e678e0a24b915949d7b76e77b558809be65ccc7b0c0156b852c3d1a587ba SHA512 92ef82c00cd8e6de92adccfe1c61ef23130458f912a6c9a7d52447584a775660446bdef1954bbff3042ecba3de9587fb2dab8e329bc96a8e55b486668b4aaf64
+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
+MISC metadata.xml 762 BLAKE2B c6fcd5da4965ab30aa041c568356cbe8fefb5df76f5396d5d47264d1463730be034b8a8fa96bfa8961bd27ea253495b340ce07da6f16f59ed1d657da560d36bc SHA512 ef5a96b38cc3b927841a7d7e9bdc27d6609c95f585b93c8e6496c57743cdb3d0335434c63d0634207c4554d8a0aaaebd2c0ec06e953d3065dd119db6972e1666
diff --git a/sys-apps/s6-linux-init/metadata.xml b/sys-apps/s6-linux-init/metadata.xml
index 84bf60219ce0..1e5f91a033de 100644
--- a/sys-apps/s6-linux-init/metadata.xml
+++ b/sys-apps/s6-linux-init/metadata.xml
@@ -9,6 +9,14 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<maintainer type="person" proxied="yes">
+		<email>arkamar@atlas.cz</email>
+		<name>Petr Vaněk</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="sysv-utils">Install sysvinit compatibility symlinks for telinit, halt, poweroff, reboot, and shutdown</flag>
 	</use>
diff --git a/sys-apps/s6-linux-init/s6-linux-init-0.3.1.1.ebuild b/sys-apps/s6-linux-init/s6-linux-init-0.3.1.1.ebuild
deleted file mode 100644
index fe8fbf9cdc59..000000000000
--- a/sys-apps/s6-linux-init/s6-linux-init-0.3.1.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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"
-KEYWORDS="~amd64 ~x86"
-IUSE="static"
-
-DEPEND=">=sys-devel/make-3.81
-	static? (
-		>=dev-libs/skalibs-2.6.0.0[static-libs]
-	)
-	!static? (
-		>=dev-libs/skalibs-2.6.0.0
-	)
-"
-RDEPEND="
-	>=dev-lang/execline-2.3.0.2
-	>=sys-apps/s6-2.6.1.0
-	>=sys-apps/s6-linux-utils-2.4.0.0
-	>=sys-apps/s6-portable-utils-2.2.1.1
-	!static? (
-		>=dev-libs/skalibs-2.6.0.0:=
-	)
-"
-
-DOCS="INSTALL examples"
-HTML_DOCS="doc/*"
-
-src_prepare() {
-	default
-
-	# Remove QA warning about LDFLAGS addition
-	sed -i "s/tryldflag LDFLAGS_AUTO -Wl,--hash-style=both/:/" "${S}/configure" || die
-
-	# configure overrides gentoo's -fstack-protector default
-	sed -i "/^tryflag CFLAGS_AUTO -fno-stack-protector$/d" "${S}/configure" || die
-}
-
-src_configure() {
-	econf \
-		--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 \
-		$(use_enable static allstatic) \
-		$(use_enable static static-libc)
-}
-
-pkg_postinst() {
-	einfo "The generated init script requires additional packages."
-	einfo "Read ${ROOT}usr/share/doc/${PF}/INSTALL for details."
-}
diff --git a/sys-apps/s6-linux-init/s6-linux-init-0.4.0.0.ebuild b/sys-apps/s6-linux-init/s6-linux-init-0.4.0.0.ebuild
deleted file mode 100644
index 769ec2dd047d..000000000000
--- a/sys-apps/s6-linux-init/s6-linux-init-0.4.0.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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"
-KEYWORDS="~amd64 ~x86"
-IUSE="static"
-
-DEPEND=">=sys-devel/make-3.81
-	static? (
-		>=dev-libs/skalibs-2.6.4.0[static-libs]
-	)
-	!static? (
-		>=dev-libs/skalibs-2.6.4.0
-	)
-"
-RDEPEND="
-	>=dev-lang/execline-2.3.0.4
-	>=sys-apps/s6-2.7.1.0
-	>=sys-apps/s6-linux-utils-2.4.0.2
-	>=sys-apps/s6-portable-utils-2.2.1.1
-	!static? (
-		>=dev-libs/skalibs-2.6.4.0:=
-	)
-"
-
-DOCS="INSTALL examples"
-HTML_DOCS="doc/*"
-
-src_prepare() {
-	default
-
-	# Remove QA warning about LDFLAGS addition
-	sed -i "s/tryldflag LDFLAGS_AUTO -Wl,--hash-style=both/:/" "${S}/configure" || die
-
-	# configure overrides gentoo's -fstack-protector default
-	sed -i "/^tryflag CFLAGS_AUTO -fno-stack-protector$/d" "${S}/configure" || die
-}
-
-src_configure() {
-	econf \
-		--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 \
-		$(use_enable static allstatic) \
-		$(use_enable static static-libc)
-}
-
-pkg_postinst() {
-	einfo "The generated init script requires additional packages."
-	einfo "Read ${ROOT}usr/share/doc/${PF}/INSTALL for details."
-}
diff --git a/sys-apps/s6-linux-init/s6-linux-init-1.0.2.0.ebuild b/sys-apps/s6-linux-init/s6-linux-init-1.0.2.0.ebuild
deleted file mode 100644
index 935ad1c8e6b1..000000000000
--- a/sys-apps/s6-linux-init/s6-linux-init-1.0.2.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 ~x86"
-IUSE="static static-libs +sysv-utils"
-
-REQUIRED_USE="static? ( static-libs )"
-
-RDEPEND=">=dev-lang/execline-2.5.1.0:=[static-libs?]
-	>=dev-libs/skalibs-2.8.1.0:=[static-libs?]
-	>=sys-apps/s6-2.8.0.1:=[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; avoid overriding -fstack-protector
-	sed -i -e 's/.*-Wl,--hash-style=both$/:/' -e '/-fno-stack-protector$/d' \
-		configure || die
-}
-
-src_configure() {
-	econf \
-		--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)
-}
-
-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-init/s6-linux-init-1.0.4.2.ebuild b/sys-apps/s6-linux-init/s6-linux-init-1.0.4.2.ebuild
index fac1fd9f99a1..63b8c46f64c7 100644
--- a/sys-apps/s6-linux-init/s6-linux-init-1.0.4.2.ebuild
+++ b/sys-apps/s6-linux-init/s6-linux-init-1.0.4.2.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
+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"
@@ -14,9 +16,9 @@ IUSE="static static-libs +sysv-utils"
 
 REQUIRED_USE="static? ( static-libs )"
 
-RDEPEND=">=dev-lang/execline-2.6.1.0:=[static-libs?]
-	>=dev-libs/skalibs-2.9.2.1:=[static-libs?]
-	>=sys-apps/s6-2.9.2.0:=[execline,static-libs?]
+RDEPEND="<dev-lang/execline-2.7.0.0:=[static-libs?]
+	<dev-libs/skalibs-2.10.0.0:=[static-libs?]
+	<sys-apps/s6-2.10.0.0:=[execline,static-libs?]
 	sysv-utils? (
 		!sys-apps/systemd[sysv-utils]
 		!sys-apps/sysvinit
@@ -32,9 +34,13 @@ src_prepare() {
 	# Avoid QA warning for LDFLAGS addition; avoid overriding -fstack-protector
 	sed -i -e 's/.*-Wl,--hash-style=both$/:/' -e '/-fno-stack-protector$/d' \
 		configure || die
+
+	sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
 }
 
 src_configure() {
+	tc-export AR CC RANLIB
+
 	econf \
 		--bindir=/bin \
 		--dynlibdir=/usr/$(get_libdir) \
diff --git a/sys-apps/s6-linux-init/s6-linux-init-1.0.3.1.ebuild b/sys-apps/s6-linux-init/s6-linux-init-1.0.7.1.ebuild
index c68f5e1a426b..2ce334d05831 100644
--- a/sys-apps/s6-linux-init/s6-linux-init-1.0.3.1.ebuild
+++ b/sys-apps/s6-linux-init/s6-linux-init-1.0.7.1.ebuild
@@ -1,7 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
+inherit toolchain-funcs
 
 DESCRIPTION="Generates an init binary for s6-based init systems"
 HOMEPAGE="https://www.skarnet.org/software/s6-linux-init/"
@@ -14,9 +16,9 @@ IUSE="static static-libs +sysv-utils"
 
 REQUIRED_USE="static? ( static-libs )"
 
-RDEPEND=">=dev-lang/execline-2.5.3.0:=[static-libs?]
-	>=dev-libs/skalibs-2.9.1.0:=[static-libs?]
-	>=sys-apps/s6-2.9.0.1:=[static-libs?]
+RDEPEND=">=dev-lang/execline-2.8.2.0:=[static-libs?]
+	>=dev-libs/skalibs-2.11.1.0:=[static-libs?]
+	>=sys-apps/s6-2.11.0.1:=[execline,static-libs?]
 	sysv-utils? (
 		!sys-apps/systemd[sysv-utils]
 		!sys-apps/sysvinit
@@ -29,25 +31,31 @@ HTML_DOCS=( doc/. )
 src_prepare() {
 	default
 
-	# Avoid QA warning for LDFLAGS addition; avoid overriding -fstack-protector
-	sed -i -e 's/.*-Wl,--hash-style=both$/:/' -e '/-fno-stack-protector$/d' \
-		configure || die
+	# 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() {
-	econf \
-		--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) \
+	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() {