Fix syntax, clean up old ebuilds, change herd.

Package-Manager: portage-2.1.4

15 files changed, 34 insertions, 283 deletions

diff --git a/sys-block/aoetools/Manifest b/sys-block/aoetools/Manifest
index 0891cdc03df5..1341b42fd5d7 100644
--- a/sys-block/aoetools/Manifest
+++ b/sys-block/aoetools/Manifest
@@ -18,14 +18,14 @@ EBUILD aoetools-9.ebuild 1005 RMD160 dcdf8c7fd06bf5689c5a8e3669349bc1dc571dc6 SH
 MD5 6cd0b0e93f2e067e9e629428d92e5631 aoetools-9.ebuild 1005
 RMD160 dcdf8c7fd06bf5689c5a8e3669349bc1dc571dc6 aoetools-9.ebuild 1005
 SHA256 102b943c92772bd124944fa5d2c16654415a51b0a7e28aa39d31e37a66254c06 aoetools-9.ebuild 1005
-MISC ChangeLog 2270 RMD160 a28bf60864504c6687f3ca9463631f89992001ab SHA1 82a13dc21d235b02b5aec5e75264e8b45c54edd7 SHA256 966487ab2045b22c2c148408213885e1738412c5a9629ec6b6123307c2d69178
-MD5 bf1856698d7fd80eb7506805236f2b80 ChangeLog 2270
-RMD160 a28bf60864504c6687f3ca9463631f89992001ab ChangeLog 2270
-SHA256 966487ab2045b22c2c148408213885e1738412c5a9629ec6b6123307c2d69178 ChangeLog 2270
-MISC metadata.xml 223 RMD160 ffa99612cf27469c417944deed0e0c9155e64331 SHA1 607c637402dd253406aa6ee684471a702c5d1a99 SHA256 d6bb9ba68629616062b4433ab3b8fb01dfcafae5bb47804d9e06cdd6c66daa44
-MD5 21cd68602737d7c996bceabf6e62c468 metadata.xml 223
-RMD160 ffa99612cf27469c417944deed0e0c9155e64331 metadata.xml 223
-SHA256 d6bb9ba68629616062b4433ab3b8fb01dfcafae5bb47804d9e06cdd6c66daa44 metadata.xml 223
+MISC ChangeLog 2353 RMD160 bf1acb8dd3eece16f3af9378cba65642062d1829 SHA1 1ea5abd1308c556fb96f3a93ec5bc70ac6b127a9 SHA256 74e70914c907525a132949662d18d50a97acf45be754dba42f25c3131fbf01a9
+MD5 86d6771fea1eae8518e3e59a6b2cb768 ChangeLog 2353
+RMD160 bf1acb8dd3eece16f3af9378cba65642062d1829 ChangeLog 2353
+SHA256 74e70914c907525a132949662d18d50a97acf45be754dba42f25c3131fbf01a9 ChangeLog 2353
+MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
+SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 metadata.xml 164
 MD5 89a4833e4a1650d138bc4d533af6eb40 files/digest-aoetools-10 232
 RMD160 71e0f969ed7728327b5fe2b1c5d04b83154cd720 files/digest-aoetools-10 232
 SHA256 13503ca0af19859dc495aeb6aef55fa063d633bad6d58d82fbfcfa9ad9df22b1 files/digest-aoetools-10 232
diff --git a/sys-block/vblade/ChangeLog b/sys-block/vblade/ChangeLog
index 737c4cf4d4ae..ba0b7a2a0469 100644
--- a/sys-block/vblade/ChangeLog
+++ b/sys-block/vblade/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-block/vblade
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/vblade/ChangeLog,v 1.18 2007/05/15 14:13:31 bangert Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-block/vblade/ChangeLog,v 1.19 2008/01/14 02:14:49 robbat2 Exp $
+
+  14 Jan 2008; Robin H. Johnson <robbat2@gentoo.org> metadata.xml,
+  -vblade-6.ebuild, -vblade-9.ebuild, -vblade-10.ebuild,
+  -vblade-10-r1.ebuild, -vblade-10-r2.ebuild, vblade-14.ebuild:
+  Fix syntax, clean up old ebuilds, change herd.
 
   15 May 2007; Thilo Bangert <bangert@gentoo.org> metadata.xml:
   add <herd>no-herd</herd>
diff --git a/sys-block/vblade/Manifest b/sys-block/vblade/Manifest
index 839509c9ac64..63e45473da9e 100644
--- a/sys-block/vblade/Manifest
+++ b/sys-block/vblade/Manifest
@@ -14,57 +14,19 @@ AUX vbladed 650 RMD160 559099c8cb727dbd4af8df236022ff4bd112fefd SHA1 d240e8f607d
 MD5 f29d83183c32e85e0579c7325959dbaa files/vbladed 650
 RMD160 559099c8cb727dbd4af8df236022ff4bd112fefd files/vbladed 650
 SHA256 d6b7ca14e28c18bff20bf6d5fb37320c425b76ae042ae7cfd984e61e887caf41 files/vbladed 650
