--- istanbul-0.2.1.ebuild
+++ istanbul-0.2.1.ebuild
@@ -1,7 +1,9 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/media-video/istanbul/istanbul-0.2.1.ebuild,v 1.4 2008/05/29 17:30:45 hawking Exp $
 
+EAPI="3"
+
 inherit eutils gnome2 python autotools
 
 KEYWORDS="~x86 ~amd64"
@@ -53,10 +55,9 @@
 
 pkg_postinst() {
 	gnome2_pkg_postinst
-	python_version
-	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/istanbul
+	python_mod_optimize istanbul
 }
 
 pkg_postrm() {
-	python_mod_cleanup
+	python_mod_cleanup istanbul
 }
--- istanbul-0.2.2.ebuild
+++ istanbul-0.2.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/media-video/istanbul/istanbul-0.2.2.ebuild,v 1.6 2009/07/27 23:45:50 eva Exp $
 
-EAPI="2"
+EAPI="3"
 GCONF_DEBUG="no"
 
 inherit eutils gnome2 python autotools
@@ -62,11 +62,10 @@
 
 pkg_postinst() {
 	gnome2_pkg_postinst
-	python_version
-	python_mod_optimize $(python_get_sitedir)/istanbul
+	python_mod_optimize istanbul
 }
 
 pkg_postrm() {
 	gnome2_pkg_postrm
-	python_mod_cleanup
+	python_mod_cleanup istanbul
 }