add back die statements to hopefully prevent successful installations when files failed to copy

Package-Manager: portage-2.1.6.1/cvs/Linux 2.6.27-gentoo-r7 x86_64

6 files changed, 49 insertions, 37 deletions

diff --git a/sys-apps/hal/ChangeLog b/sys-apps/hal/ChangeLog
index 9f0179ca7ab1..4a978d1a966c 100644
--- a/sys-apps/hal/ChangeLog
+++ b/sys-apps/hal/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/hal
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.256 2008/12/19 17:37:01 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.257 2008/12/23 20:43:00 cardoe Exp $
+
+  23 Dec 2008; Doug Goldstein <cardoe@gentoo.org> hal-0.5.11-r1.ebuild,
+  hal-0.5.11-r2.ebuild, hal-0.5.11-r3.ebuild, hal-0.5.11-r4.ebuild:
+  add back die statements to hopefully prevent successful installations when
+  files failed to copy
 
   19 Dec 2008; Peter Volkov <pva@gentoo.org> hal-0.5.7.1-r5.ebuild,
   hal-0.5.9-r1.ebuild, hal-0.5.9.1-r1.ebuild, hal-0.5.9.1-r2.ebuild,
diff --git a/sys-apps/hal/Manifest b/sys-apps/hal/Manifest
index 2c800aa86d55..7e1d4fc4ea5d 100644
--- a/sys-apps/hal/Manifest
+++ b/sys-apps/hal/Manifest
@@ -75,22 +75,25 @@ DIST hal-0.5.9.1-r2.tar.bz2 4246 RMD160 2b1646289c23db868bd969f7ae851e6c2d317bad
 DIST hal-0.5.9.1.tar.gz 1596347 RMD160 4f1f8b9513d4e168d4d043970c062cc9084f554f SHA1 fc29322a0beba73c2eab3e0a44f9b820a5fbccdd SHA256 5dc5cf08502510a00cecd6e04ef006a74ba7ed4b31d25187b5efadd70a78733b
 DIST hal-0.5.9.tar.gz 1587364 RMD160 bc97bf63e35d36bdb5731c3447036425dc7adeb9 SHA1 5832d97bcaf3dabb9aeb919226e3c38d366057ac SHA256 65d8f8eeb61e7609a8c5001b6660d90e7a482c4b74b4e226d09b433dc1a80c9d
 EBUILD hal-0.5.10.ebuild 8107 RMD160 10e636944ff909a3475883ca68609fd101af7442 SHA1 6d0312c1e232ab893571778b7d68e671f1c2ba13 SHA256 230ee8d3a7bd02e458e9a424743b7d40061f0d1b086b9adb07982278292f00da