-DIST vblade-10.tar.gz 16689 RMD160 1899c5dc6a86f8d610b91d1e13a55274e9fdc3e6 SHA1 06a0694e0786f91c68a2335a47e8a73e9adb86a3 SHA256 70fc9b0fb6c8be089a8a04e9861b8c496a38b1f66dae2fddb22a7fb312e68521
 DIST vblade-14.tgz 20317 RMD160 ad0fe6f0c4ab40fa31daa68c7b14143ad87f443c SHA1 57bea505f3acb88f03f761954eea0759a0241e3f SHA256 29374180e288293aa0206cbdfd8444fcc69c189946ec380959a85a35a3129253
-DIST vblade-6.tar.gz 42390 RMD160 44c6658e7cb00388c49169048d6ad5b4e2fb5821 SHA1 948886218cd9ee5db4fa0590bc91571673fa4fe2 SHA256 47a3ef812a293a57a25b3afa8d143ee24cbc7bca22f30b08b42b4b37df275f95
-DIST vblade-9.tar.gz 16475 RMD160 927879e477fcd661379885ac484967d4837fc696 SHA1 88d918002b8261ce0eb8a00913a8a30e9b52b1b4 SHA256 730103caf7fd6909684bedcd3f85acf609ce944126659215400848062215c2fe
-EBUILD vblade-10-r1.ebuild 1105 RMD160 b50cb4d4864fc1c0dda6db779c8f7d1cf658ed58 SHA1 e9a9c51c51bceab74e952fd410ae67c6ac470899 SHA256 30af1fd1d50ba7649ee6d72ba2af6489787d7d53931c49034b2196202bbe4458
-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
-SHA256 ae1c3da9eba9a9a4301b38a4377b16cfe62dad565effd0dde99f072832d47b99 vblade-10.ebuild 1104
-EBUILD vblade-14.ebuild 1154 RMD160 3136400257dfc28b0d7145b9caa14c40b5bd291f SHA1 e633dcfc47db5f2c0ec655e170eaa82566a99adf SHA256 e36775308291e1c613c0f29bd8f98c90488d9fba4478594da587f8d0fa99dbae
-MD5 18ea30dc3e7b003a83071f757941c5e8 vblade-14.ebuild 1154
-RMD160 3136400257dfc28b0d7145b9caa14c40b5bd291f vblade-14.ebuild 1154
-SHA256 e36775308291e1c613c0f29bd8f98c90488d9fba4478594da587f8d0fa99dbae vblade-14.ebuild 1154
-EBUILD vblade-6.ebuild 887 RMD160 1ad35bc90db9c3c7eb2fd1aa16f9eb76a0df0e9a SHA1 3b5b7bbf8254f0c8319375cc62be97c600a29b6b SHA256 a4e4d7cb90b4da009a6f6704fb601955530bd21a3886835f94e863c14c32b91a
-MD5 f54f560cb083660797da2e799afe4b90 vblade-6.ebuild 887
-RMD160 1ad35bc90db9c3c7eb2fd1aa16f9eb76a0df0e9a vblade-6.ebuild 887
-SHA256 a4e4d7cb90b4da009a6f6704fb601955530bd21a3886835f94e863c14c32b91a vblade-6.ebuild 887
-EBUILD vblade-9.ebuild 893 RMD160 d93b7dc3098d9afd4a0577d04366e5072d014c5b SHA1 aabbfbe9112ee2ba46eeb5e0f6e7b2d4bce08327 SHA256 568601165b7728d8fe8bef7fb1ce2aea4cbd704d6c80505c843a25bc442b841c
-MD5 9defea83f0fa58c0685f373de90ab120 vblade-9.ebuild 893
-RMD160 d93b7dc3098d9afd4a0577d04366e5072d014c5b vblade-9.ebuild 893
-SHA256 568601165b7728d8fe8bef7fb1ce2aea4cbd704d6c80505c843a25bc442b841c vblade-9.ebuild 893
-MISC ChangeLog 2559 RMD160 3908e5510be496773f0682f28d0be23162fd528a SHA1 1f40f92679c7cfc39fbf35bd9646688954f40290 SHA256 bca169c13a0f7c1f88817bc7bdd2653868176250f0a54a4b6482b8d81592227d
-MD5 fa88c14f881a674753583cd441fb185f ChangeLog 2559
-RMD160 3908e5510be496773f0682f28d0be23162fd528a ChangeLog 2559
-SHA256 bca169c13a0f7c1f88817bc7bdd2653868176250f0a54a4b6482b8d81592227d ChangeLog 2559
-MISC metadata.xml 223 RMD160 ffa99612cf27469c417944deed0e0c9155e64331 SHA1 607c637402dd253406aa6ee684471a702c5d1a99 SHA256 d6bb9ba68629616062b4433ab3b8fb01dfcafae5bb47804d9e06cdd6c66daa44
-MD5 21cd68602737d7c996bceabf6e62c468 metadata.xml 223
-RMD160 ffa99612cf27469c417944deed0e0c9155e64331 metadata.xml 223
-SHA256 d6bb9ba68629616062b4433ab3b8fb01dfcafae5bb47804d9e06cdd6c66daa44 metadata.xml 223
-MD5 35cd2f92f8a6185c06f69a9ffc7cfcf2 files/digest-vblade-10 226
-RMD160 ff7ab0686963fff9e78062967bfcd50810f46a46 files/digest-vblade-10 226
-SHA256 ecb7b201fc5bef650a35fbd4c2579d6477840d15fada2d6149bad914d3e32aef files/digest-vblade-10 226
-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
+EBUILD vblade-14.ebuild 1159 RMD160 9012a58e4211d41b7374c4076fae037d9434d74a SHA1 16d4dc5bd248d6e1b23d05c89eb24a273d52e09e SHA256 f7dd810dd1e6693757ca6dd897ca37e73641b7a3b458c69c894f9d91a9bdcefc
+MD5 4b81c18dadb73eca3472bcf159b81c2b vblade-14.ebuild 1159
+RMD160 9012a58e4211d41b7374c4076fae037d9434d74a vblade-14.ebuild 1159
+SHA256 f7dd810dd1e6693757ca6dd897ca37e73641b7a3b458c69c894f9d91a9bdcefc vblade-14.ebuild 1159
+MISC ChangeLog 2797 RMD160 afa5f9d64f46ac02d309fea04ee08bcabb1cf182 SHA1 703dbd28ce963327ba7f853cac1c2deb3b26258a SHA256 6ae2dca5b88d6d5e04f89470891f565d13c1868c3fc04d95a05501f3a7e51666
+MD5 8b5fdb9fbd1b718421bb62313fd9e256 ChangeLog 2797
+RMD160 afa5f9d64f46ac02d309fea04ee08bcabb1cf182 ChangeLog 2797
+SHA256 6ae2dca5b88d6d5e04f89470891f565d13c1868c3fc04d95a05501f3a7e51666 ChangeLog 2797
+MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
+SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 metadata.xml 164
 MD5 e87f84d1278b1cf41a9821731b047484 files/digest-vblade-14 217
 RMD160 4821f954f937ae47bba24036dea925bf763028b5 files/digest-vblade-14 217
 SHA256 08dbc2591bbd1baa7f242f04225d4c2cec2bc570e35f62c4e0ff0be6beb50464 files/digest-vblade-14 217
