gentoo resync : 29.12.2022

4 files changed, 9 insertions, 60 deletions

diff --git a/sys-apps/s6-portable-utils/Manifest b/sys-apps/s6-portable-utils/Manifest
index f9b5d782e0c3..e6cd912b7454 100644
--- a/sys-apps/s6-portable-utils/Manifest
+++ b/sys-apps/s6-portable-utils/Manifest
@@ -1,7 +1,5 @@
-DIST s6-portable-utils-2.2.3.0.tar.gz 49239 BLAKE2B 3be6d6f7b92eea4fb67e3e52ced4409d2bc04c7bb23fea146d778b3739b4682f10dcd2f58cc37a7760368a645d0fa50c887445e6006a563d290c739e72634e9f SHA512 17cb58a49494bba323f031aa07db134505a0884827745ea48e4e93d1ea70b9d4dd141d065b126abb40d5c7625cbb03ba71090e66fd0adb0c54ab49478e929837
-DIST s6-portable-utils-2.2.3.4.tar.gz 50120 BLAKE2B 17eecbf432b91720ed672e0388665e3dd7302fa2638225d0cdb9ad3c580fa29734ebf5f6e838e1bc4fdcec841ac4414d5b13d78ccb9167f5fad18dc763d8f611 SHA512 1bb9f7bd1c00d12d8434dbabb7061fe589ee9de9f0745399aacf560712bb0c9b4df2dbc221b0c8144c351e9976982c7a7e69dd127517281799d810596d8db5a2
 DIST s6-portable-utils-2.2.4.0.tar.gz 50343 BLAKE2B edfbe4ab48914ae485072f220931e6af4d53fc8d1c1dc5e1186bc1688a429e6d14a370b02dbe0a9b641a8204f65e6f6bfb6cb0c0c9318acf89d9f6ad7f7f914f SHA512 35b62aff76b9fbf978e81dad2f343a2542cb4a853530948cc3b446b20e8d5f976d1624194c2aad6e0277b73d23d5cecf2142e3f2916bd152ad62342fc30fe07a
-EBUILD s6-portable-utils-2.2.3.0.ebuild 1128 BLAKE2B 028d23ac9833e15903d5a4bb8bde19423993280bc38c210ff31de80bf885f0aa216a55b2dc047df4ba565d4af5e4b53c08fe8488f6765697b77c8d667b5932eb SHA512 33674630d7611880b44a67cf390037007b8f321c138fe49be1588a3e27d75639d63b804cf60d9c5639b62cff5d5c355f34c75526c5bc614a6c5998985e90a898
-EBUILD s6-portable-utils-2.2.3.4.ebuild 1075 BLAKE2B f5b3b90648b618522c9a12658fc397010f8afa09329e6f13384e3d2e9f66a374a474ce456c646bf9914d56b8448f062278869356549ceaa4a2dae09a52b46304 SHA512 4e6a7ecd36e4525e07a4df1ebf2750aa2eb73b19b4c7bbb6f67c49f8908ccab0f11a2ed085491aff8b9c2c5bda8023b9e9b937f2c543537e0c673521f8f1ed3d
-EBUILD s6-portable-utils-2.2.4.0.ebuild 1077 BLAKE2B 1a6204b90ece44b6f12cfb259e9ecba89552848f5759b0793b1ed9d7e93cbd925672c7e2a467b0e83824f6af5ddf1d7bff9cb90d0c2b4775fb967e0e5d2cf906 SHA512 250d3c598588b128dcbba24a5ef657798b158262ef9fb868e6000aceb48c92d082a85124c9a33f0dbdc32e7dfee9d1373a361642fbeff1e5e614364fd8b857db
+DIST s6-portable-utils-2.2.5.0.tar.gz 50911 BLAKE2B e79d803544e8df6b791ecd22bd61b7c9535945c5557a25d7bc5488f5015967c4a750f1c0a136cc49b30ddd5bf3fbc17927e5ec01184106e44d0c08643e98e41a SHA512 2e90a1390140818268bd83629579098552c22160537874a90d4be94fae157cb9cdb864859c40847e8588fa9f62fb5af7bf89aa12561f1e6678a7cffc0f0a6d68
+EBUILD s6-portable-utils-2.2.4.0-r1.ebuild 1067 BLAKE2B a9d5f552beec4cc602fdc8dc1dfb933b282eaa63aed91161f2a7baa42f63fbdbeebd38eb20272135ee805266c3166f2d79c34c9bc8bdca77946f63334aedb2f4 SHA512 f0082da58ea6b2d158cfc7256e2bee3aa8e3f4edcfc35056e3053401cfa958dc859e6c831b121e479f06d7d8b02c5b3a371e93cbdf90705182ed2cc5da58c356
+EBUILD s6-portable-utils-2.2.5.0.ebuild 973 BLAKE2B 6676a2451c4f534b6c87b5e4233d7ad8e969c0d16411d457a3216b43ea2728743b6d50607aa0522e4dcb8f9d174428cdff7b7a39889d773f9308885cd007d772 SHA512 db620eb11e4b63ee5add49cb9770df8a88fe42e51d5a9aa1c93922a7c4c6f5bd4db85bdd8941d597442827e28fc1b5e7f4283f2df6c8863c1eecd07530f5c115
 MISC metadata.xml 624 BLAKE2B 42e42ad932d528935b581814d0c4b07a6cf54d800b44e77eca63f0b8fab7f91d423b6aa8b74ade323f5bf9909b3d5e67af06caacab810bd8a5fad6ce4c127496 SHA512 6516bb423a7b7a18c226f5eab903fee5147d15aaf29bbe3def230ae70d6190c8360b9645fc379acf8163103f986ffad727096729d5feee7610899ad8d98764a9
