Merge the changes from 3-1.4 into 3 since pre 1.4 runit has been removed from the tree for several years.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x8568F528

5 files changed, 16 insertions, 28 deletions

diff --git a/sys-process/runit/ChangeLog b/sys-process/runit/ChangeLog
index e14a24a39b47..5bf96f8c85e9 100644
--- a/sys-process/runit/ChangeLog
+++ b/sys-process/runit/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-process/runit
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/runit/ChangeLog,v 1.47 2014/04/09 16:00:51 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/runit/ChangeLog,v 1.48 2014/04/10 19:18:50 williamh Exp $
+
+  10 Apr 2014; William Hubbs <williamh@gentoo.org> -files/3-1.4, files/3,
+  runit-2.1.1-r1.ebuild:
+  Merge the changes from 3-1.4 into 3 since pre 1.4 runit has been removed from
+  the tree for several years.
 
   09 Apr 2014; William Hubbs <williamh@gentoo.org> -runit-1.7.0.ebuild:
   remove old version
diff --git a/sys-process/runit/Manifest b/sys-process/runit/Manifest
index e68c5ef891ae..613b1a02c2bc 100644
--- a/sys-process/runit/Manifest
+++ b/sys-process/runit/Manifest
@@ -3,19 +3,18 @@ Hash: SHA256
 
 AUX 1 175 SHA256 fd9520369851473556c038b55679dcb1eb1265d1220e8c3cf4aac2dfae4e6594 SHA512 04fa0e61c3db9f85cafea61c77c11da79d6d7a261425874e610821c92ea74d2d79a7ff7c47dacf830faaa007d9d9c7048ade0c19470f7a8fd1c8f80964cdf9d1 WHIRLPOOL f0213863f70305cc0bbde8c99cd7c9ba698863b9f20cdefdca2d9b53e126fcbe2fb095a3c16e7a4920a3254ec8419cbf03a89f57249fdb4afc72d85f797c4889
 AUX 2 551 SHA256 d0cb35c4ecdd5ef9179af22f24cb371eb8f1082ec1af7850237842bd49ccba0f SHA512 0176a59c84e135df2f92546567bbc3b0ad5709734da7cd435bf117c2e4c359098584a7e30c89b7c0fa0fa796c49bbe3f59d52ebd6a510e71004e9415ca4bd89e WHIRLPOOL 93cca0ab872980e1956e177fe638cd712b808f022662869959ef42fc1ea69d32ebd61364658ddcff6617615f6863d3a99dc805ab7077e0b8604159b8ed3b32fd
