fixing bug #114885 and others for numeric-24.2

Package-Manager: portage-2.1.1-r2

diff --git a/dev-python/numeric/ChangeLog b/dev-python/numeric/ChangeLog
index e928cc831f5e9a729195e76a63ae3ba7daa7c56f..72c3c91070b8868b23b77f71f8f93f049d62bbdb 100644 (file)
--- a/dev-python/numeric/ChangeLog
+++ b/dev-python/numeric/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-python/numeric
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numeric/ChangeLog,v 1.26 2006/07/28 20:05:01 the_paya Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numeric/ChangeLog,v 1.27 2007/02/07 17:14:57 bicatali Exp $
+
+*numeric-24.2-r1 (07 Feb 2007)
+
+  07 Feb 2007; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/numeric-24.2-arrayobject.patch, +files/numeric-24.2-eigen.patch,
+  +files/numeric-24.2-lapack.patch, +files/numeric-24.2-umath.patch,
+  metadata.xml, +numeric-24.2-r1.ebuild:
+  Fixed an include placement for math.h, allowing acosh and asinh, an 
+  eigenvalue solver hang and a memory leak. Closing bug #114885. Added 
+  longdescription in metadata.xml.
 
   28 Jul 2006; Javier Villavicencio <the_paya@gentoo.org>
   numeric-24.2.ebuild:

diff --git a/dev-python/numeric/Manifest b/dev-python/numeric/Manifest
index 44ba336819e796706d2ed9d57555d20e1761a593..b72a199ce37427bd8b4f0b7919695abb7a657470 100644 (file)
--- a/dev-python/numeric/Manifest
+++ b/dev-python/numeric/Manifest
@@ -1,7 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX numeric-23.7.patch 2311 RMD160 bab250c3106bda159fc73f85f35e82f6ab2b93fa SHA1 ad733a495b3115ecd24ca4d8f8458923d0a308d5 SHA256 eafed2342ecd71ae00c8f1e780e4fcf3fc561e33c5499a6112edefe5de4af9b4
 MD5 b962c2f9fe39159f4c6025bb24cdf701 files/numeric-23.7.patch 2311
 RMD160 bab250c3106bda159fc73f85f35e82f6ab2b93fa files/numeric-23.7.patch 2311
 SHA256 eafed2342ecd71ae00c8f1e780e4fcf3fc561e33c5499a6112edefe5de4af9b4 files/numeric-23.7.patch 2311
