Delete calls to python_version().

Package-Manager: portage-HEAD/cvs/Linux x86_64

diff --git a/media-gfx/blender/ChangeLog b/media-gfx/blender/ChangeLog
index 28bb692a080adbc3f1429fc8ab234192b21cd280..5ed38268b8946cba364099df31d074e66b10a807 100644 (file)
--- 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/Manifest b/media-gfx/blender/Manifest
index ad42341dd76e560eb4bf897c5f19d05937d8a1c6..1372bd29b81fe410cf6764364ea82357cebf1d35 100644 (file)
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -11,8 +11,8 @@ AUX blender.png 2119 RMD160 e06574002001f41198dc9408ef1bba45493fcc27 SHA1 9a0d71
 DIST blender-2.48a.tar.gz 21502247 RMD160 5ef94d6019302bfea86d5657af738d1d86a8bcd5 SHA1 9fb2dbf5d6cfcba8ae2d6d9b93ca9e3e66aae6c7 SHA256 781d4d9e2332f4f3887af1d66fb70c4c6dd0b89166391403ee4853108abf4e46
 DIST blender-2.49a.tar.gz 23039535 RMD160 f37100c7a02c75b622b8e055f32f06e064a62de2 SHA1 59f5be96eda874bb901390f55a70d58cf8e0b979 SHA256 b206b878a6f96d1e8561ee62a58fba1af4141579c27f51ec795f08f4129eb1fc
 DIST blender-2.49b.tar.gz 22918377 RMD160 5b641de7b41af5e4186c9721b66eddc6870f9fbc SHA1 43f71e7de4efe79c518d45f4b5a04e03c28d5fc5 SHA256 23554db4aa10b00e0e760a8bf9c4a9f749670d815c8bc874a04746adc4752488
-EBUILD blender-2.48a-r3.ebuild 4133 RMD160 9fe866fe26404ff233526ce0bb3c25ed38e0c777 SHA1 27cc6ff87860fc3623a4a9fd4db288435d6da4c7 SHA256 5f1f4112dc9edc04ed77b97d5daa5d27a1be96e8d4c995209909f06790aadea3
-EBUILD blender-2.49a.ebuild 4895 RMD160 67989a94da8ef7962b60b212b08a04f934c9ab0a SHA1 3be349be513eda7567a696eba351d87587fcfb0e SHA256 9d5051ea881ce46de732240ab8b424def68bb56a620e76b7cce77d87e170ad2a
-EBUILD blender-2.49b.ebuild 4853 RMD160 5bc22c46395c56c05af195c40aa3f3ca46b6a0e7 SHA1 3d1be6097fc63c899e14f540127ff1aca7b229b2 SHA256 0c10eb4bab5aeedb7c91d677f340b43aef686ee5bee1eb07f8bdb84f039c9297
-MISC ChangeLog 27247 RMD160 41da44660fcf40e6eb4320363ce8273142a98f67 SHA1 d9b1af0619d514f6235e17c6fd5a099aeaa7965f SHA256 5a995df6814ffca16430e3a16d141e6c02a442be9523595792e3ca9efef6a01f
+EBUILD blender-2.48a-r3.ebuild 4128 RMD160 93d7c03e500c3a4a3c77f3c1b48fbbced9f1ce9a SHA1 444acdc9568856df930fb3b83961bdacc3f9a6d3 SHA256 66629da81213085180ab9a8572456d1d17eef2e5074d9e33b3c476a668e4d98f
+EBUILD blender-2.49a.ebuild 4892 RMD160 85e418ec33898b281cd86a4cf1c6d953f8e2e0b8 SHA1 3279a28fa7707af8bba6210161333dd81a148c99 SHA256 43ac20552b96b6a2866d98fc0c75465a29fd2a1d3e170a2a5c2ecabb4c5b830a
+EBUILD blender-2.49b.ebuild 4851 RMD160 1d20d3dd6c14df06d2b783953a343a024b5fd154 SHA1 a47be4e0f53cc3ca2ff266c71bef2472483d0208 SHA256 ecc00e281cd41c3fd8bc82f04f47f48617acb78fddedbe87bd2e477e812874a2
+MISC ChangeLog 27429 RMD160 e36862044f02d1a314970e4c47aa17f9e26166e6 SHA1 7b5ab3921403debe7978faf070e20b5fed8dd760 SHA256 67df180ff302f24207d504dc121dd8ea5c45ec69974a355bdb7d35dcb62731dc
 MISC metadata.xml 719 RMD160 132dfe4fc49228b922ed39f556c403347e992ef9 SHA1 7896fb17bd0dd87d8a072b0f6f6072876c1eed94 SHA256 6409856f1883ed49aae365c885d5512a38784a5a48a2bbf7dd583b8054d32510