-AUX 3 377 SHA256 3f3787de54ead7c2450f596acf022c9f255a8e6dc1e6ea7bb3a5fea20fa63ac2 SHA512 c47dd515079481d96e29d8dcf99a1fa12c328da62a6fe75b678641788c1a6c1fb1eb660b43c8efa900db2a7422a27e460c4a4a6df5092811af9c43dad72b0de7 WHIRLPOOL e9924b6838dca340b5a2b462e1f3541b5625b80b558b2da08eb81721d3d2214728a00640106785a7ce6292fa7ffce84d017859fa6808de7e15997d7c13174f9c
-AUX 3-1.4 372 SHA256 56b835cb329e71d14523038cd382ad92f77317a2c1bb75e9414bf468fa57f03b SHA512 8511045da385878f2ecc238b68d0c4317b5ac677028393b6ace7d575e0a1bceaf1e6ce639db01501461bcaa7521a5856a4e9a65097babf9a653a4747bddcd553 WHIRLPOOL 5daf16b59a23386103549167b27266225e1e54355d3e7973f7a275439b2eaf295619a3cf8d978125814eb916821edbf44a7d843e5d0d7237f6de0b3870007d4f
+AUX 3 372 SHA256 56b835cb329e71d14523038cd382ad92f77317a2c1bb75e9414bf468fa57f03b SHA512 8511045da385878f2ecc238b68d0c4317b5ac677028393b6ace7d575e0a1bceaf1e6ce639db01501461bcaa7521a5856a4e9a65097babf9a653a4747bddcd553 WHIRLPOOL 5daf16b59a23386103549167b27266225e1e54355d3e7973f7a275439b2eaf295619a3cf8d978125814eb916821edbf44a7d843e5d0d7237f6de0b3870007d4f
 AUX ctrlaltdel 189 SHA256 84eff8b4bd83ebded1689404f5da22a442e82e7f9d5d8df61a1a3032f80b503c SHA512 a0980e1dbcd2c591997e62e3e1b8ab660c36f007d12f6dd3eb6607d286c0056eb96c40b997b2c9569a7e3a6bf9a2a39d8050c31aa09a9c0ba6eb931183049b1b WHIRLPOOL 8e477312206adbc89f00e6df5acc37542dbf300558b58bd580a80f7da868924096583a706ae495b0266b9ed66516e1fa4886a27f91dbbd3afdee885560ca5fdc
 AUX finish.getty 30 SHA256 6c5db3570b4abbc2547ee7923c18879912f197b52883abb08586f529cccd5aa5 SHA512 122a4ab21dbd5e6b77e0225bda48f813ec680c85767fdc917933bd1a88d854b6714809ebd63d0fa6b81c25c5e0a9de224aa920565e8d197556e7d99c5836681d WHIRLPOOL 531628897da4a74a84bd75730a2812eb7338b88bfadb988479705bab02b550c72a7863e07b0149dc8a98e73be03dd6a71f166722d785356ad3499560ae59c1a1
 AUX run.getty 44 SHA256 3b4105965417490496352da0fa36d7e79e8ff27989ce7d33023251654d6c119e SHA512 c23aa0ba79043a5717e5567f39bb714154f68c1e417538013943a65de5584b775c265423dd5d47c52027a1be1621f8fb017b115d75d127a31b2ef7cae3ed9eea WHIRLPOOL 987669e356d167019db08885d9f54f91639b8ede3d449295175e96ecf2ed8c39dc4b88c4f18ae1d66a3279547fd877e08ae8b405b678a211d446645f7592fc06
 DIST runit-2.1.1.tar.gz 109661 SHA256 ffcf2d27b32f59ac14f2d4b0772a3eb80d9342685a2042b7fbbc472c07cf2a2c SHA512 a927a757386653fdc40437884e3dc2d1dda6aaf5f1919f301fcf604e559836bd44e5fcb296d69e7f4260fd881475124c44996530de4948d35d8a102b206ca470 WHIRLPOOL ff378ace3c4e0829a435eec8a9e40da7df6e0e0b00ad8c821a169d2e88a38aee4608147316eec1cfc2e676780fefb4bab81e56e3fe7be80bbb6bd08656373208
-EBUILD runit-2.1.1-r1.ebuild 1973 SHA256 f9b80e4fdb51e7cba44899ca4a20735e921611a9a9ed6bee6891b05661161872 SHA512 82796029ad8a26e4b778113f2e4d32023a7c86a82cf46adb68033428745925989c91040dd02d2c70ed2a5cbc588aa6d3fb9c4628d9cd0d3779695dabfbdc67c4 WHIRLPOOL 640887132b2073496910bfa26de1abab2382ae49acbed632551a63c0a946bfd913e9d1b3eeb8af6e367ce3a7a6cbd022bd5046fd269ff09cbcf27e6a4ff1e8a0
-MISC ChangeLog 5657 SHA256 61e0de02ceeedff0708aca4b8642e6c1215d1f712ba44c0921398f185842a40c SHA512 43093ab0ace76c057380cc85049358e2a2abcf9ff869cd076f50b6501f00152cc861fcbf365ca33932073fcd65b4613bc4739f9d427c7d151847c88695c32795 WHIRLPOOL 9bd3be3024fc0a688f8d0fa12874a7dc60b07aa09ed92a45769d5ea0432e255b86dc314ae24abcf82ef29f0b5424fa9e5cd48617c1d403691084549106013ef5
+EBUILD runit-2.1.1-r1.ebuild 1943 SHA256 807825247e5847b8dbceccd6ea256d0a7ff47316fdcd16667ce9ff04e7f14b4b SHA512 429b3f3870368b584ad2503cb51c9b230a13cff4484da6e688a9781780cd72c2db052f1d7e4d31ef39b48e25f6027e3a0bb9572d16201f715467a40d9426bdbe WHIRLPOOL b9b6245d4e085d630bf2a30ebef75e7f837a7597a4c4adeeb62f8b586463ab35102e569301fc31a99e52892fd9031fe74dfe3e11cc45aadb618006f75c5dfdd3
+MISC ChangeLog 5867 SHA256 b90402fc584befbe403301e6a216d47f2f7ce2f4eb0a4981cd3c1b0ccd623074 SHA512 de6ab89b505b4abf0c634e3eada8990d95066e95a27b6e3543dadcfbd52369106d6b5f24518d833084127238818e15adfaae5d8814f6db4ab714ffd514d7e66c WHIRLPOOL 434e82fb5a13dd368e3331ea661d592ee3285c26690a2c0562202e770d4ecfd5022841d64ffdbafca97e8d7bd3c07ef85e35cb09267fe17f4255fbd58f4648fc
 MISC metadata.xml 228 SHA256 3802abab34ac1cd651bf39ec188765876376abbbaeb5c67cdb24b17df69c9b01 SHA512 168d4a018449523cfcd0dbc8f4e90696701665ff2595aa3127cd8c2cacc3c1bf89f9f9ef7df09192b91d86ce23e8a069efe7250af366d14aac9ce8ed73531826 WHIRLPOOL e2acc8db9feb1c444cc7d78bd14e01a5fdf1bf31a59170d05344637f9ee89f07333540c8c44029fe327978bc3f810b52a941accd9fee9267d5c180989f36eac1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlNFbr0ACgkQblQW9DDEZTjlnwCgi23ohNj7culAt3MBPWrssGa8
