--- systemtap-2.1.ebuild	2013-02-16 18:51:26.000000000 +0100
+++ systemtap-2.1-r1.ebuild	2013-03-02 15:49:04.847579270 +0100
@@ -2,11 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-util/systemtap/systemtap-2.1.ebuild,v 1.1 2013/02/16 17:51:26 swegener Exp $
 
-EAPI=4
-
-PYTHON_DEPEND="2"
+EAPI=5
 
-inherit linux-info autotools eutils python
+PYTHON_COMPAT=( python2_7 )
+inherit linux-info autotools eutils python-single-r1
 
 DESCRIPTION="A linux trace/probe tool"
 HOMEPAGE="http://sourceware.org/systemtap/"
@@ -19,6 +18,7 @@ IUSE="sqlite"
 
 DEPEND=">=dev-libs/elfutils-0.142
 	sys-libs/libcap
+	${PYTHON_DEPS}
 	sqlite? ( dev-db/sqlite:3 )"
 RDEPEND="${DEPEND}
 	virtual/linux-sources"
@@ -34,13 +34,12 @@ DOCS="AUTHORS HACKING NEWS README"
 
 pkg_setup() {
 	linux-info_pkg_setup
-	python_set_active_version 2
-	python_pkg_setup
+	python-single-r1_pkg_setup
 }
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-2.0-gettext.patch
-	python_convert_shebangs 2 dtrace.in
+	python_fix_shebang .
 
 	sed -i \
 		-e 's:-Werror::g' \