Make it work for python 2.6, thanks Dustin Polke, closing bug #278028

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 25 insertions, 26 deletions

diff --git a/sci-physics/camfr/ChangeLog b/sci-physics/camfr/ChangeLog
index ac7a0b3db72c..d4bc3744b5d7 100644
--- 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.13 2009/03/14 14:25:38 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/camfr/ChangeLog,v 1.14 2009/07/26 00:24:15 bicatali Exp $
+
+  26 Jul 2009; Sébastien Fabbro <bicatali@gentoo.org>
+  camfr-20070717-r1.ebuild, files/machine_cfg.py.gentoo:
+  Make it work for python 2.6, thanks Dustin Polke, closing bug #278028
 
   14 Mar 2009; Sébastien Fabbro <bicatali@gentoo.org>
   camfr-20070717-r1.ebuild:
diff --git a/sci-physics/camfr/Manifest b/sci-physics/camfr/Manifest
index a6f4209f3545..cbad569a7a33 100644
--- a/sci-physics/camfr/Manifest
+++ b/sci-physics/camfr/Manifest
@@ -2,15 +2,15 @@
 Hash: SHA1
 
 AUX camfr-20070717-gcc43.patch 391 RMD160 4addf806c2d8ddb5ee5dbd2cc1b02381dbf3f6b8 SHA1 41ef3f6be02d4d6b6bf6d03b4b1f6e9ef0fca3d9 SHA256 50cfc3e04c4774fd0404d044c128cf8346c1762e64808ca77147cb4207729db3
-AUX machine_cfg.py.gentoo 1177 RMD160 3424d19ee66eacf6aeff3677d2acd844d2feb764 SHA1 4453d6bda496fe00b2a8842bed3c0212d9d581cb SHA256 2aa781f2f6be7cd0311a746080c250fde9b626ac3bac0598b89598977e19c76f
+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 1716 RMD160 967c859b8dee287bf115e78328cb88603a071436 SHA1 4b5d84970a8703e73aaeeb17c32bfd9ae4d1d146 SHA256 6b7265db09795614dd45b97a35ad67b35c31e37028ccaab5e2563fa40e9c3c7b
-MISC ChangeLog 2404 RMD160 fdcdbfbbc9589457a2deb6c50c58be3cc69d1c64 SHA1 8da122933f6ddd014c128b36a0852e2ca511cc44 SHA256 66563a0e4ced7e850764c6fb77b9fcb413e32e749d1197b10fedc3ec9c76bd7a
+EBUILD camfr-20070717-r1.ebuild 1975 RMD160 643f07a6dc759796ea2cef594c55c1d266be8997 SHA1 71e34d99d772421494018664a080327a5fa47b19 SHA256 cbb2c5eab93d41c9fd6aaddf67d4b0194f2509546341f659798a619101edbbea
+MISC ChangeLog 2589 RMD160 4f997097ae4fd855c0fee258ec6e67abf3dcc9d5 SHA1 c5de5c3e78bca7c1236e22c054f65aaaae7f814e SHA256 0db2282abe3dd8a7e4a9efa79464db77a18e6106ee7c43ade8b43f999996675d
 MISC metadata.xml 164 RMD160 6e4c63a6f70f174f40277eed39ac05fba4a49566 SHA1 e1af6f2028e69dee3c76e7e85353a144c83d3383 SHA256 9eddaccbdd2f6b3f93213d72782f07518dff1625fd8d63faf61dc97bd328b5e7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.10 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkm7vm4ACgkQ1ycZbhPLE2CE9wCfbIB/JOSx04iS+Ld0Yg86gels
-MBkAoKZ5Dm1ucoHgpxnvxZhl3o4zVkuT
-=45GY
+iEYEARECAAYFAkprojoACgkQ1ycZbhPLE2BpUACgpcaskzyzcdL2lQ8BtdEAl7gp
+mnwAn0y4OJE6WJRWsdslfAE7hUvCepm+
+=PRGY
 -----END PGP SIGNATURE-----
diff --git a/sci-physics/camfr/camfr-20070717-r1.ebuild b/sci-physics/camfr/camfr-20070717-r1.ebuild
index f28e038b3276..355ded6acdfb 100644
--- a/sci-physics/camfr/camfr-20070717-r1.ebuild
+++ b/sci-physics/camfr/camfr-20070717-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2009 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.3 2009/03/14 14:25:38 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/camfr/camfr-20070717-r1.ebuild,v 1.4 2009/07/26 00:24:15 bicatali Exp $
 
 EAPI=2
-inherit eutils distutils fortran
+inherit eutils distutils fortran python
 
 DESCRIPTION="Full vectorial Maxwell solver based on eigenmode expansion"
 HOMEPAGE="http://camfr.sourceforge.net/"
@@ -31,6 +31,15 @@ S="${WORKDIR}/${P/-/_}"
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-gcc43.patch
 	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_sitedir)")
+	EOF
+
 	local lapack_libs=
 	for x in $(pkg-config --libs-only-l lapack); do
 		lapack_libs="${lapack_libs}, \"${x#-l}\""
@@ -56,12 +65,13 @@ 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
 }
 
 src_install() {
+	python_need_rebuild
 	distutils_src_install
 	dodoc docs/camfr.pdf || die "doc install failed"
 }
diff --git a/sci-physics/camfr/files/machine_cfg.py.gentoo b/sci-physics/camfr/files/machine_cfg.py.gentoo
index 673287ff2ad0..bdcd4bbfcf21 100644
--- a/sci-physics/camfr/files/machine_cfg.py.gentoo
+++ b/sci-physics/camfr/files/machine_cfg.py.gentoo
@@ -26,21 +26,6 @@ flags = flags + base_flags
 fflags =  fflags + base_flags
 
 
-include_dirs = []
-
-if os.path.isdir("/usr/include/python2.5"):
-   include_dirs.append("/usr/include/python2.5")   
-   include_dirs.append("/usr/lib/python2.5/site-packages")
-elif os.path.isdir("/usr/include/python2.4"):
-   include_dirs.append("/usr/include/python2.4")
-   include_dirs.append("/usr/lib/python2.4/site-packages")
-elif os.path.isdir("/usr/include/python2.3"):
-   include_dirs.append("/usr/include/python2.3")   
-   include_dirs.append("/usr/lib/python2.3/site-packages")
-else:
-   print "Python dir not found!"
-   sys.exit()
-
 dllsuffix = ".so"
 strip_command = ""
 extra_files = [("doc", ["docs/camfr.pdf"])]