commit: 2fce14a9b581ec5442840c07d8de952fe1c05beb Author: Luis Ressel <aranea <AT> aixah <DOT> de> AuthorDate: Wed Nov 15 20:04:35 2017 +0000 Commit: William Hubbs <williamh <AT> gentoo <DOT> org> CommitDate: Wed Nov 15 20:07:19 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fce14a9
sys-apps/s6: Bump to 2.6.1.1 sys-apps/s6/Manifest | 1 + sys-apps/s6/s6-2.6.1.1.ebuild | 60 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+) diff --git a/sys-apps/s6/Manifest b/sys-apps/s6/Manifest index 9020de4572a..1507c1c4965 100644 --- a/sys-apps/s6/Manifest +++ b/sys-apps/s6/Manifest @@ -5,3 +5,4 @@ DIST s6-2.4.0.0.tar.gz 193534 SHA256 5e788d5935dbcce76ac9a99cfcf6ee46a2ffb84220c 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 DIST s6-2.6.1.0.tar.gz 195903 SHA256 f0de303791134302f2630b9fe76a936b064e1e3aa772c8ae1b891155a6ea2c79 SHA512 e29855cd3c0037d83270318569d2a79a8f616c681cb9c218cfc8c207d9c267cedbb6adc4a6379dbdd29323aef5549810363af08a9fdcc9308d8f6924c12399e6 WHIRLPOOL cf5d29fe60c9c857e8896ece9523c0401e236846bf27b4e6b35f107b5eb3058a2c95dd65673e18c631d1b74d5bf572af4996103ae23a5ac6ee3235d7c6861cd8 +DIST s6-2.6.1.1.tar.gz 196083 SHA256 0172b7293d4d5607ca3ca77382fee9b87c10bd58680720b29625cf35afc75c5c SHA512 08f1af0f2e66b3f60f4a6b1489ae91fc59dd5aec97789cc655ae2ba7841327293e3a3027155d02502b34bcdad40778dfaeb441f100e8598aecf081d9d739c99d WHIRLPOOL f6be53e83dd9d2448ce0291088814b81df4bdf892d661c16f658921c57e4e3d9940dfcddc42b4dea2d23ac4b69b4b8c3e9f360e5e5f057562ebe41be3a61f607 diff --git a/sys-apps/s6/s6-2.6.1.1.ebuild b/sys-apps/s6/s6-2.6.1.1.ebuild new file mode 100644 index 00000000000..c638efeca0a --- /dev/null +++ b/sys-apps/s6/s6-2.6.1.1.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.3[static-libs] + >=dev-libs/skalibs-2.6.0.1[static-libs] + ) + !static? ( + >=dev-lang/execline-2.3.0.3[static=] + >=dev-libs/skalibs-2.6.0.1 + ) +" +RDEPEND=" + >=dev-lang/execline-2.3.0.3:=[!static?] + !static? ( + >=dev-libs/skalibs-2.6.0.1:= + ) +" + +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 -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) +}
