diff --git a/app-crypt/cpyrit_cuda/Manifest b/app-crypt/cpyrit_cuda/Manifest
index 9393c1fc4..a074a7276 100644
--- a/app-crypt/cpyrit_cuda/Manifest
+++ b/app-crypt/cpyrit_cuda/Manifest
@@ -1,3 +1,2 @@
-EBUILD cpyrit_cuda-0.4.0-r1.ebuild 698 RMD160 28d81f1c8d87362754b6a4b65b263d5d055b68b0 SHA1 a8b8f20d4ccfbb1f6392a14b928d7fe07dc2c70e SHA256 4916128153c489e00301bf5ca1480b7c84fe35df8cd79d97aa8aba9662214a75
-EBUILD cpyrit_cuda-0.4.0.ebuild 706 RMD160 acf5d214594c4a632844a227adf0020283660752 SHA1 d5eb06e99913810fd0d9ce3e5e6386dd34f565f9 SHA256 6c5ccbce0f73a1f0188b2c50db300cb1622f0695bd94b012430e5998768932d9
-EBUILD cpyrit_cuda-9999.ebuild 771 RMD160 d53bc30b700dd51c80ea32ac11c1a656e8642f38 SHA1 bc2665344f96ffeea07a753e1c6d4110b540a26e SHA256 cb79f12e9fb798933d3cbbc5fd578f6d38ee8dbb3f77557901ac3a9b163b97c4
+EBUILD cpyrit_cuda-0.4.0-r1.ebuild 764 SHA256 3390ed29668ad4ba07b3af9997593491c4d98abeb0c9955ba85a5d4232223a33 SHA512 bfded6fd4261c3bb1b310fc5586a9b88f856306ec5fd7a65380ffa7ab21608ace63cb2f2e78d25adf8cc771c23bec5bcbb6d6f8b49ad02494bbeb568fa96df34 WHIRLPOOL fa832f7d41a12bda906682407380f5ab7b49184173513c033639b03e22ebeea003803acfa226b4a9d63b090296318d69d9005e740c9700ab5e4141a3d8a48ead
+EBUILD cpyrit_cuda-9999.ebuild 854 SHA256 ab321df50cdf70e6be81e84396651a922194120e82295a22ea110f4362fa2493 SHA512 78819b7c8cbee51296da362a3710111935b8dadf6dc7a14390b837e3a447b4a0208d80b6eb8f0757599055babd7988519a5c92b69fc245e0f49499499ace36cb WHIRLPOOL 7e1c6b01d42fef0148b8f88e28902d18397c8bffff1b0c2e50df0a5ac6a6b43c7f974bb136887c9d572f164d8be9421ffa71988fc61251a30af2dd53024c0800
diff --git a/app-crypt/cpyrit_cuda/cpyrit_cuda-0.4.0-r1.ebuild b/app-crypt/cpyrit_cuda/cpyrit_cuda-0.4.0-r1.ebuild
index ec17d9bfe..4376151f3 100644
--- a/app-crypt/cpyrit_cuda/cpyrit_cuda-0.4.0-r1.ebuild
+++ b/app-crypt/cpyrit_cuda/cpyrit_cuda-0.4.0-r1.ebuild
@@ -4,6 +4,8 @@
 
 EAPI=3
 
+PYTHON_DEPEND="2"
+
 inherit eutils python distutils subversion flag-o-matic
 
 DESCRIPTION="A GPU-based WPA-PSK and WPA2-PSK cracking tool"
