gentoo resync : 20.05.2018

3 files changed, 10 insertions, 10 deletions

diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index a08efdf6a758..6163998eecec 100644
--- a/sys-process/Manifest.gz
+++ b/sys-process/Manifest.gz
diff --git a/sys-process/runit/Manifest b/sys-process/runit/Manifest
index 19fc1dde321e..dce935cdd016 100644
--- a/sys-process/runit/Manifest
+++ b/sys-process/runit/Manifest
@@ -10,7 +10,7 @@ AUX run.getty 44 BLAKE2B 38b80fc06bb53a06a6dd2ebeb6f5c320c73c9d3e928c5dbfeaad2fa
 AUX run.getty-2.1.2 44 BLAKE2B 38b80fc06bb53a06a6dd2ebeb6f5c320c73c9d3e928c5dbfeaad2fa0a19e1bdeaa28cf6fe61fcdd46406c0f1f4a05113b8b2cdb652bcac3d6560e0af0f5d521c SHA512 c23aa0ba79043a5717e5567f39bb714154f68c1e417538013943a65de5584b775c265423dd5d47c52027a1be1621f8fb017b115d75d127a31b2ef7cae3ed9eea
 DIST runit-2.1.1.tar.gz 109661 BLAKE2B 3962d3cb0d3d9f612bcef40939cba7d71f0bb338281578f4a2c3ec10a819e0d90c3d6cb6c3992226a5aaaa7e5f282a64abadac762422221f7abe0aedbffc2249 SHA512 a927a757386653fdc40437884e3dc2d1dda6aaf5f1919f301fcf604e559836bd44e5fcb296d69e7f4260fd881475124c44996530de4948d35d8a102b206ca470
 DIST runit-2.1.2.tar.gz 110916 BLAKE2B 101e514aeed282685ebe636f401ca6f94d157281d08a3ac487340aebe945b82d2ee01d41e9917446f4ebd7b27fe9fd18ba4ad55739ab1b62a0e59e1c438b55e9 SHA512 a18773ebf1aa22305dd89ed67363165b9fcf86c192b2be4e268d08005dd82d51265160c637abe072f2f2e378c4b315a75bd3d3e602c3e75bdd451a3b0190f8cf
-EBUILD runit-2.1.1-r1.ebuild 1835 BLAKE2B dd089585082524d2a5b17f5ae33f354055ebf4917bdb7f6ecaee84056dc6ce0f521744b2b6d855a3d9c564337f62d2a640570925c7cda1218ee0e1e2a295b239 SHA512 6b975f0dc0043cf261715698ceadec51cc73c2ffa28df41fce96f8b015428c582a36e53cb56b26aa174f6901290deaafdd164b90663162fe7d45b203e2af2092
+EBUILD runit-2.1.1-r2.ebuild 1907 BLAKE2B 60be7768eb0fd529f87ac3ffc65b1917dff70c051a5c134d1646023e4f566d92475919ad118ed0e344128b5a3bf1ba716d01759380cd78b05275673b8ddab395 SHA512 45851608a5e48b2a617f24ba32bb12c67196306a1ac9ab205eb67d3245b95ad98e7aabc61f8dc1c59eeb362d779679c5d365a66a670285ecb519f5c6a25531a6
 EBUILD runit-2.1.2-r1.ebuild 4120 BLAKE2B 0ca6d559fae6d7b4513e5ef2b0805edb3dab32904fc347af6fc2bed9ce024a617fbab9c5d843ea4571497608fd1b97cdfa20e0e360c867c2efb73e4f0dba1c29 SHA512 706b60ea8c5b820717c6b160d56f15439ade2a7233aeafcaab7110ec05e5116fba417e3e0fee5eac207b12e4e006b1e5c22f7547d53c96c19f4ac7c86a0d874e
 EBUILD runit-2.1.2.ebuild 3999 BLAKE2B 744597a208dd6fc490ebc453ccc0fa3710a057d93f36c7814c5b19c72b5d08df8c42e5cc017f6c5fa516c00335f1f3c8875b7c1cd4c93181dae47981a6f9c61c SHA512 8141d2f1916dd602180667a9ac6a2c44ed903e1a8535cb08b8713f2e29e1c10848e84b2d28467213e33307c63622aceadfbdbcc8d1fac58d918642b60171f183
 MISC metadata.xml 330 BLAKE2B 5cff293985a925289e0508f19f64e72d0118eec36628f0c8ac436f382f430c617a352c42ae8df7551a6299d7a6afbfba3fb20096a6d134200ac4e5e923adb2e9 SHA512 fad9bdd34ed7305ef25a909651d5e37e9b77360a12f60b40d9aa73b890a1ede5676ab1f1be4013b67ffc6f91cc15005a2f5acf54a5b99d22fa762af914b94901
diff --git a/sys-process/runit/runit-2.1.1-r1.ebuild b/sys-process/runit/runit-2.1.1-r2.ebuild
index 806a4a39161a..48bdcfc31e7c 100644
--- a/sys-process/runit/runit-2.1.1-r1.ebuild
+++ b/sys-process/runit/runit-2.1.1-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="3"
+EAPI=6
 
 inherit toolchain-funcs flag-o-matic
 
@@ -17,25 +17,25 @@ IUSE="static"
 S=${WORKDIR}/admin/${P}/src
 
 src_prepare() {
+	default
 	# we either build everything or nothing static
-	sed -i -e 's:-static: :' Makefile
+	sed -i -e 's:-static: :' Makefile || die "sed of Makefile failed"
 }
 
 src_configure() {
 	use static && append-ldflags -static
 
-	echo "$(tc-getCC) ${CFLAGS}"  > conf-cc
-	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
+	echo "$(tc-getCC) ${CFLAGS}"  > conf-cc || die "setting cflags"
+	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld || die "setting ldflags failed"
 }
 
 src_install() {
-	dodir /var
 	keepdir /etc/runit{,/runsvdir{,/default,/all}}
 	dosym default /etc/runit/runsvdir/current
 	dosym ../etc/runit/runsvdir/current /var/service
 	dosym ../etc/runit/2 /sbin/runsvdir-start
 
-	dobin $(<../package/commands) || die "dobin"
+	dobin $(<../package/commands)
 	dodir /sbin
 	mv "${ED}"/usr/bin/{runit-init,runit,utmpset} "${ED}"/sbin/ || die "dosbin"
 
@@ -45,12 +45,12 @@ src_install() {
 	doman man/*.[18]
 
 	exeinto /etc/runit
-	doexe "${FILESDIR}"/{1,2,3,ctrlaltdel} || die
+	doexe "${FILESDIR}"/{1,2,3,ctrlaltdel}
 	for tty in tty1 tty2 tty3 tty4 tty5 tty6; do
 		exeinto /etc/runit/runsvdir/all/getty-$tty/
 		for script in run finish; do
 			newexe "${FILESDIR}"/$script.getty $script
-			dosed "s:TTY:${tty}:g" /etc/runit/runsvdir/all/getty-$tty/$script
+			sed -i -e "s:TTY:${tty}:g" "${ED}"/etc/runit/runsvdir/all/getty-$tty/$script
 		done
 		dosym ../all/getty-$tty /etc/runit/runsvdir/default/getty-$tty
 	done