--- oclhashcat-plus-bin-0.15.ebuild	2013-08-25 07:08:17.000000000 +0200
+++ oclhashcat-bin-1.01.ebuild	2014-01-19 14:38:38.071763013 +0100
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 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.15.ebuild,v 1.1 2013/08/25 05:08:17 zerochaos Exp $
+# $Header: $
 
 EAPI=5
 
@@ -9,7 +9,7 @@
 DESCRIPTION="An opencl multihash cracker"
 HOMEPAGE="http://hashcat.net/oclhashcat-plus/"
 
-MY_P="oclHashcat-plus-${PV}"
+MY_P="oclHashcat-${PV}"
 SRC_URI="http://hashcat.net/files/${MY_P}.7z"
 
 LICENSE="hashcat"
@@ -19,7 +19,7 @@
 IUSE_VIDEO_CARDS="video_cards_fglrx
 	video_cards_nvidia"
 
-IUSE="virtualcl ${IUSE_VIDEO_CARDS}"
+IUSE="${IUSE_VIDEO_CARDS}"
 
 RDEPEND="sys-libs/zlib
 	video_cards_nvidia? ( >=x11-drivers/nvidia-drivers-319.37 )
@@ -30,25 +30,24 @@
 S="${WORKDIR}/${MY_P}"
 
 RESTRICT="strip"
-QA_PREBUILT="*Hashcat-plus*.bin
+QA_PREBUILT="*Hashcat*.bin
 	    opt/${PN}/kernels/4098/*.llvmir"
 
 src_prepare() {
-	use x86 && rm *Hashcat-plus64*
-	use amd64 && rm *Hashcat-plus32*
-	use virtualcl || rm vclHashcat-plus*
+	use x86 && rm *Hashcat64*
+	use amd64 && rm *Hashcat32*
 
 	if ! use video_cards_fglrx; then
 		rm -r kernels/4098 || die
-		rm oclHashcat-plus*.bin || die
+		rm ocl* || die
 	fi
 	if ! use video_cards_nvidia; then
 		rm -r kernels/4318 || die
-		rm cudaHashcat-plus*.bin || die
+		rm cuda* || die
 	fi
 
 	#paxmark goes here so test and install works
-	pax-mark r *Hashcat-plus*.bin
+	pax-mark r *Hashcat*.bin
 }
 
 src_test() {
@@ -61,20 +60,19 @@
 			einfo "Please run \"gpasswd -a portage video\" if the tests will fail"
 		fi
 		if use amd64; then
-			./cudaHashcat-plus64.bin -a 3 -m 1500 nQCk49SiErOgk || die
+			./cudaHashcat64.bin -a 3 -m 1500 nQCk49SiErOgk || die
 		elif use x86; then
-			./cudaHashcat-plus32.bin -a 3 -m 1500 nQCk49SiErOgk || die
+			./cudaHashcat32.bin -a 3 -m 1500 nQCk49SiErOgk || die
 		fi
 	fi
 	if use video_cards_fglrx; then
 		addwrite /dev/ati
 		if use amd64; then
-			./oclHashcat-plus64.bin -a 3 -m 1500 nQCk49SiErOgk || die
+			./oclHashcat64.bin -a 3 -m 1500 nQCk49SiErOgk || die
 		elif use x86; then
-			./oclHashcat-plus32.bin -a 3 -m 1500 nQCk49SiErOgk || die
+			./oclHashcat32.bin -a 3 -m 1500 nQCk49SiErOgk || die
 		fi
 	fi
-	rm eula.accepted hashcat.pot hashcat.dictstat
 }
 
 src_install() {
@@ -86,34 +84,28 @@
 
 	dodir /opt/bin
 
-	cat <<-EOF > "${ED}"/opt/bin/oclhashcat-plus
+	cat <<-EOF > "${ED}"/opt/bin/oclhashcat
 		#! /bin/sh
-		echo "oclHashcat-plus and all related files have been installed in /opt/${PN}"
+		echo "oclHashcat 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
+	for x in oclHashcat64.bin oclHashcat32.bin cudaHashcat64.bin cudaHashcat32.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
+				oclHashcat64.bin)
+					echo "echo '64 bit ATI accelerated \"oclHashcat64.bin\"'" >> "${ED}"/opt/bin/oclhashcat
 					;;
-				oclHashcat-plus32.bin)
-					echo "echo '32 bit ATI accelerated \"oclHashcat-plus32.bin\"'" >> "${ED}"/opt/bin/oclhashcat-plus
+				oclHashcat32.bin)
+					echo "echo '32 bit ATI accelerated \"oclHashcat32.bin\"'" >> "${ED}"/opt/bin/oclhashcat
 					;;
-				cudaHashcat-plus64.bin)
-					echo "echo '64 bit NVIDIA accelerated \"cudaHashcat-plus64.bin\"'" >> "${ED}"/opt/bin/oclhashcat-plus
+				cudaHashcat64.bin)
+					echo "echo '64 bit NVIDIA accelerated \"cudaHashcat64.bin\"'" >> "${ED}"/opt/bin/oclhashcat
 					;;
-				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
+				cudaHashcat32.bin)
+					echo "echo '32 bit NVIDIA accelerated \"cudaHashcat32.bin\"'" >> "${ED}"/opt/bin/oclhashcat
 					;;
 			esac
 
@@ -131,10 +123,10 @@
 		fi
 	done
 
-	fperms +x /opt/bin/oclhashcat-plus
+	fperms +x /opt/bin/oclhashcat
 	fowners -R root:video /opt/${PN}
 	fperms g+w /opt/${PN}
-	einfo "oclhashcat-plus can be run as user if you are in the video group"
+	einfo "oclhashcat can be run as user if you are in the video group"
 }
 
 pkg_preinst() {