1 |
commit: ca19989e22b273e8a19e52a5355fa85c5adacf9f |
2 |
Author: Samuel Holland <samuel <AT> sholland <DOT> org> |
3 |
AuthorDate: Fri Mar 30 03:24:34 2018 +0000 |
4 |
Commit: William Hubbs <williamh <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu May 31 22:48:06 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca19989e |
7 |
|
8 |
sys-apps/s6: 2.7.1.1 version bump |
9 |
|
10 |
sys-apps/s6/Manifest | 1 + |
11 |
sys-apps/s6/s6-2.7.1.1.ebuild | 60 +++++++++++++++++++++++++++++++++++++++++++ |
12 |
2 files changed, 61 insertions(+) |
13 |
|
14 |
diff --git a/sys-apps/s6/Manifest b/sys-apps/s6/Manifest |
15 |
index b055cb4df68..fc86d3003e9 100644 |
16 |
--- a/sys-apps/s6/Manifest |
17 |
+++ b/sys-apps/s6/Manifest |
18 |
@@ -1,3 +1,4 @@ |
19 |
DIST s6-2.1.3.0.tar.gz 181237 BLAKE2B 8cf3b4d4da81aacc17fb663a0648bae1a17085c796014d9c49b4c8c5915cdb9694f067fc1f23afc0738377535d4db493f3b1d187c62ebb48c531e975e398db6f SHA512 f5b962fb9f36a910fd8b56b1158cc28d1dab808f22f6beb309b8c23dab1863409aaecd2e3806b51ec34aef1c70f117d3b8af4c7167e0e854f6925fe278cdcaca |
20 |
DIST s6-2.6.1.1.tar.gz 196083 BLAKE2B a05083adcba33770ccbc5621c0fc6d7f6c5be22f700bb6a5642fd37bab1ed78b18c16bf5713ade1c2ae456fb653b38aeb793e671138b1038f988ed78c6fad748 SHA512 08f1af0f2e66b3f60f4a6b1489ae91fc59dd5aec97789cc655ae2ba7841327293e3a3027155d02502b34bcdad40778dfaeb441f100e8598aecf081d9d739c99d |
21 |
DIST s6-2.7.0.0.tar.gz 198303 BLAKE2B e835fd25c75a25d3f39ed59098911e65441e3fcbb4f53c48b3c13de63600975839be4fafb9a620d9ec6168a27a2f0bf86efe08797803230e8e12cab1fb0bcd3a SHA512 495d73b8e5c34ad7295dcf94d34b6998341db063594b31be6b15bead5e47644cc3c7e893974bed4ed1feff7a8a3ad2430658c26eab361e8c90893f877476cc53 |
22 |
+DIST s6-2.7.1.1.tar.gz 204738 BLAKE2B 5a322fb992197b921f12fbf1e5bdec7cf1797a2bec81b72faf1eb2bf94c8f46392f9eb494de58d05b6df43daafa5b0abb3947c3c1a0cb5aa3cd83a56ccd45370 SHA512 59b0a611eaa0bbdeae3133a182e933e14806151d3b8d44c7f4258a63693cf2fa487fce91a4ea37527ed0f52f211a5391b3fcf6202773b0a80d6ce7f3de60ff79 |
23 |
|
24 |
diff --git a/sys-apps/s6/s6-2.7.1.1.ebuild b/sys-apps/s6/s6-2.7.1.1.ebuild |
25 |
new file mode 100644 |
26 |
index 00000000000..df566e620d6 |
27 |
--- /dev/null |
28 |
+++ b/sys-apps/s6/s6-2.7.1.1.ebuild |
29 |
@@ -0,0 +1,60 @@ |
30 |
+# Copyright 1999-2018 Gentoo Foundation |
31 |
+# Distributed under the terms of the GNU General Public License v2 |
32 |
+ |
33 |
+EAPI=6 |
34 |
+ |
35 |
+inherit versionator |
36 |
+ |
37 |
+DESCRIPTION="skarnet.org's small and secure supervision software suite" |
38 |
+HOMEPAGE="https://www.skarnet.org/software/s6/" |
39 |
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz" |
40 |
+ |
41 |
+LICENSE="ISC" |
42 |
+SLOT="0/$(get_version_component_range 1-2)" |
43 |
+KEYWORDS="~amd64 ~arm ~x86" |
44 |
+IUSE="static static-libs" |
45 |
+ |
46 |
+DEPEND=">=sys-devel/make-3.81 |
47 |
+ static? ( |
48 |
+ >=dev-lang/execline-2.3.0.4[static-libs] |
49 |
+ >=dev-libs/skalibs-2.6.4.0[static-libs] |
50 |
+ ) |
51 |
+ !static? ( |
52 |
+ >=dev-lang/execline-2.3.0.4[static=] |
53 |
+ >=dev-libs/skalibs-2.6.4.0 |
54 |
+ ) |
55 |
+" |
56 |
+RDEPEND=" |
57 |
+ >=dev-lang/execline-2.3.0.4:=[!static?] |
58 |
+ !static? ( |
59 |
+ >=dev-libs/skalibs-2.6.4.0:= |
60 |
+ ) |
61 |
+" |
62 |
+ |
63 |
+DOCS="AUTHORS examples README*" |
64 |
+HTML_DOCS="doc/*" |
65 |
+ |
66 |
+src_prepare() { |
67 |
+ default |
68 |
+ |
69 |
+ # Remove QA warning about LDFLAGS addition |
70 |
+ sed -i "s/tryldflag LDFLAGS_AUTO -Wl,--hash-style=both/:/" "${S}/configure" || die |
71 |
+ |
72 |
+ # configure overrides gentoo's -fstack-protector default |
73 |
+ sed -i "/^tryflag CFLAGS -fno-stack-protector$/d" "${S}/configure" || die |
74 |
+} |
75 |
+ |
76 |
+src_configure() { |
77 |
+ econf \ |
78 |
+ --bindir=/bin \ |
79 |
+ --dynlibdir=/$(get_libdir) \ |
80 |
+ --libdir=/usr/$(get_libdir)/${PN} \ |
81 |
+ --with-dynlib=/$(get_libdir) \ |
82 |
+ --with-lib=/usr/$(get_libdir)/execline \ |
83 |
+ --with-lib=/usr/$(get_libdir)/skalibs \ |
84 |
+ --with-sysdeps=/usr/$(get_libdir)/skalibs \ |
85 |
+ $(use_enable !static shared) \ |
86 |
+ $(use_enable static allstatic) \ |
87 |
+ $(use_enable static static-libc) \ |
88 |
+ $(use_enable static-libs static) |
89 |
+} |