move loader, cleanup ebuild in oclhashcat-lite-bin style

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

3 files changed, 82 insertions, 77 deletions

diff --git a/app-crypt/oclhashcat-plus-bin/ChangeLog b/app-crypt/oclhashcat-plus-bin/ChangeLog
index aacadf3ca73d..5a2c51f1fbe4 100644
--- a/app-crypt/oclhashcat-plus-bin/ChangeLog
+++ b/app-crypt/oclhashcat-plus-bin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-crypt/oclhashcat-plus-bin
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/oclhashcat-plus-bin/ChangeLog,v 1.1 2012/07/02 01:52:04 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/oclhashcat-plus-bin/ChangeLog,v 1.2 2012/07/04 03:38:29 zerochaos Exp $
+
+  04 Jul 2012; Rick Farina <zerochaos@gentoo.org>
+  oclhashcat-plus-bin-0.081.ebuild:
+  move loader, cleanup ebuild in oclhashcat-lite-bin style
 
 *oclhashcat-plus-bin-0.081 (02 Jul 2012)
 
diff --git a/app-crypt/oclhashcat-plus-bin/Manifest b/app-crypt/oclhashcat-plus-bin/Manifest
index c54a3a3c68d9..71cbaaaa57e2 100644
--- a/app-crypt/oclhashcat-plus-bin/Manifest
+++ b/app-crypt/oclhashcat-plus-bin/Manifest
@@ -3,23 +3,23 @@ Hash: SHA1
 
 DIST oclHashcat-plus-0.081-32.7z 2896 RMD160 29096952f9d4c296e3b9c65a3dedcb7aad618274 SHA1 8031b111d5ffd70a092f0a0b6dc9deb1889e8998 SHA256 e0e892edb4c4853dcb2e8c7e4763b58d966d03d2fa76a1294cde61049f736e71
 DIST oclHashcat-plus-0.081-64.7z 22259753 RMD160 4acbece6a1911e84ca7df2edfbd2f5ab7e61a027 SHA1 2fc8a56e2182e9835d9184da2ce82b16f8fc320f SHA256 5390a8a3c6b8887536e936c918ca2cfeba6b971e4cd9a57dca36a3cfa5e83684
