[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-utils/

[Sam James]

commit:     d92753325265f8e45dbb2ade41bfa876add6d833
Author:     Petr Vaněk <arkamar <AT> atlas <DOT> cz>
AuthorDate: Sun Jan 23 12:54:19 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 28 07:59:12 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9275332

sys-apps/s6-linux-utils: add 2.5.1.7

-fno-stack-protector flag was removed from configure script in upstream
in version 2.5.1.4.

Upstream-commit: c934e0b32812 ("Don't put -fno-stack-protector in default 
CFLAGS")
Signed-off-by: Petr Vaněk <arkamar <AT> atlas.cz>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-apps/s6-linux-utils/Manifest                   |  1 +
 .../s6-linux-utils/s6-linux-utils-2.5.1.7.ebuild   | 48 ++++++++++++++++++++++
 2 files changed, 49 insertions(+)

diff --git a/sys-apps/s6-linux-utils/Manifest b/sys-apps/s6-linux-utils/Manifest
index d00f5c01ec13..c216167be4ed 100644
--- a/sys-apps/s6-linux-utils/Manifest
+++ b/sys-apps/s6-linux-utils/Manifest
@@ -1 +1,2 @@
 DIST s6-linux-utils-2.5.1.3.tar.gz 35549 BLAKE2B 
e39dcf141839e6fc4554ba10fc89daaa7b9600ffa4360c80d3278d49224c88f124588ec988a2386a3243923002a16d9829d4828c829fda18745356fa6774175d
 SHA512 
73c887e67251c162677b2151d37a1cdbb9cee6f50bd52c5eefd4750f9bf77452a023e0484891e384312fb169dfbe02af3d4cfecb17d34f1668cc0acb8d7a9181
+DIST s6-linux-utils-2.5.1.7.tar.gz 36574 BLAKE2B 
53b5c46e84873df2263eb05ef6dae2321957e2065966854402f819cff6712de991a3a3c480325556e53491c9016deb52c0a437a8b9bcc721dac97e31c98ba501
 SHA512 
dabe510d0a4d045578309beeec17aa1b4f88acb09513be65c31a7b338bd50fcb7cc809015fa7328c4a310b838f1335e754f49a12dcf369483c83294b5957156c

diff --git a/sys-apps/s6-linux-utils/s6-linux-utils-2.5.1.7.ebuild 
b/sys-apps/s6-linux-utils/s6-linux-utils-2.5.1.7.ebuild
new file mode 100644
index 000000000000..5d413e9c74c8
--- /dev/null
+++ b/sys-apps/s6-linux-utils/s6-linux-utils-2.5.1.7.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Set of tiny linux utilities"
+HOMEPAGE="https://www.skarnet.org/software/s6-linux-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.11.1.0:= )"
+DEPEND="${RDEPEND}
+       static? ( >=dev-libs/skalibs-2.11.1.0[static-libs] )
+"
+
+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)/skalibs
+               --with-sysdeps=/usr/$(get_libdir)/skalibs
+               $(use_enable static allstatic)
+               $(use_enable static static-libc)
+       )
+
+       econf "${myconf[@]}"
+}