Use die for file removal.

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

4 files changed, 20 insertions, 16 deletions

diff --git a/net-proxy/sshuttle/ChangeLog b/net-proxy/sshuttle/ChangeLog
index 9d48b801f8f8..bcdf4bec255a 100644
--- a/net-proxy/sshuttle/ChangeLog
+++ b/net-proxy/sshuttle/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-proxy/sshuttle
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/sshuttle/ChangeLog,v 1.6 2012/01/15 23:22:18 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/sshuttle/ChangeLog,v 1.7 2012/01/15 23:25:32 radhermit Exp $
+
+  15 Jan 2012; Tim Harder <radhermit@gentoo.org> sshuttle-0.54.ebuild,
+  sshuttle-0.60.ebuild:
+  Use die for file removal.
 
 *sshuttle-0.60 (15 Jan 2012)
 
diff --git a/net-proxy/sshuttle/Manifest b/net-proxy/sshuttle/Manifest
index 1d25ec4082c1..a6fc81e51dac 100644
--- a/net-proxy/sshuttle/Manifest
+++ b/net-proxy/sshuttle/Manifest
@@ -3,18 +3,18 @@ Hash: SHA512
 
 DIST sshuttle-0.54.tar.xz 177536 RMD160 8201f238d2a9fb13e7d5f6305090275216d62712 SHA1 2c71dbd81ceeae9a29894c769033b000d37af48c SHA256 11a06409e65dc0fd9c5f139085086ce1288397ceb35c160147d6b8697be29fda
 DIST sshuttle-0.60.tar.xz 180496 RMD160 d4b2594d533a63bb277924d34670f9ecf21fe7b0 SHA1 d6c1ad695ae1667d9f055283651d46803896f19d SHA256 a3f83198c9dff3e09aa205d6998193df425771f20f819f702875aa79981f4817
-EBUILD sshuttle-0.54.ebuild 1000 RMD160 2170fd495154f2bc94aa4fcbbab1e7e035df70ed SHA1 c6ee14bf2acae41d99244d8016f4a30a7192ca23 SHA256 00529da1b95cd723d648ec5a2822587dc2c4be4dcb249a96db598f4541777ff8
-EBUILD sshuttle-0.60.ebuild 1039 RMD160 75429d540972550b37439d6770accec371ee01f7 SHA1 c2dbd5409531bce3878165ab3f7db9e16d6d4470 SHA256 80e5fd2df5616d20a93e5c804fe494a0f04261ba422bfac0894154775e49f2a0
-MISC ChangeLog 967 RMD160 9574a14607bb0405aed83b94e3af71561053e743 SHA1 ff86fc32d9bbe6d921d9980fd6f44a970f1588ab SHA256 60e2d1fac28123aadbda60a3b8a90ffea360cb4ad1599b4a02a50846c3bd872e
+EBUILD sshuttle-0.54.ebuild 1003 RMD160 af1a995f654e679b5e2edc391fdc268c3e04d1d8 SHA1 070b89acda5b00967ad8f74b961c96cb707d28ed SHA256 8a24cfc4fb43399103952cc519089258cc2edebf34ac458f2144b1fa51176308
+EBUILD sshuttle-0.60.ebuild 1043 RMD160 8074f6e95422c5cc650ea2dea02bb1a0c588a683 SHA1 daa48483fe842bdbab066586f1f7a902a50439a2 SHA256 69c611f2a0a226bbd77c4cdd5ba7b94e5e27ab23a88f42248191c5224c079018
+MISC ChangeLog 1091 RMD160 2b6bc0a065211b9a288dc44f8a2ec7c1c9e3a30c SHA1 eeb68399d1fd0d530065e61b2430e61e18931005 SHA256 e1667debfd8a54e2b585fc122bab5a45c662dfa1c4b56812569914c4bf9cd07b
 MISC metadata.xml 236 RMD160 5aae0279e740410983bb7929bac4231bb0830f03 SHA1 a7d75412a029c27c9267363220a8bd74d3281060 SHA256 5285fd5ca6bc85e0392ff64ec8e54d0018ebd761d3977869c00c93dee45ea09d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPE1+0AAoJEEqz6FtPBkyjvm4IALX+xhgqvkUSmEeT4ylyyoqy