+AUX numeric-24.2-arrayobject.patch 389 RMD160 04c59d5bb1dfab822ac24298632e3a6d87c99f6f SHA1 07195f7560c8f662016cd946c58630b817f60cb5 SHA256 1f475cb518649871306fe85b22bad7ad34144933c12d5e435c58897d61bac847
+MD5 40944b7b93d0a05737a0c40fc2dd6437 files/numeric-24.2-arrayobject.patch 389
+RMD160 04c59d5bb1dfab822ac24298632e3a6d87c99f6f files/numeric-24.2-arrayobject.patch 389
+SHA256 1f475cb518649871306fe85b22bad7ad34144933c12d5e435c58897d61bac847 files/numeric-24.2-arrayobject.patch 389
+AUX numeric-24.2-eigen.patch 292 RMD160 7502282632c01c2012b27ac191c2036abb43b59f SHA1 48eba53c874a212964fd5fcd87cd8285dc8ba792 SHA256 8038f5e8ceaa3c853d32711ee9945903c56d550f316f5778e93e234db6897cab
+MD5 4b0a676b71ebbe6df65f0ebffd72d019 files/numeric-24.2-eigen.patch 292
+RMD160 7502282632c01c2012b27ac191c2036abb43b59f files/numeric-24.2-eigen.patch 292
+SHA256 8038f5e8ceaa3c853d32711ee9945903c56d550f316f5778e93e234db6897cab files/numeric-24.2-eigen.patch 292
+AUX numeric-24.2-lapack.patch 1145 RMD160 e152b034a1e7045b6e75e7bef9238dbc4fe443be SHA1 b7f5ac135f068122bb078e967e2f045cd64386a8 SHA256 f059eb3c91851e02ace0269606027237e59ec54f0cd38f1d656360e3fbc15c6b
+MD5 ec13158428efee29f2f0eddd799e556f files/numeric-24.2-lapack.patch 1145
+RMD160 e152b034a1e7045b6e75e7bef9238dbc4fe443be files/numeric-24.2-lapack.patch 1145
+SHA256 f059eb3c91851e02ace0269606027237e59ec54f0cd38f1d656360e3fbc15c6b files/numeric-24.2-lapack.patch 1145
+AUX numeric-24.2-umath.patch 357 RMD160 33c55cd84cd3a1e2acb32b9420e5c2fab3f6486b SHA1 e62bef8fb392eedc9b27364fdd2c6ad1d3800175 SHA256 00f41e3fb05b9e26daf200a0bc1397d36055590b1ccb416c33ac76464d08a36c
+MD5 ff094342d7c47777acfdf87db45b9596 files/numeric-24.2-umath.patch 357
+RMD160 33c55cd84cd3a1e2acb32b9420e5c2fab3f6486b files/numeric-24.2-umath.patch 357
+SHA256 00f41e3fb05b9e26daf200a0bc1397d36055590b1ccb416c33ac76464d08a36c files/numeric-24.2-umath.patch 357
 DIST Numeric-23.7.tar.gz 725824 RMD160 1ff89d0e809c97b5cc06184676503bfee12c2fcd SHA1 3fe90c14692c9fe9da0d4202df4036e8ecfdd365 SHA256 33225097777e84dfed251aee1265a9c0dd0976854e83f60e778a670027b12e7c
 DIST Numeric-23.8.tar.gz 725817 RMD160 c97297adaa8652dfc8e661fc9b28fac2b227c002 SHA1 e86aa5956fb0c3a9b1325bf437f8df9e03339390 SHA256 16d88e7dcf5a6967cd2782edff2e355a6abebd7881fcf99fe79eef7fd9e163ae
 DIST Numeric-24.2.tar.gz 743800 RMD160 c9502db28663558c535e236392c9beddec9743bb SHA1 72869ef80c12630a9a125ba10c96093b6ae16aff SHA256 5f72e729eb6ff57442f2a38bfc9931738b59e5077928e2e70d22b4610ff15258
@@ -13,18 +32,22 @@ EBUILD numeric-23.8.ebuild 866 RMD160 2e135c4fc62dcd8c7962a75ccc61c840c8438b39 S
 MD5 c641bcf12a746279a3247e8a1840e65a numeric-23.8.ebuild 866
 RMD160 2e135c4fc62dcd8c7962a75ccc61c840c8438b39 numeric-23.8.ebuild 866
 SHA256 27c3dc03b21c2ffc151f119968f89161558169926aa54be03124248644ebd56c numeric-23.8.ebuild 866
+EBUILD numeric-24.2-r1.ebuild 1285 RMD160 cca33cb77a18b5e447a951f74580684ed4fb43f6 SHA1 906268f917c34d988e7a0c9dd7a66e5a95f1de70 SHA256 e554510aa5ce5591884229d70bc391d83aa964359d7138349a93ebd3f880bd25
+MD5 20864c217512cbeb2a397cab658f01e0 numeric-24.2-r1.ebuild 1285
+RMD160 cca33cb77a18b5e447a951f74580684ed4fb43f6 numeric-24.2-r1.ebuild 1285
+SHA256 e554510aa5ce5591884229d70bc391d83aa964359d7138349a93ebd3f880bd25 numeric-24.2-r1.ebuild 1285
 EBUILD numeric-24.2.ebuild 848 RMD160 a60967fc80d1900e57d198356494b2db25a413ae SHA1 f28d3654a80bc3c437a21d581f7ea7ec142cbcfd SHA256 93e209fb19b862bc914fc9b04e45bcfd0ca40c4aed2e34d41b82d15e85ba770e
 MD5 be3fad4c9fdf2ed413ea4fcfb24caa43 numeric-24.2.ebuild 848
 RMD160 a60967fc80d1900e57d198356494b2db25a413ae numeric-24.2.ebuild 848
 SHA256 93e209fb19b862bc914fc9b04e45bcfd0ca40c4aed2e34d41b82d15e85ba770e numeric-24.2.ebuild 848
