Bug 141392, fix another blip in the init script.

(Portage version: 2.1.1_pre3-r1)

4 files changed, 54 insertions, 3 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/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."
+}