Bug 141392, fix another blip in the init script.

Package-Manager: portage-2.1.1_pre3-r1

5 files changed, 69 insertions, 11 deletions

diff --git a/sys-block/vblade/ChangeLog b/sys-block/vblade/ChangeLog
index 176471c0d224..796544604d9b 100644
--- a/sys-block/vblade/ChangeLog
+++ b/sys-block/vblade/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-block/vblade
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/vblade/ChangeLog,v 1.10 2006/07/22 05:06:34 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/vblade/ChangeLog,v 1.11 2006/07/22 19:51:57 robbat2 Exp $
+
+*vblade-10-r2 (22 Jul 2006)
+
+  22 Jul 2006; Robin H. Johnson <robbat2@gentoo.org>
+  files/init.d-vblade.vblade0, +vblade-10-r2.ebuild:
+  Bug 141392, fix another blip in the init script.
 
 *vblade-10-r1 (22 Jul 2006)
 
diff --git a/sys-block/vblade/Manifest b/sys-block/vblade/Manifest
index 37a7fef75618..9a9c6d593878 100644
--- a/sys-block/vblade/Manifest
+++ b/sys-block/vblade/Manifest
@@ -2,10 +2,10 @@ AUX conf.d-vblade 929 RMD160 965d193ca4034302083552253b40f81bb46596d9 SHA1 a06f2
 MD5 34e059f8c29888d30558536919443b50 files/conf.d-vblade 929
 RMD160 965d193ca4034302083552253b40f81bb46596d9 files/conf.d-vblade 929
 SHA256 959b212244647776e04b1f28270b8a7fc2a6717326ee5b28e93af472f25dedcc files/conf.d-vblade 929
-AUX init.d-vblade.vblade0 2704 RMD160 86f21d49ea00819cf8a61bff058547363b9dcd47 SHA1 d80bb3112f75bc764212c8a2aeedbd3fa8078cd6 SHA256 08c4b1aa1e16be9d3f5b6c7a0a6b29e5f28652159c6c4dac7c1ec40c89f94eff
-MD5 e94f2b06be434ef2e5f21f41d199c67e files/init.d-vblade.vblade0 2704
-RMD160 86f21d49ea00819cf8a61bff058547363b9dcd47 files/init.d-vblade.vblade0 2704
-SHA256 08c4b1aa1e16be9d3f5b6c7a0a6b29e5f28652159c6c4dac7c1ec40c89f94eff files/init.d-vblade.vblade0 2704
+AUX init.d-vblade.vblade0 2716 RMD160 e4211e81d16b6283d366e3614c46926b3cb05767 SHA1 3add92747ab16f5e863b192cfa2fd34b9e536fdc SHA256 7e65a2fe4d1e3a4abfafb734176ee10664458b4c9871e293bed0bc8c56c301ff
+MD5 54dce6a59c4eb448e4f027da1b21ea88 files/init.d-vblade.vblade0 2716
+RMD160 e4211e81d16b6283d366e3614c46926b3cb05767 files/init.d-vblade.vblade0 2716
+SHA256 7e65a2fe4d1e3a4abfafb734176ee10664458b4c9871e293bed0bc8c56c301ff files/init.d-vblade.vblade0 2716
 AUX vbladed 650 RMD160 559099c8cb727dbd4af8df236022ff4bd112fefd SHA1 d240e8f607dd7e5eae22ec5ccd00b00b93410e3a SHA256 d6b7ca14e28c18bff20bf6d5fb37320c425b76ae042ae7cfd984e61e887caf41
 MD5 f29d83183c32e85e0579c7325959dbaa files/vbladed 650
 RMD160 559099c8cb727dbd4af8df236022ff4bd112fefd files/vbladed 650
@@ -17,6 +17,10 @@ EBUILD vblade-10-r1.ebuild 1105 RMD160 b50cb4d4864fc1c0dda6db779c8f7d1cf658ed58
 MD5 4d4db2e352e256e770cd6a05586c983e vblade-10-r1.ebuild 1105
 RMD160 b50cb4d4864fc1c0dda6db779c8f7d1cf658ed58 vblade-10-r1.ebuild 1105
 SHA256 30af1fd1d50ba7649ee6d72ba2af6489787d7d53931c49034b2196202bbe4458 vblade-10-r1.ebuild 1105
