gentoo resync : 29.12.2022

4 files changed, 11 insertions, 68 deletions

diff --git a/sys-apps/s6/Manifest b/sys-apps/s6/Manifest
index f101f06160a8..9638d470a2dc 100644
--- a/sys-apps/s6/Manifest
+++ b/sys-apps/s6/Manifest
@@ -1,7 +1,5 @@
-DIST s6-2.11.0.1.tar.gz 227802 BLAKE2B 76721fdbc4fdbcb11d20eff31b817e66c49a488290ac8564a0418c5cd2ba3a204625dac2ce0dedcc8fccb18f54c5178253627f6874160b748db323cb4a34f32e SHA512 e833ae42d7094a46eea4d914c8e9b07b030cab2c6010c1d7698a070d14adbb62a614822a9575a3064a6b8a5a856146fc9fa27661f0d84569dac14ad6cdbf84d9
 DIST s6-2.11.1.0.tar.gz 228745 BLAKE2B 872ac1f736337a8e6617c46af92f8e894c06a4b40501ebf58568dc6a58cb594fdf36654cdb8cfd8e922431c17f9b4f82441296a3ce8031ba8b1f27fa1ba8a051 SHA512 ab3cb4a61fae21537eacffdaa427a0a6b23b12088586f0cd8dc993e0de29e9863d04c8706cb044acdc08254002b19eb5f894262d37348d467f8c713d8124e738
-DIST s6-2.9.2.0.tar.gz 205009 BLAKE2B a3b3299d7d8695b4c3555a9603763e51c7c8d84d05ea229c787e46af8f5dca3efc09d16eb3380fbbd8e9ff1d300eddb5f632082ffa8dfbe08d45b5799f705131 SHA512 ef814c0426d00112c793d4f8bb99319cde8e4ab91c24e98401559bbd28eafdb11a66d446a31816a50f67d607ed1e8c55383362e9761abca21ca24b3598929eee
-EBUILD s6-2.11.0.1.ebuild 1303 BLAKE2B 48e80812dfdecce6aca5998024b95aaa25533f0dd6c73e03a7c41ea7b898b1388b3941b32ccf111912e7da89821f658fa1e0c4a1447bcff16c84825b58b88748 SHA512 0b2ba15254cd187e8594d1124e0431e7d6a64ce21578f36dd6e6309da93e64452ddc80b5c56d6fcd10770358df47b4f45e78c140f35ff6adb9cc2abbf7a8e552
-EBUILD s6-2.11.1.0.ebuild 1305 BLAKE2B 61b02f5abb1138a61a431f8ae267e0a5746ac6e8b759a5eca11b1845fc3ca5d18b9bedd6396508de68148aa718cdfade3684bdf5bfb446968f6920a867b71375 SHA512 ed187f4373043e66ab0aadba46ce10e350c7d5c1e596e67e5701e8de750c70ec6348d636d8dfd9b69413b233c0dbbbde6a44be140c4d3cc24e5e8c1e6db11dd5
-EBUILD s6-2.9.2.0.ebuild 1360 BLAKE2B b031627f947e70b106b19335538a7873430dfba114d8c8fa5384570eb99d43c276777c4a6943bfac5808d57d8f0767e071db9a1405d44e758f71f90c6812ba89 SHA512 37b8ec76eeb1a008a5694ce07181a7b76bbeaf4e5ad445028e0fd0fecfd230541b8b68d529cfc59012e352b2116e2baf2b2508038edc0fbc2391b28aaa884781
+DIST s6-2.11.1.1.tar.gz 228878 BLAKE2B c94c18b66862c7945a317ab76d933d40fc360847b71c6fb3d507535ee41637d60327a05486a93ab7aec630a0c8ead61d6c17bfc064bd9f94b39a7cc56f76cb49 SHA512 f5fc903c11b57b2a83d9e120a51f64b63984a2af9b772dd6fd64f268b512a083350abedcae04c926deb6751b5ae30e992d6a4128ddf4ab1d49c548ef8f3d7752
+EBUILD s6-2.11.1.0-r1.ebuild 1309 BLAKE2B 21e324158a89d92f9ff05d6188375435d3b254a722ab222f615224a12fa614dbdb0e5f2e7f40c410b6f104710094f6855fda0c8d50e4df505096cafdf22f3e20 SHA512 0e9b27a30c07af081e0fcb189ba7a9aa4eea03c685434a5c7bbe6a228eeca0bf6ff145215114eec7d760b7eb56bac457070396f7a53e0766473fd31813e30291
+EBUILD s6-2.11.1.1.ebuild 1121 BLAKE2B 3f1d0f3d60e2e7dc19380198c82431fa2362efe082980f62baa11b6c506cb004d28a15f6bb34299c107c03e6ebf13f7f671f895b1f2169a4253fb2569fc1eb16 SHA512 9e5335e94e50136c01df285867204dffb20819eab9bfbca8db92a0c8c8889f3cd166dab85f2bf954f92e79cb8986b42e7ce555f3c97f2ef33aa4fa072f4e4994
 MISC metadata.xml 883 BLAKE2B 501518e15b1abd7badfd84007057b30f5ce972d7da8997ebbc218db6aa4001e06500f3b42f88ff259324bd3ba732231275cd33f27baa1588e28b9b80098befa9 SHA512 98b763747501225ebb0a5a1b8fb8a49757bb64c792c572f01c84dbdfe62ae83f03f72cb4ccfb905f58f9d24f06ded96a158602528ee26c1979c017477a4be183