-EBUILD hal-0.5.11-r1.ebuild 9030 RMD160 49fddd76dd7d3d8d10c5bdd8683f34980c27d11b SHA1 660c02d6d5199c78229f8341e53c274fd23d32a7 SHA256 8f6866aea853a9c01fea1d32bc3d8656ba8c15c4d5107feb42bbad62cae94756
-EBUILD hal-0.5.11-r2.ebuild 9181 RMD160 81ed5c10abc59fe6dae49057e05270028398b0ca SHA1 ea20f9cbb292f629e453e324b788a1ec9cd136b4 SHA256 e4ea2dca3f423dc1e6e350350ac2b44a7c0e53fcf146c89c6271b177610a5d36
-EBUILD hal-0.5.11-r3.ebuild 9181 RMD160 190c952d43f38efdbfc16b23cbd29ea5e14dccaa SHA1 551c3ca04f9dad747fd8e0ac02e9422f174ee46f SHA256 ca1b6a0086e2202e223ee3de5adf24a460a8622cf45bc323de263edbbd6268f5
-EBUILD hal-0.5.11-r4.ebuild 9227 RMD160 e0e78fb6a22ffe1c39dab9bf464f3729082834aa SHA1 b5719d710dd0c7c37dd56c9df86c38c3df5154f8 SHA256 fd6fcaaf5724fd48883e10d354834839f339fb93093c5832cb54d62f6f71d5a7
+EBUILD hal-0.5.11-r1.ebuild 9180 RMD160 11a91a37f88e8af8800af29ba484455aec85efd4 SHA1 d39b0fa1609f7ec033bdfcd35fbc8004ec0be8e7 SHA256 8b8e789c624380415e01f7876a9b617fdf629d9512de4c1667847ac241879614
+EBUILD hal-0.5.11-r2.ebuild 9334 RMD160 63c10463ab343224c3b712214f926d8acde748cd SHA1 ebc2b0fe207598fa07c343293b5dc0d44579eea4 SHA256 fa2cc02310db1e21652e35fd00a7b8d9d2a8b7164af4338284cfa7c17b60133d
+EBUILD hal-0.5.11-r3.ebuild 9334 RMD160 594535ddf9d40a4ae52d8fbafab57f104f882647 SHA1 7b8576678d77d4f4d5500b7ab512b3c7b98127e0 SHA256 afc94cb716524d838e7af1b2ce16bd020c797607af29fec83c868b0b9efe20e6
+EBUILD hal-0.5.11-r4.ebuild 9380 RMD160 cd939db1fc9d7fb3145fef5325310e35c889a336 SHA1 cd9eeaa2a83dc2d793d3c8c4a34f2dd2eab5aaf9 SHA256 f9ab0c39d29e700e16e21c8deb5a855c4bb46ac66ad15d265556c242db1bc059
 EBUILD hal-0.5.11.ebuild 8933 RMD160 f0c5a571486b51256c3cf106bc18c3328c69c23d SHA1 101e74f1898c6f38d5f5b65cc238a46ac4d84389 SHA256 79b791da6e06ba5b38bdfcdc896236f299111ef26db886d658762ddd92d9e521
 EBUILD hal-0.5.7.1-r5.ebuild 5949 RMD160 3e3de84c3ac4676da8fd588e2d58b7ba943c682c SHA1 39d62645fd278d08e47628b32462ee02eb6c00b7 SHA256 b92d8ecb4b07428dc14988fae6c30372e9feac64f1c9dbc65ffa9fc0982d6012
 EBUILD hal-0.5.9-r1.ebuild 7954 RMD160 3192a7977b48c0e9d1810ce0e3bfdbbb77baf74a SHA1 7d3aa2946146730a8bc9e88e66816623e2a23452 SHA256 8e34ca0d4779f910f56c994f479ee50835006f15198157e0fe0080c822573fe2
 EBUILD hal-0.5.9.1-r1.ebuild 7028 RMD160 026cdc11e94531e74ac3297ea55102ce0c727b78 SHA1 ca452ee26ce9604b3803a14ba531d45fe6ef8ed2 SHA256 aa19c41ae0f9ddb7044ad6313479ae6d5d52b02176bffa287214d58d8bd10758
 EBUILD hal-0.5.9.1-r2.ebuild 6704 RMD160 d94dc27787f001b71a46e375c622df17fbb166ec SHA1 60389e086d054b3189eb052277ad1ae676032261 SHA256 71d193a6ba2dc82ea0cadcf5a6911f89e6eeebcb467aa60aba857e0dd6c53cfe
 EBUILD hal-0.5.9.1-r3.ebuild 6694 RMD160 91f751aa5525c0879cf23bcbb95a9fb343742d0f SHA1 a0b0da643a6c7dab8f0517e01bae4d774224b15a SHA256 09338520c2c1278f1fec32c0c8e9fa95ac906d35eefe52f1f4e1507b12953452