-EBUILD oclhashcat-plus-bin-0.081.ebuild 4383 RMD160 ded1a97e5d23e9d5ac62e826df180345ca8efa51 SHA1 3902dcf14490284bc852048dd87d89ad7d257bca SHA256 53e31f9e3ae096d530320df01dd6b4d3ffc3b7ef8b6e402916faf487e10d23df
-MISC ChangeLog 418 RMD160 a946e967ed39d3a580c36e4ebc4a5e203eb858d0 SHA1 b2b66a4a846faab94cd6d62e16e446ed1f397d59 SHA256 85aae2c1bbd549a04f8735ec95dbc5a5dc1f9277266eec4bc66c30977c51abf7
+EBUILD oclhashcat-plus-bin-0.081.ebuild 3173 RMD160 1419b622bd55a0f818c765b5de54efeecff59783 SHA1 39d09911d2451d3be602c7bb23ee41efaf82c949 SHA256 453789f05fd0a18e2f9e4d67a7c69a0c1895ca5d25a5d5fc8c30f5e6c396a01d
+MISC ChangeLog 564 RMD160 1550bbaafa99f7e58305c6ff245c8e464e9d80f4 SHA1 aec306d475e65e3f5c74db7d606033c9c463869f SHA256 98afd5a33bbb62e6e59e4912283b089aeeafb913e62d9567664a880507080288
 MISC metadata.xml 248 RMD160 9be78fc0023d72adbaca76feca5a5dfc600976e7 SHA1 01b020ce75fdad7ceab0d6cf3b971107031cb264 SHA256 c48f1d43aa5eb2f3374c54e1be22241c09bc94d9fd2156794be28f7b09af4bac
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBAgAGBQJP8P7YAAoJEKXdFCfdEflKHtQQAJJSW6azLWmY07NadvNzEbON
-PgyiDn0VWKmztXOJnPrEvLxUeuIxYKSTit5T62rdENNOQr1/7v0SpbwQ5nZ2TrRe
-y9yI/rfB0NoWhAz0EENJbnC4EigNfo4oLVbq6vMi1xXdENHDh+S4FTxFBAywwJ3K
-9VWUQ32XECtchjPfVoe5kYY6ndDVcsEErTqQRX9XNKjWZaREmCkBbmEMCw6WMFxI
-esCGRWRXVjhHtV5acrzwrwac4L/K3wJkrjetODH7r7MdBDUbalPUk4aJnaZCbEvk
-BPeJoX/pPzcKmeyaOIkn5lR88gv1JK8j/0Q5ASsXYCkLL77QFAE53FRejVTGDSyu
-io5DxasxRbNFiabYlTwo7YorvSQKguAxdcBauiY4LUCB8k0QTE2hjNVqqc7DbM2R
-XGkAPXQCeLoXPb6FE4iYzf7yH/CaNMT591WeHaBBSvx6JkE/9oFk7UxDBgbzFLbe
-uXhJm9noKAl0K7SUHb3cVgPcyyj7RRWRYcxa/jc8W4OauP+ii8A76pkQ9Gfgjwth
-l76jch1K/j9nWX9ET7g8AQLgGE3ISSnI2cnXe03bLhDtjn0SocDf+GUPPCdjNWTW
-vqsHcceTPsPEsFyFdql/Guef634kZohjug4mDx3o5uRJwDVo4Q1hzesXCJDX/xyP
-vSu7sN4WbOFlAKtaI478
-=rMgW
+iQIcBAEBAgAGBQJP87rQAAoJEKXdFCfdEflKjFAP/2At6Uk3nbmpCS0tUV6tyYoy
+oux0koxr/G54ovp8txoLIMjLyQfnlYLAJOOA3Gc43VhcKKw16M5lRVEVUJV0Iqav
+fPkkKmp8MCBw4U0GSB2MFYRER5CPKTBrkBGYJuncxD0PcU7DmVoSdvcJV7aeWF3f
+gK7hq8Bx2SW2T1eZO6AQcNVmE6f1B8IV9b7ewWUMnTv+dgLw9YNeJ3dz1/DRFZMz
+nmHtFtRRD+Ad9oxxdKh+Tw2tcxFKhpEZaKKkZnjqZoDdidT0QDCQVuc3j+sxeVB0
+9UT63suD7ev3gv+QUVJKQEoALnBDSnfQNpfUvDbtk2OgpfoLmijq6Bd5sql6dS1s
+3+AxyUHVFvgKJtNFn3Q7h0GKC6LSlRSSdpoOOoPa/dPpvg6LKWJj/FyuMLdQH3i9
+yJXuVnU22gpRX4DeH9/tKJEOq++NLzDgJjGKjpUt9G3MGymccXf5mV+UbiuBkN+x
+nObl3Ly4dtC2vPdUle1DgMtX54CZKIcVi5hFoPLJGqSQVH+ZDEXEQ1QaPU5EylLd
+GsbEomS8KwrQRAFNOOpCAekj53fbVrJo2KX/1NA4HGE3gHpATgMKXKbuN3JLlJmA
+Mu34L+QjCxW9MZsFEII55TuRDajtWv4TVOQd77OpNVL9rSN19exgtptD1BltHhJv
+OhTpFnRjDkchVCuhJkTR
+=ACmy
 -----END PGP SIGNATURE-----
diff --git a/app-crypt/oclhashcat-plus-bin/oclhashcat-plus-bin-0.081.ebuild b/app-crypt/oclhashcat-plus-bin/oclhashcat-plus-bin-0.081.ebuild
index e1c742bc184e..59276515e329 100644
--- a/app-crypt/oclhashcat-plus-bin/oclhashcat-plus-bin-0.081.ebuild
+++ b/app-crypt/oclhashcat-plus-bin/oclhashcat-plus-bin-0.081.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/oclhashcat-plus-bin/oclhashcat-plus-bin-0.081.ebuild,v 1.1 2012/07/02 01:52:04 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/oclhashcat-plus-bin/oclhashcat-plus-bin-0.081.ebuild,v 1.2 2012/07/04 03:38:29 zerochaos Exp $
 
 EAPI=4
 
