pyrit: move svn version to meta-package

app-crypt/pyrit/Manifest

@@ -2,4 +2,4 @@ AUX pyrit-0.3.patch 826 RMD160 62f810c2697cb3a2e6ea3dea565c9e6134c20d40 SHA1 b83
 AUX pyrit-9999.patch 950 RMD160 4bade1fc92ab97c77d62f7d3ebee960e8b1b71f7 SHA1 8c83d40418b69088f0cfcc48336722889e5cb289 SHA256 663f821ee8e30b3f0e35d6415379b3268c5ada29d163fb21d9a3ba576698b0b6
 EBUILD pyrit-0.3-r1.ebuild 772 RMD160 67415ca6ef2751548a406a127cc38ae241fa965d SHA1 0c6fbd499dd3e171665de375ce5c777f2846e8a3 SHA256 897261adde4c0ad279ca4f54e521d1b93a755747605d0fe49977461834135d47
 EBUILD pyrit-0.3.ebuild 1148 RMD160 6cd54b5372655b703b0b61bb2487a8d705353795 SHA1 d89ba89e6b65d0df23c79349b6668546177c8cbb SHA256 8e850120842228177f41a6d6c2d3af65ef9bdf5562d8b3a6688b90d610184024
-EBUILD pyrit-9999.ebuild 1214 RMD160 b642620388b5cac9850f72e04f104c5bdd36152c SHA1 e9e093107d35bb53c7c889d1f0c29bba5b09d1c5 SHA256 5813456b0507ed7116c5851476b31a7b4f2d18f2e46c2278f3ddb03cbe8a8281
+EBUILD pyrit-9999.ebuild 885 RMD160 bc4f52a407a7d243eb3057943014864bf05e0e65 SHA1 4cf02bcbfdc8fb5fa94d23f4c1164e45044137e8 SHA256 7a84566012e3488daba97c7e8565e184bdce995f198229a2ac1a23eaa73c9861

app-crypt/pyrit/files/pyrit-9999.patch

@@ -1,25 +0,0 @@
---- setup.py.orig	2009-11-21 14:30:29.756444115 +0100
-+++ setup.py	2009-11-21 14:33:18.623230521 +0100
-@@ -27,20 +27,9 @@
- import subprocess
- 
- # Try to find the Brook+ library and headers
--STREAM_LIB_DIRS = []
--STREAM_INC_DIRS = []
-+STREAM_LIB_DIRS = ['/opt/atibrook/include','/opt/atibrook/include/brook']
-+STREAM_INC_DIRS = ['/opt/atibrook/lib','/usr/lib']
- BRCC = 'brcc'
--for path in ('/usr/local/atibrook/sdk', '/opt/atibrook/sdk'):
--    if os.path.exists(path):
--        STREAM_LIB_DIRS.append(os.path.sep.join((path, 'lib')))
--        STREAM_INC_DIRS.append(os.path.sep.join((path, 'include')))
--        BRCC = os.path.sep.join((path, 'bin', 'brcc'))
--        break
--else:
--    print >>sys.stderr, "The AMD-Stream compiler, headers and libraries " \
--                        "required to build the kernel were not found. " \
--                        "Trying to continue anyway..."
--
- 
- try:
-     svn_info = subprocess.Popen(('svn', 'info'), \

app-crypt/pyrit/pyrit-9999.ebuild

@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+EAPI=2
+
 inherit eutils python distutils subversion flag-o-matic
 
 DESCRIPTION="A GPU-based WPA-PSK and WPA2-PSK cracking tool"
@@ -11,10 +13,14 @@ ESVN_REPO_URI="http://pyrit.googlecode.com/svn/trunk/"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~arm ~amd64 ~x86"
-IUSE="cuda stream"
+IUSE="cuda opencl"
+
+DEPEND="dev-db/sqlite:3
+	dev-lang/python[sqlite]
+	net-analyzer/scapy
+	opencl? ( =app-crypt/cpyrit_opencl-9999 )
+	cuda? ( =app-crypt/cpyrit_cuda-9999 )"
 
-DEPEND="stream? ( >=dev-util/ati-stream-sdk-bin-1.4.0_beta )
-	cuda? ( dev-util/nvidia-cuda-sdk )"
 RDEPEND="${DEPEND}"
 
 src_compile() {
@@ -22,29 +28,11 @@ src_compile() {
 	filter-ldflags -Wl,--as-needed
 	cd "${S}/pyrit"
 	distutils_src_compile
-	if use cuda; then
-		cd "${S}/cpyrit_cuda"
-		distutils_src_compile
-	fi
-	if use stream; then
-		# patch is only needed when compiling with stream support
-		epatch "${FILESDIR}/pyrit-9999.patch"
-		cd "${S}/cpyrit_stream"
-		distutils_src_compile
-	fi
 }
 
 src_install() {
 	cd "${S}/pyrit"
 	distutils_src_install
-	if use cuda; then
-		cd "${S}/cpyrit_cuda"
-		distutils_src_install
-	fi
-	if use stream; then
-		cd "${S}/cpyrit_stream"
-		distutils_src_install
-	fi
 }
 
 pkg_postinst() {