sys-apps/s6: Bump to 2.5.1.0, fix #618156

diff --git a/sys-apps/s6/Manifest b/sys-apps/s6/Manifest
index cbbca8f80539410947aa327e54e4c1b3b5a4be33..0d5d10698d1a8b582f70b2d012cd34defcb4b10c 100644 (file)
--- a/sys-apps/s6/Manifest
+++ b/sys-apps/s6/Manifest
@@ -3,3 +3,4 @@ DIST s6-2.2.4.3.tar.gz 192153 SHA256 f584ec56d5f2a3a2d81698d5f744b9b64d8fb6c22b5
 DIST s6-2.3.0.0.tar.gz 192887 SHA256 49c9a0476d93c6279c776ca5ae9c49b3fd39c356eda674828aebf78f8488e8e6 SHA512 40b9ae41b29a32a47a88211a3eb2a0771b5108fc57a2a7a0524e5c6b99bf31c465e99bd910b11c7de784f22b712c79bb32306e963bf8b1aa5270e5463577758c WHIRLPOOL 7052ece89b0bc4174b9583b3dba721322ee89974f9540a243fd9e4f4a5c43710360c31e5fd7596630f539e7204f7cb7bc92569e6a5d11a68cb520379078b5f37
 DIST s6-2.4.0.0.tar.gz 193534 SHA256 5e788d5935dbcce76ac9a99cfcf6ee46a2ffb84220c84225df7589e9a3585560 SHA512 bd294fd6ec6bd5b696c52f8ef43de278a82d2b5ec4bcea3f32ab45f15b22b33633210f38709c1e736bab8ac4c560af6a307b2617709adfc8d5f9c0bce329dff2 WHIRLPOOL 6c6fe574cfdd8d6d97279dac48d4a284941f1e2cce981fecac3fa5083fc3ddc9e960fa38676edf94881e48f7e85ce7875415c12a7f867ca847d2e639716e62d7
 DIST s6-2.5.0.0.tar.gz 190980 SHA256 11413aea4add3aea2d0f3f7515d274ac58d4adfb03661a1f6ce7fa2abd24dab1 SHA512 ffda119167fa334e2d87de1a453ddefafa541be0a71ced95f7eb2001dcc76a01db4a8bda04746c49d2cd26495453f0b39d3dbf57e2a76435c8537218b745da94 WHIRLPOOL 66a98dc92d0b83b3c67c6857d2d4ed2ba9e7abe0af77065430689a276b51088d6287b95fb381a77ee115288fe9ce48a4756aefd5221ccdce3b884fae0a6f4726
+DIST s6-2.5.1.0.tar.gz 191814 SHA256 73cd4c1975905db92122a7c7eebd0c480d046624426800b3bcc5a432e6af27cd SHA512 b8d40b541d6c9b4b78f2aea229eea3188f867dda4ed15626e590b549c0e6bd5114d015ad749faa520e69385272c0960cf6d635a4e51d4e14821e61cab7469fd0 WHIRLPOOL ad9e35e7c6097e07386846daf6a546cf16f0ea83c9ab646d6445fdec52f253aa4bdc64dc20a181125ecdbd28d33011cc0ea3376534852bc5968a3017a9cfb9b5

diff --git a/sys-apps/s6/s6-2.5.1.0.ebuild b/sys-apps/s6/s6-2.5.1.0.ebuild
new file mode 100644 (file)
index 0000000..622bd4a
--- /dev/null
+++ b/sys-apps/s6/s6-2.5.1.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit versionator
+
+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/$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="static static-libs"
+
+DEPEND=">=sys-devel/make-3.81
+       static? (
+               >=dev-lang/execline-2.3.0.1[static-libs]
+               >=dev-libs/skalibs-2.5.1.0[static-libs]
+       )
+       !static? (
+               >=dev-lang/execline-2.3.0.1[static=]
+               >=dev-libs/skalibs-2.5.1.0
+       )
+"
+RDEPEND="
+       >=dev-lang/execline-2.3.0.1:=[!static?]
+       !static? (
+               >=dev-libs/skalibs-2.5.1.0:=
+       )
+"
+
+DOCS="AUTHORS examples README*"
+HTML_DOCS="doc/*"
+
+src_prepare() {
+       default
+
+       # Remove QA warning about LDFLAGS addition
+       sed -i "s/tryldflag LDFLAGS_AUTO -Wl,--hash-style=both/:/" "${S}/configure" || die
+
+       # configure overrides gentoo's -fstack-protector default
+       sed -i "/^tryflag CFLAGS_AUTO -fno-stack-protector$/d" "${S}/configure" || die
+}
+
+src_configure() {
+       econf \
+               --bindir=/bin \
+               --dynlibdir=/$(get_libdir) \
+               --libdir=/usr/$(get_libdir)/${PN} \
+               --with-dynlib=/$(get_libdir) \
+               --with-lib=/usr/$(get_libdir)/execline \
+               --with-lib=/usr/$(get_libdir)/skalibs \
+               --with-sysdeps=/usr/$(get_libdir)/skalibs \
+               $(use_enable !static shared) \
+               $(use_enable static allstatic) \
+               $(use_enable static static-libc) \
+               $(use_enable static-libs static)
+}