| 1 |
commit: 051b4fcac808821f0254d4d318360b1482c72949 |
| 2 |
Author: Luis Ressel <aranea <AT> aixah <DOT> de> |
| 3 |
AuthorDate: Wed Aug 22 21:37:26 2018 +0000 |
| 4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Oct 9 00:11:14 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=051b4fca |
| 7 |
|
| 8 |
sys-apps/s6-rc: Bump to 0.4.1.0 |
| 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-rc/Manifest | 1 + |
| 18 |
sys-apps/s6-rc/s6-rc-0.4.1.0.ebuild | 59 +++++++++++++++++++++++++++++++++++++ |
| 19 |
2 files changed, 60 insertions(+) |
| 20 |
|
| 21 |
diff --git a/sys-apps/s6-rc/Manifest b/sys-apps/s6-rc/Manifest |
| 22 |
index 8632670f2c3..3534d166438 100644 |
| 23 |
--- a/sys-apps/s6-rc/Manifest |
| 24 |
+++ b/sys-apps/s6-rc/Manifest |
| 25 |
@@ -1,3 +1,4 @@ |
| 26 |
DIST s6-rc-0.3.0.0.tar.gz 93183 BLAKE2B 0096fe268393192867b1e2d45f9a46c0a76184783e16dbf066891a84a3f6177aec40a4cc78c276126c4588d7d57e4c5a2fa609b1b0276a12a595b99bc7440497 SHA512 d29755f84975b6b2811f55a88cd2b9f1f8383c80ec8aa19e778f74eedf0ae6cb17e55ad96c46bfea7dc3c586a6f10c783db80e8742d2a2e36d3d0062c0f10c06 |
| 27 |
DIST s6-rc-0.4.0.0.tar.gz 96417 BLAKE2B fea4cfbadd82e8e775e4ba2cc1168fc3932f2f23335efa73f254fb17176954cf4d0c10e16bcecf4d62e9ebe05cb213e370042f86e40cb5a4a5583768fe313a83 SHA512 81ed2b09ab980e9d531e6b919f25fe9819f6144e7e639d488362fd872aead73244a03d83da9abd4cb64c10226c5e6fd163c517dcd59566b32a26841b4814ac21 |
| 28 |
DIST s6-rc-0.4.0.1.tar.gz 96491 BLAKE2B fe6aa6e2ed868cca6d76928571d561784012ded476825501bb137798c644495a06c2b08c752198d6e985f48fe34404868fa24d49785ff42610e1dd7314ee8088 SHA512 f4e4105dd51eb9dfa4ba45d3f85970d763c70eb5e276de818d9b2c75db9153d3000dd7579ca8e7c4bf814b05bcbcde1dd9b363c57c6507f1cc5af7898049fba7 |
| 29 |
+DIST s6-rc-0.4.1.0.tar.gz 96840 BLAKE2B 07a05ab7f69a821c677d569051dbe4c22c4e774540866fee6acb91853195a7138965869698cf33eb8d02d183f55e8945beacd567fba742a0bf092cb6e65a7c89 SHA512 12bb1136bc1222e09f115118b631dd5ce7d8155151b1e57427ae932db7654484543dbf5b12f442708ca9defe51d44bba9785caf0a9857847a1f3acb375301e92 |
| 30 |
|
| 31 |
diff --git a/sys-apps/s6-rc/s6-rc-0.4.1.0.ebuild b/sys-apps/s6-rc/s6-rc-0.4.1.0.ebuild |
| 32 |
new file mode 100644 |
| 33 |
index 00000000000..9074e87b722 |
| 34 |
--- /dev/null |
| 35 |
+++ b/sys-apps/s6-rc/s6-rc-0.4.1.0.ebuild |
| 36 |
@@ -0,0 +1,59 @@ |
| 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="service manager for the s6 supervision suite" |
| 43 |
+HOMEPAGE="https://www.skarnet.org/software/s6-rc/" |
| 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 ~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 |
+ >=sys-apps/s6-2.7.2.0[static-libs?] |
| 55 |
+ >=dev-libs/skalibs-2.7.0.0[static-libs?] |
| 56 |
+" |
| 57 |
+RDEPEND=">=dev-lang/execline-2.5.0.1:= |
| 58 |
+ >=sys-apps/s6-2.7.2.0:= |
| 59 |
+ !static? ( >=dev-libs/skalibs-2.7.0.0:= ) |
| 60 |
+" |
| 61 |
+ |
| 62 |
+DOCS="examples" |
| 63 |
+HTML_DOCS="doc/*" |
| 64 |
+ |
| 65 |
+src_prepare() { |
| 66 |
+ default |
| 67 |
+ |
| 68 |
+ # Remove QA warning about LDFLAGS addition |
| 69 |
+ sed -i "s/tryldflag LDFLAGS_AUTO -Wl,--hash-style=both/:/" "${S}/configure" || die |
| 70 |
+ |
| 71 |
+ # configure overrides gentoo's -fstack-protector default |
| 72 |
+ sed -i "/^tryflag CFLAGS -fno-stack-protector$/d" "${S}/configure" || die |
| 73 |
+} |
| 74 |
+ |
| 75 |
+src_configure() { |
| 76 |
+ econf \ |
| 77 |
+ --bindir=/bin \ |
| 78 |
+ --dynlibdir=/$(get_libdir) \ |
| 79 |
+ --libdir=/usr/$(get_libdir)/${PN} \ |
| 80 |
+ --with-dynlib=/$(get_libdir) \ |
| 81 |
+ --with-lib=/usr/$(get_libdir)/execline \ |
| 82 |
+ --with-lib=/usr/$(get_libdir)/s6 \ |
| 83 |
+ --with-lib=/usr/$(get_libdir)/skalibs \ |
| 84 |
+ --with-sysdeps=/usr/$(get_libdir)/skalibs \ |
| 85 |
+ --enable-shared \ |
| 86 |
+ $(use_enable static allstatic) \ |
| 87 |
+ $(use_enable static static-libc) \ |
| 88 |
+ $(use_enable static-libs static) |
| 89 |
+} |
| 90 |
+ |
| 91 |
+pkg_postinst() { |
| 92 |
+ ewarn "Databases from ${PN}-0.3.0.0 or earlier must be manually upgraded!" |
| 93 |
+ ewarn "See the upgrade notes at ${EPREFIX}/usr/share/doc/${P}/html/upgrade.html" |
| 94 |
+ ewarn "and the documentation for the s6-rc-format-upgrade utility." |
| 95 |
+} |
Archives