--- revelation-0.4.11-r2.ebuild
+++ revelation-0.4.11-r2.ebuild
@@ -2,7 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/x11-misc/revelation/revelation-0.4.11-r2.ebuild,v 1.8 2011/06/26 13:07:04 nyhm Exp $
 
-inherit autotools eutils multilib python gnome2
+EAPI="3"
+PYTHON_DEPEND="2"
+
+inherit autotools eutils gnome2 python
 
 DESCRIPTION="A password manager for GNOME"
 HOMEPAGE="http://oss.codepoet.no/revelation/"
@@ -24,8 +27,13 @@
 	applet? ( dev-python/gnome-applets-python )"
 RDEPEND="${DEPEND}"
 
-src_unpack() {
-	gnome2_src_unpack
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	gnome2_src_prepare
 	ln -sf $(type -P true) py-compile
 	epatch \
 		"${FILESDIR}"/${P}-list-index.patch \
@@ -33,8 +41,8 @@
 	eautoreconf
 }
 
-src_compile() {
-	gnome2_src_compile \
+src_configure() {
+	gnome2_src_configure \
 		--disable-dependency-tracking \
 		--disable-desktop-update \
 		--disable-mime-update \
@@ -49,10 +57,10 @@
 
 pkg_postinst() {
 	gnome2_pkg_postinst
-	python_mod_optimize $(python_get_sitedir)/${PN}
+	python_mod_optimize ${PN}
 }
 
 pkg_postrm() {
 	gnome2_pkg_postrm
-	python_mod_cleanup $(python_get_sitedir)/${PN}
+	python_mod_cleanup ${PN}
 }