gentoo resync : 16.11.2017

2 files changed, 66 insertions, 0 deletions

diff --git a/sys-apps/s6-rc/Manifest b/sys-apps/s6-rc/Manifest
index 1d9f6103294c..36b5566a074d 100644
--- a/sys-apps/s6-rc/Manifest
+++ b/sys-apps/s6-rc/Manifest
@@ -4,11 +4,13 @@ DIST s6-rc-0.1.0.0.tar.gz 88520 SHA256 d04a8a765740ed55e38a33da3639197f51f83b3e4
 DIST s6-rc-0.2.0.0.tar.gz 90133 SHA256 b83a4f15ba0e13f935c7e4db8ef17229388e1fb4ca4e553b817ad039427404a5 SHA512 981d504382c9801ef53fb2a4a4f7410cf6165f1f49670cb5d42545c3e1bef6c0a50e6176b149fd61ec45ebe701411d12b5e7012cfb897d3472e52a1b8f76f636 WHIRLPOOL 297b7cfb73f480ee5e419197a13a7462849ee948f5445c29b1c0da31ad1d3eb2206afc1cccafb8a489f472ed8853298ff89662dedc57f69e4a95a6e2beaacaab
 DIST s6-rc-0.2.0.1.tar.gz 90345 SHA256 8b01d5b4c2380c6b30d320118b9a9b9ca174a25ed3c75afe8f59a4e840847a76 SHA512 d067f1b409146923531f5191e8c9d17c8e846cf4815fac11f08089fe983a55a1d11bba942a036d2d8f48d26390e1350f273bcd8705abcfbff33b9da2984cb8ef WHIRLPOOL dbfa8c726db19a87b1271c311a514ac71803ac4c66e5d1947785177d0825214630e4a149f21679c6126bcec966dcc3390688ee2b654003e34d29a11c06edb7da
 DIST s6-rc-0.2.1.2.tar.gz 90978 SHA256 4fa35cf8af41498c9fa0c21220dcdc7595a18ebc2975a254d719f7e1c864b1f0 SHA512 33951996cf1fc1e497c26a90254a916e992c69128134cbc64ed41c76e74c04e55c91036e2c7e836f3eda650fbcd670c52722b5b2d12ec4a3887101eb20c3347f WHIRLPOOL 89aa08ffd5f8073f506d7fb302f1e2363501f35248531cafb389aef092a3b3e6a1da202a320cecd927e0da9dc85e35c1def6dfd8505742fc428ebaed2257e916
+DIST s6-rc-0.3.0.0.tar.gz 93183 SHA256 78266a397330d35d5eac9e99d1436feba58e36f41bfe1db0fd16c4b6cc73c999 SHA512 d29755f84975b6b2811f55a88cd2b9f1f8383c80ec8aa19e778f74eedf0ae6cb17e55ad96c46bfea7dc3c586a6f10c783db80e8742d2a2e36d3d0062c0f10c06 WHIRLPOOL 0ecb9e8edbf9e0b6fbef963b0a07ef7f2229540d7ec63b99dad5d50f52aaff75c93d695e2d34ede26412d7f1bed6a375f203158d51e82a332cb207f5de7e2b50
 EBUILD s6-rc-0.0.2.1.ebuild 1296 SHA256 afd2c052d47ef4c06877aec9fabb76324a973fee43b1ae369721c0e93b82c238 SHA512 3f5c56e6c861a36ae0afead1b982b3596adb7929e8a26e66df33087ca89cf2950b8667303e640f164fc38298de6afc3e6f3d754d683209be618c93032c36d0f0 WHIRLPOOL 77ae06f77263fac1d6fd21d80e4ed53839dc59fdcd800141b52afc434aa6f3d84deb953fd795b75648c83d2576069f01536afac249bc01d75b72b8e431214ff7
 EBUILD s6-rc-0.0.3.0.ebuild 1299 SHA256 88c22aeff4e92a5e376e149e2b284bff89bfdd6775d06feb07be08ceacc90eab SHA512 1332f82db79db0a80d8e07904fa34c6465fabad96837efdd44ec81e5f4f63d2b8fc97fe3d58066be589ce760f780026211e7040f970cbe8a06a96c71c6bc0960 WHIRLPOOL bdc0fd8b8ce2c836f25cb924c0196bc5ff22237ef687680561a805b7e4781793c0eaacaa434687338b05424954bceb9c7c267a2312b9bf98f0f31730a5ebcb35
 EBUILD s6-rc-0.1.0.0.ebuild 1483 SHA256 c17e7b6ffbc3a619cd6af0b12b93279e00c2690a7326fa382e79526ed4b0c95b SHA512 e4e60d92632789123df84e325888dddf9d13297c90ae55ce9f8f9ec7425320d0ad3c0e0c24b816ea472c87d71908de091e72946b7b8722cc6551dd243eb4820c WHIRLPOOL d731a6f799dc7b923f04acf07a9a0134935340a7bbd220629af0e82acc2ae1268e3947cfafc161368609aa8376903e1d277e1d76978b0400daee59a09bf8a4a0
 EBUILD s6-rc-0.2.0.0.ebuild 1485 SHA256 19ae142ecdb00fd1dca0c4427907e4702188ed43753bb7526fe689c074cf6869 SHA512 6e2518ccb38a40d4520a464f7f124fdf03be30d9445cb6661a603c770a2db472cd9cd9b2e676b9deb278ba559aed6f12505205dbf3707af68cdb79aedf686ece WHIRLPOOL ea42b986daa6e6584cbaf4b38f79d118adb549f12208aaa006c7b3f0739c7d3f73f71f6254fadc3cc6f115ecd2e9f6f84263804327d34293593c173bd1941bd3
 EBUILD s6-rc-0.2.0.1.ebuild 1624 SHA256 be18b061f2ab78978dfe740ab18f69c0fa346f0f954e21532a4a39feea7c2255 SHA512 0737f02730bd5af03134199843fe2c0103c6ecd76342b8e0aada063777260158542ac25ff081eff10c4db0cfeed958f3e2b0a9ecada65da98877f8b985bd30a7 WHIRLPOOL bac5b78ebeff1cd6821928b6b5172713309c2c289112cb8f39beb146f3e3fd48b6ff49d0b0abb4f5e4a0623c6938a4ce05714a9aefb200edb85acfeaa6e2786e
 EBUILD s6-rc-0.2.1.2.ebuild 1624 SHA256 2a70327428ba8aed2c59946e5593b9b03d0a1873fe3b25a380e6ece1f05511cc SHA512 1461f37172187ecf8457db8ccd1f34e8197c554aca47d88b2f867ba7e5509f84984373da8cad06380d3ee1ccfb3b07ea0efa03ad2ad61bd5d5b7d3607c56068f WHIRLPOOL e697638a0d6fe716697888f471a4a662d4b9fa76aefcdb20c1ae5538d6bc5667f3c05c689ee0a37585b6f78d48d22720242daec74091ed67b3651947868c6aa1
