Delete call to deprecated python_version().

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

diff --git a/sci-physics/camfr/ChangeLog b/sci-physics/camfr/ChangeLog
index 965544921963051138b8d90ab13a8419a4996545..fbf455b11f4bc66cd98d979f671c509f96d02368 100644 (file)
--- a/sci-physics/camfr/ChangeLog
+++ b/sci-physics/camfr/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-physics/camfr
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/camfr/ChangeLog,v 1.15 2009/11/12 17:55:06 bicatali Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/camfr/ChangeLog,v 1.16 2010/06/04 16:34:26 arfrever Exp $
+
+  04 Jun 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  camfr-20070717-r1.ebuild:
+  Delete call to deprecated python_version().
 
   12 Nov 2009; Sébastien Fabbro <bicatali@gentoo.org>
   camfr-20070717-r1.ebuild:

diff --git a/sci-physics/camfr/Manifest b/sci-physics/camfr/Manifest
index e0cde2ab4b322c17c7b2211cb42f9ea9b5e649f2..4978df5bb44a80123fe081883aaff0de3b557e46 100644 (file)
--- a/sci-physics/camfr/Manifest
+++ b/sci-physics/camfr/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX camfr-20070717-gcc43.patch 391 RMD160 4addf806c2d8ddb5ee5dbd2cc1b02381dbf3f6b8 SHA1 41ef3f6be02d4d6b6bf6d03b4b1f6e9ef0fca3d9 SHA256 50cfc3e04c4774fd0404d044c128cf8346c1762e64808ca77147cb4207729db3
 AUX machine_cfg.py.gentoo 638 RMD160 9a2016338d094e1b1d32444bd2ed281cfca1551e SHA1 96084ebc5ae03698b52a1b9a82899869f43c2532 SHA256 8942256f99ad1432d7092cb616727ffd6ef82834435e185f9b9863e420bf08f0
 DIST camfr-20070717.tgz 763070 RMD160 4e4237188caecd4dca3980b9cab381479e6382bc SHA1 7838482db8557b365dac51769950d49746397e29 SHA256 f675ba7d58947076c0679c8760c9282e2efc82828bec67de90567fd8a4f135de
-EBUILD camfr-20070717-r1.ebuild 1921 RMD160 fa66f28d321b5fbbff0dca9537e08f14d762b854 SHA1 b0a96a109d3d4060db0654b6d48e57aca7ab1a23 SHA256 77e8930fbc0f5f6dd6fd7971ef4d09ae1986715671d3ca24376ef69474fdef7c
-MISC ChangeLog 2741 RMD160 3af4b534db6df000e59a6f1fea6e30cf26124a5c SHA1 6aaa8791c17e5a4d532e8ded6006c758a820ee18 SHA256 1022f038286250cffabf9d081b4c4689ee0c90c36c22d6d03489e4cc362d40b4
+EBUILD camfr-20070717-r1.ebuild 1902 RMD160 afc2f5d4e58b8be4029e1c7ca2012a13b74dfaad SHA1 ecef4d23dabf097a96bc7bd567772fc42491f494 SHA256 fa724ebcab88d4af38924f39696a3b5cb8a61cb7c415d2ceb5e6be2b8d9471d5
+MISC ChangeLog 2889 RMD160 123e6ee51279d37444df378a69a5566cc915e7c5 SHA1 28d632406c80a32859bca4043d79c42274be3495 SHA256 a247630594bf46fb8d141d7e23fcc518d7cf8a5ec42317a1e6fcb5197a34424e
 MISC metadata.xml 164 RMD160 6e4c63a6f70f174f40277eed39ac05fba4a49566 SHA1 e1af6f2028e69dee3c76e7e85353a144c83d3383 SHA256 9eddaccbdd2f6b3f93213d72782f07518dff1625fd8d63faf61dc97bd328b5e7
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.13 (GNU/Linux)
-
-iEYEARECAAYFAkr8VeoACgkQ1ycZbhPLE2CbvwCeKfRawP3G5l/AjpqZIJJV0OjM
-IC8AnjLnMFdf0tAc/X/0ViEWf3I1nHLT
-=0j0Z
------END PGP SIGNATURE-----

diff --git a/sci-physics/camfr/camfr-20070717-r1.ebuild b/sci-physics/camfr/camfr-20070717-r1.ebuild
index b6620885e44ec835613dbbe3ddb220c358b93e38..364ddb34e4ced4c466e1e6cf0d1fc793ee9e86ec 100644 (file)
--- a/sci-physics/camfr/camfr-20070717-r1.ebuild
+++ b/sci-physics/camfr/camfr-20070717-r1.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/sci-physics/camfr/camfr-20070717-r1.ebuild,v 1.5 2009/11/12 17:55:06 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/camfr/camfr-20070717-r1.ebuild,v 1.6 2010/06/04 16:34:26 arfrever Exp $
 
 EAPI=2
 inherit eutils distutils python toolchain-funcs
@@ -33,10 +33,9 @@ src_prepare() {
        cp "${FILESDIR}"/machine_cfg.py.gentoo machine_cfg.py || die
 
        # Configure to compile against selected python version
-       python_version
        cat <<-EOF >> machine_cfg.py
                include_dirs = []
-               include_dirs.append("/usr/include/python${PYVER}")
+               include_dirs.append("$(python_get_includedir)")
                include_dirs.append("$(python_get_sitedir)")
        EOF
 
@@ -63,7 +62,7 @@ src_prepare() {
 src_test() {
        # trick to avoid X in testing (bug #229753)
        echo "backend : Agg" > matplotlibrc
-       PYTHONPATH=".:visualisation" "${python}" testsuite/camfr_test.py \
+       PYTHONPATH=".:visualisation" "$(PYTHON)" testsuite/camfr_test.py \
                || die "tests failed"
        rm -f matplotlibrc
 }