+EBUILD vblade-10-r2.ebuild 1105 RMD160 01635ae2187edf11dac60fee4e99a411bd0f1642 SHA1 2b9ebf8174aac22d76240b09f32a939693d35a94 SHA256 fc767d5f01badaeb3953a78606af79feb24b36edabced1bd0d6c89eae515013c
+MD5 ba870f8667f3c1d112a7c67613905eba vblade-10-r2.ebuild 1105
+RMD160 01635ae2187edf11dac60fee4e99a411bd0f1642 vblade-10-r2.ebuild 1105
+SHA256 fc767d5f01badaeb3953a78606af79feb24b36edabced1bd0d6c89eae515013c vblade-10-r2.ebuild 1105
 EBUILD vblade-10.ebuild 1104 RMD160 e1c8801a6618c6a30a26d38f5055146ec2d7f6a1 SHA1 8b912c4f91e1abb88203bd64413f963eaef9cb70 SHA256 ae1c3da9eba9a9a4301b38a4377b16cfe62dad565effd0dde99f072832d47b99
 MD5 e499201cf14186f5a4a1b7a8e553426b vblade-10.ebuild 1104
 RMD160 e1c8801a6618c6a30a26d38f5055146ec2d7f6a1 vblade-10.ebuild 1104
@@ -29,10 +33,10 @@ EBUILD vblade-9.ebuild 893 RMD160 d93b7dc3098d9afd4a0577d04366e5072d014c5b SHA1
 MD5 9defea83f0fa58c0685f373de90ab120 vblade-9.ebuild 893
 RMD160 d93b7dc3098d9afd4a0577d04366e5072d014c5b vblade-9.ebuild 893
 SHA256 568601165b7728d8fe8bef7fb1ce2aea4cbd704d6c80505c843a25bc442b841c vblade-9.ebuild 893
-MISC ChangeLog 1599 RMD160 2b856616dfee803c235d22046f8166eed34d66a4 SHA1 fe4e5e2cf2eaa43327acd8476253347e243aa140 SHA256 b5bdb01a5d37866a60ce63f31dfec99c05eb6e2db06120ae053df8fbe43e56ce
-MD5 3366be91f721adc47769caadf7a76823 ChangeLog 1599
-RMD160 2b856616dfee803c235d22046f8166eed34d66a4 ChangeLog 1599
-SHA256 b5bdb01a5d37866a60ce63f31dfec99c05eb6e2db06120ae053df8fbe43e56ce ChangeLog 1599
+MISC ChangeLog 1786 RMD160 c04362405fdd4148f222ddcc24ecb6acc197ed3e SHA1 2dafe6546beded3defa39ad0770bdc12bb281465 SHA256 13bedda3220b4efa0b80212abbf5b4d103f1710d3cbc0d97e4673c304e4aa6d5
+MD5 ff7c39087b7f9ad7a2d7177f3cdb1dae ChangeLog 1786
+RMD160 c04362405fdd4148f222ddcc24ecb6acc197ed3e ChangeLog 1786
+SHA256 13bedda3220b4efa0b80212abbf5b4d103f1710d3cbc0d97e4673c304e4aa6d5 ChangeLog 1786
 MISC metadata.xml 202 RMD160 ca69c6e7044d6681415f1e86a1c084f890ff08ef SHA1 62ab18bf0e1da311494ca0912e5a79daeceb46ad SHA256 76dbb4a720140d78f0ddfb2b2782c03852169c201c1f507eb17ef4d2a82f212a
 MD5 c8bc5b7915619c3198683ce72b740321 metadata.xml 202
 RMD160 ca69c6e7044d6681415f1e86a1c084f890ff08ef metadata.xml 202
@@ -43,6 +47,9 @@ SHA256 ecb7b201fc5bef650a35fbd4c2579d6477840d15fada2d6149bad914d3e32aef files/di
 MD5 35cd2f92f8a6185c06f69a9ffc7cfcf2 files/digest-vblade-10-r1 226
 RMD160 ff7ab0686963fff9e78062967bfcd50810f46a46 files/digest-vblade-10-r1 226
 SHA256 ecb7b201fc5bef650a35fbd4c2579d6477840d15fada2d6149bad914d3e32aef files/digest-vblade-10-r1 226
