--- www-apps/trac/trac-1.0.1.ebuild	2013-05-03 15:31:32.000000000 +0200
+++ www-apps/trac/trac-1.0.1.ebuild	2013-08-22 00:55:18.000000000 +0200
@@ -1,16 +1,16 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/trac/trac-1.0.1.ebuild,v 1.5 2013/05/03 13:30:51 ago Exp $
+# $Header: $
 
-EAPI="4"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython"
+EAPI=5
 
-inherit distutils eutils user webapp
+PYTHON_COMPAT=( python{2_6,2_7} )
+DISTUTILS_SINGLE_IMPL=Yes
 
-MY_PV=${PV/_beta/b}
-MY_P=Trac-${MY_PV}
+inherit distutils-r1 eutils user webapp
+
+MY_PV="${PV/_beta/b}"
+MY_P="Trac-${MY_PV}"
 
 DESCRIPTION="Trac is a minimalistic web-based project management, wiki and bug/issue tracking system."
 HOMEPAGE="http://trac.edgewall.com/ http://pypi.python.org/pypi/Trac"
@@ -18,35 +18,40 @@ SRC_URI="http://ftp.edgewall.com/pub/tra
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 ~sparc x86 ~x86-fbsd"
-IUSE="cgi fastcgi i18n mysql postgres +sqlite subversion"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE="cgi fastcgi i18n mysql postgres +sqlite subversion test"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
 
 RDEPEND="
-	dev-python/setuptools
-	dev-python/docutils
-	dev-python/genshi
-	dev-python/pygments
-	dev-python/pytz
-	i18n? ( >=dev-python/Babel-0.9.5 )
-	cgi? ( virtual/httpd-cgi )
-	fastcgi? ( virtual/httpd-fastcgi )
-	mysql? ( dev-python/mysql-python )
-	postgres? ( >=dev-python/psycopg-2 )
+	dev-python/setuptools:0
+	dev-python/docutils:0
+	dev-python/genshi:0
+	dev-python/pygments:0
+	dev-python/pytz:0
+	i18n? ( >=dev-python/Babel-0.9.5:0[${PYTHON_USEDEP}] )
+	cgi? ( virtual/httpd-cgi:0 )
+	fastcgi? ( virtual/httpd-fastcgi:0 )
+	mysql? ( dev-python/mysql-python:0[${PYTHON_USEDEP}] )
+	postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
 	sqlite? (
-		>=dev-db/sqlite-3.3.4
-		|| ( dev-lang/python:2.7[sqlite] dev-lang/python:2.6[sqlite] dev-lang/python:2.5[sqlite] >=dev-python/pysqlite-2.3.2 )
+		>=dev-db/sqlite-3.3.4:3
+		|| ( dev-lang/python:2.7[sqlite] dev-lang/python:2.6[sqlite] )
 	)
-	subversion? ( dev-vcs/subversion[python] )
+	subversion? ( dev-vcs/subversion:0[python,${PYTHON_USEDEP}] )
 	"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/twill:0[${PYTHON_USEDEP}]
+		dev-python/lxml:0[${PYTHON_USEDEP}]
+		dev-python/configobj:0[${PYTHON_USEDEP}]
+	)"
 
 S="${WORKDIR}/${MY_P}"
 
 WEBAPP_MANUAL_SLOT="yes"
 
 pkg_setup() {
-	python_pkg_setup
+	python-single-r1_pkg_setup
 	webapp_pkg_setup
 
 	enewgroup tracd
@@ -57,23 +62,20 @@ src_prepare() {
 	epatch "${FILESDIR}/${PV}-git-identity.patch"
 }
 
-src_test() {
-	testing() {
-		PYTHONPATH=. "$(PYTHON)" trac/test.py
-	}
-	python_execute_function testing
+python_test() {
+	einfo "Running ${PYTHON} trac/test.py -v"
+	PYTHONPATH=. "${PYTHON}" trac/test.py -v || die
 
 	if use i18n; then
-		make check
+		emake check
 	fi
 }
 
 # the default src_compile just calls setup.py build
 # currently, this switches i18n catalog compilation based on presence of Babel
-
 src_install() {
 	webapp_src_preinst
-	distutils_src_install
+	distutils-r1_src_install
 
 	# project environments might go in here
 	keepdir /var/lib/trac
@@ -91,10 +93,12 @@ src_install() {
 	newinitd "${FILESDIR}"/tracd.initd tracd
 
 	if use cgi; then
-		cp contrib/cgi-bin/trac.cgi "${ED}${MY_CGIBINDIR}" || die
+		python_scriptinto "${MY_CGIBINDIR}"
+		python_doscript contrib/cgi-bin/trac.cgi
 	fi
 	if use fastcgi; then
-		cp contrib/cgi-bin/trac.fcgi "${ED}${MY_CGIBINDIR}" || die
+		python_scriptinto "${MY_CGIBINDIR}"
+		python_doscript contrib/cgi-bin/trac.fcgi
 	fi
 
 	for lang in en; do
@@ -106,6 +110,5 @@ src_install() {
 }
 
 pkg_postinst() {
-	distutils_pkg_postinst
 	webapp_pkg_postinst
 }