diff --git a/media-gfx/blender/blender-2.48a-r3.ebuild b/media-gfx/blender/blender-2.48a-r3.ebuild
index 3ffa9877867f426fbb7dd550e8b2e6f83de6e5db..6d13a584edacb088b686847d05a4969b17dbcb3f 100644 (file)
--- 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 93ed726f753fe8baa14c5874d660cd944f2fdc55..5f3fc2f8e1c5e3e10f107e77115bde55a0afdacf 100644 (file)
--- 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 64ef09f406813aec29756fce6cff28592e74d069..3ad91b34c3073127d0b36cf654de14c1078b47d2 100644 (file)
--- 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.

diff --git a/media-gfx/gnome-specimen/Manifest b/media-gfx/gnome-specimen/Manifest
index 9687afc4f55f5368ad578d7219a77cdc6b2b6de0..39a4596e6cf20ff88776f3e70ed3543ebbd86369 100644 (file)
--- a/media-gfx/gnome-specimen/Manifest
+++ b/media-gfx/gnome-specimen/Manifest
@@ -1,6 +1,6 @@
 DIST gnome-specimen-0.3.1.tar.gz 213400 RMD160 4bc8e6f336e6241a28792b6941835edf28c01597 SHA1 374c2063b75319b1654fdabdc4e9923f94891f53 SHA256 24798dff4b4dee9c5c3b5f494b49ec805d259ef62eb46f0f7919705591b27a35
 DIST gnome-specimen-0.4.tar.gz 220574 RMD160 4a799bcc59f3cc1b039780759918035c8c70d87b SHA1 7e9980c3063b823de74456a4bf17079198b74455 SHA256 353ef10e647e5d06354dd827a4152a8cb45bf56b2f1c72e449a41e5175880424
 EBUILD gnome-specimen-0.3.1.ebuild 720 RMD160 625d5991315945e6cd612a4af90ee6b949ceba18 SHA1 f42a8e0a30c5dc54ebd5618377f3c91ea381a623 SHA256 384b719b9a38d0b9eecc807d01c70c2e3a0ca62cd5271f0ab8a684a4029ba07d
-EBUILD gnome-specimen-0.4.ebuild 1076 RMD160 27c175148ed031ad46abf6f5f88ec102b52245c0 SHA1 4568b90fe9616174c2d7ee71fffa7eebccb2ab7a SHA256 fef3a5d883c990e601204c2f2fa9c293877edcb76e82b0b7670a3592d66098e5
-MISC ChangeLog 744 RMD160 4eef8bde372fd0e1db4bd117ae35979b2b7d80f2 SHA1 ab4130704a4b34566f403c2bc51f8fb89ed7c9e7 SHA256 cfb6b68256982b10df20e08c1587aea9b3afff99e2061b266023b7054773b31e
+EBUILD gnome-specimen-0.4.ebuild 1015 RMD160 e4ed8711deb7db0776ccf925027ff89b5d0afa41 SHA1 cea9830a79e4e679472980133ba8139cc295b9c0 SHA256 66b03ab323ccf01c0d9ed8d850c959054871c4963c64c3660f2b31054b8d3ddd
+MISC ChangeLog 897 RMD160 32efcd3dc2b2e42a01db089ef4ff6bd4545e5291 SHA1 cb02ec844d07f7b5d0361673cf05d2de5bdb9465 SHA256 f9517ad52ddcf30359dd9e453f1ba5db5728dbbb3b2ad9b7efdd2d12fcd35421
 MISC metadata.xml 161 RMD160 60f70b15d67f0e6aafc59833b2f0a30e30b51765 SHA1 1c35398222ef7ed670c31965e42cca77fe4b1da6 SHA256 e8daadc5e27e3ef1148993b5b48d96e93bc36d798a1f416693f7f8c84be427e1