Apply upstream patches to fix build with python2.7. Fixes bug 321587

(Portage version: 2.2_rc67/cvs/Linux x86_64)

5 files changed, 65 insertions, 7 deletions

diff --git a/sci-libs/scipy/ChangeLog b/sci-libs/scipy/ChangeLog
index 4bee0de58480..3089f8d41b6a 100644
--- a/sci-libs/scipy/ChangeLog
+++ b/sci-libs/scipy/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/scipy
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/ChangeLog,v 1.57 2010/08/03 11:45:54 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/ChangeLog,v 1.58 2010/08/03 13:40:45 xarthisius Exp $
+
+  03 Aug 2010; Kacper Kowalik <xarthisius@gentoo.org> scipy-0.7.2-r1.ebuild,
+  +files/scipy-0.7.2-python2.7.patch, scipy-0.8.0.ebuild,
+  +files/scipy-0.8.0-python2.7.patch:
+  Apply upstream patches to fix build with python2.7. Fixes bug 321587
 
 *scipy-0.8.0 (03 Aug 2010)
 
diff --git a/sci-libs/scipy/files/scipy-0.7.2-python2.7.patch b/sci-libs/scipy/files/scipy-0.7.2-python2.7.patch
new file mode 100644
index 000000000000..13dbd4caaef3
--- /dev/null
+++ b/sci-libs/scipy/files/scipy-0.7.2-python2.7.patch
@@ -0,0 +1,26 @@
+http://projects.scipy.org/scipy/changeset/6645
+
+--- scipy/sparse/sparsetools/setup.py
++++ scipy/sparse/sparsetools/setup.py
+@@ -8,7 +8,10 @@
+ 
+     for fmt in ['csr','csc','coo','bsr','dia']:
+         sources = [ fmt + '_wrap.cxx' ]
+-        config.add_extension('_' + fmt, sources=sources)
++        depends = [ fmt + '.h' ]
++        config.add_extension('_' + fmt, sources=sources,
++		define_macros=[('__STDC_FORMAT_MACROS', 1)],
++		depends=depends)
+ 
+     return config
+ 
+--- scipy/sparse/sparsetools/SConscript
++++ scipy/sparse/sparsetools/SConscript
+@@ -3,6 +3,7 @@
+ from numscons import GetNumpyEnvironment
+ 
+ env = GetNumpyEnvironment(ARGUMENTS)
++env.PrependUnique(CPPDEFINES = '__STDC_FORMAT_MACROS')
+ 
+ for fmt in ['csr','csc','coo','bsr','dia']:
+     sources = [ fmt + '_wrap.cxx' ]
diff --git a/sci-libs/scipy/files/scipy-0.8.0-python2.7.patch b/sci-libs/scipy/files/scipy-0.8.0-python2.7.patch
new file mode 100644
index 000000000000..e6933f0cf18b
--- /dev/null
+++ b/sci-libs/scipy/files/scipy-0.8.0-python2.7.patch
@@ -0,0 +1,25 @@
+http://projects.scipy.org/scipy/changeset/6646
+
+--- scipy/sparse/sparsetools/setup.py
++++ scipy/sparse/sparsetools/setup.py
+@@ -9,7 +9,9 @@
+     for fmt in ['csr','csc','coo','bsr','dia']:
+         sources = [ fmt + '_wrap.cxx' ]
+         depends = [ fmt + '.h' ]
+-        config.add_extension('_' + fmt, sources=sources, depends=depends)
++        config.add_extension('_' + fmt, sources=sources,
++            define_macros=[('__STDC_FORMAT_MACROS', 1)],
++            depends=depends)
+ 
+     return config
+ 
+--- scipy/sparse/sparsetools/SConscript
++++ scipy/sparse/sparsetools/SConscript
+@@ -3,6 +3,7 @@
+ from numscons import GetNumpyEnvironment
+ 
+ env = GetNumpyEnvironment(ARGUMENTS)
++env.PrependUnique(CPPDEFINES = '__STDC_FORMAT_MACROS')
+ 
+ for fmt in ['csr','csc','coo','bsr','dia']:
+     sources = [ fmt + '_wrap.cxx' ]
diff --git a/sci-libs/scipy/scipy-0.7.2-r1.ebuild b/sci-libs/scipy/scipy-0.7.2-r1.ebuild
index b2cd7652c285..8e4e1d637791 100644
--- a/sci-libs/scipy/scipy-0.7.2-r1.ebuild
+++ b/sci-libs/scipy/scipy-0.7.2-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/scipy-0.7.2-r1.ebuild,v 1.6 2010/07/13 17:04:16 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/scipy-0.7.2-r1.ebuild,v 1.7 2010/08/03 13:40:45 xarthisius Exp $
 
 EAPI="2"
 PYTHON_DEPEND="2"
 SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.7 3.*"
+RESTRICT_PYTHON_ABIS="3.*"
 
 inherit eutils distutils flag-o-matic toolchain-funcs versionator
 
@@ -72,7 +72,8 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-0.7.0_beta1-implicit.patch
 	epatch "${FILESDIR}"/${PN}-0.6.0-stsci.patch
 	epatch "${FILESDIR}"/${PN}-0.7.1-weave.patch
-	epatch "${FILESDIR}"/${PN}-0.7.2-optimize.patch
+	epatch "${FILESDIR}"/${PN}-0.7.2-optimize.patch \
+		"${FILESDIR}"/${P}-python2.7.patch
 	local libdir="${EPREFIX}"/usr/$(get_libdir)
 	cat > site.cfg <<-EOF
 		[atlas]
diff --git a/sci-libs/scipy/scipy-0.8.0.ebuild b/sci-libs/scipy/scipy-0.8.0.ebuild
index ba23142ae918..0fc6d1cfff6c 100644
--- a/sci-libs/scipy/scipy-0.8.0.ebuild
+++ b/sci-libs/scipy/scipy-0.8.0.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/scipy-0.8.0.ebuild,v 1.1 2010/08/03 11:45:54 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/scipy-0.8.0.ebuild,v 1.2 2010/08/03 13:40:45 xarthisius Exp $
 
 EAPI="2"
 PYTHON_DEPEND="2"
 SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.7 3.*"
+RESTRICT_PYTHON_ABIS="3.*"
 
 inherit eutils distutils flag-o-matic toolchain-funcs versionator
 
@@ -68,7 +68,8 @@ src_unpack() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.6.0-stsci.patch
+	epatch "${FILESDIR}"/${PN}-0.6.0-stsci.patch \
+		"${FILESDIR}"/${P}-python2.7.patch
 	local libdir="${EPREFIX}"/usr/$(get_libdir)
 	cat > site.cfg <<-EOF
 		[atlas]