gentoo resync : 16.11.2017

2 files changed, 64 insertions, 0 deletions

diff --git a/sys-apps/s6-linux-init/Manifest b/sys-apps/s6-linux-init/Manifest
index 450509b3e0e3..725f0c00fc82 100644
--- a/sys-apps/s6-linux-init/Manifest
+++ b/sys-apps/s6-linux-init/Manifest
@@ -3,10 +3,12 @@ DIST s6-linux-init-0.1.0.0.tar.gz 22242 SHA256 4db16d235dc052f6376f4e88e5e4c0dd1
 DIST s6-linux-init-0.2.0.0.tar.gz 24482 SHA256 131484e61eff0e671e112f0436b13e8e7d08752f810d8bec4924a68383eee2b9 SHA512 16c8c97b65ad533b70ed9dd189827778797dc8d0a70af0880655b5f89a1524cd9d3675cb681b99f4704d43c810a4211c9926bfeb743247d7c29559ec2f77606e WHIRLPOOL 45aad2584c8036f8fe9d9c72a7da3fb29e91f36a38d6b63297dbd1c201601971b6b11304290d16df09190f0706825c3e0cbd8c7f48657be17ece3ef27dffbd95
 DIST s6-linux-init-0.3.0.0.tar.gz 24692 SHA256 9376f76ae3ab24cb18a35a6956d0fa5fe88cc4c1dfd19bbafc47dcd4f91c2535 SHA512 9aa775fb2bb86680ba438a4a03b543fda696434eaf7ddea5009ec3adaebb899a2ed039a4727eb7d5427088ed3ff08a9eeaa853769f089789a7327a538f798c67 WHIRLPOOL b43e92c48fdc808100276c6b46382c8e1f938ead96e8e5e799cf6a7e17af1f9261e7d0e1ec9b169d9b8a38a2682086ccc5a01cfee5b135c0edc1b3eb20819dfb
 DIST s6-linux-init-0.3.1.0.tar.gz 25920 SHA256 d8854a01f41db88250b73bdff3a636ed31810b1c309acb2d724380c8b69aedd6 SHA512 f9c9b35daf8c7322c2146fb14f4df61131fafb6144a71666cfb77f5684e0669abee9689b238d1d1adfea04795a8cd1e88e61920b6c42432cb8a53c0861b776d8 WHIRLPOOL a17d643d17d14d23bbbd2aa995842b1a2b3195d328a5d23a1236591b8eeafe4e5e5d07968c1ab2852e4f1eb60d494a4246116e0fe7cd7fb8480c2c3e8e35ca8c
+DIST s6-linux-init-0.3.1.1.tar.gz 25955 SHA256 9ee2e8a5abc250bcb2be7d07566592ba5cbe3abce858f60853d3ac45b1ccdd79 SHA512 b8a44e09fc6770e91f1ffeed3267bf5fb83cf857653727d52773674db5942fbbc010355bdf24e456d2b2df5a1ac72888b78b2ec502c0d42770af58aaaec00648 WHIRLPOOL 728ba81fa833872a2cfea7d9723f526c98921a05e490df3dad16bc306fb0136c479f1b5d3f62423ff86f7e42cd526712420558eff49ea1509f7f5cd4514d0bc5
 EBUILD s6-linux-init-0.0.1.4.ebuild 1240 SHA256 9e3c9033436b84e9fd38daf829e1108c3e3932cfa97206dfad13b869aaa3aed4 SHA512 1fc85d43eb2767601b08957e0ea03ee7aa0393eddce7772997ace94ee78a3b1bc2518df338b0275b00f661081cfff8f0a75d83516df13de07bf77a0dbfb07b05 WHIRLPOOL 36cc18c0a6c684027f54f8fbe68c16e82da75536b44dd056dff54af8920c294ce896e07aaaf4ed0d3ae783f490d16b7301ea0b14e90be6bdd82c3c99617c841d
 EBUILD s6-linux-init-0.1.0.0.ebuild 1243 SHA256 74663ff81ff1df28c2d52a421cc44a45bbc6fc523aeb91fe9daa320291b5bfae SHA512 a41ca8126bbdd6b374315039fe58c25efea30f304873b3fc916d11ca9e06848ae011fc3e07333339f068517362c96b94548927eb9052edaa7693f4e9253750be WHIRLPOOL 79f12f8d9b372876ac03faf03c0ada2adf35c81ab7e50483ae7e703d0156fedd889411d3125124dc2ba8dfb05a73dd12aef2e8dc336a11b529c89e6fb7acd88f
 EBUILD s6-linux-init-0.2.0.0.ebuild 1241 SHA256 f331aada0361b2d0c498698a236ba9d085a5d871f1d0a2febbd1e199242de265 SHA512 642f101392debe4604565c5ff35ba6bea7b403a28351b5f1ad157e7189feef6710886f81e4d349b84379b3888c3c0318e801f5339e86e7e0c81782200c44c215 WHIRLPOOL 07cfe94dc061816e698b38745f368b5a519e379c74742b59f9ecf7eeee07213f0082b338798023df49a689cb295251ffffc535d43d579629cc860dc4f5fb92f2
 EBUILD s6-linux-init-0.3.0.0.ebuild 1333 SHA256 8ff5299494fb70e6b8faaceb4849cee293919b37b1d22e5a24d4a037cba0047d SHA512 c2d814c76f6edc99ae64c37743018179529b41ba41c4d87adec1e3f6d0f4570f78ad350d7983d2a7238628847f4901c2fa6b74ec939523dd76302878dac1ac88 WHIRLPOOL a7d5210dc8a985b2027aeb400f17c21d166798f8582775afd1fe49501229174cbf75b1aefaae69ed0eaca62477f83be20012dcad6ad753cd8a5faa9c89fc99a3
 EBUILD s6-linux-init-0.3.1.0.ebuild 1472 SHA256 16511fba169b2985f0e0a9e66364c748c47443daf75b29ad4a263c4b066fed8d SHA512 57607c57abc5adb22a22c1aa3d24545d591d83c9a7bfb87931a394229fd4ace887b5a5e859983c5b30fb6d08d151bc76f6cc88b69d31154d218b258221aebb89 WHIRLPOOL 1656f686f6687f5216faad585c42e5b1a18c196f4a8bda1dda5a40e5134a7dd3f4db97b1e66bfa5bf755abab034ccfdf1bd54cdb1ce9b6ba5739980f7a0c6e6b
