Some QA on ebuild style and die

Package-Manager: portage-2.2.0_alpha4/cvs/Linux x86_64

5 files changed, 47 insertions, 45 deletions

diff --git a/sys-fs/avfs/ChangeLog b/sys-fs/avfs/ChangeLog
index 0efd8eb6d68f..5c8649ca0a7e 100644
--- a/sys-fs/avfs/ChangeLog
+++ b/sys-fs/avfs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/avfs
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/avfs/ChangeLog,v 1.26 2010/11/14 13:32:08 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/avfs/ChangeLog,v 1.27 2010/11/14 13:37:29 jlec Exp $
+
+  14 Nov 2010; Justin Lecher <jlec@gentoo.org> avfs-0.9.7-r1.ebuild,
+  avfs-0.9.8.ebuild, avfs-0.9.8-r1.ebuild:
+  Some QA on ebuild style and die
 
   14 Nov 2010; Justin Lecher <jlec@gentoo.org> avfs-0.9.9.ebuild,
   metadata.xml:
diff --git a/sys-fs/avfs/Manifest b/sys-fs/avfs/Manifest
index 1771fa75a31f..3bc901ecf4f5 100644
--- a/sys-fs/avfs/Manifest
+++ b/sys-fs/avfs/Manifest
@@ -5,16 +5,16 @@ AUX avfs-0.9.8-gcc43_fix_open_missing_mode.patch 413 RMD160 a3c46733fa89423c0bcb
 DIST avfs-0.9.7.tar.bz2 575400 RMD160 5df6a81667e874987785fa2a932e449fcafb6913 SHA1 2ce3b006609a499bad99dff4549a733bc2502cd7 SHA256 5912997ab8b3f60674935db85891aecfc8cf3d86df593a5e115172d0b581d3aa
 DIST avfs-0.9.8.tar.bz2 641756 RMD160 d4ea9b0ba340bc504ae62e672bfbdfe85ea0855f SHA1 8307bdd646f4ea3e9da2365c701cfa110845bfc6 SHA256 5a45760889bdbe65a6ac11b926607681930746dff79924ad8418be1a8a10f5a7
 DIST avfs-0.9.9.tar.bz2 678451 RMD160 202b16761ef995323050c42b40fdd37c985a9770 SHA1 3bc812f6caffd17de38f839d20e99448f85474d3 SHA256 5e3100e99f6e136158a0d33045649959f830ddd31d57ec02f9e70cca421196cb
-EBUILD avfs-0.9.7-r1.ebuild 1604 RMD160 e963a64e1197fc42c8608981f48cef2a28d9b90a SHA1 1729ed102de6719d9b1bca3ab39712a5c2945652 SHA256 d1517bba22e87e8f999ab9f99f00b39afe1a6c7cfc6f8fee0eb8ad69d21eb249
-EBUILD avfs-0.9.8-r1.ebuild 1701 RMD160 188d637c0e9bd2b8b2a0f47855d78cccf82c3024 SHA1 91fb90b3be0aa457f23ec11c1d82fa46fe31478d SHA256 6c48eeb46fbe8d68d13e3c19a67d78988ff254394a5d38d5407e59c704a93309
-EBUILD avfs-0.9.8.ebuild 1603 RMD160 833fbbf4fa05324561bdcee1ba70c51e348c573a SHA1 c57ef480041e7bb1132d239a9d3dea68549d3fef SHA256 14d7da9597a5f30c62073b770effcb72cf9ab16d981b5468398b010308c16d7d
+EBUILD avfs-0.9.7-r1.ebuild 1614 RMD160 7e8eaf885cdee749bfee9e40d0d25a3946f4a3ad SHA1 bdc1f95f972e226bc4288af8c0a1f6d62e5888b0 SHA256 dc6300679a74d63df612531401cf461e08648d3496d65e756ae9abb777251374
+EBUILD avfs-0.9.8-r1.ebuild 1698 RMD160 106450f82e5e6f9e671e688f91f75996c861216d SHA1 615d0d62357bc0c8e84fea520d6ea57a042a9a84 SHA256 9342470af1c594bdeaa1ef2edb79b620cb5a7406512c3a6da41024e68a752865
+EBUILD avfs-0.9.8.ebuild 1641 RMD160 13b5c7515f7cccd87830210d8a5aef1d51546316 SHA1 1485e698415ce39c32e7084ac809bf1acf8b2370 SHA256 d04c0a642327a105bffdbc69807901dc1778ec7f265a554f5d8a0a5ce5b82f59
 EBUILD avfs-0.9.9.ebuild 1880 RMD160 c35502117a8d097dad602a2e47d9514086ddfde0 SHA1 20d632defba7103573b373c838ebaf7185aa8a80 SHA256 d3c71e2a8592273d89b5c5b9ca6da3d8fe76152613590b20beed717254bfd311
