Added rev 2.2.1-r1. Fixes #392453.

Package-Manager: portage-2.1.10.11/cvs/Linux x86_64

3 files changed, 83 insertions, 12 deletions

diff --git a/sys-process/runit/ChangeLog b/sys-process/runit/ChangeLog
index c085ff22f4e5..ad78ef8a3671 100644
--- a/sys-process/runit/ChangeLog
+++ b/sys-process/runit/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-process/runit
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/runit/ChangeLog,v 1.32 2011/06/15 18:55:12 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/runit/ChangeLog,v 1.33 2011/11/30 00:19:33 mschiff Exp $
+
+*runit-2.1.1-r1 (30 Nov 2011)
+
+  30 Nov 2011; Marc Schiffbauer <mschiff@gentoo.org> +runit-2.1.1-r1.ebuild:
+  Added rev 2.2.1-r1. Fixes #392453.
 
   15 Jun 2011; Diego E. Pettenò <flameeyes@gentoo.org> runit-2.1.1.ebuild:
   QA: actually make runit build, since it was broken with a blind version bump.
diff --git a/sys-process/runit/Manifest b/sys-process/runit/Manifest
index 690d948eabb1..d4c038b015a6 100644
--- a/sys-process/runit/Manifest
+++ b/sys-process/runit/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 1 175 RMD160 ca7ea65b85ec58b1ff07d50db47807339bcb509a SHA1 f92044c4f90e0bd588860fe2b314b074d97a2fa7 SHA256 fd9520369851473556c038b55679dcb1eb1265d1220e8c3cf4aac2dfae4e6594
 AUX 2 551 RMD160 192302cd579520d2f92f4db6295db9d8cbd56303 SHA1 bfa2f2a1e7ce6ab92d76301f7afb99bca41ba830 SHA256 d0cb35c4ecdd5ef9179af22f24cb371eb8f1082ec1af7850237842bd49ccba0f
 AUX 3 377 RMD160 41baaa2fcb680c9ed17fe8fbda4b640473240540 SHA1 d1a8fdeb5d39acf42b0bea4eac45d19feda929aa SHA256 3f3787de54ead7c2450f596acf022c9f255a8e6dc1e6ea7bb3a5fea20fa63ac2
@@ -13,13 +10,7 @@ DIST runit-2.0.0.tar.gz 104373 RMD160 fc55f22462b5b05d991558adf99468777789671a S
 DIST runit-2.1.1.tar.gz 109661 RMD160 60f3d3b377bc9741ca96d2e953f86461368d6d29 SHA1 8eee39639dcb79ba251ca4ab2c7cde38059f09c2 SHA256 ffcf2d27b32f59ac14f2d4b0772a3eb80d9342685a2042b7fbbc472c07cf2a2c
 EBUILD runit-1.7.0.ebuild 1678 RMD160 03b1f0a8d49e43fbd4531a28caff6228cf4451d3 SHA1 db1f696053ae00a0671a2e00be4f644130289cec SHA256 51424de6fc338ef7e46440d67092b358f8cce4740edc9bd1cbdc2cb87cd4f6d8
 EBUILD runit-2.0.0.ebuild 1689 RMD160 0ae9e15e688aace1380bb960322b8460afda88e5 SHA1 cfbf889d3b1023c760bf020b9666cab35923949c SHA256 27a12b0806ab9f12aea923f533ae3fdea13307553d33ea44f07029cd1811cb34
+EBUILD runit-2.1.1-r1.ebuild 1999 RMD160 4d7ef54d6f2bfdf712ee10be1992dd135299b8d7 SHA1 e8c1b029d0dded2a9f71829e6fc60b2b382b803b SHA256 28839a2f7e2d2f8e23aec10ddae9330858614b8309a499fdc5261a38bd241e94
 EBUILD runit-2.1.1.ebuild 1631 RMD160 7362cc7d9228873b3d4277e164240a503157676f SHA1 3970b9e06c63a8aad79ec8b18a183007775c8467 SHA256 5b576091105dad929813ba018f9f5908f47e5c541f8787b01f79764b58940065
-MISC ChangeLog 3993 RMD160 8cd2ace044d93a8a1668151ef68ce21510a2a5a6 SHA1 513bb905ffbe9d57e9423d7e07cea7bb7fb874db SHA256 118ffce5f027a0d506490243efb013dd70d02d9cf18292b65f2e43ef98e69cbd
+MISC ChangeLog 4137 RMD160 31ee969eca2e8f0e47ede52edc003f6f8bf9283b SHA1 e85a1fe9bf8979267bf938bcf94e16481405f73c SHA256 d3868e8ff1f009a9d0fa40878c41ad764756441b953eb3f9bc01df21447afd17
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk34//EACgkQAiZjviIA2XjwbgCcDZwq0dumPIo2QNzbRGkUNqLh
-XKkAnj0mF5fgRXfqa363DcA6BvtoaQDl
-=lUDg
------END PGP SIGNATURE-----
diff --git a/sys-process/runit/runit-2.1.1-r1.ebuild b/sys-process/runit/runit-2.1.1-r1.ebuild
new file mode 100644
index 000000000000..c4e827d74bac
--- /dev/null
+++ b/sys-process/runit/runit-2.1.1-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2011 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.1 2011/11/30 00:19:33 mschiff Exp $
+
+EAPI="3"
+
+inherit toolchain-funcs flag-o-matic
+
+DESCRIPTION="A UNIX init scheme with service supervision"
+HOMEPAGE="http://smarden.org/runit/"
+SRC_URI="http://smarden.org/runit/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="static"
+
+S=${WORKDIR}/admin/${P}/src
+
+src_prepare() {
+	# we either build everything or nothing static
+	sed -i -e 's:-static: :' src/Makefile
+}
+
+src_configure() {
+	use static && append-ldflags -static
+
+	echo "$(tc-getCC) ${CFLAGS}"  > conf-cc
+	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
+}
+
+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"
+	dodir /sbin
+	mv "${D}"/usr/bin/{runit-init,runit,utmpset} "${D}"/sbin/ || die "dosbin"
+
+	cd "${S}"/..
+	dodoc package/{CHANGES,README,THANKS,TODO}
+	dohtml doc/*.html
+	doman man/*.[18]
+
+	exeinto /etc/runit
+	doexe "${FILESDIR}"/{1,2,ctrlaltdel} || die
+	newexe "${FILESDIR}"/3-1.4 3 || die
+	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
+		done
+		dosym ../all/getty-$tty /etc/runit/runsvdir/default/getty-$tty
+	done
+
+	# make sv command work
+	cd "${S}"
+	insinto /etc/env.d
+	cat <<-EOF > env.d
+		#/etc/env.d/20runit
+		SVDIR="/var/service/"
+	EOF
+	newins env.d 20runit
+}
+
+pkg_postinst() {
+	env-update
+	ewarn "/etc/profile was updated. Please run:"
+	ewarn "source /etc/profile"
+	ewarn "to make 'sv' work correctly on your currently open shells"
+}