From 3a9dc6b66faac4e8f5ff9704328fb7df8e7c253b Mon Sep 17 00:00:00 2001
From: Zero_Chaos <zerochaos-@users.noreply.github.com>
Date: Mon, 24 Jan 2011 16:42:27 +0000
Subject: [PATCH] metasploit: ebuild cleanups suggested by Montjoie

---
 net-analyzer/metasploit/Manifest               |  2 +-
 net-analyzer/metasploit/metasploit-9999.ebuild | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/net-analyzer/metasploit/Manifest b/net-analyzer/metasploit/Manifest
index 7444272f5..aa8e93a7d 100644
--- a/net-analyzer/metasploit/Manifest
+++ b/net-analyzer/metasploit/Manifest
@@ -1,3 +1,3 @@
 AUX msfrpcd3.confd 440 RMD160 67e569204d77592e8b0e19d34d87c0c75a722687 SHA1 ff1eea41295270d0b5117ee233b5f5fe44a84834 SHA256 f1148f3f4fe24b2689d6a8f3d8510031f493100a5b48823c0a5bc2085a6439b4
 AUX msfrpcd3.initd 561 RMD160 e9811489784131c4c1e68279d43b4f2ba4c093b1 SHA1 38240c3bba090011c25fffe90d9c898e540ba463 SHA256 89a897977b53a471334caa47eeadcb5595fa783bfafd99c7ae1d5c8f9e7041bc
-EBUILD metasploit-9999.ebuild 3346 RMD160 2591c3d7ba4fd9d8b719b2a6fbea0ae9de448ae7 SHA1 9bbc03561a2901fc516132fa9e47ee9a5029b4e7 SHA256 d7c2b85266caddde1fee490648210a702c89166b05df776aa079af73acc5704a
+EBUILD metasploit-9999.ebuild 3404 RMD160 60486b39eb57fe3c2ffd45b30bc911aa8d1f8c68 SHA1 808d7de8e4f07479d6f781890ba85614a6466a2f SHA256 ec9f0b7c6e42af8e8c0125158ac95b7eafd9df05b31e67074ae7332bf21fe49b
diff --git a/net-analyzer/metasploit/metasploit-9999.ebuild b/net-analyzer/metasploit/metasploit-9999.ebuild
index a1cbdb841..0af76e15b 100644
--- a/net-analyzer/metasploit/metasploit-9999.ebuild
+++ b/net-analyzer/metasploit/metasploit-9999.ebuild
@@ -38,22 +38,22 @@ S=${WORKDIR}/${MY_P}
 src_install() {
 
 	# should be as simple as copying everything into the target...
-	dodir /usr/lib/${PN}${SLOT}
+	dodir /usr/lib/${PN}${SLOT} || dir
 	cp -R "${S}"/* "${D}"/usr/lib/${PN}${SLOT} || die "Copy files failed"
-	rm -Rf "${D}"/usr/lib/${PN}${SLOT}/documentation "${D}"/usr/lib/${PN}${SLOT}/README
+	rm -Rf "${D}"/usr/lib/${PN}${SLOT}/documentation "${D}"/usr/lib/${PN}${SLOT}/README || die
 
 	# do not remove LICENSE, bug #238137
-	dodir /usr/share/doc/${PF}
-	cp -R "${S}"/{documentation,README} "${D}"/usr/share/doc/${PF}
-	dosym /usr/share/doc/${PF}/documentation /usr/lib/${PN}${SLOT}/documentation
+	dodir /usr/share/doc/${PF} || die
+	cp -R "${S}"/{documentation,README} "${D}"/usr/share/doc/${PF} || die
+	dosym /usr/share/doc/${PF}/documentation /usr/lib/${PN}${SLOT}/documentation || die
 
-	dodir /usr/bin/
+	dodir /usr/bin/ || die
 	for file in `ls msf*`; do
-		dosym /usr/lib/${PN}${SLOT}/${file} /usr/bin/${file}${SLOT}
-		dosym /usr/lib/${PN}${SLOT}/${file} /usr/bin/${file}
+		dosym /usr/lib/${PN}${SLOT}/${file} /usr/bin/${file}${SLOT} || die
+		dosym /usr/lib/${PN}${SLOT}/${file} /usr/bin/${file} || die
 	done
 
-	chown -R root:0 "${D}"
+	fowners -R root:0 "${D}"
 
 	newinitd "${FILESDIR}"/msfrpcd${SLOT}.initd msfrpcd${SLOT} \
 		|| die "newinitd failed"