-MISC ChangeLog 3727 RMD160 69694d93c3ea8a6c717b2f1507047cec50e7882f SHA1 03f4f51c9509b86fa7fe1c98ce9c302a8fc61229 SHA256 d6361014e44201ad1f24ae8dbf01797f3b6f097d47d34c9e37d355e6315d640b
+MISC ChangeLog 3874 RMD160 212f7262c9e2cd3c37531a5c496418088bb50c20 SHA1 1822c436be32d6cb19a0a51240328e5a237d317c SHA256 1c6849722c5df1ad67b2b8cad4f52de53ac936efd2e631426cc9b7fc2449b0d5
 MISC metadata.xml 266 RMD160 c0feb7c34ca51b03870a81c292be820946494791 SHA1 b62891b4420a45060425c36b4574c9f26b92fe80 SHA256 4b1357c29e2de325efcaed051c11f379bf035bc510caee8ab0b9dd777f8318db
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkzf5N0ACgkQgAnW8HDreRaiEwCgrpgPoZsT414BivGRr1R4ATd4
-ag4An1RYzM9MNu8f0kcKgF5QjMNDKjFa
-=vuUi
+iEYEARECAAYFAkzf5h4ACgkQgAnW8HDreRZFMgCglXXWyJkBg1MmXka8LtlXWYZk
+n+kAoKH6OlyrbD8g03phQQvtCFxXHopM
+=4/LN
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/avfs/avfs-0.9.7-r1.ebuild b/sys-fs/avfs/avfs-0.9.7-r1.ebuild
index 5055e672a18d..48238253142f 100644
--- a/sys-fs/avfs/avfs-0.9.7-r1.ebuild
+++ b/sys-fs/avfs/avfs-0.9.7-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/avfs/avfs-0.9.7-r1.ebuild,v 1.4 2007/07/21 13:57:10 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/avfs/avfs-0.9.7-r1.ebuild,v 1.5 2010/11/14 13:37:29 jlec Exp $
 
 inherit linux-info
 
@@ -11,6 +11,7 @@ SRC_URI="mirror://sourceforge/avf/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc sparc ~x86"
+IUSE=""
 
 DEPEND=">=sys-fs/fuse-2.4"
 RDEPEND="${DEPEND}"