@@ -22,6 +24,8 @@ RDEPEND="${DEPEND}"
 
 pkg_setup() {
 	append-ldflags $(no-as-needed)
+	python_set_active_version 2
+	python_pkg_setup
 }
 
 src_compile() {
diff --git a/app-crypt/cpyrit_cuda/cpyrit_cuda-0.4.0.ebuild b/app-crypt/cpyrit_cuda/cpyrit_cuda-0.4.0.ebuild
deleted file mode 100644
index 8b7464c85..000000000
--- a/app-crypt/cpyrit_cuda/cpyrit_cuda-0.4.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-inherit eutils python distutils subversion flag-o-matic
-
-DESCRIPTION="A GPU-based WPA-PSK and WPA2-PSK cracking tool"
-HOMEPAGE="http://code.google.com/p/pyrit/"
-ESVN_REPO_URI="http://pyrit.googlecode.com/svn/trunk/@294"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="!<app-crypt/pyrit-0.3-r1
-	>=dev-util/nvidia-cuda-sdk-2.2[pentoo]
-	x11-drivers/nvidia-drivers"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	append-ldflags $(no-as-needed)
-}
-
-src_compile() {
-	cd "${S}/cpyrit_cuda"
-	distutils_src_compile
-}
-
-src_install() {
-	cd "${S}/cpyrit_cuda"
-	distutils_src_install
-}
diff --git a/app-crypt/cpyrit_cuda/cpyrit_cuda-9999.ebuild b/app-crypt/cpyrit_cuda/cpyrit_cuda-9999.ebuild
index d3e58cfae..285588ef2 100644
--- a/app-crypt/cpyrit_cuda/cpyrit_cuda-9999.ebuild
+++ b/app-crypt/cpyrit_cuda/cpyrit_cuda-9999.ebuild
@@ -4,6 +4,8 @@
 
 EAPI=3
 
+PYTHON_DEPEND="2"
+
 inherit eutils python distutils subversion
 
 DESCRIPTION="A GPU-based WPA-PSK and WPA2-PSK cracking tool"
