--- dev-libs/glib/glib-2.34.3.ebuild
+++ dev-libs/glib/glib-2.34.3-r1.ebuild
@@ -2,11 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.34.3.ebuild,v 1.3 2013/02/19 00:08:33 tetromino Exp $
 
-EAPI="5"
-PYTHON_DEPEND="utils? 2"
-# Avoid runtime dependency on python when USE=test
-
-inherit autotools gnome.org libtool eutils flag-o-matic gnome2-utils multilib pax-utils python toolchain-funcs virtualx linux-info
+EAPI=5
+PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
+
+inherit autotools gnome.org libtool eutils flag-o-matic gnome2-utils multilib pax-utils python-r1 toolchain-funcs virtualx linux-info
 
 DESCRIPTION="The GLib library of C routines"
 HOMEPAGE="http://www.gtk.org/"
@@ -26,7 +25,10 @@
 		>=dev-libs/libelf-0.8.12 )
 	xattr? ( sys-apps/attr )
 	fam? ( virtual/fam )
-	utils? ( >=dev-util/gdbus-codegen-${PV} )"
+	utils? (
+		${PYTHON_DEPS}
+		>=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}]
+	)"
 DEPEND="${RDEPEND}
 	app-text/docbook-xml-dtd:4.1.2
 	>=dev-libs/libxslt-1.0
@@ -35,8 +37,8 @@
 	systemtap? ( >=dev-util/systemtap-1.3 )
 	test? (
 		sys-devel/gdb
-		=dev-lang/python-2*
-		>=dev-util/gdbus-codegen-${PV}
+		${PYTHON_DEPS}
+		>=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}]
 		>=sys-apps/dbus-1.2.14 )
 	!<dev-util/gtk-doc-1.15-r2"
 PDEPEND="x11-misc/shared-mime-info
@@ -45,11 +47,7 @@
 # Earlier versions of gvfs do not work with glib
 
 pkg_setup() {
-	# Needed for gio/tests/gdbus-testserver.py
-	if use test; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
+	python_export_best
 
 	if use kernel_linux ; then
 		CONFIG_CHECK="~INOTIFY_USER"
@@ -169,8 +167,8 @@
 src_install() {
 	local f
 
-	# install-exec-hook substitutes ${PYTHON} in glib/gtester-report
-	emake DESTDIR="${D}" PYTHON="${EPREFIX}/usr/bin/python2" install
+	# PYTHON is only for temporary shebang in glib/gtester-repor
+	emake DESTDIR="${D}" PYTHON="/usr/bin/python" install
 
 	if ! use utils; then
 		rm "${ED}usr/bin/gtester-report"
@@ -187,6 +185,8 @@
 	# Completely useless with or without USE static-libs, people need to use
 	# pkg-config
 	prune_libtool_files --modules
+
+	use utils && python_replicate_script "${ED}"/usr/bin/gtester-report
 }
 
 src_test() {