Included fixes for atlas, #386531; thanks My Th for the patch

Package-Manager: portage-2.2.0_alpha71/cvs/Linux x86_64

4 files changed, 29 insertions, 39 deletions

diff --git a/dev-python/numpy/ChangeLog b/dev-python/numpy/ChangeLog
index b26e46ee9b82..4eab1ae3ed94 100644
--- a/dev-python/numpy/ChangeLog
+++ b/dev-python/numpy/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/numpy
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.153 2011/10/07 15:36:33 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.154 2011/10/27 17:21:04 jlec Exp $
+
+  27 Oct 2011; Justin Lecher <jlec@gentoo.org> numpy-1.6.1-r1.ebuild,
+  files/numpy-1.6.1-atlas.patch:
+  Included fixes for atlas, #386531; thanks My Th for the patch 
 
 *numpy-1.6.1-r1 (07 Oct 2011)
 
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index a2df2fe949e5..7a981f7d6ba1 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -5,7 +5,7 @@ AUX numpy-1.1.0-f2py.patch 1123 RMD160 ff90313cbe8282ac37b0cb98effa0ff6a03760c2
 AUX numpy-1.3.0-fenv-freebsd.patch 1177 RMD160 78a84e18836472bd9c657771c43a44e417ec3e19 SHA1 4dba898255df4784eac9e52633307991c12029de SHA256 2fa3ed9fdeb9dc529d51da4ba8a3a7ea4cc4bb9998fffa66426b1606f2c637b5
 AUX numpy-1.4.0-interix.patch 478 RMD160 9a0290253238e09b824069d0026a5d2f00c90a8f SHA1 261e45c3feb068f033eed9b6468f5115ea418ca5 SHA256 4d6adcc1c66aa1399871c37f57e94ae7138c157ee5575945e83224a36c98c142
 AUX numpy-1.5.1-python-3.2.patch 971 RMD160 7e6ba80d2932279a45340a1d74f89051bbef1f0d SHA1 56fd29f930febd7b4339a821d268470fe41b67a1 SHA256 8add395a3f0a7e381fb96691024d7e2e1e062e2f3a1be8ffccbaf0cc060b4735
-AUX numpy-1.6.1-atlas.patch 712 RMD160 2d13370bebb386b0bc432e344c698309e5e02749 SHA1 dca75ad2e57368b980bcdb4e7fb4da87148f7ae5 SHA256 ceb741ba1383e8c3a05abfbcf67c9fde377d1f53ea93772214e8dfb7c0359705
+AUX numpy-1.6.1-atlas.patch 829 RMD160 111f0357500b823376b8e3a065b6dee6f3a95cd2 SHA1 784688b48308fc5ea87d9ba454fbfe51ef5ea81d SHA256 5faada467f38931eb128144bdef72d19b227eb3583bcdc95b973bc2267e3705d
 DIST numpy-1.5-html.zip 8545276 RMD160 41636f21c2c82ed1d9f15fe595c9d9303f62a2ee SHA1 c4fb912eec5850e5cf20afd47920a0019bfa5535 SHA256 2b71258bc71b623f682eaa791b81e0f81dce43b69546a1bcd3b1a9de830ce057
 DIST numpy-1.5-ref.pdf 7112007 RMD160 35901204b7e4c0ffc08ebb43a8a4dfa5b5a79bf1 SHA1 5e496e87a4f9873759397cb1cf546f6af0533598 SHA256 9ec75950b46e9d086cfb170f6978ba2b146ed7b1dc103af51e3c81ed5b8b5406
 DIST numpy-1.5-user.pdf 562092 RMD160 20d475d9c5a4abbad0ec5f969fdf9a5eef79c4b3 SHA1 6fafde625a81dd4be22a158cd73c010cb219e855 SHA256 afe77bacce8839460330e0c1c8a01508a03dd4a3010c2b8739ab61956d47f69d
@@ -17,14 +17,14 @@ DIST numpy-1.6.0.tar.gz 2633698 RMD160 29bee854e1436e0baad46150606d7a0d2d80ac61
 DIST numpy-1.6.1.tar.gz 2637779 RMD160 e4619fd5860c85a9c00bce0d0cb8dd9bb07a56f5 SHA1 3f73ff9231a1c15e28e6e259ef5cc35a72b34059 SHA256 788b1bc712ee566d4b4d62ef99736c5830fa264cbc56f8651ded1e795c755cdd
 EBUILD numpy-1.5.1.ebuild 5107 RMD160 b86e103a1f358cc172d24655a4836e19efaea7c2 SHA1 20d1865d2edd1b78dc44de8801d167c4ec140eab SHA256 7559513f731ed9ac96ae60de0e35df84ed8ba3f5f6045cabe18efd6250a709a8
 EBUILD numpy-1.6.0.ebuild 4801 RMD160 590604f459ed3f1e4a810e3cb7440401d49c0dac SHA1 846f45b4d4c3492ef50486224af58b1540dbb963 SHA256 fcd824bd3d81b721175c0037922f4752287914b618f01d0c9d6669c5ba5e4c3b