@@ -20,25 +21,24 @@ pkg_setup() {
 }
 
 src_compile() {
-	econf --enable-fuse --enable-library || die "Sorry, can't configure :("
+	econf --enable-fuse --enable-library
 	emake || die "Sorry make failed :("
 }
 
 src_install() {
 	einstall || die "Sorry, make install failed :("
 	# remove cruft
-	dobin scripts/avfs-config
-	cd ${D}/usr
-	rm -f bin/davpass bin/ftppass
-	rm -fr sbin ../etc
-	cd ${S}
-	cd doc
-	dodoc api-overview background FORMAT INSTALL.* README.avfs-fuse
+	dobin scripts/avfs-config || die
+	cd "${D}"/usr
+	rm -f bin/davpass bin/ftppass || die
+	rm -fr sbin ../etc || die
+	cd "${S}"/doc
+	dodoc api-overview background FORMAT INSTALL.* README.avfs-fuse || die
 	cd ..
-	dodoc AUTHORS ChangeLog COPYING* INSTALL NEWS README TODO
+	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO || die
 	docinto scripts
-	dodoc scripts/avfs* scripts/*pass scripts/*mountavfs
-	dosym /usr/lib/avfs/extfs/README /usr/share/doc/${PF}/README.extfs
+	dodoc scripts/avfs* scripts/*pass scripts/*mountavfs || die
+	dosym /usr/lib/avfs/extfs/README /usr/share/doc/${PF}/README.extfs || die
 }
 
 pkg_postinst() {
diff --git a/sys-fs/avfs/avfs-0.9.8-r1.ebuild b/sys-fs/avfs/avfs-0.9.8-r1.ebuild
index 0f099bc1ef35..787eb40a24e5 100644
--- a/sys-fs/avfs/avfs-0.9.8-r1.ebuild
+++ b/sys-fs/avfs/avfs-0.9.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/avfs/avfs-0.9.8-r1.ebuild,v 1.5 2010/10/24 17:31:34 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/avfs/avfs-0.9.8-r1.ebuild,v 1.6 2010/11/14 13:37:29 jlec Exp $
 
 inherit eutils linux-info
 
@@ -11,12 +11,11 @@ SRC_URI="mirror://sourceforge/avf/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 ~hppa ia64 ~ppc sparc x86"
+IUSE=""
 
 DEPEND=">=sys-fs/fuse-2.4"
 RDEPEND="${DEPEND}"
 
-IUSE=""
-
 pkg_setup() {
 	kernel_is lt 2 6 && die "Must have a version 2.6 kernel. Cannot continue. :("
 }
@@ -24,25 +23,24 @@ pkg_setup() {
 src_compile() {
 	# Fixs bug #258295
 	epatch "${FILESDIR}/${P}-gcc43_fix_open_missing_mode.patch"
-	econf --enable-fuse --enable-library || die "Sorry, can't configure :("
+	econf --enable-fuse --enable-library
 	emake || die "Sorry make failed :("
 }
 
 src_install() {
 	einstall || die "Sorry, make install failed :("
 	# remove cruft
-	dobin scripts/avfs-config
+	dobin scripts/avfs-config || die
 	cd "${D}"/usr
-	rm -f bin/davpass bin/ftppass
-	rm -fr sbin ../etc
-	cd "${S}"
-	cd doc
-	dodoc api-overview background FORMAT INSTALL.* README.avfs-fuse
+	rm -f bin/davpass bin/ftppass || die
+	rm -fr sbin ../etc || die
+	cd "${S}"/doc
+	dodoc api-overview background FORMAT INSTALL.* README.avfs-fuse || die
 	cd ..
-	dodoc AUTHORS ChangeLog COPYING* INSTALL NEWS README TODO
+	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO || die
 	docinto scripts
-	dodoc scripts/avfs* scripts/*pass scripts/*mountavfs
-	dosym /usr/lib/avfs/extfs/README /usr/share/doc/${PF}/README.extfs
+	dodoc scripts/avfs* scripts/*pass scripts/*mountavfs || die
+	dosym /usr/lib/avfs/extfs/README /usr/share/doc/${PF}/README.extfs || die
 }
 
 pkg_postinst() {
diff --git a/sys-fs/avfs/avfs-0.9.8.ebuild b/sys-fs/avfs/avfs-0.9.8.ebuild
index f445002a6270..acc20193db5a 100644
--- a/sys-fs/avfs/avfs-0.9.8.ebuild
+++ b/sys-fs/avfs/avfs-0.9.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/avfs/avfs-0.9.8.ebuild,v 1.4 2008/07/05 09:36:48 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/avfs/avfs-0.9.8.ebuild,v 1.5 2010/11/14 13:37:29 jlec Exp $
 
 inherit linux-info
 
@@ -11,6 +11,7 @@ SRC_URI="mirror://sourceforge/avf/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 ~hppa ia64 ppc sparc x86"
+IUSE=""
 
 DEPEND=">=sys-fs/fuse-2.4"
 RDEPEND="${DEPEND}"
@@ -27,18 +28,17 @@ src_compile() {
 src_install() {
 	einstall || die "Sorry, make install failed :("
 	# remove cruft
-	dobin scripts/avfs-config
+	dobin scripts/avfs-config || die
 	cd "${D}"/usr
-	rm -f bin/davpass bin/ftppass
-	rm -fr sbin ../etc
-	cd "${S}"
-	cd doc
-	dodoc api-overview background FORMAT INSTALL.* README.avfs-fuse
+	rm -f bin/davpass bin/ftppass || die
+	rm -fr sbin ../etc || die
+	cd "${S}"/doc
+	dodoc api-overview background FORMAT INSTALL.* README.avfs-fuse || die
 	cd ..
-	dodoc AUTHORS ChangeLog COPYING* INSTALL NEWS README TODO
+	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO || die
 	docinto scripts
-	dodoc scripts/avfs* scripts/*pass scripts/*mountavfs
-	dosym /usr/lib/avfs/extfs/README /usr/share/doc/${PF}/README.extfs
+	dodoc scripts/avfs* scripts/*pass scripts/*mountavfs || die
+	dosym /usr/lib/avfs/extfs/README /usr/share/doc/${PF}/README.extfs || die
 }
 
 pkg_postinst() {