diff --git a/sys-apps/s6/s6-2.11.0.1.ebuild b/sys-apps/s6/s6-2.11.1.0-r1.ebuild
index 2f9f63992ca5..65697c3d13b7 100644
--- a/sys-apps/s6/s6-2.11.0.1.ebuild
+++ b/sys-apps/s6/s6-2.11.1.0-r1.ebuild
@@ -16,8 +16,8 @@ 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?]
+RDEPEND="execline? ( >=dev-lang/execline-2.8.3.0:=[static-libs(-)?] )
+	>=dev-libs/skalibs-2.11.2.0:=[static-libs(-)?]
 "
 DEPEND="${RDEPEND}"
 
diff --git a/sys-apps/s6/s6-2.11.1.0.ebuild b/sys-apps/s6/s6-2.11.1.1.ebuild
index bf45c253220e..dcdeeef35af5 100644
--- a/sys-apps/s6/s6-2.11.1.0.ebuild
+++ b/sys-apps/s6/s6-2.11.1.1.ebuild
@@ -12,12 +12,10 @@ 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"
+IUSE="+execline"
 
-REQUIRED_USE="static? ( static-libs )"
-
-RDEPEND="execline? ( >=dev-lang/execline-2.8.3.0:=[static-libs?] )
-	>=dev-libs/skalibs-2.11.2.0:=[static-libs?]
+RDEPEND="dev-libs/skalibs:=
+	execline? ( dev-lang/execline:= )
 "
 DEPEND="${RDEPEND}"
 
@@ -43,11 +41,10 @@ src_configure() {
 		--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)
+		--disable-allstatic
+		--disable-static-libc
+		$(use_enable execline)
 	)
 
 	econf "${myconf[@]}"
diff --git a/sys-apps/s6/s6-2.9.2.0.ebuild b/sys-apps/s6/s6-2.9.2.0.ebuild
deleted file mode 100644
index 473967d84b7d..000000000000
--- a/sys-apps/s6/s6-2.9.2.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# 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"
-
-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.7.0.0:=[static-libs?] )
-	<dev-libs/skalibs-2.10.0.0:=[static-libs?]
-"
-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
-
-	sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
-}
-
-src_configure() {
-	tc-export AR CC RANLIB
-
-	econf \
-		--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)
-}