diff options
| author |   Sebastien Fabbro <bicatali@gentoo.org> | 2011-08-06 19:37:36 +0000 |
|---|---|---|
| committer | Sebastien Fabbro <bicatali@gentoo.org> | 2011-08-06 19:37:36 +0000 |
| commit | c02e4d3126096606d8b519bfdab8d757f4197d76 (patch) | |
| tree | bb30f27439feeb83b6b54a5c26be580289cfbddd /dev-python | |
| parent | BSD fixes: Replaced dependency on app-shells/dash with app-shells/bash; Added... (diff) | |
| download | gentoo-2-c02e4d3126096606d8b519bfdab8d757f4197d76.tar.gz gentoo-2-c02e4d3126096606d8b519bfdab8d757f4197d76.tar.bz2 gentoo-2-c02e4d3126096606d8b519bfdab8d757f4197d76.zip | |
upstream patch for newer numpy, bug #376597
(Portage version: 2.1.10.10/cvs/Linux x86_64)
Diffstat (limited to 'dev-python')
| -rw-r--r-- | dev-python/pyamg/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-python/pyamg/files/2.0.0-stencil.patch | 11 | ||||
| -rw-r--r-- | dev-python/pyamg/pyamg-2.0.0.ebuild | 8 |
3 files changed, 22 insertions, 3 deletions
diff --git a/dev-python/pyamg/ChangeLog b/dev-python/pyamg/ChangeLog index eb6fd27fb2e2..d6e5556895f8 100644 --- a/dev-python/pyamg/ChangeLog +++ b/dev-python/pyamg/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-python/pyamg # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pyamg/ChangeLog,v 1.1 2011/07/26 19:09:17 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pyamg/ChangeLog,v 1.2 2011/08/06 19:37:36 bicatali Exp $ + + 06 Aug 2011; Sébastien Fabbro <bicatali@gentoo.org> + +files/2.0.0-stencil.patch, pyamg-2.0.0.ebuild: + upstream patch for newer numpy, bug #376597 26 Jul 2011; Sébastien Fabbro <bicatali@gentoo.org> +pyamg-2.0.0.ebuild, +metadata.xml: diff --git a/dev-python/pyamg/files/2.0.0-stencil.patch b/dev-python/pyamg/files/2.0.0-stencil.patch new file mode 100644 index 000000000000..f000b93709ac --- /dev/null +++ b/dev-python/pyamg/files/2.0.0-stencil.patch @@ -0,0 +1,11 @@ +--- pyamg/gallery/stencil.py.orig 2011-08-06 20:26:36.000000000 +0100 ++++ pyamg/gallery/stencil.py 2011-08-06 20:27:12.000000000 +0100 +@@ -85,7 +85,7 @@ + + # compute index offset of each dof within the stencil + strides = numpy.cumprod( [1] + list(reversed(grid)) )[:-1] +- indices = S.nonzero() ++ indices = tuple(i.copy() for i in S.nonzero()) + for i,s in zip(indices,S.shape): + i -= s // 2 + for stride,coords in zip(strides, reversed(indices)): diff --git a/dev-python/pyamg/pyamg-2.0.0.ebuild b/dev-python/pyamg/pyamg-2.0.0.ebuild index efd0125ca1c9..3508fb69a397 100644 --- a/dev-python/pyamg/pyamg-2.0.0.ebuild +++ b/dev-python/pyamg/pyamg-2.0.0.ebuild @@ -1,13 +1,13 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pyamg/pyamg-2.0.0.ebuild,v 1.1 2011/07/26 19:09:17 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pyamg/pyamg-2.0.0.ebuild,v 1.2 2011/08/06 19:37:36 bicatali Exp $ EAPI=3 PYTHON_DEPEND="*" SUPPORT_PYTHON_ABIS="1" RESTRICT_PYTHON_ABIS="3.*" -inherit distutils +inherit distutils eutils DESCRIPTION="Algebraic multigrid solvers in Python" HOMEPAGE="http://code.google.com/p/pyamg/" @@ -25,6 +25,10 @@ DEPEND="${RDEPEND} doc? ( dev-python/sphinx ) test? ( dev-python/nose )" +src_prepare() { + epatch "${FILESDIR}"/${PV}-stencil.patch +} + src_compile() { distutils_src_compile if use doc; then |