gentoo resync : 29.12.2022

4 files changed, 62 insertions, 66 deletions

diff --git a/net-misc/s6-networking/Manifest b/net-misc/s6-networking/Manifest
index 1bbb53c3e36f..a255d03e9419 100644
--- a/net-misc/s6-networking/Manifest
+++ b/net-misc/s6-networking/Manifest
@@ -1,5 +1,5 @@
-DIST s6-networking-2.3.2.0.tar.gz 87949 BLAKE2B 675974fd5a2e2e764944eb314725834bbc1e4a17b87af9559cda4bca4a6cb3f0e766741519a4d5024f7a8608dfe80310801a59a2b04f8ccd42acede27efeffe2 SHA512 876005e3060493fb22efb59dcdc3392eb746454cf9c11c9c0ebdd6b24789db18e364039096a8a4168dcd4023b98e539d8489d490a0b7a24ddccc437f7076618d
 DIST s6-networking-2.5.1.0.tar.gz 110443 BLAKE2B 489676bcb050d57482b0901742b53ce6cff00e25c1d8effc5c3d96d8e8ad0d32d42a62c15c73155d3b21fcfe6f310fc0f0c020bf945ac1a4b1c7fb9e9785adf4 SHA512 5d64420811d8d8a0034431dccda82b7ddd546f3b7c40ed02e05565c29c3ec14b75477306fea1a1e4aacc898e66e03718d7ac229b85be82d62bfe26c3ffc5fdf8
-EBUILD s6-networking-2.3.2.0.ebuild 1477 BLAKE2B 96d16dfe48d15634efc4a263166d313fda023ecadf16bb1ee699bb3c82da7f392b4e78e50433870a61532c39a30092e4bd0899e8791fea298382c0c0771c9a66 SHA512 f4801e7bd836a1813cf4c30c6cff479ecb1804a76a6f4149be5282643e53bd4ac9ae701c8981d1d30053ee22f9e983d8def1de2c5db8d8133a59fea7bd2c6a82
-EBUILD s6-networking-2.5.1.0.ebuild 1499 BLAKE2B 37e5180ff6def720c91084889bfa9611269ff101f1c35dc56e3be6a7b9c3021238918cd7f3c010787582a16d70a8c31717be662928a0ce6bce90b2a2f2d64800 SHA512 73cb9a9746d3e2e93a0a4d3cd8bb87c36aea727331878c64abb269df38a2b5562e1ece1ffe6a7a97e0a7bc6ef618ee842f2862f8fdf49264c0d783c24f183483
+DIST s6-networking-2.5.1.1.tar.gz 110431 BLAKE2B 67776a8aa6b02d20ed73c8b8d45e255677c3688973f9ee5f8dcc0de5cfd26146b7ccdc680b22a57e2523d8ab3c08d6e090252e376d09c1edd971a391632d83a0 SHA512 a9c1970cad5b3aeee447cce7c858e8bd88ee378fe456cc68d032f195373dabf658eacf55d9fa39ec635e893116296c1c614b89d97c5045b90dbe745a52e24021
+EBUILD s6-networking-2.5.1.0-r1.ebuild 1504 BLAKE2B 33adf1e83378e0328edc28361b2e883e3bfd83fdaec2e38f0cac0d85b498091fea3439904ccfbf4f551686ac3a49aaa86b9b3a8810bc71138b32c741c7a987de SHA512 b4f765272eaa5496c9fed6f709bee064d2ed73aa43492c818db6d04eafc8390c14c300e66ad528fc6db29b5cf1a5bf2b9a8126145655ed6e8b2cd939e241c6d3
+EBUILD s6-networking-2.5.1.1.ebuild 1223 BLAKE2B 8e7b85ba0fca7e3cfd07a7fcb6c22037d9bd51d51ba8499ea9b35c0877e784e99cfbbdb4443bba569cd29c5c26972b4407e3c043a61f394466ba1153d81e58fc SHA512 81518d26f3ed84744d48c07ec48306e8f050962c38fa89d9efd2fb11af594704ff627bb09e608e321da06431570466db3bc1741f73610bbdf2855abf706e88b8
 MISC metadata.xml 807 BLAKE2B 3b0c32efb3bde7b1694f42e3210878e74b3b79d553cfde13815e4a3dee276540c8444191fdab060f3639ef8414ecc06c1efb3621a67b24a41c1fb3be01343a07 SHA512 a38d2ba464e4e6fa7da69fc2006e6110fcd5ab6e65d41676c4d8fc5ee06c5c9b4dc333ef83d1b607cd13927eb2a88d868aee92cd184bbc64d572a30900250833
