1 |
commit: b6579a4044b271eb121d2447f13dff67dc83a105 |
2 |
Author: Luis Ressel <aranea <AT> aixah <DOT> de> |
3 |
AuthorDate: Wed Aug 22 21:37:21 2018 +0000 |
4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Oct 9 00:10:54 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6579a40 |
7 |
|
8 |
sys-apps/s6: Bump to 2.7.2.1 |
9 |
|
10 |
Bump EAPI to 7, always compile shared libs, fix bug with USE="static |
11 |
-static-libs", simplify dependency syntax. |
12 |
|
13 |
Closes: https://github.com/gentoo/gentoo/pull/9675 |
14 |
Signed-off-by: Luis Ressel <aranea <AT> aixah.de> |
15 |
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> |
16 |
|
17 |
sys-apps/s6/Manifest | 1 + |
18 |
sys-apps/s6/s6-2.7.2.1.ebuild | 50 +++++++++++++++++++++++++++++++++++++++++++ |
19 |
2 files changed, 51 insertions(+) |
20 |
|
21 |
diff --git a/sys-apps/s6/Manifest b/sys-apps/s6/Manifest |
22 |
index fc86d3003e9..a44a6564b12 100644 |
23 |
--- a/sys-apps/s6/Manifest |
24 |
+++ b/sys-apps/s6/Manifest |
25 |
@@ -2,3 +2,4 @@ DIST s6-2.1.3.0.tar.gz 181237 BLAKE2B 8cf3b4d4da81aacc17fb663a0648bae1a17085c796 |
26 |
DIST s6-2.6.1.1.tar.gz 196083 BLAKE2B a05083adcba33770ccbc5621c0fc6d7f6c5be22f700bb6a5642fd37bab1ed78b18c16bf5713ade1c2ae456fb653b38aeb793e671138b1038f988ed78c6fad748 SHA512 08f1af0f2e66b3f60f4a6b1489ae91fc59dd5aec97789cc655ae2ba7841327293e3a3027155d02502b34bcdad40778dfaeb441f100e8598aecf081d9d739c99d |
27 |
DIST s6-2.7.0.0.tar.gz 198303 BLAKE2B e835fd25c75a25d3f39ed59098911e65441e3fcbb4f53c48b3c13de63600975839be4fafb9a620d9ec6168a27a2f0bf86efe08797803230e8e12cab1fb0bcd3a SHA512 495d73b8e5c34ad7295dcf94d34b6998341db063594b31be6b15bead5e47644cc3c7e893974bed4ed1feff7a8a3ad2430658c26eab361e8c90893f877476cc53 |
28 |
DIST s6-2.7.1.1.tar.gz 204738 BLAKE2B 5a322fb992197b921f12fbf1e5bdec7cf1797a2bec81b72faf1eb2bf94c8f46392f9eb494de58d05b6df43daafa5b0abb3947c3c1a0cb5aa3cd83a56ccd45370 SHA512 59b0a611eaa0bbdeae3133a182e933e14806151d3b8d44c7f4258a63693cf2fa487fce91a4ea37527ed0f52f211a5391b3fcf6202773b0a80d6ce7f3de60ff79 |
29 |
+DIST s6-2.7.2.1.tar.gz 207088 BLAKE2B 233413e3cd400af291c20fc1b82e4a803be50eba9854fcbbe917715afe3a9c51467795f620a2596ab067dc7dbb4edcd09177c208bfcaaa7b3b0f392f49c49ff3 SHA512 dcf032b812ce955c2276af36aa93138debcfa9e429e79af7b8da4f1e98b21e7b658564024c713fef45ffee03704d78f7618ad4b890de0bd3defa51b4689d3790 |
30 |
|
31 |
diff --git a/sys-apps/s6/s6-2.7.2.1.ebuild b/sys-apps/s6/s6-2.7.2.1.ebuild |
32 |
new file mode 100644 |
33 |
index 00000000000..d91e04cfffd |
34 |
--- /dev/null |
35 |
+++ b/sys-apps/s6/s6-2.7.2.1.ebuild |
36 |
@@ -0,0 +1,50 @@ |
37 |
+# Copyright 1999-2018 Gentoo Authors |
38 |
+# Distributed under the terms of the GNU General Public License v2 |
39 |
+ |
40 |
+EAPI=7 |
41 |
+ |
42 |
+DESCRIPTION="skarnet.org's small and secure supervision software suite" |
43 |
+HOMEPAGE="https://www.skarnet.org/software/s6/" |
44 |
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz" |
45 |
+ |
46 |
+LICENSE="ISC" |
47 |
+SLOT="0/$(ver_cut 1-2)" |
48 |
+KEYWORDS="~amd64 ~arm ~x86" |
49 |
+IUSE="static static-libs" |
50 |
+ |
51 |
+REQUIRED_USE="static? ( static-libs )" |
52 |
+ |
53 |
+DEPEND=">=dev-lang/execline-2.5.0.1[static-libs?] |
54 |
+ >=dev-libs/skalibs-2.7.0.0[static-libs?] |
55 |
+" |
56 |
+RDEPEND=">=dev-lang/execline-2.5.0.1:= |
57 |
+ !static? ( >=dev-libs/skalibs-2.7.0.0:= ) |
58 |
+" |
59 |
+ |
60 |
+DOCS="AUTHORS examples README*" |
61 |
+HTML_DOCS="doc/*" |
62 |
+ |
63 |
+src_prepare() { |
64 |
+ default |
65 |
+ |
66 |
+ # Remove QA warning about LDFLAGS addition |
67 |
+ sed -i "s/tryldflag LDFLAGS_AUTO -Wl,--hash-style=both/:/" "${S}/configure" || die |
68 |
+ |
69 |
+ # configure overrides gentoo's -fstack-protector default |
70 |
+ sed -i "/^tryflag CFLAGS -fno-stack-protector$/d" "${S}/configure" || die |
71 |
+} |
72 |
+ |
73 |
+src_configure() { |
74 |
+ econf \ |
75 |
+ --bindir=/bin \ |
76 |
+ --dynlibdir=/$(get_libdir) \ |
77 |
+ --libdir=/usr/$(get_libdir)/${PN} \ |
78 |
+ --with-dynlib=/$(get_libdir) \ |
79 |
+ --with-lib=/usr/$(get_libdir)/execline \ |
80 |
+ --with-lib=/usr/$(get_libdir)/skalibs \ |
81 |
+ --with-sysdeps=/usr/$(get_libdir)/skalibs \ |
82 |
+ --enable-shared \ |
83 |
+ $(use_enable static allstatic) \ |
84 |
+ $(use_enable static static-libc) \ |
85 |
+ $(use_enable static-libs static) |
86 |
+} |