diff options
| author |   Donnie Berkholz <spyderous@gentoo.org> | 2006-06-14 03:02:50 +0000 |
|---|---|---|
| committer | Donnie Berkholz <spyderous@gentoo.org> | 2006-06-14 03:02:50 +0000 |
| commit | 315b6f9a14f83e959f4e276a5069ef17a806ae5f (patch) | |
| tree | 6be9007011308c5f046f3156b1d2829b54212c20 /sci-libs | |
| parent | Clean up old versions (diff) | |
| download | gentoo-2-315b6f9a14f83e959f4e276a5069ef17a806ae5f.tar.gz gentoo-2-315b6f9a14f83e959f4e276a5069ef17a806ae5f.tar.bz2 gentoo-2-315b6f9a14f83e959f4e276a5069ef17a806ae5f.zip | |
Proper fix for new numpy -- just depend on the new numpy, and always fix up the .py files to use the 'old' module. Also fix the python_mod_optimize() call, it was missing /usr in the location and wasn't multilib-friendly.
(Portage version: 2.1)
Diffstat (limited to 'sci-libs')
| -rw-r--r-- | sci-libs/pymmlib/ChangeLog | 7 | ||||
| -rw-r--r-- | sci-libs/pymmlib/pymmlib-0.9.8.ebuild | 20 |
2 files changed, 22 insertions, 5 deletions
diff --git a/sci-libs/pymmlib/ChangeLog b/sci-libs/pymmlib/ChangeLog index 422c4cc2e9b4..0c6401fe33ab 100644 --- a/sci-libs/pymmlib/ChangeLog +++ b/sci-libs/pymmlib/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sci-libs/pymmlib # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/pymmlib/ChangeLog,v 1.6 2006/06/14 01:28:29 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/pymmlib/ChangeLog,v 1.7 2006/06/14 03:02:50 spyderous Exp $ + + 14 Jun 2006; Donnie Berkholz <spyderous@gentoo.org>; pymmlib-0.9.8.ebuild: + Proper fix for new numpy -- just depend on the new numpy, and always fix up + the .py files to use the 'old' module. Also fix the python_mod_optimize() + call, it was missing /usr in the location and wasn't multilib-friendly. 14 Jun 2006; Donnie Berkholz <spyderous@gentoo.org>; pymmlib-0.9.8.ebuild: Force numpy dep to <0.9.8 -- 0.9.8 moves some functions into a deprecated diff --git a/sci-libs/pymmlib/pymmlib-0.9.8.ebuild b/sci-libs/pymmlib/pymmlib-0.9.8.ebuild index 91498d2d6eb7..6da140484f15 100644 --- a/sci-libs/pymmlib/pymmlib-0.9.8.ebuild +++ b/sci-libs/pymmlib/pymmlib-0.9.8.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/pymmlib/pymmlib-0.9.8.ebuild,v 1.2 2006/06/14 01:28:29 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/pymmlib/pymmlib-0.9.8.ebuild,v 1.3 2006/06/14 03:02:50 spyderous Exp $ -inherit python +inherit multilib python DESCRIPTION="Software toolkit and library of routines for the analysis and manipulation of macromolecular structural models" HOMEPAGE="http://pymmlib.sourceforge.net/" @@ -13,7 +13,7 @@ KEYWORDS="~ppc ~x86" IUSE="" RDEPEND="virtual/glut dev-python/pygtkglext - <dev-python/numpy-0.9.8 + >=dev-python/numpy-0.9.8 virtual/opengl virtual/glu || ( x11-libs/libXmu virtual/x11 )" @@ -28,8 +28,20 @@ src_install() { dobin ${S}/applications/* ${S}/examples/* dodoc ${S}/README.txt dohtml -r ${S}/doc + + # numpy >= 0.9.8 moved lost of numpy.linalg methods to numpy.linalg.old + local b="numpy.linalg" + ebegin "Updating for numpy >= 0.9.8" + find ${D} -name '*.py' \ + | xargs sed -i \ + -e "s:\(${b}.\)\(determinant\):\1old.\2:g" \ + -e "s:\(${b}.\)\(eigenvalues\):\1old.\2:g" \ + -e "s:\(${b}.\)\(eigenvectors\):\1old.\2:g" \ + -e "s:\(${b}.\)\(inverse\):\1old.\2:g" \ + -e "s:\(import numpy\):\1\nimport numpy.linalg.old:g" + eend $? } pkg_postinst() { - python_mod_optimize ${ROOT}lib/python2.4/site-packages/mmLib + python_mod_optimize ${ROOT}usr/$(get_libdir)/python2.4/site-packages/mmLib } |