-MISC ChangeLog 41159 RMD160 b9c330f2227717228f163f9d4533b019311b25c8 SHA1 a53390de337c050d26cb8e7110ab068a48fc40a3 SHA256 4aaf5f2dc031b23709d40fc5f47fbdfff1860b3da0d36bb1c669c36ca6e00bad
+MISC ChangeLog 41403 RMD160 298f133ae88c5c4a81cdb7391b67308f47f5c8a9 SHA1 4ca72dc6cc5bd1e3cc41f059af06704eab9c4360 SHA256 2261f0217324f86e5d3f19f8836fdebfda8ec47ad91515dc02baa6fbb2d7342b
+MISC hal-0.5.11-r1.ebuild.orig 9030 RMD160 49fddd76dd7d3d8d10c5bdd8683f34980c27d11b SHA1 660c02d6d5199c78229f8341e53c274fd23d32a7 SHA256 8f6866aea853a9c01fea1d32bc3d8656ba8c15c4d5107feb42bbad62cae94756
+MISC hal-0.5.11-r2.ebuild.orig 9181 RMD160 81ed5c10abc59fe6dae49057e05270028398b0ca SHA1 ea20f9cbb292f629e453e324b788a1ec9cd136b4 SHA256 e4ea2dca3f423dc1e6e350350ac2b44a7c0e53fcf146c89c6271b177610a5d36
+MISC hal-0.5.11-r3.ebuild.orig 9181 RMD160 190c952d43f38efdbfc16b23cbd29ea5e14dccaa SHA1 551c3ca04f9dad747fd8e0ac02e9422f174ee46f SHA256 ca1b6a0086e2202e223ee3de5adf24a460a8622cf45bc323de263edbbd6268f5
 MISC metadata.xml 2118 RMD160 c5e854ace21eaef57ae132e7dd9fe6bbcd644214 SHA1 c936358b6965f4f59c408fdaeed2d5ec22e66144 SHA256 c0eeaa1b4b92601ee0e46deafddaad311af80bc4a0111124fabdb0380386c39a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAklQCjkACgkQoeSe8B0zEfyVIgCfRuUG5HLvR+tGG5jVcUTCn0bX
-SeQAnRnDvj7HiCsuYPMCjK7VIvDX4O0R
-=mjHi
+iEYEARECAAYFAklRTWoACgkQoeSe8B0zEfy/sgCdEMaojjbQ+sGsVgAiKxh8WFKz
+Y8wAnAyzup6ovPwelBZ1ZGNZ/ngLrjgt
+=vYav
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/hal/hal-0.5.11-r1.ebuild b/sys-apps/hal/hal-0.5.11-r1.ebuild
index f4894325f5a1..44188364eb25 100644
--- a/sys-apps/hal/hal-0.5.11-r1.ebuild
+++ b/sys-apps/hal/hal-0.5.11-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.11-r1.ebuild,v 1.12 2008/12/22 21:44:12 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.11-r1.ebuild,v 1.13 2008/12/23 20:43:00 cardoe Exp $
 
 inherit eutils linux-info autotools flag-o-matic
 
@@ -207,22 +207,23 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog NEWS README || die "docs failed"
 
 	# hal umount for unclean unmounts
 	exeinto /lib/udev/
-	newexe "${FILESDIR}/hal-unmount.dev" hal_unmount
+	newexe "${FILESDIR}/hal-unmount.dev" hal_unmount || die "udev helper failed"
 
 	# initscript
-	newinitd "${FILESDIR}/0.5.10-hald.rc" hald
+	newinitd "${FILESDIR}/0.5.10-hald.rc" hald || die "init script failed"
 
 	# configuration
-	cp "${FILESDIR}/0.5.10-hald.conf" "${WORKDIR}/"
+	cp "${FILESDIR}/0.5.10-hald.conf" "${WORKDIR}/" || \
+		die "failed to copy hald.conf"
 
 	if use debug; then
 		sed -e 's:HALD_VERBOSE="no":HALD_VERBOSE="yes":' \
-			-i "${WORKDIR}/0.5.10-hald.conf"
+			-i "${WORKDIR}/0.5.10-hald.conf" || die "failed to change verbose"
 	fi
 	newconfd "${WORKDIR}/0.5.10-hald.conf" hald
 
diff --git a/sys-apps/hal/hal-0.5.11-r2.ebuild b/sys-apps/hal/hal-0.5.11-r2.ebuild
index 5e104386c1ee..1b50a7c8a87c 100644
--- a/sys-apps/hal/hal-0.5.11-r2.ebuild
+++ b/sys-apps/hal/hal-0.5.11-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.11-r2.ebuild,v 1.5 2008/12/19 17:37:01 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.11-r2.ebuild,v 1.6 2008/12/23 20:43:00 cardoe Exp $
 
 inherit eutils linux-info autotools flag-o-matic
 
@@ -207,22 +207,23 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog NEWS README || die "docs failed"
 
 	# hal umount for unclean unmounts
 	exeinto /lib/udev/
-	newexe "${FILESDIR}/hal-unmount.dev" hal_unmount
+	newexe "${FILESDIR}/hal-unmount.dev" hal_unmount || die "udev helper failed"
 
 	# initscript