-1lVrSZsXu7fLAMfnc5rpKLmNsbqgpzelDGkWTmepeNzVw2vWLeI8t+26fwXtCVSc
-ZDkaAhIsOd3qZXSrc7LGvgTF5HUkNlUdOP5/mvWIu0/I2CdxGn1HOoaWF1Z8rkag
-pvNP3clQXw3CD6F7Uzr9ZEOcr7Hn3dmkkGirz4J5lhKTSslkjIOQFK0+EFSbvr6B
-TSA23LZOuBns+S6/msLN7KcU8Nj6RnA934/zx53js70M3Kv9DZvwSKM2X8jRN0FP
-sZ/udsvbTsfOVGnvhKq4b0ZVTNe4jWKgJhfj1wuTL0FRQSvbTK9+iPxrAtHzpOU=
-=evFH
+iQEcBAEBCgAGBQJPE2ByAAoJEEqz6FtPBkyjVDUIAKZBpOo68uQiY5aH3rrDXmCb
+GuCHf20cDA6+bna7FGOicudtYFguaC86s7lTi9WgFITpLODv6pqCSGfvRr4lG/3o
+b9urMLfyHwdEO4+mbmFOs1zn3FNeYBRp+rQi8TNfcZjutbUHW8U19iquhPuvIZQB
+sOSeJqwIrreZSh0Xy+Jyz/1sjFs0vJXFemdQwlgMoXSq9xsYMEjXVSECMpPlezIN
+tmdIGLQ/XLLC4mMYeU2va2Y4AT9o2C/CPBa4Y9+/FJvZ5Q5rh9lyYGTDHrlT4VJF
+lZ9uii3Z7MoodieJqIQMy9yfZcrz7gFBlz4+UvohrkOkXbgPFFuP6rJl+TojfXc=
+=BkjV
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/sshuttle/sshuttle-0.54.ebuild b/net-proxy/sshuttle/sshuttle-0.54.ebuild
index bc644098ae6b..0fa7435d6038 100644
--- a/net-proxy/sshuttle/sshuttle-0.54.ebuild
+++ b/net-proxy/sshuttle/sshuttle-0.54.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/sshuttle/sshuttle-0.54.ebuild,v 1.5 2011/11/02 14:50:26 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/sshuttle/sshuttle-0.54.ebuild,v 1.6 2012/01/15 23:25:32 radhermit Exp $
 
 EAPI=3
 PYTHON_DEPEND="2"
@@ -25,7 +25,7 @@ CONFIG_CHECK="~NETFILTER_XT_TARGET_HL ~IP_NF_TARGET_REDIRECT ~NF_NAT"
 src_compile() { :; }
 
 src_install() {
-	rm -f stresstest.py
+	rm stresstest.py || die
 	insinto "$(python_get_sitedir)"/${PN}
 	doins -r *.py compat || die
 
diff --git a/net-proxy/sshuttle/sshuttle-0.60.ebuild b/net-proxy/sshuttle/sshuttle-0.60.ebuild
index 7add8c0484fe..40ee28f8e8a4 100644
--- a/net-proxy/sshuttle/sshuttle-0.60.ebuild
+++ b/net-proxy/sshuttle/sshuttle-0.60.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/sshuttle/sshuttle-0.60.ebuild,v 1.1 2012/01/15 23:22:18 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/sshuttle/sshuttle-0.60.ebuild,v 1.2 2012/01/15 23:25:32 radhermit Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2"
@@ -30,7 +30,7 @@ pkg_setup() {
 src_compile() { :; }
 
 src_install() {
-	rm -f stresstest.py
+	rm stresstest.py || die
 	insinto "$(python_get_sitedir)"/${PN}
 	doins -r *.py compat