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.

Package-Manager: portage-2.1

3 files changed, 30 insertions, 13 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/Manifest b/sci-libs/pymmlib/Manifest
index 57b5c95a0ae7..d6d82f58007a 100644
--- a/sci-libs/pymmlib/Manifest
+++ b/sci-libs/pymmlib/Manifest
@@ -4,14 +4,14 @@ EBUILD pymmlib-0.9.7.ebuild 986 RMD160 2a827e07acf57bc9a0c7123e1e3c75e519ff3280
 MD5 74b33f7b36742536bcfb5173c3fe6b3e pymmlib-0.9.7.ebuild 986
 RMD160 2a827e07acf57bc9a0c7123e1e3c75e519ff3280 pymmlib-0.9.7.ebuild 986
 SHA256 f4d8bb67f0966641b5096b8a3c150c03510dd5c95e3ce3d872ba7586adbcd319 pymmlib-0.9.7.ebuild 986
-EBUILD pymmlib-0.9.8.ebuild 991 RMD160 56efd90681b1563e053805ea28bcf901e26c5ed5 SHA1 35ca3f7f3cb113751830cfc93becc2b9b07091a6 SHA256 5b52aba1833af6db900f88b656a7f869774c66119aba5ec2b599cbeb34e29dc0
-MD5 be287e0b85a226b9c0b73534d369a3de pymmlib-0.9.8.ebuild 991
-RMD160 56efd90681b1563e053805ea28bcf901e26c5ed5 pymmlib-0.9.8.ebuild 991
-SHA256 5b52aba1833af6db900f88b656a7f869774c66119aba5ec2b599cbeb34e29dc0 pymmlib-0.9.8.ebuild 991
-MISC ChangeLog 1163 RMD160 ba9aa2081c8afb149c4d6297616d86a42c8cc5ef SHA1 9378e5a6ee711c16d19428df6bc63f293ffcd0a6 SHA256 a0c12dcaadd0122fce2e14c276bfed15d3bf207edeeaf408273e32997ec77d30
-MD5 789a6eec6d360ef24b6c12b879943c7c ChangeLog 1163
-RMD160 ba9aa2081c8afb149c4d6297616d86a42c8cc5ef ChangeLog 1163
-SHA256 a0c12dcaadd0122fce2e14c276bfed15d3bf207edeeaf408273e32997ec77d30 ChangeLog 1163
+EBUILD pymmlib-0.9.8.ebuild 1445 RMD160 2b161241e982ee40d92c3ad6968052d636fb68c8 SHA1 07b4955d74b5738a7b1dfa6e4d9eea7cc7a98a49 SHA256 e7ee03142409e68660f51f86fe93b583590d3dd83f4a9bc7c329d59b0932d024
+MD5 cdf09b80d7347eeaf7aa4b8328f72f8b pymmlib-0.9.8.ebuild 1445
+RMD160 2b161241e982ee40d92c3ad6968052d636fb68c8 pymmlib-0.9.8.ebuild 1445
+SHA256 e7ee03142409e68660f51f86fe93b583590d3dd83f4a9bc7c329d59b0932d024 pymmlib-0.9.8.ebuild 1445
+MISC ChangeLog 1469 RMD160 82e0a8e6bced50c95aef9050a4dcb43b9204321f SHA1 ffc90a3345ee1bb976866055e5710ed22f3ebed2 SHA256 d01a1f1a2a24a384809fd2983c8250b3de216192e574969a67f58d61e9879c94
+MD5 81b860fb33a925948a2459782990c2d5 ChangeLog 1469
+RMD160 82e0a8e6bced50c95aef9050a4dcb43b9204321f ChangeLog 1469
+SHA256 d01a1f1a2a24a384809fd2983c8250b3de216192e574969a67f58d61e9879c94 ChangeLog 1469
 MISC metadata.xml 248 RMD160 6488d9f1ef3e05e6ac5a29ddcc818e5ead0a5230 SHA1 75a648fddef9922cdfe21fb0298a1c746190fd82 SHA256 de0ad7dc383b462c407cae015684d27c090455eac87c6f0f9ff581ef6e0b5b27
 MD5 af1bfbb0777267a03e889b08173f2757 metadata.xml 248
 RMD160 6488d9f1ef3e05e6ac5a29ddcc818e5ead0a5230 metadata.xml 248
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
 }