@@ -20,6 +22,11 @@ DEPEND="!<app-crypt/pyrit-0.3-r1
 	x11-drivers/nvidia-drivers"
 RDEPEND="${DEPEND}"
 
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
 src_compile() {
 	cd "${S}/cpyrit_cuda"
 	distutils_src_compile
diff --git a/app-crypt/cpyrit_opencl/Manifest b/app-crypt/cpyrit_opencl/Manifest
index 89010779d..85b016962 100644
--- a/app-crypt/cpyrit_opencl/Manifest
+++ b/app-crypt/cpyrit_opencl/Manifest
@@ -1,4 +1,4 @@
-AUX cpyrit_opencl-0.4.0.patch 544 RMD160 27ac44a24afc0a46dd39e79c4fbaf17c2c117674 SHA1 9bbb63b5bde77d7b1daed1e00361f122751f6126 SHA256 683628384036b39a8457ea5608c22f2b78ed5b40fc13528a6943d3f16357d46f
-AUX cpyrit_opencl-9999.patch 516 RMD160 9c62b08071e73301757233863d10bc9d29950dd1 SHA1 027fe2d75478389ee4608e5e7bdcb76a54e60c1c SHA256 75c9f8fcf83b4fafcb20292d234b19d9c5363aa6020bc1a301da66962439f921
-EBUILD cpyrit_opencl-0.4.0.ebuild 784 RMD160 1bb71700be2eb4ca9b4e72511303727414cebf25 SHA1 53c2084ede061cb37c06bc688ea9f953f357d2fc SHA256 2c7a95b55040f048cc6dd6afcc561eb6e57199ab04509489f787b7f739a1b5b9
-EBUILD cpyrit_opencl-9999.ebuild 718 RMD160 8a883529d64b8139fa428ec052c3743cef108414 SHA1 b400fd1262e332acb94889f87b3a32525a6be801 SHA256 40d484fe36297982be03ece8215fba497228ff4a1e5337b99a4b746c61e5beeb
+AUX cpyrit_opencl-0.4.0.patch 544 SHA256 683628384036b39a8457ea5608c22f2b78ed5b40fc13528a6943d3f16357d46f SHA512 873c0903745ed34f34014ca5399fea7b18027c3902144693d7402f33924464cd31e5026514a7e7ca49dc636984a9d17fde2ac53d2c5fdf1b236792f4d07e2f7e WHIRLPOOL b64fd556c14414fe04d8fc27346dd8cf7b8df404271307e3c5f7c5ec67285ded8cb04640cc4451f55649c4e04069804203808fdca86520c77d1ad5024a8ef283
+AUX cpyrit_opencl-9999.patch 516 SHA256 75c9f8fcf83b4fafcb20292d234b19d9c5363aa6020bc1a301da66962439f921 SHA512 d9f678b03238e8845ca565cd9e71379e94d90f6377286f3ca52b2deaa847aab1975218d164f1546db0d69db95d879e05d46d68bad648d1b0f1a2fb73a30cda13 WHIRLPOOL 0bfba2df2c19eee061ebf91b98927f5e2348fe1658fd56d12efaf6fba7d6e9d9f8022bb60a8a130818487c838262d874b19d26d4ffcad8fe17eea4e1d7062304
+EBUILD cpyrit_opencl-0.4.0.ebuild 850 SHA256 f55792c1a6b5aad64612e13ca1673e69f941f7da07c9ac2c4324e252c21770d8 SHA512 cddb66c39e02e776062b3e02ebf102e0fa01d2b69e2c5b0ce170be9d21368f96f5fa3a943a993c666be6f225e7d781e8683a4e254d4fdb92e40b7fb7d0abd862 WHIRLPOOL 4f276886bcd370af9a43dd3e782a08c03419a521741412868449c45c3ab7e1ad6e027c8f76347549567f121b6437e118c645c82dd66f60799f62ea2ee486e4ed
+EBUILD cpyrit_opencl-9999.ebuild 801 SHA256 626ecc64fba86ed527aee18ab5d969e55f52cd3780426896d8dc84f09edff5ae SHA512 3384dcd9b326b918a05d825fdab4a2579b5e799eeb6a88052b45f924f5d300b28fc8fc435c4c6662762aed459c6336fd557ddd9214f27b917e68bdb3dbd1c393 WHIRLPOOL 539094c78e0b41c86cd10d263c3da25f4f2532facb98869dc6784ad7c47ef937e1b5597dafa9cc0c2c6a90822c8610feb1da17941f9e6d8e68553fe41bad12c1
diff --git a/app-crypt/cpyrit_opencl/cpyrit_opencl-0.4.0.ebuild b/app-crypt/cpyrit_opencl/cpyrit_opencl-0.4.0.ebuild
index dd6f2496e..5e9c9149b 100644
--- a/app-crypt/cpyrit_opencl/cpyrit_opencl-0.4.0.ebuild
+++ b/app-crypt/cpyrit_opencl/cpyrit_opencl-0.4.0.ebuild
@@ -4,6 +4,8 @@
 
 EAPI=3
 
+PYTHON_DEPEND="2"
+
 inherit eutils python distutils subversion flag-o-matic
 
 DESCRIPTION="A GPU-based WPA-PSK and WPA2-PSK cracking tool"
@@ -24,6 +26,8 @@ RDEPEND="${DEPEND}"
 
 pkg_setup() {
 	append-ldflags $(no-as-needed)
+	python_set_active_version 2
+	python_pkg_setup
 }
 
 src_compile() {
diff --git a/app-crypt/cpyrit_opencl/cpyrit_opencl-9999.ebuild b/app-crypt/cpyrit_opencl/cpyrit_opencl-9999.ebuild
index 687156ca8..22d4978da 100644
--- a/app-crypt/cpyrit_opencl/cpyrit_opencl-9999.ebuild
+++ b/app-crypt/cpyrit_opencl/cpyrit_opencl-9999.ebuild
@@ -4,6 +4,8 @@
 
 EAPI=3
 
+PYTHON_DEPEND="2"
+
 inherit eutils python distutils subversion
 
 DESCRIPTION="A GPU-based WPA-PSK and WPA2-PSK cracking tool"
@@ -18,6 +20,11 @@ IUSE=""
 DEPEND="virtual/opencl-sdk"
 RDEPEND="${DEPEND}"
 
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
 src_compile() {
 	epatch "${FILESDIR}/${P}.patch"
 	cd "${S}/cpyrit_opencl"