--- gtest-1.6.0-r2.ebuild	2013-06-19 20:44:11.000000000 +0200
+++ gtest-1.6.0-r2.ebuild	2013-08-16 13:33:10.754000000 +0200
@@ -3,9 +3,11 @@ 
 # $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtest/gtest-1.6.0-r2.ebuild,v 1.2 2013/06/19 18:44:11 bicatali Exp $
 
 EAPI="5"
-PYTHON_DEPEND="2"
 
-inherit eutils python autotools-multilib
+# Python is required for tests and some dist tasks.
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit eutils python-any-r1 autotools-multilib
 
 DESCRIPTION="Google C++ Testing Framework"
 HOMEPAGE="http://code.google.com/p/googletest/"
@@ -16,7 +18,8 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-fbsd ~x86-linux ~ppc-macos"
 IUSE="examples static-libs"
 
-DEPEND="app-arch/unzip"
+DEPEND="app-arch/unzip
+	test? ( ${PYTHON_DEPS} )"
 RDEPEND=""
 
 PATCHES=(
@@ -26,8 +29,7 @@ PATCHES=(
 AUTOTOOLS_AUTORECONF="1"
 
 pkg_setup() {
-	python_pkg_setup
-	python_set_active_version 2
+	use test && python-any-r1_pkg_setup
 }
 
 src_prepare() {
@@ -37,8 +39,6 @@ src_prepare() {
 		Makefile.am || die
 	autotools-multilib_src_prepare
 
-	python_convert_shebangs -r 2 .
-
 	multilib_copy_sources
 }