--- /usr/portage/sys-fs/cryptsetup/cryptsetup-1.6.0.ebuild	2013-01-21 22:01:31.000000000 +0100
+++ /usr/portage/sys-fs/cryptsetup/cryptsetup-1.6.0.ebuild	2013-05-19 01:56:03.232229546 +0200
@@ -1,10 +1,11 @@ 
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.6.0.ebuild,v 1.3 2013/01/21 21:00:18 vapier Exp $
+# $Header: Exp $
 
-EAPI="4"
+EAPI=5
 
-inherit python linux-info libtool
+PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+inherit python-single-r1 linux-info libtool
 
 MY_P=${P/_rc/-rc}
 DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
@@ -30,7 +31,8 @@ 
 # these other packages. #414665
 RDEPEND="static-libs? ( ${LIB_DEPEND} )
 	${LIB_DEPEND//\[static-libs(+)]}
-	selinux? ( sys-libs/libselinux )"
+	selinux? ( sys-libs/libselinux )
+	python? ( ${PYTHON_DEPS} )"
 DEPEND="${RDEPEND}
 	static? ( ${LIB_DEPEND} )"
 
@@ -40,10 +42,7 @@ 
 	local WARNING_CRYPTO_CBC="CONFIG_CRYPTO_CBC:\tis not set (required for kernel 2.6.19)\n"
 	local WARNING_CRYPTO="CONFIG_CRYPTO:\tis not set (required for cryptsetup)\n"
 	check_extra_config
-	if use python ; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
+	use python && python-single-r1_pkg_setup
 }
 
 src_prepare() {