diff --git a/www-apps/trac-pydotorgtheme/ChangeLog b/www-apps/trac-pydotorgtheme/ChangeLog
index fb35be60..b01ac5bc 100644
--- a/www-apps/trac-pydotorgtheme/ChangeLog
+++ b/www-apps/trac-pydotorgtheme/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  31 Aug 2010; Mario Fetka <mario.fetka@gmail.com>
+  -trac-pydotorgtheme-2.0.ebuild, +trac-pydotorgtheme-2.0-r1.ebuild:
+  cleanup
+
   26 Feb 2010; Mario Fetka <mario.fetka@gmail.com>
   trac-pydotorgtheme-2.0.ebuild:
   add arm keyword
diff --git a/www-apps/trac-pydotorgtheme/Manifest b/www-apps/trac-pydotorgtheme/Manifest
index 340c811a..7d6886ad 100644
--- a/www-apps/trac-pydotorgtheme/Manifest
+++ b/www-apps/trac-pydotorgtheme/Manifest
@@ -1,3 +1,3 @@
-EBUILD trac-pydotorgtheme-2.0.ebuild 1087 RMD160 798c91931797c3a3beac8dbb41fb352481d2deb5 SHA1 c72fed0a18193b103dd953fd3d2f3d4d8630176b SHA256 49f93108768ebb731b74a110d4d80a84cba333862c0b3a82b34dd75c5c656faf
-MISC ChangeLog 312 RMD160 77003936d067963f01c8b9361cf61062194f230d SHA1 a1a4163ba83d3f641f5d2e380994ba544685fc5e SHA256 f56d872bb7fd5b617fc435ae12e87979f6a5b2998fdf22f1555b38cdbde038da
+EBUILD trac-pydotorgtheme-2.0-r1.ebuild 880 RMD160 b40886ae9acfed22b3dccde293966d79857549a3 SHA1 026037858fb0691db64b2526ae0a369b7f200739 SHA256 914568172b4d95e8597b45174f016121abebb0f39c17a43c87ab9847f0972c01
+MISC ChangeLog 443 RMD160 146ae13f4def21d81cf8a461f18d496df150d612 SHA1 c74f455688424a37e57cff6d874c14933b62e2d6 SHA256 0d6a5fbf7b8e4972449c23e4969268a35efd9a61691ed35c33d73046d44de89a
 MISC metadata.xml 1238 RMD160 c82938e77f387291d6a1c3bf9b0d802f2878dd12 SHA1 b5738f14922c69e78cfb867acdc65eeea25977bf SHA256 2c13f98be5fa8bdaf21ac86bcd00bbeb8944df5615de0cfce35ae4c00ef4b4d5
diff --git a/www-apps/trac-pydotorgtheme/trac-pydotorgtheme-2.0.ebuild b/www-apps/trac-pydotorgtheme/trac-pydotorgtheme-2.0-r1.ebuild
similarity index 65%
rename from www-apps/trac-pydotorgtheme/trac-pydotorgtheme-2.0.ebuild
rename to www-apps/trac-pydotorgtheme/trac-pydotorgtheme-2.0-r1.ebuild
index 855a214e..a8ea1ce5 100644
--- a/www-apps/trac-pydotorgtheme/trac-pydotorgtheme-2.0.ebuild
+++ b/www-apps/trac-pydotorgtheme/trac-pydotorgtheme-2.0-r1.ebuild
@@ -2,12 +2,16 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/www-apps/trac-webadmin/trac-webadmin-0.1.2.ebuild,v 1.4 2007/02/13 20:39:33 corsair Exp $
 
+EAPI="2"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
+
 inherit distutils subversion
 
 ESVN_REPO_URI="http://trac-hacks.org/svn/pydotorgtheme/0.11/"
 DESCRIPTION="A theme based on python.org"
 HOMEPAGE="http://trac-hacks.org/wiki/PyDotOrgTheme"
-# SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="trac"
 KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
@@ -15,19 +19,9 @@ IUSE=""
 
 SLOT="0"
 
-DEPEND=">=www-apps/trac-0.10
-	>=www-apps/trac-themeengine-2.0
-	>=dev-python/setuptools-0.6_rc1"
-
-# from marienz's setuptools.eclass:
-src_install() {
-	"${python}" setup.py install --root=${D} --no-compile \
-		--single-version-externally-managed "$@" || die "install failed"
-}
-
-src_test() {
-	"${python}" setup.py test || die "tests failed"
-}
+DEPEND="dev-python/setuptools"
+RDEPEND=">=www-apps/trac-0.12
+	>=www-apps/trac-themeengine-2.0"
 
 pkg_postinst() {
 	elog "To enable the IntraBlog template, you have to add:"