summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Holland <samuel@sholland.org>2017-10-03 13:32:23 -0500
committerWilliam Hubbs <williamh@gentoo.org>2017-10-03 13:43:54 -0500
commit8f4c407356bbd9d7f960f746b639522a30d9bdc9 (patch)
treef582cd124bed0f2c2bedc9d1a8ad939836be5ed8 /sys-apps/s6
parentdev-lang/execline: 2.3.0.2 version bump (diff)
downloadgentoo-8f4c407356bbd9d7f960f746b639522a30d9bdc9.tar.gz
gentoo-8f4c407356bbd9d7f960f746b639522a30d9bdc9.tar.bz2
gentoo-8f4c407356bbd9d7f960f746b639522a30d9bdc9.zip
sys-apps/s6: 2.6.1.0 version bump
Diffstat (limited to 'sys-apps/s6')
-rw-r--r--sys-apps/s6/Manifest1
-rw-r--r--sys-apps/s6/s6-2.6.1.0.ebuild60
2 files changed, 61 insertions, 0 deletions
diff --git a/sys-apps/s6/Manifest b/sys-apps/s6/Manifest
index 0d5d10698d1..9020de4572a 100644
--- a/sys-apps/s6/Manifest
+++ b/sys-apps/s6/Manifest
@@ -4,3 +4,4 @@ DIST s6-2.3.0.0.tar.gz 192887 SHA256 49c9a0476d93c6279c776ca5ae9c49b3fd39c356eda
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
+DIST s6-2.6.1.0.tar.gz 195903 SHA256 f0de303791134302f2630b9fe76a936b064e1e3aa772c8ae1b891155a6ea2c79 SHA512 e29855cd3c0037d83270318569d2a79a8f616c681cb9c218cfc8c207d9c267cedbb6adc4a6379dbdd29323aef5549810363af08a9fdcc9308d8f6924c12399e6 WHIRLPOOL cf5d29fe60c9c857e8896ece9523c0401e236846bf27b4e6b35f107b5eb3058a2c95dd65673e18c631d1b74d5bf572af4996103ae23a5ac6ee3235d7c6861cd8
diff --git a/sys-apps/s6/s6-2.6.1.0.ebuild b/sys-apps/s6/s6-2.6.1.0.ebuild
new file mode 100644
index 00000000000..44dec59c63f
--- /dev/null
+++ b/sys-apps/s6/s6-2.6.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.2[static-libs]
+ >=dev-libs/skalibs-2.6.0.0[static-libs]
+ )
+ !static? (
+ >=dev-lang/execline-2.3.0.2[static=]
+ >=dev-libs/skalibs-2.6.0.0
+ )
+"
+RDEPEND="
+ >=dev-lang/execline-2.3.0.2:=[!static?]
+ !static? (
+ >=dev-libs/skalibs-2.6.0.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)
+}