--- a/dev-python/flask-browserid/flask-browserid-9999.ebuild	Mon Aug 17 10:36:39 2015 +0200
+++ b/dev-python/flask-browserid/flask-browserid-9999.ebuild	Mon Aug 17 12:04:02 2015 +0200
@@ -1,47 +1,50 @@
-EAPI="3"
-PYTHON_DEPEND="2:2.5"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.4 3.*"
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
 
-inherit distutils git-2
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
 
 EGIT_REPO_URI="git://github.com/garbados/flask-browserid.git"
 
+[[ ${PV} == 9999 ]] && SCM=git-r3
+
+inherit distutils-r1 ${SCM}
+
 MY_PN="Flask-BrowserID"
-
 DESCRIPTION="Flask support for BrowserID authentication"
 HOMEPAGE="http://pypi.python.org/pypi/Flask-BrowserID"
 
+if [ ${PV} != 9999 ]; then
+	SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${MY_PN}-${PV}"
+fi
+
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc"
+IUSE="doc test"
 
-RDEPEND=">=dev-python/flask-0.9
-		>=dev-python/flask-login-0.1.3
-		dev-python/requests
-		doc? ( dev-python/sphinx ) "
-DEPEND="${RDEPEND}
-	dev-python/setuptools"
+DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) "
+RDEPEND=">=dev-python/flask-0.9[${PYTHON_USEDEP}]
+		>=dev-python/flask-login-0.1.3[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/setuptools[${PYTHON_USEDEP}]"
 
-S="${WORKDIR}/${MY_P}"
-
-PYTHON_MODNAME="flaskext/browserid"
-
-src_compile() {
-	distutils_src_compile
-
+python_compile_all() {
 	if use doc; then
 		einfo "Generation of documentation"
 		cd docs
-		PYTHONPATH=".." emake html || die "Generation of documentation failed"
+		emake html || die "Generation of documentation failed"
 	fi
 }
 
-src_install() {
-	distutils_src_install
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/_build/html/. )
 
-	if use doc; then
-		dohtml -r docs/_build/html/* || die "Installation of documentation failed"
-	fi
+	distutils-r1_python_install_all
 }
+
+python_test() {
+	esetup.py test
+}