-MD5 b452d0c080298e9760c1eb20d10356cb files/digest-vblade-6 223
-RMD160 15fadb793c1c14bfce56ae5accd914c5e0586fa7 files/digest-vblade-6 223
-SHA256 35c36d74d13822dc05eefa73fd9e83ae89b55810b246ea9e8a93443668700e30 files/digest-vblade-6 223
-MD5 48d960dac31f023e65f6e7548dd70987 files/digest-vblade-9 223
-RMD160 50dd3272d4d91511049aa073a00dafcf06a79344 files/digest-vblade-9 223
-SHA256 63dcc1caa86cf668a0c4a801b194e7e596d47324426b36da16b37bfde33f60f0 files/digest-vblade-9 223
diff --git a/sys-block/vblade/files/digest-vblade-10 b/sys-block/vblade/files/digest-vblade-10
deleted file mode 100644
index fe78ce8a6729..000000000000
--- a/sys-block/vblade/files/digest-vblade-10
+++ /dev/null
@@ -1,3 +0,0 @@
-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/digest-vblade-10-r1 b/sys-block/vblade/files/digest-vblade-10-r1
deleted file mode 100644
index fe78ce8a6729..000000000000
--- a/sys-block/vblade/files/digest-vblade-10-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-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/digest-vblade-10-r2 b/sys-block/vblade/files/digest-vblade-10-r2
deleted file mode 100644
index fe78ce8a6729..000000000000
--- a/sys-block/vblade/files/digest-vblade-10-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-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/digest-vblade-6 b/sys-block/vblade/files/digest-vblade-6
deleted file mode 100644
index ddaf34dc1874..000000000000
--- a/sys-block/vblade/files/digest-vblade-6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 0fd536f304c09e21993142b354765ca9 vblade-6.tar.gz 42390
-RMD160 44c6658e7cb00388c49169048d6ad5b4e2fb5821 vblade-6.tar.gz 42390
-SHA256 47a3ef812a293a57a25b3afa8d143ee24cbc7bca22f30b08b42b4b37df275f95 vblade-6.tar.gz 42390
diff --git a/sys-block/vblade/files/digest-vblade-9 b/sys-block/vblade/files/digest-vblade-9
deleted file mode 100644
index 6095cdde4502..000000000000
--- a/sys-block/vblade/files/digest-vblade-9
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 6a875597b4d38590c06d2a70039b06dc vblade-9.tar.gz 16475
-RMD160 927879e477fcd661379885ac484967d4837fc696 vblade-9.tar.gz 16475
-SHA256 730103caf7fd6909684bedcd3f85acf609ce944126659215400848062215c2fe vblade-9.tar.gz 16475
diff --git a/sys-block/vblade/metadata.xml b/sys-block/vblade/metadata.xml
index 5d9f5be9d49d..96a2d586367d 100644
--- a/sys-block/vblade/metadata.xml
+++ b/sys-block/vblade/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
-<maintainer>
-  <email>robbat2@gentoo.org</email>
-</maintainer>
+<herd>base-system</herd>
 </pkgmetadata>
