version bump and some minor improvements

(Portage version: 2.1.11.55/cvs/Linux x86_64, signed Manifest commit with key DD11F94A)

4 files changed, 163 insertions, 3 deletions

diff --git a/app-crypt/oclhashcat-plus-bin/ChangeLog b/app-crypt/oclhashcat-plus-bin/ChangeLog
index b7549ba4a8ec..d16c01279083 100644
--- a/app-crypt/oclhashcat-plus-bin/ChangeLog
+++ b/app-crypt/oclhashcat-plus-bin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-crypt/oclhashcat-plus-bin
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/oclhashcat-plus-bin/ChangeLog,v 1.8 2013/03/11 14:39:40 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/oclhashcat-plus-bin/ChangeLog,v 1.9 2013/04/23 02:36:58 zerochaos Exp $
+
+*oclhashcat-plus-bin-0.14 (23 Apr 2013)
+
+  23 Apr 2013; Rick Farina <zerochaos@gentoo.org>
+  +oclhashcat-plus-bin-0.14.ebuild, metadata.xml,
+  oclhashcat-plus-bin-0.13.ebuild:
+  version bump and some minor improvements
 
   11 Mar 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
   -oclhashcat-plus-bin-0.081.ebuild, -oclhashcat-plus-bin-0.09.ebuild,
diff --git a/app-crypt/oclhashcat-plus-bin/metadata.xml b/app-crypt/oclhashcat-plus-bin/metadata.xml
index 88e9eb110229..8006cb0e3265 100644
--- a/app-crypt/oclhashcat-plus-bin/metadata.xml
+++ b/app-crypt/oclhashcat-plus-bin/metadata.xml
@@ -6,5 +6,6 @@
 <email>zerochaos@gentoo.org</email>
 <name>Rick Farina</name>
 </maintainer>
+<use><flag name="virtualcl">Support for Mosix VirtualCL Clustering Platform</flag></use>
 </pkgmetadata>
 
diff --git a/app-crypt/oclhashcat-plus-bin/oclhashcat-plus-bin-0.13.ebuild b/app-crypt/oclhashcat-plus-bin/oclhashcat-plus-bin-0.13.ebuild
index 08dcdcf704ed..ea4f76d0c81f 100644
--- a/app-crypt/oclhashcat-plus-bin/oclhashcat-plus-bin-0.13.ebuild
+++ b/app-crypt/oclhashcat-plus-bin/oclhashcat-plus-bin-0.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.13.ebuild,v 1.1 2013/02/03 01:55:07 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/oclhashcat-plus-bin/oclhashcat-plus-bin-0.13.ebuild,v 1.2 2013/04/23 02:36:58 zerochaos Exp $
 
 EAPI=5
 
