Use python_setup to obtain the Python interpreter, and do that in src_prepare() rather than in multilib_src_configure() (to avoid calling twice).

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)

7 files changed, 26 insertions, 25 deletions

diff --git a/sys-devel/llvm/ChangeLog b/sys-devel/llvm/ChangeLog
index ed66a2012266..4e55f6f158f5 100644
--- a/sys-devel/llvm/ChangeLog
+++ b/sys-devel/llvm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-devel/llvm
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.191 2014/04/28 17:51:17 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.192 2014/05/01 15:09:30 mgorny Exp $
+
+  01 May 2014; Michał Górny <mgorny@gentoo.org> llvm-3.3-r1.ebuild,
+  llvm-3.3-r3.ebuild, llvm-3.4-r1.ebuild, llvm-3.4-r2.ebuild, llvm-3.4.ebuild,
+  llvm-9999.ebuild:
+  Use python_setup to obtain the Python interpreter, and do that in
+  src_prepare() rather than in multilib_src_configure() (to avoid calling
+  twice).
 
   28 Apr 2014; Michał Górny <mgorny@gentoo.org> llvm-3.3-r3.ebuild,
   llvm-3.4-r1.ebuild, llvm-3.4-r2.ebuild, llvm-3.4.ebuild, llvm-9999.ebuild:
diff --git a/sys-devel/llvm/llvm-3.3-r1.ebuild b/sys-devel/llvm/llvm-3.3-r1.ebuild
index 99501b76a164..d768103b46c7 100644
--- a/sys-devel/llvm/llvm-3.3-r1.ebuild
+++ b/sys-devel/llvm/llvm-3.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.3-r1.ebuild,v 1.18 2014/03/31 21:21:24 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.3-r1.ebuild,v 1.19 2014/05/01 15:09:30 mgorny Exp $
 
 EAPI=5
 
@@ -194,6 +194,8 @@ src_prepare() {
 
 	# User patches
 	epatch_user
+
+	python_setup
 }
 
 multilib_src_configure() {
@@ -243,9 +245,6 @@ multilib_src_configure() {
 	fi
 	CONF_FLAGS="${CONF_FLAGS} $(use_enable libffi)"
 
-	# build with a suitable Python version
-	python_export_best
-
 	# llvm prefers clang over gcc, so we may need to force that
 	tc-export CC CXX
 
diff --git a/sys-devel/llvm/llvm-3.3-r3.ebuild b/sys-devel/llvm/llvm-3.3-r3.ebuild
index 2cd4acf3288a..37aa1b637317 100644
--- a/sys-devel/llvm/llvm-3.3-r3.ebuild
+++ b/sys-devel/llvm/llvm-3.3-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.3-r3.ebuild,v 1.9 2014/04/28 17:51:17 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.3-r3.ebuild,v 1.10 2014/05/01 15:09:30 mgorny Exp $
 
 EAPI=5
 
@@ -194,6 +194,8 @@ src_prepare() {
 
 	# User patches
 	epatch_user
+
+	python_setup
 }
 
 multilib_src_configure() {
@@ -249,9 +251,6 @@ multilib_src_configure() {
 		append-cppflags "$(pkg-config --cflags libffi)"
 	fi
 
-	# build with a suitable Python version
-	python_export_best
-
 	# llvm prefers clang over gcc, so we may need to force that
 	tc-export CC CXX
 
diff --git a/sys-devel/llvm/llvm-3.4-r1.ebuild b/sys-devel/llvm/llvm-3.4-r1.ebuild
index de4f8fe49214..b1242e4e4917 100644
--- a/sys-devel/llvm/llvm-3.4-r1.ebuild
+++ b/sys-devel/llvm/llvm-3.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.4-r1.ebuild,v 1.2 2014/04/28 17:51:17 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.4-r1.ebuild,v 1.3 2014/05/01 15:09:30 mgorny Exp $
 
 EAPI=5
 
@@ -194,6 +194,8 @@ src_prepare() {
 
 	# User patches
 	epatch_user
+
+	python_setup
 }
 
 multilib_src_configure() {
@@ -247,9 +249,6 @@ multilib_src_configure() {
 		append-cppflags "$(pkg-config --cflags libffi)"
 	fi
 
-	# build with a suitable Python version
-	python_export_best
-
 	# llvm prefers clang over gcc, so we may need to force that
 	tc-export CC CXX
 
diff --git a/sys-devel/llvm/llvm-3.4-r2.ebuild b/sys-devel/llvm/llvm-3.4-r2.ebuild
index ac1a71d74deb..6fba4cede180 100644
--- a/sys-devel/llvm/llvm-3.4-r2.ebuild
+++ b/sys-devel/llvm/llvm-3.4-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.4-r2.ebuild,v 1.3 2014/04/28 17:51:17 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.4-r2.ebuild,v 1.4 2014/05/01 15:09:30 mgorny Exp $
 
 EAPI=5
 
@@ -203,6 +203,8 @@ src_prepare() {
 
 	# User patches
 	epatch_user
+
+	python_setup
 }
 
 multilib_src_configure() {
@@ -256,9 +258,6 @@ multilib_src_configure() {
 		append-cppflags "$(pkg-config --cflags libffi)"
 	fi
 
-	# build with a suitable Python version
-	python_export_best
-
 	# llvm prefers clang over gcc, so we may need to force that
 	tc-export CC CXX
 
diff --git a/sys-devel/llvm/llvm-3.4.ebuild b/sys-devel/llvm/llvm-3.4.ebuild
index 709b79a4ba05..fd61bd27117d 100644
--- a/sys-devel/llvm/llvm-3.4.ebuild
+++ b/sys-devel/llvm/llvm-3.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.4.ebuild,v 1.11 2014/04/28 17:51:17 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.4.ebuild,v 1.12 2014/05/01 15:09:30 mgorny Exp $
 
 EAPI=5
 
@@ -198,6 +198,8 @@ src_prepare() {
 
 	# User patches
 	epatch_user
+
+	python_setup
 }
 
 multilib_src_configure() {
@@ -251,9 +253,6 @@ multilib_src_configure() {
 		append-cppflags "$(pkg-config --cflags libffi)"
 	fi
 
-	# build with a suitable Python version
-	python_export_best
-
 	# llvm prefers clang over gcc, so we may need to force that
 	tc-export CC CXX
 
diff --git a/sys-devel/llvm/llvm-9999.ebuild b/sys-devel/llvm/llvm-9999.ebuild
index 1bd1c811cf40..8caa2f5bca2a 100644
--- a/sys-devel/llvm/llvm-9999.ebuild
+++ b/sys-devel/llvm/llvm-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v 1.86 2014/04/28 17:51:17 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v 1.87 2014/05/01 15:09:30 mgorny Exp $
 
 EAPI=5
 
@@ -195,6 +195,8 @@ src_prepare() {
 
 	# User patches
 	epatch_user
+
+	python_setup
 }
 
 multilib_src_configure() {
@@ -245,9 +247,6 @@ multilib_src_configure() {
 		append-cppflags "$(pkg-config --cflags libffi)"
 	fi
 
-	# build with a suitable Python version
-	python_export_best
-
 	# llvm prefers clang over gcc, so we may need to force that
 	tc-export CC CXX