summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'sys-process')
-rw-r--r--sys-process/supervise-scripts/ChangeLog9
-rw-r--r--sys-process/supervise-scripts/Manifest26
-rw-r--r--sys-process/supervise-scripts/files/supervise-scripts-3.5-head-tails-syntax.patch19
-rw-r--r--sys-process/supervise-scripts/supervise-scripts-3.5.ebuild5
4 files changed, 44 insertions, 15 deletions
diff --git a/sys-process/supervise-scripts/ChangeLog b/sys-process/supervise-scripts/ChangeLog
index 59be64fc9f7c..fa74e3e425ca 100644
--- a/sys-process/supervise-scripts/ChangeLog
+++ b/sys-process/supervise-scripts/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for sys-process/supervise-scripts
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/supervise-scripts/ChangeLog,v 1.4 2006/06/06 01:34:30 eradicator Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-process/supervise-scripts/ChangeLog,v 1.5 2006/10/22 12:36:02 vapier Exp $
+
+ 22 Oct 2006; Mike Frysinger <vapier@gentoo.org>
+ +files/supervise-scripts-3.5-head-tails-syntax.patch,
+ supervise-scripts-3.5.ebuild:
+ Fixup head/tail stuff missed by the eclass #152307 by Richard Scott.
06 Jun 2006; Jeremy Huddleston <eradicator@gentoo.org>
supervise-scripts-3.5.ebuild:
diff --git a/sys-process/supervise-scripts/Manifest b/sys-process/supervise-scripts/Manifest
index 422ebf69bc4c..3d9a5a2bfe6a 100644
--- a/sys-process/supervise-scripts/Manifest
+++ b/sys-process/supervise-scripts/Manifest
@@ -1,15 +1,19 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
+AUX supervise-scripts-3.5-head-tails-syntax.patch 521 RMD160 662f93b70f0a2204b22fb290ee627946aa31511f SHA1 19e093abe5937288bf0629cf11d5416da66704d9 SHA256 002c6ce3bc58145e548ee0266557a537e19ef1cd73c6cc64873eb6cc24ea28a9
+MD5 90b79338a37af0f93f517d7b5d9186a1 files/supervise-scripts-3.5-head-tails-syntax.patch 521
+RMD160 662f93b70f0a2204b22fb290ee627946aa31511f files/supervise-scripts-3.5-head-tails-syntax.patch 521
+SHA256 002c6ce3bc58145e548ee0266557a537e19ef1cd73c6cc64873eb6cc24ea28a9 files/supervise-scripts-3.5-head-tails-syntax.patch 521
DIST supervise-scripts-3.5.tar.gz 19994 RMD160 2f6dac802b22c0f56660ac29688dfd92743b4a44 SHA1 e1f0e84c599c7f27ff2a451fa069a7c1112006a9 SHA256 00a0fda7f8b507297f32030307e9bc02b3a5bbf74dea5d53e2c56a6cf1aa6c34
-EBUILD supervise-scripts-3.5.ebuild 1261 RMD160 511718d1f1f9681d63b1f41427eebcd3a3508c2a SHA1 ac2ab87209956756f4f297e499e6731519403d75 SHA256 903a3d36a81d5333226f7a109daafaff7ae1f5cd81fd96ead4157cad3b20c74f
-MD5 1635cc134e099c15938bd53851786865 supervise-scripts-3.5.ebuild 1261
-RMD160 511718d1f1f9681d63b1f41427eebcd3a3508c2a supervise-scripts-3.5.ebuild 1261
-SHA256 903a3d36a81d5333226f7a109daafaff7ae1f5cd81fd96ead4157cad3b20c74f supervise-scripts-3.5.ebuild 1261
-MISC ChangeLog 2809 RMD160 c50f7b998ff8cf6eb3e7255dd821b58ea549a473 SHA1 e64b3f6042f2ff8b60d501397c2329afe38bc2de SHA256 d47c1d933ad71126d1700b951e5c5171971674a172ebdba8c7e7e112fe914b1b
-MD5 ad925a5c5d434c9266c0b60ae601b22a ChangeLog 2809
-RMD160 c50f7b998ff8cf6eb3e7255dd821b58ea549a473 ChangeLog 2809
-SHA256 d47c1d933ad71126d1700b951e5c5171971674a172ebdba8c7e7e112fe914b1b ChangeLog 2809
+EBUILD supervise-scripts-3.5.ebuild 1327 RMD160 5933d11ec2763b435312ab5d75a59e2ea9353c1b SHA1 696c8ae33b71fb8ab20533068bfd5496094b6ec9 SHA256 fe577b872313ead62a514260c653b903f3df5fae993482d2f6c58edf58e0bb10
+MD5 46de5a13da3f3e31ae2086d78224e2d7 supervise-scripts-3.5.ebuild 1327
+RMD160 5933d11ec2763b435312ab5d75a59e2ea9353c1b supervise-scripts-3.5.ebuild 1327
+SHA256 fe577b872313ead62a514260c653b903f3df5fae993482d2f6c58edf58e0bb10 supervise-scripts-3.5.ebuild 1327
+MISC ChangeLog 3015 RMD160 93549496eb2d80d38f3ed9fa0aed757da7a09c10 SHA1 e8ecfcb59b347ac9582d373358aace9e77624a3e SHA256 244ee146dd2fb5c4c0208f98eaad35711c46cd23d8e456e2870fb98c5e45ea5b
+MD5 7b83f22a9fd976ed7abe78a308356d4e ChangeLog 3015
+RMD160 93549496eb2d80d38f3ed9fa0aed757da7a09c10 ChangeLog 3015
+SHA256 244ee146dd2fb5c4c0208f98eaad35711c46cd23d8e456e2870fb98c5e45ea5b ChangeLog 3015
MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -20,7 +24,7 @@ SHA256 75b91cf2e27394b1d78320a2f8ff351d102b94ecb21fc8b0906074d38844bbe4 files/di
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (GNU/Linux)
-iD8DBQFFOxEtamhnQswr0vIRApxZAJ0eVW4Nsugx79z1+DvxwqzLGIC26QCgpu0r
-nWhWMMWpHegLB9VdCJnjkY8=
-=K72i
+iD8DBQFFO2XbamhnQswr0vIRAmGvAKCuUwcEdsp46kCIEkMOcqyyORF81QCcCsgv
+dNwmyeaYtnCL+aYqsHy96FM=
+=l4iL
-----END PGP SIGNATURE-----
diff --git a/sys-process/supervise-scripts/files/supervise-scripts-3.5-head-tails-syntax.patch b/sys-process/supervise-scripts/files/supervise-scripts-3.5-head-tails-syntax.patch
new file mode 100644
index 000000000000..6a38a544724a
--- /dev/null
+++ b/sys-process/supervise-scripts/files/supervise-scripts-3.5-head-tails-syntax.patch
@@ -0,0 +1,19 @@
+fixheadtails.eclass can't handle shell scripts so we need to fix ourselves
+
+http://bugs.gentoo.org/152307
+
+--- svscan-add-to-inittab.in
++++ svscan-add-to-inittab.in
+@@ -53,10 +53,10 @@
+
+ # Splice the new lines into the old file
+ {
+- catit | head -$(($lineno-1))
++ catit | head -n $(($lineno-1))
+ echo "SV:2345:respawn:$conf_bin/svscan-start /service"
+ echo "SX:S016:wait:$conf_bin/svscan-stopall /service"
+- catit | tail +$lineno
++ catit | tail -n +$lineno
+ } >"$tmpfile"
+
+ # And move it over the existing file
diff --git a/sys-process/supervise-scripts/supervise-scripts-3.5.ebuild b/sys-process/supervise-scripts/supervise-scripts-3.5.ebuild
index 7bc33463c1d1..c24cc6d59bc9 100644
--- a/sys-process/supervise-scripts/supervise-scripts-3.5.ebuild
+++ b/sys-process/supervise-scripts/supervise-scripts-3.5.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/supervise-scripts/supervise-scripts-3.5.ebuild,v 1.4 2006/10/22 06:34:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/supervise-scripts/supervise-scripts-3.5.ebuild,v 1.5 2006/10/22 12:36:02 vapier Exp $
-inherit fixheadtails toolchain-funcs
+inherit eutils fixheadtails toolchain-funcs
DESCRIPTION="Starting and stopping daemontools managed services"
HOMEPAGE="http://untroubled.org/supervise-scripts/"
@@ -26,6 +26,7 @@ src_unpack() {
echo "$(tc-getCC) ${CFLAGS}" > conf-cc
echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
ht_fix_file svscan-add-to-inittab.in Makefile
+ epatch "${FILESDIR}"/${P}-head-tails-syntax.patch #152307
}
src_compile() {