@@ -34,7 +34,7 @@ QA_PREBUILT="*Hashcat-plus*.bin"
 
 src_install() {
 	dodoc docs/*
-	rm -r *.exe docs || die
+	rm -r *.exe *.cmd docs || die
 	use x86 && rm *Hashcat-plus64*
 	use amd64 && rm *Hashcat-plus32*
 
@@ -98,3 +98,22 @@ src_install() {
 	fperms 0660 /opt/${PN}/eula.accepted
 	einfo "oclhashcat-plus can be run as user if you are in the video group"
 }
+
+src_test() {
+	printf "%02x" ${PV#0.} > "${S}"/eula.accepted
+	if use video_cards_nvidia; then
+		if [ ! -w /dev/nvidia0 ]; then
+			einfo "To run these tests, portage likely must be in the video group."
+			einfo "Please run \"passwd -a portage video\" if the tests will fail"
+		fi
+		./cudaExample0.sh || die
+		./cudaExample400.sh || die
+		./cudaExample500.sh || die
+	fi
+	if use video_cards_fglrx; then
+		./oclExample0.sh || die
+		./oclExample400.sh || die
+		./oclExample500.sh || die
+	fi
+	rm "${S}"/eula.accepted
+}
diff --git a/app-crypt/oclhashcat-plus-bin/oclhashcat-plus-bin-0.14.ebuild b/app-crypt/oclhashcat-plus-bin/oclhashcat-plus-bin-0.14.ebuild
new file mode 100644
index 000000000000..e5f7deed5844
--- /dev/null
+++ b/app-crypt/oclhashcat-plus-bin/oclhashcat-plus-bin-0.14.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2013 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.14.ebuild,v 1.1 2013/04/23 02:36:57 zerochaos Exp $
+
+EAPI=5
+
+inherit eutils pax-utils
+
+DESCRIPTION="An opencl multihash cracker"
+HOMEPAGE="http://hashcat.net/oclhashcat-plus/"
+
+MY_P="oclHashcat-plus-${PV}"
+SRC_URI="http://hashcat.net/files/${MY_P}.7z"
+
+LICENSE="hashcat"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+IUSE_VIDEO_CARDS="video_cards_fglrx
+	video_cards_nvidia"
+
+IUSE="virtualcl ${IUSE_VIDEO_CARDS}"
+
+RDEPEND="sys-libs/zlib
+	video_cards_nvidia? ( >=x11-drivers/nvidia-drivers-310.32 )
+	video_cards_fglrx?  ( =x11-drivers/ati-drivers-13.1 )"
+DEPEND="${RDEPEND}
+	app-arch/p7zip"
+
+S="${WORKDIR}/${MY_P}"
+
+RESTRICT="strip"
+QA_PREBUILT="*Hashcat-plus*.bin"
+
+src_test() {
+	printf "%02x" ${PV#0.} > "${S}"/eula.accepted
+	if use video_cards_nvidia; then
+		if [ ! -w /dev/nvidia0 ]; then
+			einfo "To run these tests, portage likely must be in the video group."
+			einfo "Please run \"passwd -a portage video\" if the tests will fail"
+		fi
+		./cudaExample0.sh || die
+		./cudaExample400.sh || die
+		./cudaExample500.sh || die
+	fi
+	if use video_cards_fglrx; then
+		./oclExample0.sh || die
+		./oclExample400.sh || die
+		./oclExample500.sh || die
+	fi
+	rm "${S}"/eula.accepted
+}
+
+src_install() {
+	dodoc docs/*
+	rm -r "${S}"/*.exe "${S}"/*.cmd "${S}"/docs || die
+	use x86 && rm *Hashcat-plus64*
+	use amd64 && rm *Hashcat-plus32*
+	use virtualcl || { rm vclHashcat-plus* || die; }
+
+	if ! use video_cards_fglrx; then
+		rm -r kernels/4098 || die
+		rm oclHashcat-plus*.bin || die
+	fi
+	if ! use video_cards_nvidia; then
+		rm -r kernels/4318 || die
+		rm cudaHashcat-plus*.bin || die
+	fi
+	pax-mark m *Hashcat-plus*.bin
+
+	insinto /opt/${PN}
+	doins -r "${S}"/* || die "Copy files failed"
+
+	dodir /opt/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
+
+	for x in oclHashcat-plus64.bin oclHashcat-plus32.bin cudaHashcat-plus64.bin cudaHashcat-plus32.bin vclHashcat-plus64.bin vclHashcat-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
+					;;
+				vclHashcat-plus64.bin)
+					echo "echo '64 bit VirtualCL Cluster support \"vclHashcat-plus64.bin\"'" >> "${ED}"/opt/bin/oclhashcat-plus
+					;;
+				vclHashcat-plus32.bin)
+					echo "echo '32 bit VirtualCL Cluster support \"vclHashcat-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."
+				exec ./${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"
+}
+
+pkg_preinst() {
+	#I feel so dirty doing this
+	#first we remove the eula.accepted because it cannot properly handle and empty or old one (crash or doesn't run at all)
+	rm -f "${EROOT}"/opt/${PN}/eula.accepted
+	#next we remove any compiled kernel files as these get built on first run only if they aren't there because there are no timestamp checks
+	rm -f "${EROOT}"/opt/${PN}/kernels/{4318,4098}/"*.kernel"
+	#have mercy on my soul
+}