diff --git a/net-misc/s6-networking/s6-networking-2.3.2.0.ebuild b/net-misc/s6-networking/s6-networking-2.3.2.0.ebuild
deleted file mode 100644
index a0221c4ec4bf..000000000000
--- a/net-misc/s6-networking/s6-networking-2.3.2.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Suite of small networking utilities for Unix systems"
-HOMEPAGE="https://www.skarnet.org/software/s6-networking/"
-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"
-
-REQUIRED_USE="static? ( 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?]
-	!static? (
-		<net-dns/s6-dns-2.3.4.0:=
-	)
-"
-DEPEND="${RDEPEND}
-	<net-dns/s6-dns-2.3.4.0[static-libs?]
-"
-
-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)/s6 \
-		--with-lib=/usr/$(get_libdir)/s6-dns \
-		--with-lib=/usr/$(get_libdir)/skalibs \
-		--with-sysdeps=/usr/$(get_libdir)/skalibs \
-		--enable-shared \
-		--disable-ssl \
-		$(use_enable static allstatic) \
-		$(use_enable static static-libc) \
-		$(use_enable static-libs static)
-}
diff --git a/net-misc/s6-networking/s6-networking-2.5.1.0.ebuild b/net-misc/s6-networking/s6-networking-2.5.1.0-r1.ebuild
index 47a1748d6605..47977f15efc7 100644
--- a/net-misc/s6-networking/s6-networking-2.5.1.0.ebuild
+++ b/net-misc/s6-networking/s6-networking-2.5.1.0-r1.ebuild
@@ -17,16 +17,16 @@ IUSE="ssl static static-libs"
 REQUIRED_USE="static? ( static-libs )
 	ssl? ( !static !static-libs )"
 
-RDEPEND=">=dev-lang/execline-2.8.1.0:=[static-libs?]
-	>=dev-libs/skalibs-2.11.0.0:=[static-libs?]
-	>=sys-apps/s6-2.11.0.0:=[execline,static-libs?]
+RDEPEND=">=dev-lang/execline-2.8.1.0:=[static-libs(-)?]
+	=dev-libs/skalibs-2.11*:=[static-libs?]
+	>=sys-apps/s6-2.11.0.0:=[execline,static-libs(-)?]
 	ssl? ( dev-libs/libretls )
 	!static? (
 		>=net-dns/s6-dns-2.3.5.2:=
 	)
 "
 DEPEND="${RDEPEND}
-	>=net-dns/s6-dns-2.3.5.2[static-libs?]
+	>=net-dns/s6-dns-2.3.5.2[static-libs(-)?]
 "
 
 HTML_DOCS=( doc/. )
diff --git a/net-misc/s6-networking/s6-networking-2.5.1.1.ebuild b/net-misc/s6-networking/s6-networking-2.5.1.1.ebuild
new file mode 100644
index 000000000000..9adaf81f7a5d
--- /dev/null
+++ b/net-misc/s6-networking/s6-networking-2.5.1.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Suite of small networking utilities for Unix systems"
+HOMEPAGE="https://www.skarnet.org/software/s6-networking/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~x86"
+IUSE="ssl"
+
+RDEPEND="dev-lang/execline:=
+	>=dev-libs/skalibs-2.12.0.0:=
+	net-dns/s6-dns:=
+	sys-apps/s6:=[execline]
+	ssl? ( dev-libs/libretls )
+"
+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)/s6
+		--with-lib=/usr/$(get_libdir)/s6-dns
+		--with-lib=/usr/$(get_libdir)/skalibs
+		--with-sysdeps=/usr/$(get_libdir)/skalibs
+		--enable-shared
+		--disable-allstatic
+		--disable-static-libc
+		$(use_enable ssl ssl libtls)
+	)
+
+	econf "${myconf[@]}"
+}