Delete calls to python_version().

(Portage version: HEAD/cvs/Linux x86_64)

4 files changed, 24 insertions, 23 deletions

diff --git a/media-gfx/blender/ChangeLog b/media-gfx/blender/ChangeLog
index 28bb692a080a..5ed38268b894 100644
--- a/media-gfx/blender/ChangeLog
+++ b/media-gfx/blender/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/blender
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.184 2009/10/13 17:32:34 armin76 Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.185 2010/05/31 15:02:53 arfrever Exp $
+
+  31 May 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  blender-2.48a-r3.ebuild, blender-2.49a.ebuild, blender-2.49b.ebuild:
+  Delete calls to python_version().
 
   13 Oct 2009; Raúl Porcel <armin76@gentoo.org> blender-2.49a.ebuild:
   sparc stable
diff --git a/media-gfx/blender/blender-2.48a-r3.ebuild b/media-gfx/blender/blender-2.48a-r3.ebuild
index 3ffa9877867f..6d13a584edac 100644
--- a/media-gfx/blender/blender-2.48a-r3.ebuild
+++ b/media-gfx/blender/blender-2.48a-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.48a-r3.ebuild,v 1.11 2009/04/29 12:22:20 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.48a-r3.ebuild,v 1.12 2010/05/31 15:02:53 arfrever Exp $
 
 EAPI=2
 
@@ -73,13 +73,12 @@ src_configure() {
 	fi
 	# pass compiler flags to the scons build system
 	# and set python version to current version in use
-	python_version
 	cat <<- EOF >> "${S}"/user-config.py
 		CFLAGS += '${CFLAGS}'
-		BF_PYTHON_VERSION="${PYVER}"
-		BF_PYTHON_INC="/usr/include/python${PYVER}"
-		BF_PYTHON_BINARY="/usr/bin/python${PYVER}"
-		BF_PYTHON_LIB="python${PYVER}"
+		BF_PYTHON_VERSION="$(python_get_version)"
+		BF_PYTHON_INC="$(python_get_includedir)"
+		BF_PYTHON_BINARY="$(PYTHON -a)"
+		BF_PYTHON_LIB="python$(python_get_version)"
 	EOF
 
 	if use openmp && built_with_use --missing false sys-devel/gcc openmp ; then
diff --git a/media-gfx/blender/blender-2.49a.ebuild b/media-gfx/blender/blender-2.49a.ebuild
index 93ed726f753f..5f3fc2f8e1c5 100644
--- a/media-gfx/blender/blender-2.49a.ebuild
+++ b/media-gfx/blender/blender-2.49a.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.49a.ebuild,v 1.11 2009/10/13 17:32:34 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.49a.ebuild,v 1.12 2010/05/31 15:02:53 arfrever Exp $
 
 EAPI=2
 
@@ -70,12 +70,11 @@ src_configure() {
 	EOF
 
 	#  set python version to current version in use
-	python_version
 	cat <<- EOF >> "${S}"/user-config.py
-		BF_PYTHON_VERSION="${PYVER}"
-		BF_PYTHON_INC="/usr/include/python${PYVER}"
-		BF_PYTHON_BINARY="/usr/bin/python${PYVER}"
-		BF_PYTHON_LIB="python${PYVER}"
+		BF_PYTHON_VERSION="$(python_get_version)"
+		BF_PYTHON_INC="$(python_get_includedir)"
+		BF_PYTHON_BINARY="$(PYTHON -a)"
+		BF_PYTHON_LIB="python$(python_get_version)"
 	EOF
 
 	# add system openjpeg into scons build.
diff --git a/media-gfx/blender/blender-2.49b.ebuild b/media-gfx/blender/blender-2.49b.ebuild
index 64ef09f40681..3ad91b34c307 100644
--- a/media-gfx/blender/blender-2.49b.ebuild
+++ b/media-gfx/blender/blender-2.49b.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.49b.ebuild,v 1.2 2009/09/30 21:32:43 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.49b.ebuild,v 1.3 2010/05/31 15:02:53 arfrever Exp $
 
 EAPI=2
 
@@ -69,12 +69,11 @@ src_configure() {
 	EOF
 
 	#  set python version to current version in use
-	python_version
 	cat <<- EOF >> "${S}"/user-config.py
-		BF_PYTHON_VERSION="${PYVER}"
-		BF_PYTHON_INC="/usr/include/python${PYVER}"
-		BF_PYTHON_BINARY="/usr/bin/python${PYVER}"
-		BF_PYTHON_LIB="python${PYVER}"
+		BF_PYTHON_VERSION="$(python_get_version)"
+		BF_PYTHON_INC="$(python_get_includedir)"
+		BF_PYTHON_BINARY="$(PYTHON -a)"
+		BF_PYTHON_LIB="python$(python_get_version)"
 	EOF
 
 	# add system openjpeg into scons build.