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 | ed3565b129a9cc9f2718f989b5a31e6a1c2767ee (patch) | |
| tree | 4df231e7cbd23b548e8fed0e9bed4d1f4db7fe62 /dev-python | |
| parent | BSD fixes: Replaced dependency on app-shells/dash with app-shells/bash; Added... (diff) | |
| download | historical-ed3565b129a9cc9f2718f989b5a31e6a1c2767ee.tar.gz historical-ed3565b129a9cc9f2718f989b5a31e6a1c2767ee.tar.bz2 historical-ed3565b129a9cc9f2718f989b5a31e6a1c2767ee.zip | |
upstream patch for newer numpy, bug #376597
Package-Manager: portage-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/Manifest | 13 | ||||
| -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 |
4 files changed, 29 insertions, 9 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/Manifest b/dev-python/pyamg/Manifest index c3a8df05782f..61c37d195af5 100644 --- a/dev-python/pyamg/Manifest +++ b/dev-python/pyamg/Manifest @@ -1,14 +1,15 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 +AUX 2.0.0-stencil.patch 475 RMD160 91e2e27495428887d2d677db91d0a25c6c22c8b8 SHA1 12a019bd389c5bba7cc8c9e0faaa8bfcb67c20c1 SHA256 f0aed9693fde0f7ae053c324996d0ae18b8c7aa1d4e50def11977dae399cd155 DIST pyamg-2.0.0.tar.gz 1364498 RMD160 4de005d7716042e0e90877996564de14c60455fd SHA1 ffb7fef3f29b5aeb0b2ff3155ee871e865d9fb00 SHA256 293e85e61b245f034e2346d9ecc476e084148fa68084eab267cffdd269f30c2b -EBUILD pyamg-2.0.0.ebuild 1297 RMD160 501b7906ab3e2ba37fb38af4889c9b64ed06049c SHA1 6d3a853e4ddddb08dc3468f830754549875c542a SHA256 a5803b4bb6122068dad33c638c16ac1326f1dc165a334bba85ef5cbcc43b7561 -MISC ChangeLog 633 RMD160 3e58e517c38b1f45e4f452cf6c106c05cba36346 SHA1 b253ad0202127583c3ae86ea7ac59d658ada5411 SHA256 2d3df61ad410db2171309fccbc4f988d72121bffff9a2ac7c65c1e5a1911ec50 +EBUILD pyamg-2.0.0.ebuild 1365 RMD160 7dbb491e7d4db4be1db424b05ba0db36af73e5ae SHA1 c9b4cecbbc1dac9ac1277efdf7a3ebf111c84145 SHA256 4ac6887231d4665c2b57b51092e429fbd13ee2d4bda4c4afb9b41649bf8a82da +MISC ChangeLog 785 RMD160 ba2f2e1e0a58ca1585f85723334be7eea5fc6828 SHA1 7bdf77e592bc573e9d6a7b810048ae19526baa43 SHA256 bb6e4ffd96a9b86846ea385f238810ea628eabc133b5a40a9324d717eb9d3a95 MISC metadata.xml 972 RMD160 21aee9bd738add10d04bf9520162b0ed6cbcb188 SHA1 8d4fff40f607044a8f157cc41645d13675aa7f38 SHA256 b9cc96bfec5b7d61edff3e321eaa59a7d815c61049087e117476b53ffe15714c -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.18 (GNU/Linux) -iEYEARECAAYFAk4vEOYACgkQ1ycZbhPLE2Al2ACgjAe5Drlh5yZfCaBcEx1QsP20 -5KgAoI1wYxjWks7sxgcnUcJPZVBgKSa6 -=cQdP +iEYEARECAAYFAk49mCgACgkQ1ycZbhPLE2B5+QCdG3RoOxZauBmF8lwEoi6MALOQ +bxcAoIN1h/jg5k7gL0/WLIRLn3Y3uZ9v +=/Xvl -----END PGP SIGNATURE----- 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 |