fix loader location and minor ebuild style improvements

Package-Manager: portage-2.1.11.3/cvs/Linux x86_64

3 files changed, 36 insertions, 29 deletions

diff --git a/app-crypt/hashcat-bin/ChangeLog b/app-crypt/hashcat-bin/ChangeLog
index eb8c91953e18..cd96b6de0b66 100644
--- a/app-crypt/hashcat-bin/ChangeLog
+++ b/app-crypt/hashcat-bin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-crypt/hashcat-bin
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/hashcat-bin/ChangeLog,v 1.2 2012/07/02 01:19:04 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/hashcat-bin/ChangeLog,v 1.3 2012/07/03 22:27:31 zerochaos Exp $
+
+  03 Jul 2012; Rick Farina <zerochaos@gentoo.org> hashcat-bin-0.39.ebuild:
+  fix loader location and minor ebuild style improvements
 
   02 Jul 2012; Rick Farina <zerochaos@gentoo.org> hashcat-bin-0.39.ebuild:
   trade RESTRICT=binchecks for QA_PREBUILT
diff --git a/app-crypt/hashcat-bin/Manifest b/app-crypt/hashcat-bin/Manifest
index 6324d7527a42..cd7f8669ffa2 100644
--- a/app-crypt/hashcat-bin/Manifest
+++ b/app-crypt/hashcat-bin/Manifest
@@ -2,23 +2,23 @@
 Hash: SHA1
 
 DIST hashcat-0.39.7z 716387 RMD160 d5c8983c5938e273d055772a1ae59970e5109beb SHA1 baf0d3660cfc241c635f772eef1682980744521d SHA256 9d86cb175030de5b5872077028456f944c18e94749fc79cb63fb2f74106bed4e
-EBUILD hashcat-bin-0.39.ebuild 1865 RMD160 e5c5f75a4d780d456ca2f97d50fc5d48266d632a SHA1 c72742e667d838d4f26c5613b0c29bacbbcf838a SHA256 3fb2844fbe4241218b0791abc77bdd875b11435444012ab11768949a3557395e
-MISC ChangeLog 473 RMD160 07411446471fddfcf61e08d12f42b7018581da1a SHA1 06e379e3826309ad74540445ec8ab47a986bf0bc SHA256 ede1cb632199d349df9496ce24e3791cbbfa3dab0fed0b1d6f38bdbfdd7cf01f
+EBUILD hashcat-bin-0.39.ebuild 1628 RMD160 a57d37ad06013988f4087add2f3669c6dcbe169c SHA1 41b36b370bd8740d542add893b4e332e8f5e42d9 SHA256 9b09c221058df081947a93f52cf8f9df684495e4b32e26dfc504887267e52590
+MISC ChangeLog 607 RMD160 c266759faf66101b0a038ffb74d95cf08cdc5792 SHA1 acef81f3f96c97527279e184af0c9ded7e1096a4 SHA256 bf413312483e16de6ac04db1ec4d85f3a73e85daf59c946efc0380f369d1c207
 MISC metadata.xml 248 RMD160 9be78fc0023d72adbaca76feca5a5dfc600976e7 SHA1 01b020ce75fdad7ceab0d6cf3b971107031cb264 SHA256 c48f1d43aa5eb2f3374c54e1be22241c09bc94d9fd2156794be28f7b09af4bac
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBAgAGBQJP8PcaAAoJEKXdFCfdEflKJ24QAIXC0oeYIal38Ul5YWoJtmlJ
-LDejSTxA5XGrUmhKQLV25r47J8NAeNu5e32JQYjICJhjCT9wMyqfpkgJ/CmPPUHl
-TPhjJ2h+CPf6FaE/xk46aHIcCnahjvYj6Gwe/Q554CtuNNXGJ/yP5aO/4So8Brck
-Mf+fUoXMueaZlqPfTVyHKG00udjQvf4kmG7c4NRXmdkvWLk8EGMta9S+wUoW8vQN
-ZKmQgj6rFHLwjU0JaRUGCWsWleJ6viV1Ie+NaZWlgEyrPHiCqyTPjDmN8gugPcuL
-KOQhEOsLJ2MB8W2hfW293leWtH4zqZL/7Rx26FQB/ueKqJGju/BNAGhdG7kx0w9q
-rVG22AywB9xZJfzwHFJKCWxL011klqKDxuB8HqIFm/TqdL6Cs/wqf9w9Suxl+oWp
-zZb1pZJ1JLx+rxh686ye6JZl6kdXdADPvPSUhHujXAZ2Xly1Q1DnIitYZ9Oz5nT0
-kIOsC5WJNhAkx1jjcHi/rjiVVdK7O7PBBV2C59Af9NlD0XRuhB8mNeotioPkPTxa
-lYrpys11h/oT9vJR8GpZlQyHHQ2CzvkV5UTQPwbeadro0+kNMdWrKhj0/3fgY5az
-/pLQsMn+SQ5mYQdaKrXq5eACn/rw+AlmwD00fUg/H98EkT7jlAlhXrBoKqH/xJ8Q
-D/iqLQCXtOarfNvGSEDt
-=rpQ0
+iQIcBAEBAgAGBQJP83HqAAoJEKXdFCfdEflKGUcP/3br7LEoYyiCrDH9hBz6YZ7E
+IrP3qdTAlqo4CrxReKbz7Ld74l6goR1WoCbCD8s/XUgqk9pXejhe8osaONDK4S31
+uO5lXnDu+hkiMktOL9iUsiYYyLtPAQXQleIjyXbcPbQI6n9Uz6WypPRdhWJ7zc4A
+4WN6Y7te5BUFttkNFnCIXpGrKkAuttLFu9EXQBmiTm4WY1Ox85BajeCxSR5dQ9Ub
+kucQfxaULg+KMVp1YYS2Ocu2SkSV8EXaVombHGnPXRX6dFAA4hFNsNTxzzOayq4C
+4ydr8nhwLuFzx+vO85lFoxYovwEjZ65tNbGkj2vqGafsT7CfFTNjxbbNetzcz0ki
+0HV91ruEjF8HFw+fCFoL231QSmaswDnLjejdB5FwaLLZ/MkF8tT4YclIonE94nkk
+I54Won8SM+AC4XNur0qJk/8ZUp6Q/X/K/XbevaFuPqAhfOlIyBiRVMMFIEYNjTQb
+JgKWUazrTrcfXuFqWAcy71KuceOrbjffMsYHECBw3LujRlIMOHrOvmpflyJ+gjYs
+KcCBtEOcLqkOmh9rMweArzp0P/GOvDSjKIGtEgnfu5yPfE8r2jBmceyIQT/9/AYy
+bD1WBaQWLU2cI5noo11Zh9M+wg0TyU6bo8Awi+p+gh8ylMmYgquiwfhOdhFftBSY
+I8OR7F85Ewg7fDV4O1kV
+=KDAN
 -----END PGP SIGNATURE-----