+EBUILD s6-linux-init-0.3.1.1.ebuild 1472 SHA256 16511fba169b2985f0e0a9e66364c748c47443daf75b29ad4a263c4b066fed8d SHA512 57607c57abc5adb22a22c1aa3d24545d591d83c9a7bfb87931a394229fd4ace887b5a5e859983c5b30fb6d08d151bc76f6cc88b69d31154d218b258221aebb89 WHIRLPOOL 1656f686f6687f5216faad585c42e5b1a18c196f4a8bda1dda5a40e5134a7dd3f4db97b1e66bfa5bf755abab034ccfdf1bd54cdb1ce9b6ba5739980f7a0c6e6b
 MISC ChangeLog 578 SHA256 9d6b549d019cc9eddfd42db57fbec5d0e60f5bf1c8de5a87b8aed6b2058b9ef0 SHA512 f7f7f2235e6bbeb0e448551265fcc2db166505c8a1b824d2b84a6c4a61c3c155f5449e45ddaaa7bd3daafe802692b2247b2196dc14ad6dadf0474b713b97125d WHIRLPOOL fd6a39132052f486377cfc7f2a7c827910a92e1929bb67c78a5ba901827b92adafeff5f5d5b0333bfdb36b6051a123d187923a1b2d6d11444d375679324ef900
 MISC metadata.xml 538 SHA256 661cba228986e0ca89a6d369c7f2aaa37bb606bfa574b3eaba919677ebd5d2e3 SHA512 a2d8e7031c5aa7cd310ad049b796c36498d1cf530c03f3d35d8f795530f49b2a8b59683c9ddc01910375a5883673072d8dab28b15ddd4c53e298e15b400cabeb WHIRLPOOL e6548172067128f98edc201ea193a261c780381edf79ef830db3cdc71309942564cbceb71a3ac76e7f81e3c7fda0599fc135f4ed72f7910c9c9abd2adf569648
diff --git a/sys-apps/s6-linux-init/s6-linux-init-0.3.1.1.ebuild b/sys-apps/s6-linux-init/s6-linux-init-0.3.1.1.ebuild
new file mode 100644
index 000000000000..d94588ab510a
--- /dev/null
+++ b/sys-apps/s6-linux-init/s6-linux-init-0.3.1.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Generates an init binary for s6-based init systems"
+HOMEPAGE="https://www.skarnet.org/software/s6-linux-init/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static"
+
+DEPEND=">=sys-devel/make-3.81
+	static? (
+		>=dev-libs/skalibs-2.6.0.0[static-libs]
+	)
+	!static? (
+		>=dev-libs/skalibs-2.6.0.0
+	)
+"
+RDEPEND="
+	>=dev-lang/execline-2.3.0.2
+	>=sys-apps/s6-2.6.1.0
+	>=sys-apps/s6-linux-utils-2.4.0.0
+	>=sys-apps/s6-portable-utils-2.2.1.1
+	!static? (
+		>=dev-libs/skalibs-2.6.0.0:=
+	)
+"
+
+DOCS="INSTALL 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_AUTO -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)/skalibs \
+		--with-sysdeps=/usr/$(get_libdir)/skalibs \
+		$(use_enable static allstatic) \
+		$(use_enable static static-libc)
+}
+
+pkg_postinst()
+{
+	einfo "The generated init script requires additional packages."
+	einfo "Read ${ROOT}usr/share/doc/${PF}/INSTALL for details."
+}