+EBUILD s6-rc-0.3.0.0.ebuild 1619 SHA256 2251ae22256b333b1f08daa8c81381a2931a9b0b960da9050fe8350d5a8aa3bb SHA512 30767d3accaed63968c91dba9d4d4eef80eef838cb2505a84cbc75ce8e966a0f5fa60a24942921a3bdec524f49e22148fd012c1212f206010dd8ef7061956f3c WHIRLPOOL d057ddd01f908be57ab1c9e9bc306bac8d180124b7c24453277faf3b1d2437e13c36f00e6800481f86fd48967fac81514b9ab611c11b06c5c91e452b839f1455
 MISC ChangeLog 507 SHA256 9b892d7b9da785b1df61684c571f57bc7b7d04e12c0cbaf97ba18ff63568e8a6 SHA512 c5ad12d9c9322e182ce42971945948ff37afacd4cc93bfdf1ff0f534a36ee7be92e16892854f868cea62ceea2ca63d5186f10ba146bc4fd012b4ac1867d8b04e WHIRLPOOL 98405834d761128ab639a739fbd4ea41eacd2afec21f86e82ad6ed2df5bfb446b78d9543c01b573377bcc54a2b2b195961fbe2b06127f86b809a90b08f73ccdb
 MISC metadata.xml 538 SHA256 661cba228986e0ca89a6d369c7f2aaa37bb606bfa574b3eaba919677ebd5d2e3 SHA512 a2d8e7031c5aa7cd310ad049b796c36498d1cf530c03f3d35d8f795530f49b2a8b59683c9ddc01910375a5883673072d8dab28b15ddd4c53e298e15b400cabeb WHIRLPOOL e6548172067128f98edc201ea193a261c780381edf79ef830db3cdc71309942564cbceb71a3ac76e7f81e3c7fda0599fc135f4ed72f7910c9c9abd2adf569648
diff --git a/sys-apps/s6-rc/s6-rc-0.3.0.0.ebuild b/sys-apps/s6-rc/s6-rc-0.3.0.0.ebuild
new file mode 100644
index 000000000000..9d30ce768b86
--- /dev/null
+++ b/sys-apps/s6-rc/s6-rc-0.3.0.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2017 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.3[static-libs]
+		>=dev-libs/skalibs-2.6.0.1[static-libs]
+		>=sys-apps/s6-2.6.1.1[static-libs]
+	)
+	!static? (
+		>=dev-lang/execline-2.3.0.3[static=]
+		>=dev-libs/skalibs-2.6.0.1
+		>=sys-apps/s6-2.6.1.1[static=]
+	)
+"
+RDEPEND="
+	>=dev-lang/execline-2.3.0.3:=[!static?]
+	>=sys-apps/s6-2.6.1.1:=[!static?]
+	!static? (
+		>=dev-libs/skalibs-2.6.0.1:=
+	)
+"
+
+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)
+}