-EBUILD numpy-1.6.1-r1.ebuild 4400 RMD160 baf94c262fca853851073dd34dcf4162e22e9578 SHA1 e3091369982d2179371cfd1d15104b5fa114ea53 SHA256 f88b40428361cb0907d94f7e7b8b6a37daf995bbbbcfe4e15c6a43aa896e2977
+EBUILD numpy-1.6.1-r1.ebuild 4147 RMD160 5067bcd49109a9773d570a79776fae4187fcc845 SHA1 dbfc69a25b4851b35e9bfc2ccdba2e35a303a2a0 SHA256 e3b22414d75f2108aeac18df255ccb7c189faf3868bb9d9a10eb75ca93924b26
 EBUILD numpy-1.6.1.ebuild 4820 RMD160 474904fd117469e8255c3fe708759215ec60ecee SHA1 51649d2c39b688b5a7cee71444b48ef7eed31e2b SHA256 3fc958720f24a600c6e58f1567a2936592e0a8139b033b4705b4fea0c85eb449
-MISC ChangeLog 21719 RMD160 e34dbf0294b0beb1c57ae58195224b7ebeedf05c SHA1 9cb31b43add01a12f2c0fd3fd09c25ea432b9922 SHA256 c443e2c3c35c6ce45a461538a5a21219ffff1a5471f08119d3e2541fe7f905ee
+MISC ChangeLog 21888 RMD160 72cde1cd35106b9b6c2bdabb8a55c605f825fc29 SHA1 d92c86708286cd8caf28f06c3d6ebd750fd828c7 SHA256 9468a5feb20c7c43fa499dde3270852e17421279de52bf4e7a1885c3e5fd2d90
 MISC metadata.xml 615 RMD160 2f09f0eca557ef9bdc4c672c8d2172b66e25ad69 SHA1 189dc5a2f5d3cb26680e81987501a4266c4972d1 SHA256 f50bbda17ece7ce10e62c739225822877af67a95b3fb9b6a861ee31db489cab3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEAREKAAYFAk6PHIcACgkQgAnW8HDreRZ/EgCgnHBqfc+6Ut56zVmuuC0FHoRF
-i1IAoIjwkZ1RcBrPcDsWaznZa9abrLWZ
-=bKqX
+iEYEAREKAAYFAk6pkwYACgkQgAnW8HDreRbyXQCfXZa+3ICXbbw5mTXxMvMlYrzp
+0xkAoJLxkL0G08od4WwbTUfCh9wFGfbf
+=4SU1
 -----END PGP SIGNATURE-----
diff --git a/dev-python/numpy/files/numpy-1.6.1-atlas.patch b/dev-python/numpy/files/numpy-1.6.1-atlas.patch
index 0f0e1ffdaead..b10f653ea33b 100644
--- a/dev-python/numpy/files/numpy-1.6.1-atlas.patch
+++ b/dev-python/numpy/files/numpy-1.6.1-atlas.patch
@@ -1,22 +1,17 @@
---- numpy/distutils/system_info.py.orig	2011-08-08 11:40:37.514881710 -0500
-+++ numpy/distutils/system_info.py	2011-08-08 11:41:36.386872112 -0500
-@@ -1015,9 +1015,6 @@
-             else:
-                 info['language'] = 'f77'
- 
--        atlas_version, atlas_extra_info = get_atlas_version(**atlas)
--        dict_append(info, **atlas_extra_info)
--
-         self.set_info(**info)
- 
- class atlas_blas_info(atlas_info):
-@@ -1042,9 +1039,6 @@
-             dict_append(info,include_dirs=[h])
-         info['language'] = 'c'
- 
--        atlas_version, atlas_extra_info = get_atlas_version(**atlas)
--        dict_append(atlas, **atlas_extra_info)
--
-         dict_append(info,**atlas)
- 
-         self.set_info(**info)
+--- numpy/distutils/system_info.py	2011-10-10 20:45:44.261316565 +0300
++++ numpy/distutils/system_info.py	2011-10-10 20:50:22.977932228 +0300
+@@ -255,13 +255,7 @@
+       1 - display warning message
+       2 - raise error
+     """
+-    cl = {'atlas':atlas_info,  # use lapack_opt or blas_opt instead
+-          'atlas_threads':atlas_threads_info,                # ditto
+-          'atlas_blas':atlas_blas_info,
+-          'atlas_blas_threads':atlas_blas_threads_info,
+-          'lapack_atlas':lapack_atlas_info,  # use lapack_opt instead
+-          'lapack_atlas_threads':lapack_atlas_threads_info,  # ditto
+-          'mkl':mkl_info,
++    cl = {'mkl':mkl_info,
+           'lapack_mkl':lapack_mkl_info,      # use lapack_opt instead
+           'blas_mkl':blas_mkl_info,          # use blas_opt instead
+           'x11':x11_info,
diff --git a/dev-python/numpy/numpy-1.6.1-r1.ebuild b/dev-python/numpy/numpy-1.6.1-r1.ebuild
index 440df12bf9db..3c9703402a83 100644
--- a/dev-python/numpy/numpy-1.6.1-r1.ebuild
+++ b/dev-python/numpy/numpy-1.6.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.6.1-r1.ebuild,v 1.1 2011/10/07 15:36:33 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.6.1-r1.ebuild,v 1.2 2011/10/27 17:21:04 jlec Exp $
 
 EAPI=3
 
@@ -73,15 +73,6 @@ src_unpack() {
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-atlas.patch
 
-	# Gentoo patch for ATLAS library names
-	sed -i \
-		-e "s:'f77blas':'blas':g" \
-		-e "s:'ptf77blas':'blas':g" \
-		-e "s:'ptcblas':'cblas':g" \
-		-e "s:'lapack_atlas':'lapack':g" \
-		numpy/distutils/system_info.py \
-		|| die "sed system_info.py failed"
-
 	if use lapack; then
 		append-ldflags "$(pkg-config --libs-only-other cblas lapack)"
 		sed -i -e '/NO_ATLAS_INFO/,+1d' numpy/core/setup.py || die