commit: 051b4fcac808821f0254d4d318360b1482c72949 Author: Luis Ressel <aranea <AT> aixah <DOT> de> AuthorDate: Wed Aug 22 21:37:26 2018 +0000 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> CommitDate: Tue Oct 9 00:11:14 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=051b4fca
sys-apps/s6-rc: Bump to 0.4.1.0 Bump EAPI to 7, always compile shared libs, fix bug with USE="static -static-libs", simplify dependency syntax. Closes: https://github.com/gentoo/gentoo/pull/9675 Signed-off-by: Luis Ressel <aranea <AT> aixah.de> Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> sys-apps/s6-rc/Manifest | 1 + sys-apps/s6-rc/s6-rc-0.4.1.0.ebuild | 59 +++++++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+) diff --git a/sys-apps/s6-rc/Manifest b/sys-apps/s6-rc/Manifest index 8632670f2c3..3534d166438 100644 --- a/sys-apps/s6-rc/Manifest +++ b/sys-apps/s6-rc/Manifest @@ -1,3 +1,4 @@ DIST s6-rc-0.3.0.0.tar.gz 93183 BLAKE2B 0096fe268393192867b1e2d45f9a46c0a76184783e16dbf066891a84a3f6177aec40a4cc78c276126c4588d7d57e4c5a2fa609b1b0276a12a595b99bc7440497 SHA512 d29755f84975b6b2811f55a88cd2b9f1f8383c80ec8aa19e778f74eedf0ae6cb17e55ad96c46bfea7dc3c586a6f10c783db80e8742d2a2e36d3d0062c0f10c06 DIST s6-rc-0.4.0.0.tar.gz 96417 BLAKE2B fea4cfbadd82e8e775e4ba2cc1168fc3932f2f23335efa73f254fb17176954cf4d0c10e16bcecf4d62e9ebe05cb213e370042f86e40cb5a4a5583768fe313a83 SHA512 81ed2b09ab980e9d531e6b919f25fe9819f6144e7e639d488362fd872aead73244a03d83da9abd4cb64c10226c5e6fd163c517dcd59566b32a26841b4814ac21 DIST s6-rc-0.4.0.1.tar.gz 96491 BLAKE2B fe6aa6e2ed868cca6d76928571d561784012ded476825501bb137798c644495a06c2b08c752198d6e985f48fe34404868fa24d49785ff42610e1dd7314ee8088 SHA512 f4e4105dd51eb9dfa4ba45d3f85970d763c70eb5e276de818d9b2c75db9153d3000dd7579ca8e7c4bf814b05bcbcde1dd9b363c57c6507f1cc5af7898049fba7 +DIST s6-rc-0.4.1.0.tar.gz 96840 BLAKE2B 07a05ab7f69a821c677d569051dbe4c22c4e774540866fee6acb91853195a7138965869698cf33eb8d02d183f55e8945beacd567fba742a0bf092cb6e65a7c89 SHA512 12bb1136bc1222e09f115118b631dd5ce7d8155151b1e57427ae932db7654484543dbf5b12f442708ca9defe51d44bba9785caf0a9857847a1f3acb375301e92 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 new file mode 100644 index 00000000000..9074e87b722 --- /dev/null +++ b/sys-apps/s6-rc/s6-rc-0.4.1.0.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="service manager for the s6 supervision suite" +HOMEPAGE="https://www.skarnet.org/software/s6-rc/"; +SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"; + +LICENSE="ISC" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64 ~x86" +IUSE="static static-libs" + +REQUIRED_USE="static? ( static-libs )" + +DEPEND=">=dev-lang/execline-2.5.0.1[static-libs?] + >=sys-apps/s6-2.7.2.0[static-libs?] + >=dev-libs/skalibs-2.7.0.0[static-libs?] +" +RDEPEND=">=dev-lang/execline-2.5.0.1:= + >=sys-apps/s6-2.7.2.0:= + !static? ( >=dev-libs/skalibs-2.7.0.0:= ) +" + +DOCS="examples" +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)/s6 \ + --with-lib=/usr/$(get_libdir)/skalibs \ + --with-sysdeps=/usr/$(get_libdir)/skalibs \ + --enable-shared \ + $(use_enable static allstatic) \ + $(use_enable static static-libc) \ + $(use_enable static-libs static) +} + +pkg_postinst() { + ewarn "Databases from ${PN}-0.3.0.0 or earlier must be manually upgraded!" + ewarn "See the upgrade notes at ${EPREFIX}/usr/share/doc/${P}/html/upgrade.html" + ewarn "and the documentation for the s6-rc-format-upgrade utility." +}