diff --git a/sys-apps/s6-portable-utils/s6-portable-utils-2.2.3.0.ebuild b/sys-apps/s6-portable-utils/s6-portable-utils-2.2.3.0.ebuild
deleted file mode 100644
index 321cb2248504..000000000000
--- a/sys-apps/s6-portable-utils/s6-portable-utils-2.2.3.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Set of tiny portable unix utilities"
-HOMEPAGE="https://www.skarnet.org/software/s6-portable-utils/"
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="static"
-
-RDEPEND="!static? ( >=dev-libs/skalibs-2.10.0.0:= )"
-DEPEND="${RDEPEND}
-	static? ( >=dev-libs/skalibs-2.10.0.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)/skalibs \
-		--with-sysdeps=/usr/$(get_libdir)/skalibs \
-		$(use_enable static allstatic) \
-		$(use_enable static static-libc)
-}
diff --git a/sys-apps/s6-portable-utils/s6-portable-utils-2.2.3.4.ebuild b/sys-apps/s6-portable-utils/s6-portable-utils-2.2.4.0-r1.ebuild
index e94c0ff91382..175012649933 100644
--- a/sys-apps/s6-portable-utils/s6-portable-utils-2.2.3.4.ebuild
+++ b/sys-apps/s6-portable-utils/s6-portable-utils-2.2.4.0-r1.ebuild
@@ -14,9 +14,9 @@ SLOT="0"
 KEYWORDS="amd64 ~arm x86"
 IUSE="static"
 
-RDEPEND="!static? ( >=dev-libs/skalibs-2.11.1.0:= )"
+RDEPEND="!static? ( =dev-libs/skalibs-2.11*:= )"
 DEPEND="${RDEPEND}
-	static? ( >=dev-libs/skalibs-2.11.1.0[static-libs] )
+	static? ( =dev-libs/skalibs-2.11*[static-libs] )
 "
 
 HTML_DOCS=( doc/. )
diff --git a/sys-apps/s6-portable-utils/s6-portable-utils-2.2.4.0.ebuild b/sys-apps/s6-portable-utils/s6-portable-utils-2.2.5.0.ebuild
index 5defe8187bb3..34e4528aaa94 100644
--- a/sys-apps/s6-portable-utils/s6-portable-utils-2.2.4.0.ebuild
+++ b/sys-apps/s6-portable-utils/s6-portable-utils-2.2.5.0.ebuild
@@ -12,12 +12,9 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
 LICENSE="ISC"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="static"
 
-RDEPEND="!static? ( >=dev-libs/skalibs-2.11.2.0:= )"
-DEPEND="${RDEPEND}
-	static? ( >=dev-libs/skalibs-2.11.2.0[static-libs] )
-"
+RDEPEND=">=dev-libs/skalibs-2.12.0.0:="
+DEPEND="${RDEPEND}"
 
 HTML_DOCS=( doc/. )
 
@@ -40,8 +37,8 @@ src_configure() {
 		--with-dynlib=/usr/$(get_libdir)
 		--with-lib=/usr/$(get_libdir)/skalibs
 		--with-sysdeps=/usr/$(get_libdir)/skalibs
-		$(use_enable static allstatic)
-		$(use_enable static static-libc)
+		--disable-allstatic
+		--disable-static-libc
 	)
 
 	econf "${myconf[@]}"