--- ipkg-utils/ipkg-utils-1.7-r1.ebuild	2010-03-20 03:49:40.000000000 +0000
+++ ipkg-utils/ipkg-utils-1.7-r1.ebuild	2010-03-20 04:07:42.000000000 +0000
@@ -2,6 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/app-arch/ipkg-utils/ipkg-utils-1.7-r1.ebuild,v 1.2 2009/10/12 16:42:48 halcy0n Exp $
 
+EAPI="3"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+
 inherit distutils eutils toolchain-funcs
 
 DESCRIPTION="Tools for working with the ipkg binary package format"
@@ -20,10 +24,11 @@
 
 DEPEND="${RDEPEND}"
 
-src_unpack() {
-	unpack ${A}; cd "${S}"
+RESTRICT_PYTHON_ABIS="3.*"
 
+src_prepare() {
 	epatch "${FILESDIR}"/${PN}-tar_call_fixes.patch
+	epatch "${FILESDIR}"/${P}-hashlib_update.patch
 
 	sed '/python setup.py build/d' -i Makefile
 
--- ipkg-utils/ipkg-utils-1.7.050831-r1.ebuild	2010-03-20 03:49:33.000000000 +0000
+++ ipkg-utils/ipkg-utils-1.7.050831-r1.ebuild	2010-03-20 04:07:37.000000000 +0000
@@ -2,6 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/app-arch/ipkg-utils/ipkg-utils-1.7.050831-r1.ebuild,v 1.2 2009/10/12 16:42:48 halcy0n Exp $
 
+EAPI="3"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+
 inherit distutils eutils toolchain-funcs versionator
 
 MY_P=${PN}-$(get_version_component_range 3)
@@ -23,10 +27,11 @@
 
 DEPEND="${RDEPEND}"
 
-src_unpack() {
-	unpack ${A}; cd "${S}"
+RESTRICT_PYTHON_ABIS="3.*"
 
+src_prepare() {
 	epatch "${FILESDIR}"/${PN}-tar_call_fixes.patch
+	epatch "${FILESDIR}"/${P}-hashlib_update.patch
 
 	sed '/python setup.py build/d' -i Makefile