3 files changed, 74 insertions, 7 deletions
diff --git a/sys-process/runit/ChangeLog b/sys-process/runit/ChangeLog
index ea2c789b6fd8..d340c7f3ca2a 100644
--- a/sys-process/runit/ChangeLog
+++ b/sys-process/runit/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-process/runit
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/runit/ChangeLog,v 1.30 2008/12/25 22:24:45 vapier Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-process/runit/ChangeLog,v 1.31 2011/06/15 05:43:26 jer Exp $
+
+*runit-2.1.1 (15 Jun 2011)
+
+  15 Jun 2011; Jeroen Roovers <jer@gentoo.org> +runit-2.1.1.ebuild:
+  Version bump.
 
 *runit-2.0.0 (25 Dec 2008)
 
diff --git a/sys-process/runit/Manifest b/sys-process/runit/Manifest
index 99946f0fb147..a4d120a4e70a 100644
--- a/sys-process/runit/Manifest
+++ b/sys-process/runit/Manifest
@@ -10,14 +10,16 @@ AUX finish.getty 30 RMD160 0bb0f0c1a05a78ce33bb4f95b84d142896e6471c SHA1 922f54e
 AUX run.getty 44 RMD160 4659766d2f0d3128a23bc0beac2dfe92f368d723 SHA1 6a7a78bc77448d2e5d1187be1214caab8cda31c2 SHA256 3b4105965417490496352da0fa36d7e79e8ff27989ce7d33023251654d6c119e
 DIST runit-1.7.0.tar.gz 101315 RMD160 418db787290586a003481f938f4fa01934b9f063 SHA1 a49810a0c8c77dfec19f7282ac9c82b129554243 SHA256 f6bcd04bb300710ba4ade3b6c64298cb3e22090a8866455491ad086243453984
 DIST runit-2.0.0.tar.gz 104373 RMD160 fc55f22462b5b05d991558adf99468777789671a SHA1 a48d8579478fbcef37c347c3aa986f23fe528241 SHA256 2eb22e37946e479249a0b0e1fb0fb4651cebfd3d88aa116a39c07a0ec253fe28
+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
-MISC ChangeLog 3720 RMD160 71a4fcd10acd194a089ecc904c9d9d7164d0d2e0 SHA1 f216ca5cf9d2a2930cd1dda36fe345ff7dfe40e6 SHA256 0efab43eae25b726f25202b4bc10dab1f7926da745c74996d14bdf7a68d2ba5a
+EBUILD runit-2.1.1.ebuild 1634 RMD160 8ec7b5da24f886c1be1a08d54b7f88025b777201 SHA1 b24ac4f2e9cec6fb422418338ef5a72f9612e2b5 SHA256 315441b15848c92603ec0d24e6750009a56e53ce00533279f35409231806d339
+MISC ChangeLog 3830 RMD160 58ec67564690d7722c572c1fddb6a8a70a874138 SHA1 d811fd3ad102613a2a77e40881a36eb9bb98d2f1 SHA256 6fedbdb9b2687c4aea778b27f420ea16704775ec0e0b06442a76ab9421af5242
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAklUCDMACgkQn/5bYzqsSmHj4ACfY03xttJ6jDMPwejgOJpaXEV2
-LRoAn3tBfbaxqFwMcJi67eRXH26Z2iv4
-=+pkL
+iEYEARECAAYFAk34RoQACgkQVWmRsqeSphP8wgCaA5RGamlvHlmWMjeGhNoEftbf
+QiUAnjdS3zEDK8+FV3vj4hQFafRGOanj
+=Nnkg
 -----END PGP SIGNATURE-----
diff --git a/sys-process/runit/runit-2.1.1.ebuild b/sys-process/runit/runit-2.1.1.ebuild
new file mode 100644
index 000000000000..0ca0be3d979b
--- /dev/null
+++ b/sys-process/runit/runit-2.1.1.ebuild
@@ -0,0 +1,60 @@
+# 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.ebuild,v 1.1 2011/06/15 05:43:26 jer 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_prepare() {
+	# we either build everything or nothing static
+	sed -i -e 's:-static: :' src/Makefile
+}
+
+src_configure() {
+	cd src
+	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
+
+	cd src
+	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
+}