-MISC ChangeLog 4184 RMD160 5921a254dbc49a98e8552a322aa60bc12032c0bf SHA1 48de0e15f56db5fc8b9099ee64a8a925eb98163f SHA256 defc9b6edb024b1ef91f3db40c5faf740ca291e32c163009f137db266616bd31
-MD5 af026068beb6f84ac6ac439cfdc82abd ChangeLog 4184
-RMD160 5921a254dbc49a98e8552a322aa60bc12032c0bf ChangeLog 4184
-SHA256 defc9b6edb024b1ef91f3db40c5faf740ca291e32c163009f137db266616bd31 ChangeLog 4184
-MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4
-MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
-RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f metadata.xml 159
-SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4 metadata.xml 159
+MISC ChangeLog 4634 RMD160 cc049721560d98cb3623a17e1d1e469c40a57a9d SHA1 2c4837e8dbb4f8118a236fb85eb617441f54050c SHA256 c189a6ed67e9ccf35e55ef9e9df8dfc5323e24a0ccbd16defbe83cdd7aebca5b
+MD5 fcb83eefb31e5dc365a96fccb98fc2c9 ChangeLog 4634
+RMD160 cc049721560d98cb3623a17e1d1e469c40a57a9d ChangeLog 4634
+SHA256 c189a6ed67e9ccf35e55ef9e9df8dfc5323e24a0ccbd16defbe83cdd7aebca5b ChangeLog 4634
+MISC metadata.xml 524 RMD160 196b661a6d6b3dfb8b4c41a4bf114b0b7dcc99c5 SHA1 6b6b2097e61f55bf5f83aa826053b6923368fc86 SHA256 66a1c707d248e0c7bb2bf22af2ab9910cf256a468bb58e71961c7786d6c6fae1
+MD5 23a6e92b4a0d6a7e34ed10882f87383c metadata.xml 524
+RMD160 196b661a6d6b3dfb8b4c41a4bf114b0b7dcc99c5 metadata.xml 524
+SHA256 66a1c707d248e0c7bb2bf22af2ab9910cf256a468bb58e71961c7786d6c6fae1 metadata.xml 524
 MD5 ad35d120972f70efdf47d1d25aff45d0 files/digest-numeric-23.7 238
 RMD160 f0611578b9d8714ff1684cdd06a89d8e679fd2ca files/digest-numeric-23.7 238
 SHA256 716c8bdf5baf3d199351596b5e9ffce5b90b723460ec9773d783782a2cfc7a65 files/digest-numeric-23.7 238
@@ -34,3 +57,13 @@ SHA256 aaee47a9b2b160539310d1b7215f1ff93a48fa3ad9576be20d56bd241ba39ac6 files/di
 MD5 ecd78d1bb4d2b61725a79deb65e5bb75 files/digest-numeric-24.2 238
 RMD160 fc57f969862ead472f970e34a365c6aff70c906e files/digest-numeric-24.2 238
 SHA256 d672c5f7d95f34bcc793b9091ebe6ebb22ed591f953e172ffc338679e5fa4a00 files/digest-numeric-24.2 238
+MD5 ecd78d1bb4d2b61725a79deb65e5bb75 files/digest-numeric-24.2-r1 238
+RMD160 fc57f969862ead472f970e34a365c6aff70c906e files/digest-numeric-24.2-r1 238
+SHA256 d672c5f7d95f34bcc793b9091ebe6ebb22ed591f953e172ffc338679e5fa4a00 files/digest-numeric-24.2-r1 238
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFFygkcWc/Ciu+QQGkRAqqSAJ9caGcHQxR5dy9FQiH9/QF+dvATAQCfbIu4
++94BZ5GGlENo5ADQ5wwOkZk=
+=LnwJ
+-----END PGP SIGNATURE-----

