summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2011-06-15 18:55:12 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2011-06-15 18:55:12 +0000
commit1a05511678a0568d8fc5589aa222184dc3aca898 (patch)
tree54872b767d1cf028b028c866a3c6ce73c6c05f9a /sys-process/runit
parentVersion bump. (diff)
downloadhistorical-1a05511678a0568d8fc5589aa222184dc3aca898.tar.gz
historical-1a05511678a0568d8fc5589aa222184dc3aca898.tar.bz2
historical-1a05511678a0568d8fc5589aa222184dc3aca898.zip
QA: actually make runit build, since it was broken with a blind version bump.
Package-Manager: portage-2.2.0_alpha41/cvs/Linux x86_64
Diffstat (limited to 'sys-process/runit')
-rw-r--r--sys-process/runit/ChangeLog5
-rw-r--r--sys-process/runit/Manifest10
-rw-r--r--sys-process/runit/runit-2.1.1.ebuild8
3 files changed, 12 insertions, 11 deletions
diff --git a/sys-process/runit/ChangeLog b/sys-process/runit/ChangeLog
index d340c7f3ca2a..c085ff22f4e5 100644
--- a/sys-process/runit/ChangeLog
+++ b/sys-process/runit/ChangeLog
@@ -1,6 +1,9 @@
# 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.31 2011/06/15 05:43:26 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/runit/ChangeLog,v 1.32 2011/06/15 18:55:12 flameeyes Exp $
+
+ 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.
*runit-2.1.1 (15 Jun 2011)
diff --git a/sys-process/runit/Manifest b/sys-process/runit/Manifest
index a4d120a4e70a..690d948eabb1 100644
--- a/sys-process/runit/Manifest
+++ b/sys-process/runit/Manifest
@@ -13,13 +13,13 @@ 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.ebuild 1634 RMD160 8ec7b5da24f886c1be1a08d54b7f88025b777201 SHA1 b24ac4f2e9cec6fb422418338ef5a72f9612e2b5 SHA256 315441b15848c92603ec0d24e6750009a56e53ce00533279f35409231806d339
-MISC ChangeLog 3830 RMD160 58ec67564690d7722c572c1fddb6a8a70a874138 SHA1 d811fd3ad102613a2a77e40881a36eb9bb98d2f1 SHA256 6fedbdb9b2687c4aea778b27f420ea16704775ec0e0b06442a76ab9421af5242
+EBUILD runit-2.1.1.ebuild 1631 RMD160 7362cc7d9228873b3d4277e164240a503157676f SHA1 3970b9e06c63a8aad79ec8b18a183007775c8467 SHA256 5b576091105dad929813ba018f9f5908f47e5c541f8787b01f79764b58940065
+MISC ChangeLog 3993 RMD160 8cd2ace044d93a8a1668151ef68ce21510a2a5a6 SHA1 513bb905ffbe9d57e9423d7e07cea7bb7fb874db SHA256 118ffce5f027a0d506490243efb013dd70d02d9cf18292b65f2e43ef98e69cbd
MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iEYEARECAAYFAk34RoQACgkQVWmRsqeSphP8wgCaA5RGamlvHlmWMjeGhNoEftbf
-QiUAnjdS3zEDK8+FV3vj4hQFafRGOanj
-=Nnkg
+iEYEARECAAYFAk34//EACgkQAiZjviIA2XjwbgCcDZwq0dumPIo2QNzbRGkUNqLh
+XKkAnj0mF5fgRXfqa363DcA6BvtoaQDl
+=lUDg
-----END PGP SIGNATURE-----
diff --git a/sys-process/runit/runit-2.1.1.ebuild b/sys-process/runit/runit-2.1.1.ebuild
index 0ca0be3d979b..e3c69152368b 100644
--- a/sys-process/runit/runit-2.1.1.ebuild
+++ b/sys-process/runit/runit-2.1.1.ebuild
@@ -1,6 +1,6 @@
# 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 $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/runit/runit-2.1.1.ebuild,v 1.2 2011/06/15 18:55:12 flameeyes Exp $
EAPI="3"
@@ -15,7 +15,7 @@ SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
IUSE="static"
-S=${WORKDIR}/admin/${P}
+S=${WORKDIR}/admin/${P}/src
src_prepare() {
# we either build everything or nothing static
@@ -23,7 +23,6 @@ src_prepare() {
}
src_configure() {
- cd src
use static && append-ldflags -static
echo "$(tc-getCC) ${CFLAGS}" > conf-cc
@@ -36,12 +35,11 @@ src_install() {
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}"
+ cd "${S}"/..
dodoc package/{CHANGES,README,THANKS,TODO}
dohtml doc/*.html
doman man/*.[18]