@@ -37,75 +37,76 @@ QA_PREBUILT="*Hashcat-plus*.bin"
 
 src_install() {
 	dodoc docs/*
-	rm -rf *.exe docs
-	if use x86; then
-		rm oclHashcat-plus64.bin
-		rm cudaHashcat-plus64.bin
-		rm kernels/4098/*64* kernels/4318/*64*
-	fi
-	if use amd64; then
-		rm oclHashcat-plus32.bin
-		rm cudaHashcat-plus32.bin
-		rm kernels/4098/*32* kernels/4318/*32*
-	fi
+	rm -rf *.exe docs || die
+	#patches already in aircrack-ng
+	rm -rf contrib/aircrack-ng_r1959 || die
+
+	#the current release (0.08) seperates 64bit from 32 bit, will he stay with this?
+	#if ! use amd64; then
+	#	rm oclHashcat-plus64.bin || die
+	#	rm cudaHashcat-plus64.bin || die
+	#	rm kernels/4098/*64* kernels/4318/*64* || die
+	#fi
+	#if ! use x86; then
+	#	rm oclHashcat-plus32.bin || die
+	#	rm cudaHashcat-plus32.bin || die
+	#	rm kernels/4098/*32* kernels/4318/*32* || die
+	#fi
 	if ! use video_cards_fglrx; then
-		rm -rf kernels/4098
-		rm -f oclHashcat-plus*.bin
+		rm -rf kernels/4098 || die
+		rm -f oclHashcat-plus*.bin || die
 	fi
 	if ! use video_cards_nvidia; then
-		rm -rf kernels/4318
-		rm -f cudaHashcat-plus*.bin
+		rm -rf kernels/4318 || die
+		rm -f cudaHashcat-plus*.bin || die
 	fi
 	pax-mark m *Hashcat-plus*.bin
 
 	insinto /opt/${PN}
 	doins -r "${S}"/* || die "Copy files failed"
 
-	dodir /usr/bin
-	echo '#! /bin/sh' > "${ED}"/usr/bin/oclhashcat-plus
-	echo 'echo "oclHashcat-plus and all related files have been installed in /opt/oclhashcat-plus-bin"' >> "${ED}"/usr/bin/oclhashcat-plus
-	echo 'echo "Please run one of the following binaries to use gpu accelerated hashcat:"' >> "${ED}"/usr/bin/oclhashcat-plus
-	if [ -f "${ED}"/opt/${PN}/oclHashcat-plus64.bin ]
-	then
-		echo 'echo "64 bit ATI accelerated \"oclHashcat-plus64.bin\""' >> "${ED}"/usr/bin/oclhashcat-plus
-		fperms +x /opt/${PN}/oclHashcat-plus64.bin
-		echo '#! /bin/sh' > "${ED}"/usr/bin/oclHashcat-plus64.bin
-		echo 'cd /opt/oclhashcat-plus-bin' >> "${ED}"/usr/bin/oclHashcat-plus64.bin
-		echo 'echo "Warning: oclHashcat-plus64.bin is running from $(pwd) so be careful of relative paths."' >> "${ED}"/usr/bin/oclHashcat-plus64.bin
-		echo './oclHashcat-plus64.bin $@' >> "${ED}"/usr/bin/oclHashcat-plus64.bin
-		fperms +x /usr/bin/oclHashcat-plus64.bin
+	dodir /opt/bin
 
-	fi
-	if [ -f "${ED}"/opt/${PN}/oclHashcat-plus32.bin ]
-	then
-		echo 'echo "32 bit ATI accelerated \"oclHashcat-plus32.bin\""' >> "${ED}"/usr/bin/oclhashcat-plus
-		fperms +x /opt/${PN}/oclHashcat-plus32.bin
-		echo '#! /bin/sh' > "${ED}"/usr/bin/oclHashcat-plus32.bin
-		echo 'cd /opt/oclhashcat-plus-bin' >> "${ED}"/usr/bin/oclHashcat-plus32.bin
-		echo 'echo "Warning: oclHashcat-plus32.bin is running from $(pwd) so be careful of relative paths."' >> "${ED}"/usr/bin/oclHashcat-plus32.bin
-		echo './oclHashcat-plus32.bin $@' >> "${ED}"/usr/bin/oclHashcat-plus32.bin
-		fperms +x /usr/bin/oclHashcat-plus32.bin
-	fi
-	if [ -f "${ED}"/opt/${PN}/cudaHashcat-plus64.bin ]
-	then
-		echo 'echo "64 bit NVIDIA accelerated \"cudaHashcat-plus64.bin\""' >> "${ED}"/usr/bin/oclhashcat-plus
-		fperms +x /opt/${PN}/cudaHashcat-plus64.bin
-		echo '#! /bin/sh' > "${ED}"/usr/bin/cudaHashcat-plus64.bin
-		echo 'cd /opt/oclhashcat-plus-bin' >> "${ED}"/usr/bin/cudaHashcat-plus64.bin
-		echo 'echo "Warning: cudaHashcat-plus64.bin is running from $(pwd) so be careful of relative paths."' >> "${ED}"/usr/bin/cudaHashcat-plus64.bin
-		echo './cudaHashcat-plus64.bin $@' >> "${ED}"/usr/bin/cudaHashcat-plus64.bin
-		fperms +x /usr/bin/cudaHashcat-plus64.bin
+	cat <<-EOF > "${ED}"/opt/bin/oclhashcat-plus
+	#! /bin/sh
+	echo "oclHashcat-plus and all related files have been installed in /opt/${PN}"
+	echo "Please run one of the following binaries to use gpu accelerated hashcat:"
+	EOF
 
-	fi
-	if [ -f "${ED}"/opt/${PN}/cudaHashcat-plus32.bin ]
-	then
-		echo 'echo 32 bit NVIDIA accelerated \"cudaHashcat-plus32.bin\""' >> "${ED}"/usr/bin/oclhashcat-plus
-		fperms +x /opt/${PN}/cudaHashcat-plus32.bin
-		echo '#! /bin/sh' > "${ED}"/usr/bin/cudaHashcat-plus32.bin
-		echo 'cd /opt/oclhashcat-plus-bin' >> "${ED}"/usr/bin/cudaHashcat-plus32.bin
-		echo 'echo "Warning: cudaHashcat-plus32.bin is running from $(pwd) so be careful of relative paths."' >> "${ED}"/usr/bin/cudaHashcat-plus32.bin
-		echo './cudaHashcat-plus32.bin $@' >> "${ED}"/usr/bin/cudaHashcat-plus32.bin
-		fperms +x /usr/bin/oclHashcat-plus32.bin
-	fi
-	fperms +x /usr/bin/oclhashcat-plus
+	for x in oclHashcat-plus64.bin oclHashcat-plus32.bin cudaHashcat-plus64.bin cudaHashcat-plus32.bin
+	do
+		if [ -f "${ED}"/opt/${PN}/${x} ]
+		then
+			case "${x}" in
+				oclHashcat-plus64.bin)
+					echo "echo '64 bit ATI accelerated \"oclHashcat-plus64.bin\"'" >> "${ED}"/opt/bin/oclhashcat-plus
+					;;
+				oclHashcat-plus32.bin)
+					echo "echo '32 bit ATI accelerated \"oclHashcat-plus32.bin\"'" >> "${ED}"/opt/bin/oclhashcat-plus
+					;;
+				cudaHashcat-plus64.bin)
+					echo "echo '64 bit NVIDIA accelerated \"cudaHashcat-plus64.bin\"'" >> "${ED}"/opt/bin/oclhashcat-plus
+					;;
+				cudaHashcat-plus32.bin)
+					echo "echo '32 bit NVIDIA accelerated \"cudaHashcat-plus32.bin\"'" >> "${ED}"/opt/bin/oclhashcat-plus
+					;;
+			esac
+
+			fperms +x /opt/${PN}/${x}
+
+			cat <<-EOF > "${ED}"/opt/bin/${x}
+			#! /bin/sh
+			cd /opt/${PN}
+			echo "Warning: ${x} is running from /opt/${PN} so be careful of relative paths."
+			./${x} "\$@"
+			EOF
+
+			fperms +x /opt/bin/${x}
+
+		fi
+	done
+
+	fperms +x /opt/bin/oclhashcat-plus
+	fowners root:video /opt/${PN}
+	einfo "oclhashcat-plus can be run as user if you are in the video group"
 }