gentoo resync : 29.12.2022

4 files changed, 81 insertions, 26 deletions

diff --git a/sys-apps/s6-rc/Manifest b/sys-apps/s6-rc/Manifest
index ab393c29ef56..c39bdf5ecbb2 100644
--- a/sys-apps/s6-rc/Manifest
+++ b/sys-apps/s6-rc/Manifest
@@ -1,5 +1,7 @@
-DIST s6-rc-0.5.2.0.tar.gz 98758 BLAKE2B 9de7a96a67be33dd152a801af1f85d2feeed6581e96cb5f9ea4f9497326061096fff4873e068d5eb9a7361aad6dc11e8c43566d4f108cccf0a56378448bc4df8 SHA512 663cddac2b60143703cf9cc33777ead2a283eb9cba53add726849e1c95418fa2729e0d3bc5dafe8879a5ce036f705e344aaf3f7e2f287fbd6c2a68e9dcbb01f5
 DIST s6-rc-0.5.3.0.tar.gz 99155 BLAKE2B 8d65ba95b9d3b9b68a9830c79b3c419513e00aff87fb7b9fa18e007107afd8f41c561ac37db9ff28b3fa5b0bf5656aa5053f4337cf24b0fcbc1ce7138712edf1 SHA512 0b5dda996d96761f1df192675ed117f2acff9f2ad24e6c1405f3eaa46fdd2767178005582fbc9938152232f85ff01b008efedab6c80051bc65f1193d468a56f1
-EBUILD s6-rc-0.5.2.0.ebuild 1613 BLAKE2B 8eaf3b4e3598ad22f0e4e26c54cab9bfb7e0592c5f3b2147ebc82841f5d7b45d3611ba60ef14e09358179dce3aa14bb7f96d568c40313cf15cb41659818ec708 SHA512 6035993720a534dc85be24466c65b3edda4d4b47da166fe1e360ebeae5f4e480fcff4fd5dd4c6e7cd47b5f94942302ce75e10d1256ec4a1765327fd5337fed5c
-EBUILD s6-rc-0.5.3.0.ebuild 1555 BLAKE2B 4999b9c4e4c54a6054a4f51b5a7c1bcb10ea6da1c78c664f2cb0e039451bc3ee4b8e1c3e5e324632278da9f8836da40594cc108315bb17024de12d56ead0d039 SHA512 596b1f9c1261ad6dcac1bba72080285a51d2ccb00714970824ac39ab5cfa49b92a28a231571ffd57947d2f930ba7b3ec85f4b3c1b9913fb5a1f0b2079192d3cc
+DIST s6-rc-0.5.3.1.tar.gz 99212 BLAKE2B 6f2bb8b25669dd0a87f716842c6a3018f8157e5193530fa84ce622169db5e8bb14cc145c64e4ea23d1905933b47411ad5b2b059e81435881c117c0377037be63 SHA512 1e181604510f39d0b10a3552c13e25d9a379552daa1c174c8856ce2e24ecbfb3271bd0236e1744de3a55053b1e96d550b816dbfff7aa3f75e0642003ab8e8bc9
+DIST s6-rc-0.5.3.2.tar.gz 99249 BLAKE2B 5719823edf9e9bece6a3efdb5072c4555fc796c48144a0d1da52c609aef8d7437afc9c30924636891a829a307c30017a85140644fb7836b380adb8afbd49b35b SHA512 72963b2aa8e338503918d063102653d392cbd701823e35f87b45d9777fd512f7ad49ab47b94df0f9e5ef50a0dad5162f6f3526fa77dfaa3afb48ad8db4097051
+EBUILD s6-rc-0.5.3.0-r1.ebuild 1564 BLAKE2B bd55d06fa05b0d563266477c137ac78de5a46afd74001e9393f08a9713426e1b9e1f19bb62703f4b1e41a7a1b3825b01cde70f2245bed79eb3ec18fa2988bd2a SHA512 e5877057af14429fcd0cf05d087b6df7f8d83f0691044938d63c7e79d01ad3f05a88e141c871475eb4cb983e097341580a60b21fbf5d063d7f6e34995bf5d4f4
+EBUILD s6-rc-0.5.3.1-r1.ebuild 1564 BLAKE2B bd55d06fa05b0d563266477c137ac78de5a46afd74001e9393f08a9713426e1b9e1f19bb62703f4b1e41a7a1b3825b01cde70f2245bed79eb3ec18fa2988bd2a SHA512 e5877057af14429fcd0cf05d087b6df7f8d83f0691044938d63c7e79d01ad3f05a88e141c871475eb4cb983e097341580a60b21fbf5d063d7f6e34995bf5d4f4
+EBUILD s6-rc-0.5.3.2.ebuild 1115 BLAKE2B 00fed9fbe5865de7315607d24ec115c7f250dbf2002eb665294acee5432014ffa36229f0bcd21bb5b5fbf3cc2add539bc1ac8877f139022a8207f499617fbc13 SHA512 ac171864566939e4314d9043de2e106b49478ce903295fbbd9a730ad5c453960f466921374a5038b89d5d44edc9fa7c66f3bc663985f2739e21805e7deb6c637
 MISC metadata.xml 624 BLAKE2B 42e42ad932d528935b581814d0c4b07a6cf54d800b44e77eca63f0b8fab7f91d423b6aa8b74ade323f5bf9909b3d5e67af06caacab810bd8a5fad6ce4c127496 SHA512 6516bb423a7b7a18c226f5eab903fee5147d15aaf29bbe3def230ae70d6190c8360b9645fc379acf8163103f986ffad727096729d5feee7610899ad8d98764a9
