--- pygresql-4.0.ebuild	2012-11-28 22:31:07.000000000 +0100
+++ pygresql-4.0-r1.ebuild	2013-08-27 20:50:30.513000000 +0200
@@ -2,12 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-db/pygresql/pygresql-4.0.ebuild,v 1.6 2012/11/28 21:07:38 titanofold Exp $
 
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
+EAPI=5
 
-inherit distutils
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit distutils-r1
 
 MY_P="PyGreSQL-${PV}"
 
@@ -25,15 +24,13 @@ RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
-DOCS="docs/*.txt"
-PYTHON_MODNAME="pg.py pgdb.py"
-
-src_install() {
-	distutils_src_install
+python_install_all() {
+	local DOCS=( docs/*.txt )
+	distutils-r1_python_install_all
 
 	if use doc; then
 		insinto /usr/share/doc/${PF}/tutorial
-		doins tutorial/* || die "doins failed"
-		dohtml docs/*.{html,css} || die "dohtml failed"
+		doins tutorial/*
+		dohtml docs/*.{html,css}
 	fi
 }