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

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

6 files changed, 70 insertions, 20 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/Manifest b/sci-libs/scipy/Manifest
index 27d186bfcd08..f1c0ee6d9341 100644
--- a/sci-libs/scipy/Manifest
+++ b/sci-libs/scipy/Manifest
@@ -1,24 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX scipy-0.6.0-stsci.patch 2209 RMD160 c7c21a23aef7fff9318f224ef2383f7970c1caf9 SHA1 4b86ad61346660959a61dce24b2b9f20595ea473 SHA256 69cec7cfedbc39a30f54ec12852a84017b5a256e966e60a64b4e891b497fd1be
 AUX scipy-0.7.0_beta1-implicit.patch 905 RMD160 a22d5b5c7a67b3a806b63d7708654562fc241300 SHA1 40239fd3a77dc6f8cf9914a266953fd7b4ef41fe SHA256 cbde48ba3e22ef994b4ae0744c6186ef6d3ec608a74b3d0082f22d0be9591b96
 AUX scipy-0.7.1-weave.patch 413 RMD160 ef71432902d2ae914a9c5fbccf23ee4bb5f77802 SHA1 1f0d07591984be705ec9fb71c9d776e2a4eae25b SHA256 8f9d18c5dbf9cae951ae6d64530650e88f0109fa98d8d2e9e896e0c856a9eaa5
 AUX scipy-0.7.2-optimize.patch 1878 RMD160 59e8da9aa98c803683dd61889c9c93d5a8eaac13 SHA1 33bb4b2df3b21a8ad7211ae6de7f4224264c162e SHA256 8ea93099edd954625a272dd216cd462f5281f9b93ccfa89ec97720ee7b08ce12
+AUX scipy-0.7.2-python2.7.patch 792 RMD160 453dab01a79a3163f348750bade6537862a62339 SHA1 148e6ffda6b3eee61c574b6c99db625ae7eaa82e SHA256 286058b4c798ccad499ebdeaddef70467f0b00af12810bf9ee96e30b0f1f2cb1
+AUX scipy-0.8.0-python2.7.patch 826 RMD160 9c4cf8bb36e22dd1602fb14b4af5731692b43f9f SHA1 5b7f8a55c67d28448480a211d62379368c029df4 SHA256 cebe98b2a0f755516a154f43f99297a2a654b06b976d97db877b609d0ff0a346
 DIST scipy-0.7-html.zip 5723344 RMD160 2629be4420fcad20bd7d9f080e01e4dcf7639c10 SHA1 3db044ef8603578e15754ae890a6e2fddcdadae9 SHA256 35e2e4e4a7aaba8c348175366c120b1a802951abe50af10458c532631e0133bb
 DIST scipy-0.7-ref.pdf 3380649 RMD160 88bda2a06bc20627afbb0354fbe57c1b82dda7eb SHA1 091e1df2d28ee85428c50ee268db56146be96746 SHA256 4acbd75979fabfea9ff9d0cf60e06520c1f4d372f5369add8294f72303d3d0e0
 DIST scipy-0.7.2.tar.gz 4557178 RMD160 456e4ab9d69f9d4056bca6b52474b72bea37b122 SHA1 c3223df023008ee339cf1d3fad74d4566af69c8a SHA256 cae80f12e8b8e72fb2ca2007077e3948af9abc6f2011fe01a68137aea0ef46be
 DIST scipy-0.8-html.zip 6570421 RMD160 718a919f095e619a3669c30b3b77816500687daa SHA1 4d9e8e3bc04a3d5aec54b77c4acf36be46af342a SHA256 fd4f0a268cb0c4ca7f1b03da0036e342c06cb2dacf3eda3b893cb759e6655f7e
 DIST scipy-0.8-ref.pdf 4561020 RMD160 e748733add18a452753d2a6ec1a1084024e87756 SHA1 0ccd530749b05f56ee1372e9461ebe99810d1472 SHA256 0715c01702ac7302487544600e16870ef12027c121af336c3ae9bae03e9fd41b
 DIST scipy-0.8.0.tar.gz 5560625 RMD160 cce915a5760f9bcf4cc39381cb01d1a5726a57f3 SHA1 d7a84e5dc440d05e4d198411a2e0c6b8ec9adfc5 SHA256 b12937bd3a71ace8d7d6b7e19f8f220630969c2822e6248fc0bbc8f2cc18d825
-EBUILD scipy-0.7.2-r1.ebuild 4248 RMD160 2b86430a78e72347a05330babb7826bb78028905 SHA1 644d5a4251d5579fdc0a8009b3f91ead8610cf3f SHA256 7612c39ff887665322fa4c1eeab814eb1673fc40b31e05f653b10caa545d6c19
-EBUILD scipy-0.8.0.ebuild 4083 RMD160 20ccd494ba873ca63122e9f1e2170d0128939675 SHA1 d65bac85224868da70bf6b618f0c843e361dce71 SHA256 d65886f8d94e806a1043ae300408df9e4e1a403b676e170539fda5b28841b316
-MISC ChangeLog 11757 RMD160 d5d723a10964f3913aadaee7a395980b7af833ba SHA1 101ff3e5a1124b90875673dc758889235c6ea239 SHA256 eb578c9a1c1477c21688de399d99493e42afc23dfae17951f5bf8f58e931da07
+EBUILD scipy-0.7.2-r1.ebuild 4285 RMD160 d8eb110a2086eef9e39b79f242a898c1bacb92b8 SHA1 d0158270b6f63ea95d128d95b75ff1ecb1d49867 SHA256 3377b43d087ded50c9e5b7732d5af3dd66e6093ddd5edcd72f12019c0fc025ca
+EBUILD scipy-0.8.0.ebuild 4124 RMD160 240e972cb0bc407d05b341a4a167c70136330f26 SHA1 223146d985253ddc042f2091d7f1dfd2e6e1d143 SHA256 8666992a2bb78865b59863844bee271c4550f6244e5368194456de7b89cadb32
+MISC ChangeLog 12008 RMD160 0f1365c61ace6905a557e3de48775edd22fe0c2a SHA1 cb31dcdd76c1c6808536469e69fedc62f28e19d1 SHA256 2f6544279d4538d1dc01dd564ec84702b496e5ef5e4ad537eca4dadac0527025
 MISC metadata.xml 697 RMD160 05eb973594c8fe27be71e813f2a2294cf9e3f46e SHA1 1dbbb06751c0fc5760618d8998f9d169b3f774ae SHA256 1bfca083b6aa7c4fbd95b638daa2158b2eaa5cb93fe7a99abe9a2bc08b21e48e
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkxYAXgACgkQgAnW8HDreRbPRACfR1Qb7YGE4XIo3MkGUa+AEH9R
-qCcAn23FjS2g8Ii72UxNdB4tyLo8R6/H
-=Z6nZ
------END PGP SIGNATURE-----
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]