gentoo resync : 02.02.2022

4 files changed, 75 insertions, 5 deletions

diff --git a/sys-apps/s6/Manifest b/sys-apps/s6/Manifest
index 1b2b566b291c..07bce9da5cae 100644
--- a/sys-apps/s6/Manifest
+++ b/sys-apps/s6/Manifest
@@ -1,3 +1,5 @@
+DIST s6-2.11.0.1.tar.gz 227802 BLAKE2B 76721fdbc4fdbcb11d20eff31b817e66c49a488290ac8564a0418c5cd2ba3a204625dac2ce0dedcc8fccb18f54c5178253627f6874160b748db323cb4a34f32e SHA512 e833ae42d7094a46eea4d914c8e9b07b030cab2c6010c1d7698a070d14adbb62a614822a9575a3064a6b8a5a856146fc9fa27661f0d84569dac14ad6cdbf84d9
 DIST s6-2.9.2.0.tar.gz 205009 BLAKE2B a3b3299d7d8695b4c3555a9603763e51c7c8d84d05ea229c787e46af8f5dca3efc09d16eb3380fbbd8e9ff1d300eddb5f632082ffa8dfbe08d45b5799f705131 SHA512 ef814c0426d00112c793d4f8bb99319cde8e4ab91c24e98401559bbd28eafdb11a66d446a31816a50f67d607ed1e8c55383362e9761abca21ca24b3598929eee
-EBUILD s6-2.9.2.0.ebuild 1252 BLAKE2B 8c63a78911536d00f5a79b3937fea91ce64a2ac462587ab7b897a4e6e61016a0eff3e2586a0b8b42a3c958e46b2190a06e472510ef4266d15b4007baa37fc2ec SHA512 31aa37d2b6268d987d00f9b95c7c268a913a271ccd96a2d78908644e3b64cc3a581ed089d7e5845078bd41cc2b3c0462e9e1b1b97ec707a31ee57afac557b1ca
-MISC metadata.xml 632 BLAKE2B 4d9f06acf6c47b1f40322079fe5174500e1807b848539aa90c3db97937d825f8987b43b5f23b2cb4f61204cc7a7e73f4e1fee4f77406d5a724d1e076163e3929 SHA512 e046eb516e16aecb46354b4e8fe6bd5b211882602c7e3a00684af9d37ab6eaa4f261a94743af5efbcbc1b4c22edf9fb6854c99f8d3ad8ec339072d14317aa99f
+EBUILD s6-2.11.0.1.ebuild 1305 BLAKE2B 26ba0cb63508b2d5b86a4c8904717a218d2e2603fd769f8762d9d02e6359ab1f207bfef84c4542f68c4271652795df435d2481e3041ac37300b65fef47987b60 SHA512 d14656e8c2605f6da631e221858593e7055cc2f558aa9290a07667915ab8ede16bf83a70de55768c0fb3348fc7c76ea9499f220238bc7d37d5ed1ae560bcf3ae
+EBUILD s6-2.9.2.0.ebuild 1360 BLAKE2B b031627f947e70b106b19335538a7873430dfba114d8c8fa5384570eb99d43c276777c4a6943bfac5808d57d8f0767e071db9a1405d44e758f71f90c6812ba89 SHA512 37b8ec76eeb1a008a5694ce07181a7b76bbeaf4e5ad445028e0fd0fecfd230541b8b68d529cfc59012e352b2116e2baf2b2508038edc0fbc2391b28aaa884781
+MISC metadata.xml 883 BLAKE2B 501518e15b1abd7badfd84007057b30f5ce972d7da8997ebbc218db6aa4001e06500f3b42f88ff259324bd3ba732231275cd33f27baa1588e28b9b80098befa9 SHA512 98b763747501225ebb0a5a1b8fb8a49757bb64c792c572f01c84dbdfe62ae83f03f72cb4ccfb905f58f9d24f06ded96a158602528ee26c1979c017477a4be183
diff --git a/sys-apps/s6/metadata.xml b/sys-apps/s6/metadata.xml
index 25581316988f..405713375b37 100644
--- a/sys-apps/s6/metadata.xml
+++ b/sys-apps/s6/metadata.xml
@@ -9,6 +9,14 @@
 		<email>samuel@sholland.org</email>
 		<name>Samuel Holland</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>
 	<longdescription lang="en">
 		S6 is a small suite of programs for UNIX designed to allow
 		service supervision similar to daemontools or runit.
diff --git a/sys-apps/s6/s6-2.11.0.1.ebuild b/sys-apps/s6/s6-2.11.0.1.ebuild
new file mode 100644
index 000000000000..3827e604be40
--- /dev/null
+++ b/sys-apps/s6/s6-2.11.0.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="skarnet.org's small and secure supervision software suite"
+HOMEPAGE="https://www.skarnet.org/software/s6/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+execline static static-libs"
+
+REQUIRED_USE="static? ( static-libs )"
+
+RDEPEND="execline? ( >=dev-lang/execline-2.8.2.0:=[static-libs?] )
+	>=dev-libs/skalibs-2.11.1.0:=[static-libs?]
+"
+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)
+		--libdir=/usr/$(get_libdir)/${PN}
+		--with-dynlib=/usr/$(get_libdir)
+		--with-lib=/usr/$(get_libdir)/execline
+		--with-lib=/usr/$(get_libdir)/skalibs
+		--with-sysdeps=/usr/$(get_libdir)/skalibs
+		$(usex execline '' '--disable-execline' )
+		--enable-shared
+		$(use_enable static allstatic)
+		$(use_enable static static-libc)
+		$(use_enable static-libs static)
+	)
+
+	econf "${myconf[@]}"
+}
diff --git a/sys-apps/s6/s6-2.9.2.0.ebuild b/sys-apps/s6/s6-2.9.2.0.ebuild
index c7ca3e11252d..473967d84b7d 100644
--- a/sys-apps/s6/s6-2.9.2.0.ebuild
+++ b/sys-apps/s6/s6-2.9.2.0.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
+inherit toolchain-funcs
+
 DESCRIPTION="skarnet.org's small and secure supervision software suite"
 HOMEPAGE="https://www.skarnet.org/software/s6/"
 SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
@@ -14,8 +16,8 @@ IUSE="+execline static static-libs"
 
 REQUIRED_USE="static? ( static-libs )"
 
-RDEPEND="execline? ( >=dev-lang/execline-2.6.0.1:=[static-libs?] )
-	>=dev-libs/skalibs-2.9.2.1:=[static-libs?]
+RDEPEND="execline? ( <dev-lang/execline-2.7.0.0:=[static-libs?] )
+	<dev-libs/skalibs-2.10.0.0:=[static-libs?]
 "
 DEPEND="${RDEPEND}"
 
@@ -27,9 +29,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) \