diff --git a/app-crypt/hashcat-bin/hashcat-bin-0.39.ebuild b/app-crypt/hashcat-bin/hashcat-bin-0.39.ebuild
index d61fb35bb452..6469ef472987 100644
--- a/app-crypt/hashcat-bin/hashcat-bin-0.39.ebuild
+++ b/app-crypt/hashcat-bin/hashcat-bin-0.39.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/app-crypt/hashcat-bin/hashcat-bin-0.39.ebuild,v 1.2 2012/07/02 01:19:04 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/hashcat-bin/hashcat-bin-0.39.ebuild,v 1.3 2012/07/03 22:27:31 zerochaos Exp $
 
 EAPI=4
 
@@ -30,7 +30,7 @@ QA_PREBUILT="hashcat-cli*.bin"
 
 src_install() {
 	dodoc docs/*
-	rm -rf *.exe docs
+	rm -rf *.exe docs || die
 	use x86 && rm hashcat-cli64.bin
 	use amd64 && rm hashcat-cli32.bin
 
@@ -40,23 +40,27 @@ src_install() {
 	insinto /opt/${PN}
 	doins -r "${S}"/*
 
-	dodir /usr/bin
+	dodir /opt/bin
 	if [ -f "${ED}"/opt/${PN}/hashcat-cli32.bin ]
 	then
 		fperms +x /opt/${PN}/hashcat-cli32.bin
-		echo '#! /bin/sh' > "${ED}"/usr/bin/hashcat-cli32.bin
-		echo 'cd /opt/hashcat-bin' >> "${ED}"/usr/bin/hashcat-cli32.bin
-		echo 'echo "Warning: hashcat-cli32.bin is running from $(pwd) so be careful of relative paths."' >> "${ED}"/usr/bin/hashcat-cli32.bin
-		echo './hashcat-cli32.bin $@' >> "${ED}"/usr/bin/hashcat-cli32.bin
-		fperms +x /usr/bin/hashcat-cli32.bin
+		cat <<-EOF > "${ED}"/opt/bin/hashcat-cli32.bin
+		#! /bin/sh
+		cd /opt/${PN}
+		echo "Warning: hashcat-cli32.bin is running from /opt/${PN} so be careful of relative paths."
+		./hashcat-cli32.bin $@
+		EOF
+		fperms +x /opt/bin/hashcat-cli32.bin
 	fi
 	if [ -f "${ED}"/opt/${PN}/hashcat-cli64.bin ]
 	then
 		fperms +x /opt/${PN}/hashcat-cli64.bin
-		echo '#! /bin/sh' > "${ED}"/usr/bin/hashcat-cli64.bin
-		echo 'cd /opt/hashcat-bin' >> "${ED}"/usr/bin/hashcat-cli64.bin
-		echo 'echo "Warning: hashcat-cli64.bin is running from $(pwd) so be careful of relative paths."' >> "${ED}"/usr/bin/hashcat-cli64.bin
-		echo './hashcat-cli64.bin $@' >> "${ED}"/usr/bin/hashcat-cli64.bin
-		fperms +x /usr/bin/hashcat-cli64.bin
+		cat <<-EOF > "${ED}"/opt/bin/hashcat-cli64.bin
+		#! /bin/sh
+		cd /opt/${PN}
+		echo "Warning: hashcat-cli64.bin is running from /opt/${PN} so be careful of relative paths."
+		./hashcat-cli64.bin $@
+		EOF
+		fperms +x /opt/bin/hashcat-cli64.bin
 	fi
 }