--- cracklib-2.8.16.ebuild
+++ cracklib-2.8.16.ebuild
@@ -2,7 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/cracklib-2.8.16.ebuild,v 1.1 2010/04/30 13:02:14 vapier Exp $
 
-inherit eutils toolchain-funcs multilib libtool
+EAPI="3"
+PYTHON_DEPEND="python? 2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
+
+inherit distutils eutils toolchain-funcs multilib libtool
 
 MY_P=${P/_}
 DESCRIPTION="Password Checking Library"
@@ -14,10 +19,14 @@
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="nls python"
 
-DEPEND="python? ( <dev-lang/python-3 )"
+DEPEND="sys-libs/zlib
+	python? ( dev-python/setuptools )"
+RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${MY_P}
 
+PYTHON_MODNAME="cracklib.py"
+
 pkg_setup() {
 	# workaround #195017
 	if has unmerge-orphans ${FEATURES} && has_version "<${CATEGORY}/${PN}-2.8.10" ; then
@@ -25,30 +34,43 @@
 		eerror "Please run: FEATURES=-unmerge-orphans emerge cracklib"
 		die "Please run: FEATURES=-unmerge-orphans emerge cracklib"
 	fi
+
+	if use python; then
+		python_pkg_setup
+	fi
 }
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}"/${PN}-2.8.13-python-linkage.patch #246747
-	sed -i '/PYTHON/s:\(print\) \([^"]*\):\1(\2):' configure #302908
 	elibtoolize #269003
 }
 
-src_compile() {
+src_configure() {
 	econf \
 		--with-default-dict='$(libdir)/cracklib_dict' \
-		$(use_enable nls) \
-		$(use_with python) \
-		|| die
-	emake || die
+		--without-python \
+		$(use_enable nls)
+}
+
+src_compile() {
+	default
+
+	if use python; then
+		pushd python > /dev/null
+		distutils_src_compile
+		popd > /dev/null
+	fi
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	rm -r "${D}"/usr/share/cracklib
+	emake DESTDIR="${D}" install || die "emake install failed"
+	rm -r "${ED}"/usr/share/cracklib
 
-	find "${D}" -name '_cracklibmodule.*a' -exec rm {} + #316495
+	if use python; then
+		pushd python > /dev/null
+		distutils_src_install
+		popd > /dev/null
+	fi
 
 	# move shared libs to /
 	gen_usr_ldscript -a crack
@@ -65,4 +87,14 @@
 		create-cracklib-dict /usr/share/dict/* > /dev/null
 		eend $?
 	fi
+
+	if use python; then
+		distutils_pkg_postinst
+	fi
+}
+
+pkg_postrm() {
+	if use python; then
+		distutils_pkg_postrm
+	fi
 }