gentoo resync : 11.01.2018

2 files changed, 72 insertions, 0 deletions

diff --git a/sys-apps/s6-rc/Manifest b/sys-apps/s6-rc/Manifest
index a509fed220f8..8bcb5d7123bc 100644
--- a/sys-apps/s6-rc/Manifest
+++ b/sys-apps/s6-rc/Manifest
@@ -5,6 +5,7 @@ DIST s6-rc-0.2.0.0.tar.gz 90133 BLAKE2B 2168ecdc28c38673bdf71e73391f6253332da6eb
 DIST s6-rc-0.2.0.1.tar.gz 90345 BLAKE2B df5516e49ca3852a8046190d335dba74e20c5d106aca03d81010e41b3a8b56893d1f3339d9188211c009d1e77461fa1d6bce91cd8f1070e93209da59ac898f27 SHA512 d067f1b409146923531f5191e8c9d17c8e846cf4815fac11f08089fe983a55a1d11bba942a036d2d8f48d26390e1350f273bcd8705abcfbff33b9da2984cb8ef
 DIST s6-rc-0.2.1.2.tar.gz 90978 BLAKE2B f237704f2ce8ac00ba4b46bbc0bbfe2066592604abadf6c9a518ee9da5dae056b0467c3ddb215c40a647b726beaf5e7da3cb282c45ac66bab7fc4a09558c9fed SHA512 33951996cf1fc1e497c26a90254a916e992c69128134cbc64ed41c76e74c04e55c91036e2c7e836f3eda650fbcd670c52722b5b2d12ec4a3887101eb20c3347f
 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
 EBUILD s6-rc-0.0.2.1.ebuild 1296 BLAKE2B a3dee28d40f2e7d41c63089426294a8d216d54ad0370df4810bb6eef0f2cfde1af5a6fbbd1fa55ac869309243332248c84e990937284a73eebe59425a51a15c0 SHA512 3f5c56e6c861a36ae0afead1b982b3596adb7929e8a26e66df33087ca89cf2950b8667303e640f164fc38298de6afc3e6f3d754d683209be618c93032c36d0f0
 EBUILD s6-rc-0.0.3.0.ebuild 1299 BLAKE2B 84aaf4f43a130c71238d93c26f0f6e04689e5ed8c9224af5dbe23e3de66ec24630378c90a7821a0348d1de72b9b05a4b71bf42775f69d1e65d7c0ba9723616d6 SHA512 1332f82db79db0a80d8e07904fa34c6465fabad96837efdd44ec81e5f4f63d2b8fc97fe3d58066be589ce760f780026211e7040f970cbe8a06a96c71c6bc0960
 EBUILD s6-rc-0.1.0.0.ebuild 1483 BLAKE2B 09ebfd219ea30ba46929eb380694fbb3ec22203c49a2a81d0144d66f6fcab242d94b4e85f320a144a204dfc760b03f1d614be0aa83a9705c8317009eada7527e SHA512 e4e60d92632789123df84e325888dddf9d13297c90ae55ce9f8f9ec7425320d0ad3c0e0c24b816ea472c87d71908de091e72946b7b8722cc6551dd243eb4820c
@@ -12,4 +13,5 @@ EBUILD s6-rc-0.2.0.0.ebuild 1485 BLAKE2B 17c220018b28d78d7dce98a6ce07a2103f7d7fa
 EBUILD s6-rc-0.2.0.1.ebuild 1624 BLAKE2B 673f6fce3032b0d6f19d95f1438cae4b07ba25765306246e69341dfd407c4cc742ec142eaaa2fe25444bd0e673ed3002a19d371b589007c11505fe77921b4358 SHA512 0737f02730bd5af03134199843fe2c0103c6ecd76342b8e0aada063777260158542ac25ff081eff10c4db0cfeed958f3e2b0a9ecada65da98877f8b985bd30a7
 EBUILD s6-rc-0.2.1.2.ebuild 1624 BLAKE2B bb4dd3e3fca5846758f1e93caced185001ada0983c76d0e4531bca5f04edaaf8c0e5f445896f007dcb73d4794a1e7993b87568102a88eab1af9dede98adcf2d0 SHA512 1461f37172187ecf8457db8ccd1f34e8197c554aca47d88b2f867ba7e5509f84984373da8cad06380d3ee1ccfb3b07ea0efa03ad2ad61bd5d5b7d3607c56068f
 EBUILD s6-rc-0.3.0.0.ebuild 1619 BLAKE2B 3746812cc4b8c852ae97dad2b9e28e7b84713f98a08df1fd11660507f4810357d8cd1e4798ea246440206fbf4ad1ac452f773f0ac1442e27a4897b4d084d4db3 SHA512 30767d3accaed63968c91dba9d4d4eef80eef838cb2505a84cbc75ce8e966a0f5fa60a24942921a3bdec524f49e22148fd012c1212f206010dd8ef7061956f3c
+EBUILD s6-rc-0.4.0.0.ebuild 1866 BLAKE2B bdb83058265bfbeca41faf995b796c042f7b4f2f27816cfe6b6039e88ecc6b1f81db18337925673cd82106ce950c4d2ca533614009fb4e18d35072a562764bc0 SHA512 c0c00a6a58ea33ba062a41e26911875c944d77ff20875f8569542d17fa0e075fbe05e0018f92eab6671cd20d2ecfdcb9de0a64f1fe27f785b97ff8b0c75f6027
 MISC metadata.xml 538 BLAKE2B 1dded20ee261b376c031ec9352efb0578dd8ff398106b3d7636e36fc3b93e1dd9913c056b77b47bfcdbf5cf4cc05f05c91f868dde5c0aa91341203da013e0bc6 SHA512 a2d8e7031c5aa7cd310ad049b796c36498d1cf530c03f3d35d8f795530f49b2a8b59683c9ddc01910375a5883673072d8dab28b15ddd4c53e298e15b400cabeb
diff --git a/sys-apps/s6-rc/s6-rc-0.4.0.0.ebuild b/sys-apps/s6-rc/s6-rc-0.4.0.0.ebuild
new file mode 100644
index 000000000000..c8b064ee565a
--- /dev/null
+++ b/sys-apps/s6-rc/s6-rc-0.4.0.0.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit versionator
+
+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/$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~x86"
+IUSE="static static-libs"
+
+DEPEND=">=sys-devel/make-3.81
+	static? (
+		>=dev-lang/execline-2.3.0.4[static-libs]
+		>=dev-libs/skalibs-2.6.3.0[static-libs]
+		>=sys-apps/s6-2.6.2.0[static-libs]
+	)
+	!static? (
+		>=dev-lang/execline-2.3.0.4[static=]
+		>=dev-libs/skalibs-2.6.3.0
+		>=sys-apps/s6-2.6.2.0[static=]
+	)
+"
+RDEPEND="
+	>=dev-lang/execline-2.3.0.4:=[!static?]
+	>=sys-apps/s6-2.6.2.0:=[!static?]
+	!static? (
+		>=dev-libs/skalibs-2.6.3.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 \
+		$(use_enable !static 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."
+}