--- x11-libs/vte/vte-0.28.2-r204.ebuild
+++ x11-libs/vte/vte-0.28.2-r205.ebuild
@@ -2,19 +2,19 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/vte-0.28.2-r204.ebuild,v 1.9 2013/02/22 20:52:12 zmedico Exp $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
-PYTHON_DEPEND="python? 2:2.5"
 
-inherit eutils gnome2 python
+PYTHON_COMPAT=( python2_6 python2_7 )
+inherit eutils gnome2 python-r1
 
 DESCRIPTION="GNOME terminal widget"
 HOMEPAGE="https://live.gnome.org/VTE"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE="debug doc glade +introspection python"
 
 PDEPEND="x11-libs/gnome-pty-helper"
@@ -28,12 +28,23 @@
 
 	glade? ( dev-util/glade:3 )
 	introspection? ( >=dev-libs/gobject-introspection-0.9.0 )
-	python? ( >=dev-python/pygtk-2.4:2 )"
+	python? (
+		${PYTHON_DEPS}
+		dev-python/pygtk:2[${PYTHON_USEDEP}]
+	)"
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.35
 	virtual/pkgconfig
 	sys-devel/gettext
 	doc? ( >=dev-util/gtk-doc-1.13 )"
+
+wrap_phase() {
+	if use python; then
+		python_foreach_impl run_in_build_dir "${@}"
+	else
+		"${@}"
+	fi
+}
 
 pkg_setup() {
 	# Do not disable gnome-pty-helper, bug #401389
@@ -54,10 +65,6 @@
 	fi
 
 	DOCS="AUTHORS ChangeLog HACKING NEWS README"
-	if use python; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
 }
 
 src_prepare() {
@@ -71,10 +78,18 @@
 	epatch "${FILESDIR}"/${PN}-0.28.2-limit-arguments.patch
 
 	gnome2_src_prepare
+	python_copy_sources
+}
+
+src_configure() {
+	wrap_phase gnome2_src_configure
+}
+
+src_compile() {
+	wrap_phase gnome2_src_compile
 }
 
 src_install() {
-	gnome2_src_install
+	wrap_phase gnome2_src_install
 	rm -v "${ED}usr/libexec/gnome-pty-helper" || die
-	use python && python_clean_installation_image
 }