-NcUAn0JDg2YgszzEOmngMJyyL69MbWuK
-=NcW0
+iEYEAREIAAYFAlNG7psACgkQblQW9DDEZThViACgo0YlRiLEHEIIjdh15uqW1G52
+lVoAniSoW5vKs2QDaiLTbeWqwgKYNxfO
+=36uF
 -----END PGP SIGNATURE-----
diff --git a/sys-process/runit/files/3 b/sys-process/runit/files/3
index 182151e723d0..f143f5f46011 100755
--- a/sys-process/runit/files/3
+++ b/sys-process/runit/files/3
@@ -3,13 +3,12 @@ exec >/dev/console 2>&1
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 
 echo 'Waiting for getties to stop...'
-svwaitdown -xk -t10 /var/service/getty-*
+sv shutdown -w 10 /var/service/getty-*
 
 echo 'Waiting for services to stop...'
-svwaitdown -xk -t300 /var/service/*
+sv shutdown -w 300 /var/service/*
 
 echo 'Shutdown...'
 test -x /etc/runit/reboot && LAST=6    || LAST=0
 test -x /etc/runit/reboot && RC=reboot || RC=shutdown
 RUNLEVEL=$LAST /sbin/rc $RC
-
diff --git a/sys-process/runit/files/3-1.4 b/sys-process/runit/files/3-1.4
deleted file mode 100755
index f143f5f46011..000000000000
--- a/sys-process/runit/files/3-1.4
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-exec >/dev/console 2>&1
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-
-echo 'Waiting for getties to stop...'
-sv shutdown -w 10 /var/service/getty-*
-
-echo 'Waiting for services to stop...'
-sv shutdown -w 300 /var/service/*
-
-echo 'Shutdown...'
-test -x /etc/runit/reboot && LAST=6    || LAST=0
-test -x /etc/runit/reboot && RC=reboot || RC=shutdown
-RUNLEVEL=$LAST /sbin/rc $RC
diff --git a/sys-process/runit/runit-2.1.1-r1.ebuild b/sys-process/runit/runit-2.1.1-r1.ebuild
index e65491b6b02e..e6356568c212 100644
--- a/sys-process/runit/runit-2.1.1-r1.ebuild
+++ b/sys-process/runit/runit-2.1.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/runit/runit-2.1.1-r1.ebuild,v 1.12 2014/03/19 13:47:16 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/runit/runit-2.1.1-r1.ebuild,v 1.13 2014/04/10 19:18:50 williamh Exp $
 
 EAPI="3"
 
@@ -46,8 +46,7 @@ src_install() {
 	doman man/*.[18]
 
 	exeinto /etc/runit
-	doexe "${FILESDIR}"/{1,2,ctrlaltdel} || die
-	newexe "${FILESDIR}"/3-1.4 3 || die
+	doexe "${FILESDIR}"/{1,2,3,ctrlaltdel} || die
 	for tty in tty1 tty2 tty3 tty4 tty5 tty6; do
 		exeinto /etc/runit/runsvdir/all/getty-$tty/
 		for script in run finish; do