+MD5 35cd2f92f8a6185c06f69a9ffc7cfcf2 files/digest-vblade-10-r2 226
+RMD160 ff7ab0686963fff9e78062967bfcd50810f46a46 files/digest-vblade-10-r2 226
+SHA256 ecb7b201fc5bef650a35fbd4c2579d6477840d15fada2d6149bad914d3e32aef files/digest-vblade-10-r2 226
 MD5 b57d594810cbd242c2bd7a76c0f2eba3 files/digest-vblade-6 59
 RMD160 e62ce0ea269b1b97cd1733d511662d57fbbd396a files/digest-vblade-6 59
 SHA256 d44e99f581c572bf4eb4f0769497fc3f93b4e4bd839ac340b7ee1bd79b1e5ce9 files/digest-vblade-6 59
diff --git a/sys-block/vblade/files/digest-vblade-10-r2 b/sys-block/vblade/files/digest-vblade-10-r2
new file mode 100644
index 000000000000..fe78ce8a6729
--- /dev/null
+++ b/sys-block/vblade/files/digest-vblade-10-r2
@@ -0,0 +1,3 @@
+MD5 c51783ee3235aba58a0c095bdf5fc35c vblade-10.tar.gz 16689
+RMD160 1899c5dc6a86f8d610b91d1e13a55274e9fdc3e6 vblade-10.tar.gz 16689
+SHA256 70fc9b0fb6c8be089a8a04e9861b8c496a38b1f66dae2fddb22a7fb312e68521 vblade-10.tar.gz 16689
diff --git a/sys-block/vblade/files/init.d-vblade.vblade0 b/sys-block/vblade/files/init.d-vblade.vblade0
index bb2cdc11067f..2745b3b660ff 100644
--- a/sys-block/vblade/files/init.d-vblade.vblade0
+++ b/sys-block/vblade/files/init.d-vblade.vblade0
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-block/vblade/files/init.d-vblade.vblade0,v 1.2 2006/07/22 05:05:56 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/vblade/files/init.d-vblade.vblade0,v 1.3 2006/07/22 19:51:57 robbat2 Exp $
 
 opts="${opts} checkconfig"
 
@@ -103,7 +103,7 @@ start() {
 stop() {
 	ebegin "Stopping ${srvname}"
 	#start-stop-daemon --stop --quiet --pidfile ${pidfile}
-	ps -Ao pid,args |egrep "^[[:digit:]]+ /usr/sbin/vblade ${@}" | awk '{print $1}' | xargs kill
+	ps -Ao pid,args |egrep "^[[:space:]]*[[:digit:]]+ /usr/sbin/vblade ${@}" | awk '{print $1}' | xargs kill
 	eend $?
 	
 	#start-stop-daemon --stop --quiet --exec /usr/sbin/vblade
diff --git a/sys-block/vblade/vblade-10-r2.ebuild b/sys-block/vblade/vblade-10-r2.ebuild
new file mode 100644
index 000000000000..28f85f8395ed
--- /dev/null
+++ b/sys-block/vblade/vblade-10-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-block/vblade/vblade-10-r2.ebuild,v 1.1 2006/07/22 19:51:57 robbat2 Exp $
+
+inherit eutils
+
+DESCRIPTION="vblade exports a block device using AoE"
+HOMEPAGE="http://sf.net/projects/aoetools/"
+SRC_URI="mirror://sourceforge/aoetools/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+DEPEND="virtual/libc"
+RDEPEND="${DEPEND}
+		sys-apps/util-linux"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	# messy tarball
+	make clean  || die "Failed to clean up source"
+	sed -i 's,^CFLAGS.*,CFLAGS += -Wall,' makefile || die "Failed to clean up makefile"
+}
+src_compile() {
+	emake || die "emake failed"
+}
+
+src_install() {
+	into /usr
+	doman vblade.8
+	dodoc HACKING NEWS README
+	dosbin vblade
+	dosbin ${FILESDIR}/vbladed
+	newconfd ${FILESDIR}/conf.d-vblade vblade
+	newinitd ${FILESDIR}/init.d-vblade.vblade0 vblade.vblade0
+}
+
+pkg_postinst() {
+	einfo "We do now include an init.d script, please look in your init.d and"
+	einfo "conf.d directories for it."
+}