diff --git a/sys-block/vblade/vblade-10-r1.ebuild b/sys-block/vblade/vblade-10-r1.ebuild
deleted file mode 100644
index f3595e3f86c6..000000000000
--- a/sys-block/vblade/vblade-10-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# 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-r1.ebuild,v 1.1 2006/07/22 05:06:34 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."
-}
diff --git a/sys-block/vblade/vblade-10-r2.ebuild b/sys-block/vblade/vblade-10-r2.ebuild
deleted file mode 100644
index 28f85f8395ed..000000000000
--- a/sys-block/vblade/vblade-10-r2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# 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."
-}
diff --git a/sys-block/vblade/vblade-10.ebuild b/sys-block/vblade/vblade-10.ebuild
deleted file mode 100644
index 4103e531cb68..000000000000
--- a/sys-block/vblade/vblade-10.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# 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.ebuild,v 1.4 2006/07/06 23:00:36 squinky86 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."
-}
diff --git a/sys-block/vblade/vblade-14.ebuild b/sys-block/vblade/vblade-14.ebuild
index 22167ca8b9ca..3f8793e944a2 100644
--- a/sys-block/vblade/vblade-14.ebuild
+++ b/sys-block/vblade/vblade-14.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/vblade/vblade-14.ebuild,v 1.5 2007/04/22 13:52:09 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/vblade/vblade-14.ebuild,v 1.6 2008/01/14 02:14:49 robbat2 Exp $
 
 inherit eutils
 
@@ -18,7 +18,7 @@ RDEPEND="${DEPEND}
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	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"
@@ -32,9 +32,9 @@ src_install() {
 	doman vblade.8
 	dodoc HACKING NEWS README
 	dosbin vblade
-	dosbin ${FILESDIR}/vbladed
-	newconfd ${FILESDIR}/conf.d-vblade vblade
-	newinitd ${FILESDIR}/init.d-vblade.vblade0-14 vblade.vblade0
+	dosbin "${FILESDIR}"/vbladed
+	newconfd "${FILESDIR}"/conf.d-vblade vblade
+	newinitd "${FILESDIR}"/init.d-vblade.vblade0-14 vblade.vblade0
 }
 
 pkg_postinst() {
diff --git a/sys-block/vblade/vblade-6.ebuild b/sys-block/vblade/vblade-6.ebuild
deleted file mode 100644
index 8c1e72211bed..000000000000
--- a/sys-block/vblade/vblade-6.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/vblade/vblade-6.ebuild,v 1.1 2005/09/16 06:12:11 robbat2 Exp $
-
-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="~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 vbladed
-	dosbin vblade
-}
-
-pkg_postinst() {
-	einfo "TODO: write a Gentoo init.d script for vblade"
-}
diff --git a/sys-block/vblade/vblade-9.ebuild b/sys-block/vblade/vblade-9.ebuild
deleted file mode 100644
index c8bc6a462c13..000000000000
--- a/sys-block/vblade/vblade-9.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# 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-9.ebuild,v 1.2 2006/05/15 21:13:27 ranger Exp $
-
-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="~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 vbladed
-	dosbin vblade
-}
-
-pkg_postinst() {
-	einfo "TODO: write a Gentoo init.d script for vblade"
-}