diff --git a/dev-python/numeric/files/digest-numeric-24.2-r1 b/dev-python/numeric/files/digest-numeric-24.2-r1
new file mode 100644 (file)
index 0000000..b891af1
--- /dev/null
+++ b/dev-python/numeric/files/digest-numeric-24.2-r1
@@ -0,0 +1,3 @@
+MD5 2ae672656e06716a149acb048cca3093 Numeric-24.2.tar.gz 743800
+RMD160 c9502db28663558c535e236392c9beddec9743bb Numeric-24.2.tar.gz 743800
+SHA256 5f72e729eb6ff57442f2a38bfc9931738b59e5077928e2e70d22b4610ff15258 Numeric-24.2.tar.gz 743800

diff --git a/dev-python/numeric/files/numeric-24.2-arrayobject.patch b/dev-python/numeric/files/numeric-24.2-arrayobject.patch
new file mode 100644 (file)
index 0000000..a67d5b4
--- /dev/null
+++ b/dev-python/numeric/files/numeric-24.2-arrayobject.patch
@@ -0,0 +1,11 @@
+--- Numeric-24.2/Src/arrayobject.c     2005-11-11 07:30:18.000000000 +0000
++++ Numeric-24.2.new/Src/arrayobject.c 2006-06-06 19:13:58.000000000 +0100
+@@ -1866,7 +1866,7 @@
+     for (i=0; i<sz; i++) {
+       v=array_item((PyArrayObject *)self, i);
+       PyList_SetItem(lp, i, PyArray_ToList(v));
+-      if (((PyArrayObject *)self)->nd>1){
++      if (((PyArrayObject *)self)->nd>0){
+           Py_DECREF(v);
+       }
+     }

diff --git a/dev-python/numeric/files/numeric-24.2-eigen.patch b/dev-python/numeric/files/numeric-24.2-eigen.patch
new file mode 100644 (file)
index 0000000..331d0f1
--- /dev/null
+++ b/dev-python/numeric/files/numeric-24.2-eigen.patch
@@ -0,0 +1,11 @@
+--- Numeric-24.2/Src/dlamch.c.fix-dlamc3       2006-10-29 22:30:52.000000000 -0500
++++ Numeric-24.2/Src/dlamch.c  2006-10-29 22:31:00.000000000 -0500
+@@ -672,7 +672,7 @@
+ */
+ /* >>Start of File<<   
+        System generated locals */
+-    doublereal ret_val;
++    volatile doublereal ret_val;
+ 
+ 
+ 

diff --git a/dev-python/numeric/files/numeric-24.2-lapack.patch b/dev-python/numeric/files/numeric-24.2-lapack.patch
new file mode 100644 (file)
index 0000000..bb77b77
--- /dev/null
+++ b/dev-python/numeric/files/numeric-24.2-lapack.patch
@@ -0,0 +1,34 @@
+--- Numeric-24.2.orig/customize.py     2005-11-13 02:40:14.000000000 +0000
++++ Numeric-24.2/customize.py  2006-10-10 17:58:33.000000000 +0100
+@@ -13,9 +13,9 @@
+ # will be used, except on Mac OS X, where the vecLib framework will be used
+ # if found.
+ 
+-use_system_lapack = 0
++use_system_lapack = 1
+ lapack_library_dirs = []
+-lapack_libraries = []
++lapack_libraries = ['lapack', 'cblas', 'blas', 'atlas', 'g2c']
+ lapack_extra_link_args = []
+ 
+ # Example: using ATLAS
+@@ -35,8 +35,8 @@
+ 
+ # Set use_dotblas to 1 to use BLAS for the matrix multiplication routines.
+ # Put the directory that 'cblas.h' is in into dotblas_include_dirs
+-use_dotblas = 0
+-dotblas_include_dirs = []
++use_dotblas = 1
++dotblas_include_dirs = ['/usr/include/atlas']
+ dotblas_cblas_header = '<cblas.h>'
+ dotblas_library_dirs = lapack_library_dirs
+ dotblas_libraries = lapack_libraries
+@@ -45,7 +45,7 @@
+ # Example: using ATLAS
+ if 0:
+     use_dotblas = 1
+-    dotblas_include_dirs = ['/usr/include/atlas']
++    dotblas_include_dirs = ['/usr/include/atlas','/usr/include/cblas']
+     dotblas_library_dirs = lapack_library_dirs
+     dotblas_libraries = ['cblas', 'atlas', 'g2c']
+ 

diff --git a/dev-python/numeric/files/numeric-24.2-umath.patch b/dev-python/numeric/files/numeric-24.2-umath.patch
new file mode 100644 (file)
index 0000000..eb3d8b0
--- /dev/null
+++ b/dev-python/numeric/files/numeric-24.2-umath.patch
@@ -0,0 +1,14 @@
+--- Numeric-24.2.orig/Src/umathmodule.c        2005-04-20 19:48:47.000000000 +0100
++++ Numeric-24.2/Src/umathmodule.c     2006-10-10 16:16:40.000000000 +0100
+@@ -1,9 +1,9 @@
+-
++#include <math.h>
+ #include "Python.h"
+ #include "Numeric/arrayobject.h"
+ #include "Numeric/ufuncobject.h"
+ #include "abstract.h"
+-#include <math.h>
++
+ 
+ #ifndef CHAR_BIT
+ #define CHAR_BIT 8

diff --git a/dev-python/numeric/metadata.xml b/dev-python/numeric/metadata.xml
index de483c53568fa127e082f0a932b29dc573eb3ebf..bfa28bb2c37c40b4f9efe9da069252e463a5712b 100644 (file)
--- a/dev-python/numeric/metadata.xml
+++ b/dev-python/numeric/metadata.xml
@@ -2,4 +2,11 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>python</herd>
+<longdescription lang="en">
+The Numeric Extensions to Python (NumPy) adds multi-dimensional array
+processing. These objects facilitates processing for manny numerical
+applications such as universal functions on arrays, FFTs and linear
+algebra. This package is being superseeded by numpy, and now inactive,
+but still used in various applications.
+</longdescription>
 </pkgmetadata>

diff --git a/dev-python/numeric/numeric-24.2-r1.ebuild b/dev-python/numeric/numeric-24.2-r1.ebuild
new file mode 100644 (file)
index 0000000..79aff0b
--- /dev/null
+++ b/dev-python/numeric/numeric-24.2-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numeric/numeric-24.2-r1.ebuild,v 1.1 2007/02/07 17:14:57 bicatali Exp $
+
+inherit distutils eutils
+
+MY_P=Numeric-${PV}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="Numerical multidimensional array language facility for Python."
+HOMEPAGE="http://numeric.scipy.org/"
+SRC_URI="mirror://sourceforge/numpy/${MY_P}.tar.gz"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=">=dev-lang/python-2.3"
+
+
+src_unpack() {
+       unpack ${A}
+       # fix list problem
+       epatch "${FILESDIR}"/${P}-arrayobject.patch
+       # fix skips of acosh, asinh
+       epatch "${FILESDIR}"/${P}-umath.patch
+       # fix eigenvalue hang
+       epatch "${FILESDIR}"/${P}-eigen.patch
+}
+
+src_install() {
+       distutils_src_install
+       distutils_python_version
+
+       # Numerical Tutorial is nice for testing and learning
+       insinto /usr/$(get_libdir)/python${PYVER}/site-packages/NumTut
+       doins Demo/NumTut/*
+
+       # install various doc from packages
+       docinto FFT
+       dodoc Packages/FFT/MANIFEST
+       docinto MA
+       dodoc Packages/MA/{MANIFEST,README}
+       docinto RNG
+       dodoc Packages/RNG/{MANIFEST,README}
+       docinto lapack_lite
+       dodoc Misc/lapack_lite/README
+}