summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastien Fabbro <bicatali@gentoo.org>2010-02-25 04:05:52 +0000
committerSebastien Fabbro <bicatali@gentoo.org>2010-02-25 04:05:52 +0000
commit6fb26c8b7e5c02026cfde95df44f45a1fd9916db (patch)
treeb260bb7aac0eb71d1b95bb1de24e484f92637234 /sci-libs
parentInitial 2.6.33 release including the fbcondecor patch, a patch to enable cont... (diff)
downloadhistorical-6fb26c8b7e5c02026cfde95df44f45a1fd9916db.tar.gz
historical-6fb26c8b7e5c02026cfde95df44f45a1fd9916db.tar.bz2
historical-6fb26c8b7e5c02026cfde95df44f45a1fd9916db.zip
Added a patch for a working weave, bug #304799
Package-Manager: portage-2.2_rc63/cvs/Linux x86_64
Diffstat (limited to 'sci-libs')
-rw-r--r--sci-libs/scipy/ChangeLog6
-rw-r--r--sci-libs/scipy/Manifest15
-rw-r--r--sci-libs/scipy/files/scipy-0.7.1-weave.patch12
-rw-r--r--sci-libs/scipy/scipy-0.7.1.ebuild5
4 files changed, 33 insertions, 5 deletions
diff --git a/sci-libs/scipy/ChangeLog b/sci-libs/scipy/ChangeLog
index ea6f0099f7d8..69b61d0de865 100644
--- a/sci-libs/scipy/ChangeLog
+++ b/sci-libs/scipy/ChangeLog
@@ -1,6 +1,10 @@
# 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.48 2010/02/03 20:39:05 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/ChangeLog,v 1.49 2010/02/25 04:05:51 bicatali Exp $
+
+ 25 Feb 2010; SĂ©bastien Fabbro <bicatali@gentoo.org> scipy-0.7.1.ebuild,
+ +files/scipy-0.7.1-weave.patch:
+ Added a patch for a working weave, bug #304799
03 Feb 2010; Markos Chandras <hwoarang@gentoo.org> scipy-0.7.1.ebuild:
Stable on amd64 wrt bug #270478
diff --git a/sci-libs/scipy/Manifest b/sci-libs/scipy/Manifest
index baf28dda6af0..08ae713fc885 100644
--- a/sci-libs/scipy/Manifest
+++ b/sci-libs/scipy/Manifest
@@ -1,8 +1,19 @@
+-----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
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.1.tar.gz 4538765 RMD160 b3cb0b40a739cd8b61182f123581d57443b9401a SHA1 ab637e29743cc0c42903a8815043f85d13fb9e42 SHA256 08830d6363a8753ca1376dd22da86d164902711c5feaf0f768b5ee086b3ecd5f
-EBUILD scipy-0.7.1.ebuild 4169 RMD160 a1b72d10e88ee827537c5b9b7295cc19d3cdb069 SHA1 9dee5dd04e34783cc5f0e441328b61ea5f2d6e4a SHA256 3befcb2b47ab6a85ad97bab5f56c73516ae70cd70fd433271310baaf37857882
-MISC ChangeLog 10386 RMD160 26df902cf532645307b49821813fb362e3e7267b SHA1 8a8e88b8114e8ce998f6ce30b801f00acea48927 SHA256 d11ad0b897816f6dd01ca2bb606dace4ceb7e1e27a62063f1aba590148564db3
+EBUILD scipy-0.7.1.ebuild 4195 RMD160 72f93ae8bfffe053eaf72917c0cbbc8be6c5da53 SHA1 3fb0e1814785c4e5704ee44b1d0c1d9f169de469 SHA256 8c3b22e3871b3034ad9a03fe3e0e2caba3f6eef1668be68875f811e5bdcaa2ce
+MISC ChangeLog 10545 RMD160 5ea4fb740a1c670908eb7de5cadc4c07fd37ba4e SHA1 497c95af71959f9d4bb745aa90b4c2270dd64f90 SHA256 ee5f96d612d4a8c90bfd26b79e9759827fe873397bd512e381bf18a28c03bc13
MISC metadata.xml 697 RMD160 05eb973594c8fe27be71e813f2a2294cf9e3f46e SHA1 1dbbb06751c0fc5760618d8998f9d169b3f774ae SHA256 1bfca083b6aa7c4fbd95b638daa2158b2eaa5cb93fe7a99abe9a2bc08b21e48e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAkuF9ygACgkQ1ycZbhPLE2Cu4wCcDUA8McTlElnlelQa2rECcPgk
+06MAn1194ufk+9EOtEmiRgT1AMDg4bLU
+=uXcn
+-----END PGP SIGNATURE-----
diff --git a/sci-libs/scipy/files/scipy-0.7.1-weave.patch b/sci-libs/scipy/files/scipy-0.7.1-weave.patch
new file mode 100644
index 000000000000..56d29f2addac
--- /dev/null
+++ b/sci-libs/scipy/files/scipy-0.7.1-weave.patch
@@ -0,0 +1,12 @@
+Index: /trunk/scipy/io/dumbdbm_patched.py
+===================================================================
+--- /trunk/scipy/io/dumbdbm_patched.py (revision 3521)
++++ /trunk/scipy/io/dumbdbm_patched.py (revision 5967)
+@@ -78,4 +78,7 @@
+ return dat
+
++ def __contains__(self, key):
++ return key in self._index
++
+ def _addval(self, val):
+ f = _open(self._datfile, 'rb+')
diff --git a/sci-libs/scipy/scipy-0.7.1.ebuild b/sci-libs/scipy/scipy-0.7.1.ebuild
index 0e8730f9c0e6..825b46474acb 100644
--- a/sci-libs/scipy/scipy-0.7.1.ebuild
+++ b/sci-libs/scipy/scipy-0.7.1.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/sci-libs/scipy/scipy-0.7.1.ebuild,v 1.8 2010/02/03 20:39:05 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/scipy-0.7.1.ebuild,v 1.9 2010/02/25 04:05:51 bicatali Exp $
EAPI="2"
NEED_PYTHON="2.4"
@@ -22,7 +22,7 @@ LICENSE="BSD"
SLOT="0"
IUSE="doc umfpack"
-#IUSE="test umfpack"
+
KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
CDEPEND=">=dev-python/numpy-1.2
@@ -71,6 +71,7 @@ src_unpack() {
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
cat > site.cfg <<-EOF
[DEFAULT]
library_dirs = /usr/$(get_libdir)