Add missing pygobject:3 dependency when USE=test (bug #473622, thanks to Nikoli). Fix test failure when python-3.x is the system python interpreter.

(Portage version: 2.2.0_alpha180/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)

7 files changed, 68 insertions, 36 deletions

diff --git a/net-libs/webkit-gtk/ChangeLog b/net-libs/webkit-gtk/ChangeLog
index ae3e371d6b65..35e3b86ec7bc 100644
--- a/net-libs/webkit-gtk/ChangeLog
+++ b/net-libs/webkit-gtk/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-libs/webkit-gtk
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.209 2013/06/12 15:00:58 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.210 2013/06/18 06:10:56 tetromino Exp $
+
+  18 Jun 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
+  webkit-gtk-1.8.3-r200.ebuild, webkit-gtk-1.8.3-r201.ebuild,
+  webkit-gtk-1.8.3-r300.ebuild, webkit-gtk-1.10.2-r300.ebuild,
+  webkit-gtk-2.0.2.ebuild, webkit-gtk-2.0.3.ebuild:
+  Add missing pygobject:3 dependency when USE=test (bug #473622, thanks to
+  Nikoli). Fix test failure when python-3.x is the system python interpreter.
 
 *webkit-gtk-2.0.3 (12 Jun 2013)
 
diff --git a/net-libs/webkit-gtk/webkit-gtk-1.10.2-r300.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.10.2-r300.ebuild
index 6e00f38dac08..869480739d60 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.10.2-r300.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.10.2-r300.ebuild
@@ -1,10 +1,12 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.10.2-r300.ebuild,v 1.8 2013/05/28 05:23:26 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.10.2-r300.ebuild,v 1.9 2013/06/18 06:10:56 tetromino Exp $
 
 EAPI="5"
 
-inherit autotools check-reqs eutils flag-o-matic gnome2-utils pax-utils virtualx
+PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+
+inherit autotools check-reqs eutils flag-o-matic gnome2-utils pax-utils python-any-r1 virtualx
 
 MY_P="webkitgtk-${PV}"
 DESCRIPTION="Open source web browser engine"
@@ -50,8 +52,8 @@ RDEPEND="
 "
 # paxctl needed for bug #407085
 DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
 	dev-lang/perl
-	=dev-lang/python-2*
 	|| ( virtual/rubygems[ruby_targets_ruby19]
 	     virtual/rubygems[ruby_targets_ruby18] )
 	app-accessibility/at-spi2-core
@@ -65,6 +67,8 @@ DEPEND="${RDEPEND}
 
 	introspection? ( jit? ( sys-apps/paxctl ) )
 	test? (
+		dev-lang/python:2.7
+		dev-python/pygobject:3[python_targets_python2_7]
 		x11-themes/hicolor-icon-theme
 		jit? ( sys-apps/paxctl ) )
 "
@@ -100,6 +104,8 @@ pkg_setup() {
 		einfo "(-ggdb vs -g1) and enabled features."
 		check-reqs_pkg_setup
 	fi
+
+	[[ ${MERGE_TYPE} = "binary" ]] || python-any-r1_pkg_setup
 }
 
 src_prepare() {
@@ -210,7 +216,6 @@ src_configure() {
 		--enable-accelerated-compositing
 		--enable-dependency-tracking
 		--disable-gtk-doc
-		PYTHON=$(type -P python2)
 		"$(usex aqua "--with-font-backend=pango --with-target=quartz" "")
 		# Aqua support in gtk3 is untested
 
diff --git a/net-libs/webkit-gtk/webkit-gtk-1.8.3-r200.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.8.3-r200.ebuild
index 3a0c91f11629..ee2b7bb2faf9 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.8.3-r200.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.8.3-r200.ebuild
@@ -1,11 +1,12 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.8.3-r200.ebuild,v 1.11 2013/05/01 03:40:59 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.8.3-r200.ebuild,v 1.12 2013/06/18 06:10:56 tetromino Exp $
 
 EAPI="4"
 
-# Don't define PYTHON_DEPEND: python only needed at build time
-inherit autotools check-reqs eutils flag-o-matic gnome2-utils pax-utils python virtualx
+PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+
+inherit autotools check-reqs eutils flag-o-matic gnome2-utils pax-utils python-any-r1 virtualx
 
 MY_P="webkit-${PV}"
 DESCRIPTION="Open source web browser engine"
@@ -49,8 +50,8 @@ RDEPEND="
 "
 # paxctl needed for bug #407085
 DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
 	dev-lang/perl
-	=dev-lang/python-2*
 	sys-devel/bison
 	>=sys-devel/flex-2.5.33
 	sys-devel/gettext
@@ -58,7 +59,10 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	dev-util/gtk-doc-am
 	introspection? ( jit? ( sys-apps/paxctl ) )
-	test? ( x11-themes/hicolor-icon-theme
+	test? (
+		dev-lang/python:2.7
+		dev-python/pygobject:3[python_targets_python2_7]
+		x11-themes/hicolor-icon-theme
 		jit? ( sys-apps/paxctl ) )
 "
 # Need real bison, not yacc
@@ -93,9 +97,8 @@ pkg_setup() {
 		einfo "(-ggdb vs -g1) and enabled features."
 		check-reqs_pkg_setup
 	fi
-	# Needed for CodeGeneratorInspector.py
-	python_set_active_version 2
-	python_pkg_setup
+
+	[[ ${MERGE_TYPE} = "binary" ]] || python-any-r1_pkg_setup
 }
 
 src_prepare() {
diff --git a/net-libs/webkit-gtk/webkit-gtk-1.8.3-r201.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.8.3-r201.ebuild
index 66b198d512b7..5cc1eca6cdd4 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.8.3-r201.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.8.3-r201.ebuild
@@ -1,11 +1,12 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.8.3-r201.ebuild,v 1.3 2013/05/01 03:40:59 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.8.3-r201.ebuild,v 1.4 2013/06/18 06:10:56 tetromino Exp $
 
 EAPI=5
 
-# Don't define PYTHON_DEPEND: python only needed at build time
-inherit autotools check-reqs eutils flag-o-matic gnome2-utils pax-utils python virtualx
+PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+
+inherit autotools check-reqs eutils flag-o-matic gnome2-utils pax-utils python-any-r1 virtualx
 
 MY_P="webkit-${PV}"
 DESCRIPTION="Open source web browser engine"
@@ -49,8 +50,8 @@ RDEPEND="
 "
 # paxctl needed for bug #407085
 DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
 	dev-lang/perl
-	=dev-lang/python-2*
 	sys-devel/bison
 	>=sys-devel/flex-2.5.33
 	sys-devel/gettext
@@ -58,7 +59,10 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	dev-util/gtk-doc-am
 	introspection? ( jit? ( sys-apps/paxctl ) )
-	test? ( x11-themes/hicolor-icon-theme
+	test? (
+		dev-lang/python:2.7
+		dev-python/pygobject:3[python_targets_python2_7]
+		x11-themes/hicolor-icon-theme
 		jit? ( sys-apps/paxctl ) )
 "
 # Need real bison, not yacc
@@ -93,9 +97,8 @@ pkg_setup() {
 		einfo "(-ggdb vs -g1) and enabled features."
 		check-reqs_pkg_setup
 	fi
-	# Needed for CodeGeneratorInspector.py
-	python_set_active_version 2
-	python_pkg_setup
+
+	[[ ${MERGE_TYPE} = "binary" ]] || python-any-r1_pkg_setup
 }
 
 src_prepare() {
diff --git a/net-libs/webkit-gtk/webkit-gtk-1.8.3-r300.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.8.3-r300.ebuild
index 6e15e30ff5b1..285342775895 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.8.3-r300.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.8.3-r300.ebuild
@@ -1,11 +1,12 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.8.3-r300.ebuild,v 1.11 2013/05/01 03:40:59 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.8.3-r300.ebuild,v 1.12 2013/06/18 06:10:56 tetromino Exp $
 
 EAPI="4"
 
-# Don't define PYTHON_DEPEND: python only needed at build time
-inherit autotools check-reqs eutils flag-o-matic gnome2-utils pax-utils python virtualx
+PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+
+inherit autotools check-reqs eutils flag-o-matic gnome2-utils pax-utils python-any-r1 virtualx
 
 MY_P="webkit-${PV}"
 DESCRIPTION="Open source web browser engine"
@@ -53,8 +54,8 @@ RDEPEND="
 "
 # paxctl needed for bug #407085
 DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
 	dev-lang/perl
-	=dev-lang/python-2*
 	sys-devel/bison
 	>=sys-devel/flex-2.5.33
 	sys-devel/gettext
@@ -64,6 +65,8 @@ DEPEND="${RDEPEND}
 	doc? ( >=dev-util/gtk-doc-1.10 )
 	introspection? ( jit? ( sys-apps/paxctl ) )
 	test? (
+		dev-lang/python:2.7
+		dev-python/pygobject:3[python_targets_python2_7]
 		x11-themes/hicolor-icon-theme
 		jit? ( sys-apps/paxctl ) )
 	webkit2? ( app-accessibility/at-spi2-core )
@@ -100,9 +103,8 @@ pkg_setup() {
 		einfo "(-ggdb vs -g1) and enabled features."
 		check-reqs_pkg_setup
 	fi
-	# Needed for CodeGeneratorInspector.py
-	python_set_active_version 2
-	python_pkg_setup
+
+	[[ ${MERGE_TYPE} = "binary" ]] || python-any-r1_pkg_setup
 }
 
 src_prepare() {
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.0.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.0.2.ebuild
index 3d01af1c6c88..eb9cc3d741e0 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.0.2.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.0.2.ebuild
@@ -1,9 +1,12 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.0.2.ebuild,v 1.3 2013/06/06 05:35:44 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.0.2.ebuild,v 1.4 2013/06/18 06:10:56 tetromino Exp $
 
 EAPI="5"
-inherit autotools check-reqs eutils flag-o-matic gnome2-utils pax-utils toolchain-funcs versionator virtualx
+
+PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+
+inherit autotools check-reqs eutils flag-o-matic gnome2-utils pax-utils python-any-r1 toolchain-funcs versionator virtualx
 
 MY_P="webkitgtk-${PV}"
 DESCRIPTION="Open source web browser engine"
@@ -52,8 +55,8 @@ RDEPEND="
 "
 # paxctl needed for bug #407085
 DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
 	dev-lang/perl
-	=dev-lang/python-2*
 	|| ( virtual/rubygems[ruby_targets_ruby19]
 	     virtual/rubygems[ruby_targets_ruby18] )
 	>=app-accessibility/at-spi2-core-2.5.3
@@ -68,6 +71,8 @@ DEPEND="${RDEPEND}
 
 	introspection? ( jit? ( sys-apps/paxctl ) )
 	test? (
+		dev-lang/python:2.7
+		dev-python/pygobject:3[python_targets_python2_7]
 		x11-themes/hicolor-icon-theme
 		jit? ( sys-apps/paxctl ) )
 "
@@ -107,6 +112,8 @@ pkg_setup() {
 		einfo "(-ggdb vs -g1) and enabled features."
 		check-reqs_pkg_setup
 	fi
+
+	[[ ${MERGE_TYPE} = "binary" ]] || python-any-r1_pkg_setup
 }
 
 src_prepare() {
@@ -197,7 +204,6 @@ src_configure() {
 		--enable-credential_storage
 		--enable-dependency-tracking
 		--disable-gtk-doc
-		PYTHON=$(type -P python2)
 		"$(usex aqua "--with-font-backend=pango --with-target=quartz" "")
 		# Aqua support in gtk3 is untested
 
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.0.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.0.3.ebuild
index 7331627810e7..0fa84f42ea4f 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.0.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.0.3.ebuild
@@ -1,9 +1,12 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.0.3.ebuild,v 1.1 2013/06/12 15:00:58 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.0.3.ebuild,v 1.2 2013/06/18 06:10:56 tetromino Exp $
 
 EAPI="5"
-inherit autotools check-reqs eutils flag-o-matic gnome2-utils pax-utils toolchain-funcs versionator virtualx
+
+PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+
+inherit autotools check-reqs eutils flag-o-matic gnome2-utils pax-utils python-any-r1 toolchain-funcs versionator virtualx
 
 MY_P="webkitgtk-${PV}"
 DESCRIPTION="Open source web browser engine"
@@ -52,8 +55,8 @@ RDEPEND="
 "
 # paxctl needed for bug #407085
 DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
 	dev-lang/perl
-	=dev-lang/python-2*
 	|| ( virtual/rubygems[ruby_targets_ruby19]
 	     virtual/rubygems[ruby_targets_ruby18] )
 	>=app-accessibility/at-spi2-core-2.5.3
@@ -68,6 +71,8 @@ DEPEND="${RDEPEND}
 
 	introspection? ( jit? ( sys-apps/paxctl ) )
 	test? (
+		dev-lang/python:2.7
+		dev-python/pygobject:3[python_targets_python2_7]
 		x11-themes/hicolor-icon-theme
 		jit? ( sys-apps/paxctl ) )
 "
@@ -107,6 +112,8 @@ pkg_setup() {
 		einfo "(-ggdb vs -g1) and enabled features."
 		check-reqs_pkg_setup
 	fi
+
+	[[ ${MERGE_TYPE} = "binary" ]] || python-any-r1_pkg_setup
 }
 
 src_prepare() {
@@ -197,7 +204,6 @@ src_configure() {
 		--enable-credential_storage
 		--enable-dependency-tracking
 		--disable-gtk-doc
-		PYTHON=$(type -P python2)
 		"$(usex aqua "--with-font-backend=pango --with-target=quartz" "")
 		# Aqua support in gtk3 is untested