Added a patch to use netcdf with mpi, thanks xarthisius, bug #303160.

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

4 files changed, 49 insertions, 5 deletions

diff --git a/dev-python/scientificpython/ChangeLog b/dev-python/scientificpython/ChangeLog
index 7837bb5c354a..9207ffbf44d0 100644
--- a/dev-python/scientificpython/ChangeLog
+++ b/dev-python/scientificpython/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/scientificpython
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/scientificpython/ChangeLog,v 1.28 2010/01/17 18:51:16 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/scientificpython/ChangeLog,v 1.29 2010/02/02 17:02:19 bicatali Exp $
+
+  02 Feb 2010; Sébastien Fabbro <bicatali@gentoo.org>
+  scientificpython-2.9.ebuild, +files/scientificpython-2.9-mpi-netcdf.patch:
+  Added a patch to use netcdf with mpi, thanks xarthisius, bug #303160.
 
   17 Jan 2010; Raúl Porcel <armin76@gentoo.org>
   scientificpython-2.9.ebuild:
diff --git a/dev-python/scientificpython/Manifest b/dev-python/scientificpython/Manifest
index 485a4007b161..387d122e93d9 100644
--- a/dev-python/scientificpython/Manifest
+++ b/dev-python/scientificpython/Manifest
@@ -1,5 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX scientificpython-2.9-mpi-netcdf.patch 1350 RMD160 c7b7b91806567b1f2c315d5b98512482a1f2a6d5 SHA1 666a6ecaa0de00ab890744d340f1fe372707117b SHA256 923952fac690c8adfca49d17bccb9d6d0a77810fc7adbafccb9af85251b1c2fd
 AUX scientificpython-2.9-mpi.patch 1176 RMD160 cad462654d528591ce8dbf185cf21c14a58c31e0 SHA1 1f327805854e76ac8123f2b4f9ac0ce4cf05375b SHA256 de665a5fbf474253a1fff8b5a929cd68165e5d6dd0d9e0fe52b4ecd39bedc43f
 DIST ScientificPython-2.9.tar.gz 593720 RMD160 2533879b64fcb17027b11784fc0cff4351284c98 SHA1 60fb1ec7c31c86b7e7a068ccda780197e1e95ad8 SHA256 4ffc33f211b9dc811af0aa82b74453f73c7f415c04352ac1cef92b95b12b74be
-EBUILD scientificpython-2.9.ebuild 2127 RMD160 443a96a7fdf15aad9266c607e9972fd8a91b14be SHA1 a8cb8c19408c73cb78acad3ee58b8fb6d18efc14 SHA256 0de0f5f14f69e71e6060b2f5037628a2b70c55517364ad537215be453fb5df23
-MISC ChangeLog 6395 RMD160 21fae71562d3f85554ce54da334346703b0a7475 SHA1 81f622f72ed7c02004bfb7df7242aff9bd12db1d SHA256 e900e259cad3596ca86f707c44ca4cea74224ca177cd0f8316547220e21376df
+EBUILD scientificpython-2.9.ebuild 2189 RMD160 2890735975f95b7f415b254caeba8a9c0cffa661 SHA1 524242f308cea773a185794343e5b3ad632d0a16 SHA256 c095e6ec7e00b3336734419b6d6b770992b30c723fbbe1f403b481d063a05fc5
+MISC ChangeLog 6601 RMD160 d6f0c25358a5541ccf76df37891c60d41d14f41c SHA1 11797d2d54b62916492f49b8fbb0bcc0d22a810a SHA256 5f1914c95fbd02a44bba58fb44588dfd0275a70a87a26a325d84d1f410c3de2b
 MISC metadata.xml 734 RMD160 47baa4ca9756eff5e19c8f7b18f18054d5c3e1aa SHA1 aa3adb4221bc8997d68d01afa2ca8528ab579baf SHA256 6749ecfd7ae3f2ed8e9da27ad372d9f35023cdf3ea7ab0976b829460b1d03b2f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAktoWqQACgkQ1ycZbhPLE2ApLACcC6Gkay5beaVDTmsjqds74S1M
+Oh0AnR3s2PTt8l2z/C+vCvsGr2aIHjG5
+=HSJT
+-----END PGP SIGNATURE-----
diff --git a/dev-python/scientificpython/files/scientificpython-2.9-mpi-netcdf.patch b/dev-python/scientificpython/files/scientificpython-2.9-mpi-netcdf.patch
new file mode 100644
index 000000000000..81a1bc31a3df
--- /dev/null
+++ b/dev-python/scientificpython/files/scientificpython-2.9-mpi-netcdf.patch
@@ -0,0 +1,28 @@
+--- ScientificPython-2.9.0.orig/setup.py	2008-10-28 14:52:30.000000000 +0100
++++ ScientificPython-2.9.0/setup.py	2010-02-02 14:58:55.029160416 +0100
+@@ -3,6 +3,7 @@
+ from distutils.core import setup, Extension
+ from distutils.command.install_headers import install_headers
+ import os, sys
++from subprocess import Popen, PIPE
+ from glob import glob
+ 
+ class Dummy:
+@@ -106,6 +107,8 @@
+     else:
+         print "Using netCDF installation in ", netcdf_prefix
+         netcdf_include = os.path.join(netcdf_prefix, 'include')
++        mpi_ccflags = Popen(["mpicc", "-showme:compile"], stdout=PIPE).communicate()[0].rstrip().split()
++        mpi_ldflags = Popen(["mpicc", "-showme:link"], stdout=PIPE).communicate()[0].rstrip().split()
+         netcdf_h_file = os.path.join(netcdf_prefix, 'include', 'netcdf.h')
+         netcdf_lib = os.path.join(netcdf_prefix, 'lib')
+     ext_modules = [Extension('Scientific_netcdf',
+@@ -114,7 +117,7 @@
+                                           + arrayobject_h_include,
+                              library_dirs=[netcdf_lib],
+                              libraries = ['netcdf'],
+-                             extra_compile_args=extra_compile_args)]
++                             extra_compile_args=extra_compile_args + mpi_ccflags +mpi_ldflags )]
+ 
+ try:
+     # Add code for including documentation in Mac packages
diff --git a/dev-python/scientificpython/scientificpython-2.9.ebuild b/dev-python/scientificpython/scientificpython-2.9.ebuild
index 02ee9cf55aeb..2887519489ef 100644
--- a/dev-python/scientificpython/scientificpython-2.9.ebuild
+++ b/dev-python/scientificpython/scientificpython-2.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/scientificpython/scientificpython-2.9.ebuild,v 1.7 2010/01/17 18:51:16 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/scientificpython/scientificpython-2.9.ebuild,v 1.8 2010/02/02 17:02:19 bicatali Exp $
 
 EAPI="2"
 SUPPORT_PYTHON_ABIS="1"
@@ -20,7 +20,7 @@ KEYWORDS="alpha amd64 ia64 ppc sparc x86"
 IUSE="doc mpi test"
 
 RDEPEND="dev-python/numpy
-	sci-libs/netcdf
+	sci-libs/netcdf[mpi=]
 	mpi? ( virtual/mpi )"
 DEPEND="${RDEPEND}
 	test? ( dev-python/nose )"
@@ -33,6 +33,7 @@ PYTHON_MODNAME="Scientific"
 src_prepare() {
 	distutils_src_prepare
 	epatch "${FILESDIR}/${P}-mpi.patch"
+	use mpi && epatch "${FILESDIR}/${P}-mpi-netcdf.patch"
 }
 
 src_compile() {