diff --git a/sys-apps/s6-rc/s6-rc-0.5.3.0.ebuild b/sys-apps/s6-rc/s6-rc-0.5.3.0-r1.ebuild
index 6feff233b4ae..4c6c8d4c1bca 100644
--- a/sys-apps/s6-rc/s6-rc-0.5.3.0.ebuild
+++ b/sys-apps/s6-rc/s6-rc-0.5.3.0-r1.ebuild
@@ -16,9 +16,9 @@ IUSE="static static-libs"
 
 REQUIRED_USE="static? ( 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?]
+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(-)?]
 "
 DEPEND="${RDEPEND}"
 
diff --git a/sys-apps/s6-rc/s6-rc-0.5.2.0.ebuild b/sys-apps/s6-rc/s6-rc-0.5.3.1-r1.ebuild
index 88fb3dd4c768..4c6c8d4c1bca 100644
--- a/sys-apps/s6-rc/s6-rc-0.5.2.0.ebuild
+++ b/sys-apps/s6-rc/s6-rc-0.5.3.1-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit toolchain-funcs
 
@@ -11,14 +11,14 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm 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?]
+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(-)?]
 "
 DEPEND="${RDEPEND}"
 
@@ -27,9 +27,8 @@ 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
 }
@@ -37,19 +36,22 @@ src_prepare() {
 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)/s6 \
-		--with-lib=/usr/$(get_libdir)/skalibs \
-		--with-sysdeps=/usr/$(get_libdir)/skalibs \
-		--enable-shared \
-		$(use_enable static allstatic) \
-		$(use_enable static static-libc) \
+	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)/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[@]}"
 }
 
 pkg_postinst() {
diff --git a/sys-apps/s6-rc/s6-rc-0.5.3.2.ebuild b/sys-apps/s6-rc/s6-rc-0.5.3.2.ebuild
new file mode 100644
index 000000000000..9304b3decb02
--- /dev/null
+++ b/sys-apps/s6-rc/s6-rc-0.5.3.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Service manager for the s6 supervision suite"
+HOMEPAGE="https://www.skarnet.org/software/s6-rc/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~x86"
+
+RDEPEND="dev-lang/execline:=
+	dev-libs/skalibs:=
+	sys-apps/s6:=[execline]
+"
+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)/s6
+		--with-lib=/usr/$(get_libdir)/skalibs
+		--with-sysdeps=/usr/$(get_libdir)/skalibs
+		--enable-shared
+		--disable-allstatic
+		--disable-static-libc
+	)
+
+	econf "${myconf[@]}"
+}