-	newinitd "${FILESDIR}/0.5.10-hald.rc" hald
+	newinitd "${FILESDIR}/0.5.10-hald.rc" hald || die "init script failed"
 
 	# configuration
-	cp "${FILESDIR}/0.5.10-hald.conf" "${WORKDIR}/"
+	cp "${FILESDIR}/0.5.10-hald.conf" "${WORKDIR}/" || \
+		die "failed to copy hald.conf"
 
 	if use debug; then
 		sed -e 's:HALD_VERBOSE="no":HALD_VERBOSE="yes":' \
-			-i "${WORKDIR}/0.5.10-hald.conf"
+			-i "${WORKDIR}/0.5.10-hald.conf" || die "failed to change verbose"
 	fi
 	newconfd "${WORKDIR}/0.5.10-hald.conf" hald
 
diff --git a/sys-apps/hal/hal-0.5.11-r3.ebuild b/sys-apps/hal/hal-0.5.11-r3.ebuild
index f353f19d4c5c..b1fe12fa3d57 100644
--- a/sys-apps/hal/hal-0.5.11-r3.ebuild
+++ b/sys-apps/hal/hal-0.5.11-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.11-r3.ebuild,v 1.3 2008/12/19 17:37:01 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.11-r3.ebuild,v 1.4 2008/12/23 20:43:00 cardoe Exp $
 
 inherit eutils linux-info autotools flag-o-matic
 
@@ -207,22 +207,23 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog NEWS README || die "docs failed"
 
 	# hal umount for unclean unmounts
 	exeinto /lib/udev/
-	newexe "${FILESDIR}/hal-unmount.dev" hal_unmount
+	newexe "${FILESDIR}/hal-unmount.dev" hal_unmount || die "udev helper failed"
 
 	# initscript
-	newinitd "${FILESDIR}/0.5.10-hald.rc" hald
+	newinitd "${FILESDIR}/0.5.10-hald.rc" hald || die "init script failed"
 
 	# configuration
-	cp "${FILESDIR}/0.5.10-hald.conf" "${WORKDIR}/"
+	cp "${FILESDIR}/0.5.10-hald.conf" "${WORKDIR}/" || \
+		die "failed to copy hald.conf"
 
 	if use debug; then
 		sed -e 's:HALD_VERBOSE="no":HALD_VERBOSE="yes":' \
-			-i "${WORKDIR}/0.5.10-hald.conf"
+			-i "${WORKDIR}/0.5.10-hald.conf" || die "failed to change verbose"
 	fi
 	newconfd "${WORKDIR}/0.5.10-hald.conf" hald
 
diff --git a/sys-apps/hal/hal-0.5.11-r4.ebuild b/sys-apps/hal/hal-0.5.11-r4.ebuild
index 958e2cf3673f..6ea0d7693041 100644
--- a/sys-apps/hal/hal-0.5.11-r4.ebuild
+++ b/sys-apps/hal/hal-0.5.11-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.11-r4.ebuild,v 1.3 2008/12/19 17:37:01 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.11-r4.ebuild,v 1.4 2008/12/23 20:43:00 cardoe Exp $
 
 inherit eutils linux-info autotools flag-o-matic
 
@@ -209,22 +209,23 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog NEWS README || die "docs failed"
 
 	# hal umount for unclean unmounts
 	exeinto /lib/udev/
-	newexe "${FILESDIR}/hal-unmount.dev" hal_unmount
+	newexe "${FILESDIR}/hal-unmount.dev" hal_unmount || die "udev helper failed"
 
 	# initscript
-	newinitd "${FILESDIR}/0.5.10-hald.rc" hald
+	newinitd "${FILESDIR}/0.5.10-hald.rc" hald || die "init script failed"
 
 	# configuration
-	cp "${FILESDIR}/0.5.10-hald.conf" "${WORKDIR}/"
+	cp "${FILESDIR}/0.5.10-hald.conf" "${WORKDIR}/" || \
+		die "failed to copy hald.conf"
 
 	if use debug; then
 		sed -e 's:HALD_VERBOSE="no":HALD_VERBOSE="yes":' \
-			-i "${WORKDIR}/0.5.10-hald.conf"
+			-i "${WORKDIR}/0.5.10-hald.conf" || die "failed to change verbose"
 	fi
 	newconfd "${WORKDIR}/0.5.10-hald.conf" hald