* [gentoo-commits] proj/loongson:master commit in: dev-python/numpy/, dev-python/numpy/files/
@ 2011-07-21 20:46 Matt Turner
0 siblings, 0 replies; only message in thread
From: Matt Turner @ 2011-07-21 20:46 UTC (permalink / raw
To: gentoo-commits
commit: d11e873af69da44f9c84d36492913ce853c3e466
Author: Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Mon Jul 11 22:42:20 2011 +0000
Commit: Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Mon Jul 11 22:42:20 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/loongson.git;a=commit;h=d11e873a
remove dev-python/numpy
Changes are in at least 1.5.1 and 1.6.0 (in portage)
Signed-off-by: Matt Turner <mattst88 <AT> gmail.com>
---
dev-python/numpy/Manifest | 17 ---
dev-python/numpy/files/numpy-1.0.1-f2py.patch | 42 ------
dev-python/numpy/files/numpy-1.0.4-cpuinfo.patch | 133 -------------------
dev-python/numpy/files/numpy-1.0.4-freebsd.patch | 69 ----------
dev-python/numpy/files/numpy-1.1.0-f2py.patch | 36 -----
dev-python/numpy/files/numpy-1.3.0-alpha.patch | 24 ----
dev-python/numpy/files/numpy-1.3.0-arm-sh.patch | 50 -------
.../numpy/files/numpy-1.3.0-darwin-no-arch.patch | 83 ------------
.../numpy/files/numpy-1.3.0-fenv-freebsd.patch | 28 ----
dev-python/numpy/files/numpy-1.3.0-loongson.patch | 35 -----
dev-python/numpy/files/numpy-1.3.0-parisc.patch | 12 --
dev-python/numpy/files/numpy-1.4.0-interix.patch | 15 --
dev-python/numpy/files/numpy-1.4.1-loongson.patch | 59 ---------
dev-python/numpy/numpy-1.4.1.ebuild | 137 --------------------
14 files changed, 0 insertions(+), 740 deletions(-)
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
deleted file mode 100644
index 2474c76..0000000
--- a/dev-python/numpy/Manifest
+++ /dev/null
@@ -1,17 +0,0 @@
-AUX numpy-1.0.1-f2py.patch 1403 RMD160 4a02205910231c3b08ae919a45facc21dd2818ae SHA1 148118c4ee9d8a754a0891621ece9b5774e76016 SHA256 746b437aff172764a238bb75d6a5b7b0547113c8a256721cf4bec2b1819bcf51
-AUX numpy-1.0.4-cpuinfo.patch 4188 RMD160 540961a3aa87530703d8c5795c21dd5f0adc5aad SHA1 e05ed0360a1ac3a980d5b85c536819827c5ca7b7 SHA256 c217b30365c9134482949a5e4a8fdac0577b3205c2d46f30a327323fef5bd1c7
-AUX numpy-1.0.4-freebsd.patch 3084 RMD160 9ec6841d9b8205d584f33356fcafc30047134d63 SHA1 719621772bbb7f4016396081cac1742d15050c01 SHA256 514f00a761ceb40f4380962f36035816fdd2ca7cde8d6c5aab74aab7fd11b073
-AUX numpy-1.1.0-f2py.patch 1123 RMD160 ff90313cbe8282ac37b0cb98effa0ff6a03760c2 SHA1 5c37ea9be68782e533c7c2d64ca00e8e8ae648ea SHA256 cc67bc8ab7dba2febb91ba15cc51933021743a286c980e0068afd6fabdd065e7
-AUX numpy-1.3.0-alpha.patch 1210 RMD160 d92ca3fa7d671da1ff8e3e2e1a6b64469cf7142b SHA1 0a8740710d7b2e40b1a8899771b641999440558b SHA256 ea0da717e694338a1bca72f1b635309be15af2cdee206b50de4b38ce95701c64
-AUX numpy-1.3.0-arm-sh.patch 2166 RMD160 cc60f574ab7fe29968ebc56f9018c2427f01f6cc SHA1 59b4751c26abf837a69d8bd637bd9abb89344f72 SHA256 9b373c5b8886df971c350c44766ccdf165ffec6c2082f68704121965ad7a2f37
-AUX numpy-1.3.0-darwin-no-arch.patch 3016 RMD160 a35968a68fac400e14d5eeafb44e058825c17ed5 SHA1 35b3fa3b0ed149f2f9f906e7a81d7f3cd0260d58 SHA256 9058cb30c54314e4e8dc5e4c0e4be3178664067d1ae71b0bee9576293f8cd71d
-AUX numpy-1.3.0-fenv-freebsd.patch 1177 RMD160 78a84e18836472bd9c657771c43a44e417ec3e19 SHA1 4dba898255df4784eac9e52633307991c12029de SHA256 2fa3ed9fdeb9dc529d51da4ba8a3a7ea4cc4bb9998fffa66426b1606f2c637b5
-AUX numpy-1.3.0-loongson.patch 1487 RMD160 f18bcd18593b3a5596c1cde500087c7a83614317 SHA1 c39593d1675666806a3a4998c9b6cec6d5ffc067 SHA256 6bc7a0268cbb13b6bda2a250ac635f6996aad7b03becef396f74f6fa02892a62
-AUX numpy-1.3.0-parisc.patch 474 RMD160 682971d65894aeb2e87de5f8eac717a8f7803318 SHA1 da6067bd782604119111d69fce06b7536d59f6ca SHA256 413af76d3b5518d2f544c4497110a3401d40a7ea713a7449ea8826facddbf225
-AUX numpy-1.4.0-interix.patch 478 RMD160 9a0290253238e09b824069d0026a5d2f00c90a8f SHA1 261e45c3feb068f033eed9b6468f5115ea418ca5 SHA256 4d6adcc1c66aa1399871c37f57e94ae7138c157ee5575945e83224a36c98c142
-AUX numpy-1.4.1-loongson.patch 2033 RMD160 c61ffd492cb8bcaba727f106c3c01c79dacd7778 SHA1 b56c8f48ee932b5d1a21b9e8abf6a259dc3cc2a3 SHA256 6bc5b640ca97855b5fab2342100f6eef2c7a153c9cbec6e27a321597865ea337
-DIST numpy-1.3-html.zip 3303495 RMD160 bd35c66c78574e6225de59a47cf161f3623c5119 SHA1 10799530be334cd7b1120a0b46f3c6f5deae5110 SHA256 933724b83300c9fc0779a579dad212ca8dcee230f1d892a56b977f3854d87c7e
-DIST numpy-1.3-ref.pdf 3907485 RMD160 54fe28c711b49ccc160dceed05bafa4e605aec36 SHA1 1edc6a3467bb36c5f395c2ed4dc066394180c6f8 SHA256 c8420df5d25e7fd76e7662477787184d068f43fc340b6975fa1db9ec06c773e7
-DIST numpy-1.3-user.pdf 461480 RMD160 a8aa36e6a0c03784fa3147cc0f0967c7f3c726d6 SHA1 059eee01d65ea401e47f978e2d5ebf5f67973723 SHA256 ab99f999d33eb1d1100ddb5c995ba525edaa64efce51a1f06b65a8285779d636
-DIST numpy-1.4.1.tar.gz 2201795 RMD160 a0bbebd1138ffc93517095e3c06459cd9744a9d6 SHA1 ec6078aa09acbcca3d90f9f36353fc83e7e1daa0 SHA256 2e7bb84573e5123e07f3c919fd433bc09b78d606252b6b719e385c2a981d8e06
-EBUILD numpy-1.4.1.ebuild 4652 RMD160 5667e4af540fa620b5660b4d46d6e66f8fd6bb0e SHA1 91bbf8508403a078495df79fa86a66d4fd495302 SHA256 02f5f6f5f05a5c360a5ecc1faa1e2503bae8b35c9e34e5b3e8bca672168283fb
diff --git a/dev-python/numpy/files/numpy-1.0.1-f2py.patch b/dev-python/numpy/files/numpy-1.0.1-f2py.patch
deleted file mode 100644
index d64f1d6..0000000
--- a/dev-python/numpy/files/numpy-1.0.1-f2py.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -Nur numpy/f2py/f2py.1 numpy/f2py.new/f2py.1
---- numpy/f2py/f2py.1 2006-07-26 21:04:19.000000000 +0100
-+++ numpy/f2py.new/f2py.1 2007-02-14 12:16:47.000000000 +0000
-@@ -184,7 +184,7 @@
-
- Optional Numarray 0.9 or higher partially supported.
-
--numpy_distutils from Scipy (can be downloaded from F2PY homepage)
-+numpy_distutils from Numpy (can be downloaded from F2PY homepage)
- .SH "SEE ALSO"
- python(1)
- .SH BUGS
-@@ -200,10 +200,8 @@
-
- Mailing list: http://cens.ioc.ee/mailman/listinfo/f2py-users/
-
--Scipy website: http://www.numpy.org
-+Numpy website: http://numeric.numpy.org
- .SH COPYRIGHT
- Copyright (c) 1999, 2000, 2001, 2002, 2003, 2004, 2005 Pearu Peterson
- .SH LICENSE
- NumPy License
--.SH VERSION
--2.45.241
-diff -Nur numpy/f2py/setup.py numpy/f2py.new/setup.py
---- numpy/f2py/setup.py 2006-10-03 05:35:22.000000000 +0100
-+++ numpy/f2py.new/setup.py 2007-02-14 12:16:41.000000000 +0000
-@@ -35,13 +35,12 @@
-
- config.add_data_files('src/fortranobject.c',
- 'src/fortranobject.h',
-- 'f2py.1'
- )
-
- config.make_svn_version_py()
-
- def generate_f2py_py(build_dir):
-- f2py_exe = 'f2py'+os.path.basename(sys.executable)[6:]
-+ f2py_exe = 'f2py'
- if f2py_exe[-4:]=='.exe':
- f2py_exe = f2py_exe[:-4] + '.py'
- if 'bdist_wininst' in sys.argv and f2py_exe[-3:] != '.py':
diff --git a/dev-python/numpy/files/numpy-1.0.4-cpuinfo.patch b/dev-python/numpy/files/numpy-1.0.4-cpuinfo.patch
deleted file mode 100644
index f38b430..0000000
--- a/dev-python/numpy/files/numpy-1.0.4-cpuinfo.patch
+++ /dev/null
@@ -1,133 +0,0 @@
---- numpy-1.0.4/numpy/distutils/cpuinfo.py 2007-11-07 23:05:15.000000000 +0100
-+++ numpy-1.0.4_changed/numpy/distutils/cpuinfo.py 2008-05-19 20:30:40.000000000 +0200
-@@ -18,6 +18,7 @@
- import os
- import commands
- import warnings
-+import platform
-
- def getoutput(cmd, successful_status=(0,), stacklevel=1):
- try:
-@@ -80,8 +81,16 @@
- def _getNCPUs(self):
- return 1
-
-+ def __get_nbits(self):
-+ abits = platform.architecture()[0]
-+ nbits = re.compile('(\d+)bit').search(abits).group(1)
-+ return nbits
-+
- def _is_32bit(self):
-- return not self.is_64bit()
-+ return self.__get_nbits() == '32'
-+
-+ def _is_64bit(self):
-+ return self.__get_nbits() == '64'
-
- class LinuxCPUInfo(CPUInfoBase):
-
-@@ -104,7 +113,7 @@
- if len(name_value) != 2:
- continue
- name, value = name_value
-- if not info or info[-1].has_key(name): # next processor
-+ if not info or name in info[-1]: # next processor
- info.append({})
- info[-1][name] = value
- fo.close()
-@@ -134,7 +143,16 @@
- self.info[0]['model name']) is not None
-
- def _is_AMD64(self):
-- return self.is_AMD() and self.info[0]['family'] == '15'
-+ if 'family' in self.info[0]:
-+ family=self.info[0]['family'] in ['15','16']
-+ else:
-+ family=False
-+ if 'cpu family' in self.info[0]:
-+ cpu_family=self.info[0]['cpu family']in ['15','16']
-+ else:
-+ cpu_family=False
-+ result=(self.is_AMD() and family) or cpu_family
-+ return result
-
- def _is_Athlon64(self):
- return re.match(r'.*?Athlon\(tm\) 64\b',
-@@ -152,6 +170,10 @@
- return re.match(r'.*?Hammer\b',
- self.info[0]['model name']) is not None
-
-+ def _is_Phenom(self):
-+ return re.match(r'.*?Phenom\b',
-+ self.info[0]['model name']) is not None
-+
- # Alpha
-
- def _is_Alpha(self):
-@@ -222,7 +244,11 @@
- return self.is_PentiumIV() and self.has_sse3()
-
- def _is_Nocona(self):
-- return self.is_64bit() and self.is_PentiumIV()
-+ return self.is_Intel() \
-+ and (self.info[0]['cpu family'] == '6' \
-+ or self.info[0]['cpu family'] == '15' ) \
-+ and (self.has_sse3() and not self.has_ssse3())\
-+ and re.match(r'.*?\blm\b',self.info[0]['flags']) is not None
-
- def _is_Core2(self):
- return self.is_64bit() and self.is_Intel() and \
-@@ -263,7 +289,10 @@
- return re.match(r'.*?\bsse2\b',self.info[0]['flags']) is not None
-
- def _has_sse3(self):
-- return re.match(r'.*?\bsse3\b',self.info[0]['flags']) is not None
-+ return re.match(r'.*?\bpni\b',self.info[0]['flags']) is not None
-+
-+ def _has_ssse3(self):
-+ return re.match(r'.*?\bssse3\b',self.info[0]['flags']) is not None
-
- def _has_3dnow(self):
- return re.match(r'.*?\b3dnow\b',self.info[0]['flags']) is not None
-@@ -271,20 +300,6 @@
- def _has_3dnowext(self):
- return re.match(r'.*?\b3dnowext\b',self.info[0]['flags']) is not None
-
-- def _is_64bit(self):
-- if self.is_Alpha():
-- return True
-- if self.info[0].get('clflush size','')=='64':
-- return True
-- if self.info[0].get('uname_m','')=='x86_64':
-- return True
-- if self.info[0].get('arch','')=='IA-64':
-- return True
-- return False
--
-- def _is_32bit(self):
-- return not self.is_64bit()
--
- class IRIXCPUInfo(CPUInfoBase):
- info = None
-
-@@ -412,11 +427,6 @@
-
- def _not_impl(self): pass
-
-- def _is_32bit(self):
-- return self.info['isainfo_b']=='32'
-- def _is_64bit(self):
-- return self.info['isainfo_b']=='64'
--
- def _is_i386(self):
- return self.info['isainfo_n']=='i386'
- def _is_sparc(self):
-@@ -552,7 +562,7 @@
- # require looking at the 'brand' from cpuid
-
- def _is_AMD64(self):
-- return self.is_AMD() and self.info[0]['Family'] == 15
-+ return self.is_AMD() and self.info[0]['Family'] in [15,16]
-
- # Intel
-
diff --git a/dev-python/numpy/files/numpy-1.0.4-freebsd.patch b/dev-python/numpy/files/numpy-1.0.4-freebsd.patch
deleted file mode 100644
index a0d86f1..0000000
--- a/dev-python/numpy/files/numpy-1.0.4-freebsd.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-diff -Nur numpy-1.0.4.old/numpy/core/include/numpy/ufuncobject.h numpy-1.0.4/numpy/core/include/numpy/ufuncobject.h
---- numpy-1.0.4.old/numpy/core/include/numpy/ufuncobject.h 2007-11-07 15:05:15 -0700
-+++ numpy-1.0.4/numpy/core/include/numpy/ufuncobject.h 2007-11-20 18:10:46 -0700
-@@ -223,6 +223,10 @@
- /* This code checks the IEEE status flags in a platform-dependent way */
- /* Adapted from Numarray */
-
-+#if (defined(__unix__) || defined(unix)) && !defined(USG)
-+#include <sys/param.h>
-+#endif
-+
- /* OSF/Alpha (Tru64) ---------------------------------------------*/
- #if defined(__osf__) && defined(__alpha)
-
-@@ -267,7 +271,7 @@
- /* Solaris --------------------------------------------------------*/
- /* --------ignoring SunOS ieee_flags approach, someone else can
- ** deal with that! */
--#elif defined(sun) || defined(__BSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__)
-+#elif defined(sun) || defined(__BSD__) || defined(__OpenBSD__) || (defined(__FreeBSD__) && (__FreeBSD_version < 502114)) || defined(__NetBSD__)
- #include <ieeefp.h>
-
- #define UFUNC_CHECK_STATUS(ret) { \
-@@ -281,9 +285,9 @@
- (void) fpsetsticky(0); \
- }
-
--#elif defined(__GLIBC__) || defined(__APPLE__) || defined(__CYGWIN__) || defined(__MINGW32__)
-+#elif defined(__GLIBC__) || defined(__APPLE__) || defined(__CYGWIN__) || defined(__MINGW32__) || (defined(__FreeBSD__) && (__FreeBSD_version >= 502114))
-
--#if defined(__GLIBC__) || defined(__APPLE__) || defined(__MINGW32__)
-+#if defined(__GLIBC__) || defined(__APPLE__) || defined(__MINGW32__) || defined(__FreeBSD__)
- #include <fenv.h>
- #elif defined(__CYGWIN__)
- #include "fenv/fenv.c"
-diff -Nur numpy-1.0.4.old/numpy/numarray/_capi.c numpy-1.0.4/numpy/numarray/_capi.c
---- numpy-1.0.4.old/numpy/numarray/_capi.c 2007-11-07 15:05:16 -0700
-+++ numpy-1.0.4/numpy/numarray/_capi.c 2007-11-20 18:05:20 -0700
-@@ -4,7 +4,11 @@
- #include "numpy/libnumarray.h"
- #include <float.h>
-
--#if defined(__GLIBC__) || defined(__APPLE__) || defined(__MINGW32__)
-+#if (defined(__unix__) || defined(unix)) && !defined(USG)
-+#include <sys/param.h>
-+#endif
-+
-+#if defined(__GLIBC__) || defined(__APPLE__) || defined(__MINGW32__) || (defined(__FreeBSD__) && (__FreeBSD_version >= 502114))
- #include <fenv.h>
- #elif defined(__CYGWIN__)
- #include "numpy/fenv/fenv.h"
-@@ -231,7 +235,7 @@
- }
-
- /* Likewise for Integer overflows */
--#if defined(__GLIBC__) || defined(__APPLE__) || defined(__CYGWIN__) || defined(__MINGW32__)
-+#if defined(__GLIBC__) || defined(__APPLE__) || defined(__CYGWIN__) || defined(__MINGW32__) || (defined(__FreeBSD__) && (__FreeBSD_version >= 502114))
- static int int_overflow_error(Float64 value) { /* For x86_64 */
- feraiseexcept(FE_OVERFLOW);
- return (int) value;
-@@ -2939,7 +2943,7 @@
- return retstatus;
- }
-
--#elif defined(__GLIBC__) || defined(__APPLE__) || defined(__CYGWIN__) || defined(__MINGW32__)
-+#elif defined(__GLIBC__) || defined(__APPLE__) || defined(__CYGWIN__) || defined(__MINGW32__) || (defined(__FreeBSD__) && (__FreeBSD_version >= 502114))
-
- static int
- NA_checkFPErrors(void)
diff --git a/dev-python/numpy/files/numpy-1.1.0-f2py.patch b/dev-python/numpy/files/numpy-1.1.0-f2py.patch
deleted file mode 100644
index 1ec18a9..0000000
--- a/dev-python/numpy/files/numpy-1.1.0-f2py.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Nur numpy/f2py/f2py.1 numpy/f2py.new/f2py.1
---- numpy/f2py/f2py.1 2006-07-26 21:04:19.000000000 +0100
-+++ numpy/f2py.new/f2py.1 2007-02-14 12:16:47.000000000 +0000
-@@ -184,7 +184,7 @@
-
- Optional Numarray 0.9 or higher partially supported.
-
--numpy_distutils from Scipy (can be downloaded from F2PY homepage)
-+numpy_distutils from Numpy (can be downloaded from F2PY homepage)
- .SH "SEE ALSO"
- python(1)
- .SH BUGS
-@@ -200,10 +200,8 @@
-
- Mailing list: http://cens.ioc.ee/mailman/listinfo/f2py-users/
-
--Scipy website: http://www.numpy.org
-+Numpy website: http://numeric.numpy.org
- .SH COPYRIGHT
- Copyright (c) 1999, 2000, 2001, 2002, 2003, 2004, 2005 Pearu Peterson
- .SH LICENSE
- NumPy License
--.SH VERSION
--2.45.241
-diff -Nur numpy/f2py/setup.py numpy/f2py.new/setup.py
---- numpy/f2py/setup.py 2006-10-03 05:35:22.000000000 +0100
-+++ numpy/f2py.new/setup.py 2007-02-14 12:16:41.000000000 +0000
-@@ -35,8 +35,7 @@
-
- config.add_data_files('src/fortranobject.c',
- 'src/fortranobject.h',
-- 'f2py.1'
- )
-
- config.make_svn_version_py()
-
diff --git a/dev-python/numpy/files/numpy-1.3.0-alpha.patch b/dev-python/numpy/files/numpy-1.3.0-alpha.patch
deleted file mode 100644
index 3aa5fe4..0000000
--- a/dev-python/numpy/files/numpy-1.3.0-alpha.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ur numpy-1.3.0.orig/numpy/core/include/numpy/npy_cpu.h numpy-1.3.0/numpy/core/include/numpy/npy_cpu.h
---- numpy-1.3.0.orig/numpy/core/include/numpy/npy_cpu.h 2009-07-22 16:22:51.000000000 +0200
-+++ numpy-1.3.0/numpy/core/include/numpy/npy_cpu.h 2009-07-22 16:23:18.000000000 +0200
-@@ -44,6 +44,8 @@
- #define NPY_CPU_IA64
- #elif defined(__hppa__)
- #define NPY_CPU_PARISC
-+#elif defined(__alpha__)
-+ #define NPY_CPU_ALPHA
- #else
- #error Unknown CPU, please report this to numpy maintainers with \
- information about your platform (OS, CPU and compiler)
-diff -ur numpy-1.3.0.orig/numpy/core/include/numpy/npy_endian.h numpy-1.3.0/numpy/core/include/numpy/npy_endian.h
---- numpy-1.3.0.orig/numpy/core/include/numpy/npy_endian.h 2009-07-22 16:22:51.000000000 +0200
-+++ numpy-1.3.0/numpy/core/include/numpy/npy_endian.h 2009-07-22 16:23:04.000000000 +0200
-@@ -22,7 +22,7 @@
- #include "npy_cpu.h"
-
- #if defined(NPY_CPU_X86) || defined(NPY_CPU_AMD64)\
-- || defined(NPY_CPU_IA64)
-+ || defined(NPY_CPU_IA64) || defined(NPY_CPU_ALPHA)
- #define NPY_LITTLE_ENDIAN
- #define NPY_BYTE_ORDER 1234
- #elif defined(NPY_CPU_PPC) || defined(NPY_CPU_SPARC)\
\ No newline at end of file
diff --git a/dev-python/numpy/files/numpy-1.3.0-arm-sh.patch b/dev-python/numpy/files/numpy-1.3.0-arm-sh.patch
deleted file mode 100644
index 798eebb..0000000
--- a/dev-python/numpy/files/numpy-1.3.0-arm-sh.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -urNp numpy-1.3.0-old/numpy/core/include/numpy/npy_cpu.h numpy-1.3.0-new/numpy/core/include/numpy/npy_cpu.h
---- numpy-1.3.0-old/numpy/core/include/numpy/npy_cpu.h 2009-08-16 17:49:39.000000000 +0530
-+++ numpy-1.3.0-new/numpy/core/include/numpy/npy_cpu.h 2009-08-16 17:49:19.000000000 +0530
-@@ -9,6 +9,10 @@
- * NPY_CPU_S390
- * NPY_CPU_IA64
- * NPY_CPU_PARISC
-+ * NPY_CPU_ARMEL
-+ * NPY_CPU_ARMEB
-+ * NPY_CPU_SH_LE
-+ * NPY_CPU_SH_BE
- */
- #ifndef _NPY_CPUARCH_H_
- #define _NPY_CPUARCH_H_
-@@ -46,6 +50,14 @@
- #define NPY_CPU_PARISC
- #elif defined(__alpha__)
- #define NPY_CPU_ALPHA
-+#elif defined(__arm__) && defined(__ARMEL__)
-+ #define NPY_CPU_ARMEL
-+#elif defined(__arm__) && defined(__ARMEB__)
-+ #define NPY_CPU_ARMEB
-+#elif defined(__sh__) && defined(__LITTLE_ENDIAN__)
-+ #define NPY_CPU_SH_LE
-+#elif defined(__sh__) && defined(__BIG_ENDIAN__)
-+ #define NPY_CPU_SH_BE
- #else
- #error Unknown CPU, please report this to numpy maintainers with \
- information about your platform (OS, CPU and compiler)
-diff -urNp numpy-1.3.0-old/numpy/core/include/numpy/npy_endian.h numpy-1.3.0-new/numpy/core/include/numpy/npy_endian.h
---- numpy-1.3.0-old/numpy/core/include/numpy/npy_endian.h 2009-08-16 17:49:46.000000000 +0530
-+++ numpy-1.3.0-new/numpy/core/include/numpy/npy_endian.h 2009-08-16 17:48:39.000000000 +0530
-@@ -22,11 +22,15 @@
- #include "npy_cpu.h"
-
- #if defined(NPY_CPU_X86) || defined(NPY_CPU_AMD64)\
-- || defined(NPY_CPU_IA64) || defined(NPY_CPU_ALPHA)
-+ || defined(NPY_CPU_IA64) || defined(NPY_CPU_ALPHA)\
-+ || defined(NPY_CPU_ARMEL)\
-+ || defined(NPY_CPU_SH_LE)
- #define NPY_LITTLE_ENDIAN
- #define NPY_BYTE_ORDER 1234
- #elif defined(NPY_CPU_PPC) || defined(NPY_CPU_SPARC)\
-- || defined(NPY_CPU_S390) || defined(NPY_CPU_PARISC)
-+ || defined(NPY_CPU_S390) || defined(NPY_CPU_PARISC)\
-+ || defined(NPY_CPU_ARMEB)\
-+ || defined(NPY_CPU_SH_BE)
- #define NPY_BIG_ENDIAN
- #define NPY_BYTE_ORDER 4321
- #else
diff --git a/dev-python/numpy/files/numpy-1.3.0-darwin-no-arch.patch b/dev-python/numpy/files/numpy-1.3.0-darwin-no-arch.patch
deleted file mode 100644
index e96611d..0000000
--- a/dev-python/numpy/files/numpy-1.3.0-darwin-no-arch.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-gfortran -v happily accepts any -arch X argument, but also happily dies
-during compilation that it doesn't understand -arch argument. Hence,
-testing if -arch is supported like this is kind of not working well.
-
-Since Apple does not officially ship fortran support (any), I wonder how
-universal support could have crept into this piece of code all. They
-don't even have an Apple GCC compiler with fortran support (like we do
-with Gentoo Prefix).
-
-http://projects.scipy.org/numpy/ticket/1087
-
-
---- numpy/distutils/fcompiler/gnu.py
-+++ numpy/distutils/fcompiler/gnu.py
-@@ -12,13 +12,6 @@
-
- TARGET_R = re.compile("Target: ([a-zA-Z0-9_\-]*)")
-
--# XXX: do we really need to check for target ? If the arch is not supported,
--# the return code should be != 0
--_R_ARCHS = {"ppc": r"^Target: (powerpc-.*)$",
-- "i686": r"^Target: (i686-.*)$",
-- "x86_64": r"^Target: (i686-.*)$",
-- "ppc64": r"^Target: (powerpc-.*)$",}
--
- class GnuFCompiler(FCompiler):
- compiler_type = 'gnu'
- compiler_aliases = ('g77',)
-@@ -215,6 +208,7 @@
- # OS X: GNU Fortran 95 (GCC) 4.1.0
- # GNU Fortran 95 (GCC) 4.2.0 20060218 (experimental)
- # GNU Fortran (GCC) 4.3.0 20070316 (experimental)
-+ # GNU Fortran (GCC) 4.2.1 (Apple Inc. build 5574)
-
- possible_executables = ['gfortran', 'f95']
- executables = {
-@@ -241,46 +235,6 @@
-
- g2c = 'gfortran'
-
-- # Note that this is here instead of GnuFCompiler as gcc < 4 uses a
-- # different output format (which isn't as useful) than gcc >= 4,
-- # and we don't have to worry about g77 being universal (as it can't be).
-- def _can_target(self, cmd, arch):
-- """Return true is the compiler support the -arch flag for the given
-- architecture."""
-- newcmd = cmd[:]
-- newcmd.extend(["-arch", arch, "-v"])
-- st, out = exec_command(" ".join(newcmd))
-- if st == 0:
-- for line in out.splitlines():
-- m = re.search(_R_ARCHS[arch], line)
-- if m:
-- return True
-- return False
--
-- def _universal_flags(self, cmd):
-- """Return a list of -arch flags for every supported architecture."""
-- if not sys.platform == 'darwin':
-- return []
-- arch_flags = []
-- for arch in ["ppc", "i686"]:
-- if self._can_target(cmd, arch):
-- arch_flags.extend(["-arch", arch])
-- return arch_flags
--
-- def get_flags(self):
-- flags = GnuFCompiler.get_flags(self)
-- arch_flags = self._universal_flags(self.compiler_f90)
-- if arch_flags:
-- flags[:0] = arch_flags
-- return flags
--
-- def get_flags_linker_so(self):
-- flags = GnuFCompiler.get_flags_linker_so(self)
-- arch_flags = self._universal_flags(self.linker_so)
-- if arch_flags:
-- flags[:0] = arch_flags
-- return flags
--
- def get_library_dirs(self):
- opt = GnuFCompiler.get_library_dirs(self)
- if sys.platform == 'win32':
diff --git a/dev-python/numpy/files/numpy-1.3.0-fenv-freebsd.patch b/dev-python/numpy/files/numpy-1.3.0-fenv-freebsd.patch
deleted file mode 100644
index 629fc76..0000000
--- a/dev-python/numpy/files/numpy-1.3.0-fenv-freebsd.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- numpy/core/include/numpy/ufuncobject.h.orig 2009-07-28 15:04:42 -0400
-+++ numpy/core/include/numpy/ufuncobject.h 2009-07-28 15:05:58 -0400
-@@ -318,8 +318,10 @@
-
- #elif defined(__GLIBC__) || defined(__APPLE__) || defined(__CYGWIN__) || defined(__MINGW32__) || (defined(__FreeBSD__) && (__FreeBSD_version >= 502114))
-
--#if defined(__GLIBC__) || defined(__APPLE__) || defined(__MINGW32__) || defined(__FreeBSD__)
-+#if defined(__GLIBC__) || defined(__APPLE__) || defined(__MINGW32__)
- #include <fenv.h>
-+#elif defined(__FreeBSD__)
-+#include "fenv/fenv.h"
- #elif defined(__CYGWIN__)
- #include "fenv/fenv.c"
- #endif
---- numpy/numarray/_capi.c.orig 2009-07-28 15:18:13 -0400
-+++ numpy/numarray/_capi.c 2009-07-28 15:19:04 -0400
-@@ -8,8 +8,10 @@
- #include <sys/param.h>
- #endif
-
--#if defined(__GLIBC__) || defined(__APPLE__) || defined(__MINGW32__) || (defined(__FreeBSD__) && (__FreeBSD_version >= 502114))
-+#if defined(__GLIBC__) || defined(__APPLE__) || defined(__MINGW32__)
- #include <fenv.h>
-+#elif (defined(__FreeBSD__) && (__FreeBSD_version >= 502114))
-+#include "numpy/fenv/fenv.h"
- #elif defined(__CYGWIN__)
- #include "numpy/fenv/fenv.h"
- #include "numpy/fenv/fenv.c"
diff --git a/dev-python/numpy/files/numpy-1.3.0-loongson.patch b/dev-python/numpy/files/numpy-1.3.0-loongson.patch
deleted file mode 100644
index d9fbae8..0000000
--- a/dev-python/numpy/files/numpy-1.3.0-loongson.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff --git a/numpy/core/include/numpy/npy_cpu.h b/numpy/core/include/numpy/npy_cpu.h
-index 83c5259..59d246a 100644
---- a/numpy/core/include/numpy/npy_cpu.h
-+++ b/numpy/core/include/numpy/npy_cpu.h
-@@ -58,6 +58,10 @@
- #define NPY_CPU_SH_LE
- #elif defined(__sh__) && defined(__BIG_ENDIAN__)
- #define NPY_CPU_SH_BE
-+#elif defined(__MIPSEL__)
-+ #define NPY_CPU_MIPSEL
-+#elif defined(__MIPSEB__)
-+ #define NPY_CPU_MIPSEB
- #else
- #error Unknown CPU, please report this to numpy maintainers with \
- information about your platform (OS, CPU and compiler)
-diff --git a/numpy/core/include/numpy/npy_endian.h b/numpy/core/include/numpy/npy_endian.h
-index 09b9172..f91d10d 100644
---- a/numpy/core/include/numpy/npy_endian.h
-+++ b/numpy/core/include/numpy/npy_endian.h
-@@ -24,13 +24,13 @@
- #if defined(NPY_CPU_X86) || defined(NPY_CPU_AMD64)\
- || defined(NPY_CPU_IA64) || defined(NPY_CPU_ALPHA)\
- || defined(NPY_CPU_ARMEL)\
-- || defined(NPY_CPU_SH_LE)
-+ || defined(NPY_CPU_SH_LE) || defined(NPY_CPU_MIPSEL)
- #define NPY_LITTLE_ENDIAN
- #define NPY_BYTE_ORDER 1234
- #elif defined(NPY_CPU_PPC) || defined(NPY_CPU_SPARC)\
- || defined(NPY_CPU_S390) || defined(NPY_CPU_PARISC)\
- || defined(NPY_CPU_ARMEB)\
-- || defined(NPY_CPU_SH_BE)
-+ || defined(NPY_CPU_SH_BE) || defined(NPY_CPU_MIPSEB)
- #define NPY_BIG_ENDIAN
- #define NPY_BYTE_ORDER 4321
- #else
diff --git a/dev-python/numpy/files/numpy-1.3.0-parisc.patch b/dev-python/numpy/files/numpy-1.3.0-parisc.patch
deleted file mode 100644
index fd95f28..0000000
--- a/dev-python/numpy/files/numpy-1.3.0-parisc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- numpy-1.3.0/numpy/core/include/numpy/npy_cpu.h.orig 2009-04-05 10:09:20.000000000 +0200
-+++ numpy-1.3.0/numpy/core/include/numpy/npy_cpu.h 2009-07-15 17:13:35.000000000 +0200
-@@ -42,8 +42,7 @@
- #define NPY_CPU_S390
- #elif defined(__ia64)
- #define NPY_CPU_IA64
--#elif defined(__parisc__)
-- /* XXX: Not sure about this one... */
-+#elif defined(__hppa__)
- #define NPY_CPU_PARISC
- #else
- #error Unknown CPU, please report this to numpy maintainers with \
diff --git a/dev-python/numpy/files/numpy-1.4.0-interix.patch b/dev-python/numpy/files/numpy-1.4.0-interix.patch
deleted file mode 100644
index b755867..0000000
--- a/dev-python/numpy/files/numpy-1.4.0-interix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Reported [2010.01.18]: http://projects.scipy.org/numpy/ticket/1365
-
-diff -ru numpy-1.4.0.orig/numpy/core/setup.py numpy-1.4.0/numpy/core/setup.py
---- numpy-1.4.0.orig/numpy/core/setup.py 2010-01-15 16:49:14 +0100
-+++ numpy-1.4.0/numpy/core/setup.py 2010-01-15 17:02:27 +0100
-@@ -169,6 +169,9 @@
- priv = []
- pub = []
-
-+ if os.uname()[0] == "Interix":
-+ return priv, pub
-+
- # Check for complex support
- st = config.check_header('complex.h')
- if st:
diff --git a/dev-python/numpy/files/numpy-1.4.1-loongson.patch b/dev-python/numpy/files/numpy-1.4.1-loongson.patch
deleted file mode 100644
index b49107a..0000000
--- a/dev-python/numpy/files/numpy-1.4.1-loongson.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 0244066d28838d8e7cb5680253186e036abe87f5 Mon Sep 17 00:00:00 2001
-From: Zhang Le <r0bertz@gentoo.org>
-Date: Sun, 13 Jun 2010 21:37:39 +0800
-Subject: [PATCH] define layout for HAVE_LDOUBLE_IEEE_QUAD_LE
-
-Signed-off-by: Zhang Le <r0bertz@gentoo.org>
----
- numpy/core/src/npymath/npy_math_private.h | 35 +++++++++++++++++++++++++++++
- 1 files changed, 35 insertions(+), 0 deletions(-)
-
-diff --git a/numpy/core/src/npymath/npy_math_private.h b/numpy/core/src/npymath/npy_math_private.h
-index 5a63872..b56f916 100644
---- a/numpy/core/src/npymath/npy_math_private.h
-+++ b/numpy/core/src/npymath/npy_math_private.h
-@@ -361,6 +361,41 @@ do { \
- typedef npy_uint64 ldouble_man_t;
- typedef npy_uint64 ldouble_exp_t;
- typedef npy_uint32 ldouble_sign_t;
-+#elif defined(HAVE_LDOUBLE_IEEE_QUAD_LE)
-+ /*
-+ * IEEE quad precision, Big Endian. Bit representation is
-+ * | s |eeeeeeeeeee|mmmmmmmm................mmmmmmm|
-+ * |1 bit| 15 bits | 112 bits |
-+ * | a[1] | a[0] |
-+ */
-+ typedef npy_uint64 IEEEl2bitsrep_part;
-+
-+ union IEEEl2bitsrep {
-+ npy_longdouble e;
-+ IEEEl2bitsrep_part a[2];
-+ };
-+
-+ #define LDBL_MANL_INDEX 0
-+ #define LDBL_MANL_MASK 0xFFFFFFFFFFFFFFFF
-+ #define LDBL_MANL_SHIFT 0
-+
-+ #define LDBL_MANH_INDEX 1
-+ #define LDBL_MANH_MASK 0x0000FFFFFFFFFFFF
-+ #define LDBL_MANH_SHIFT 0
-+
-+ #define LDBL_EXP_INDEX 1
-+ #define LDBL_EXP_MASK 0x7FFF000000000000
-+ #define LDBL_EXP_SHIFT 48
-+
-+ #define LDBL_SIGN_INDEX 1
-+ #define LDBL_SIGN_MASK 0x8000000000000000
-+ #define LDBL_SIGN_SHIFT 63
-+
-+ #define LDBL_NBIT 0
-+
-+ typedef npy_uint64 ldouble_man_t;
-+ typedef npy_uint64 ldouble_exp_t;
-+ typedef npy_uint32 ldouble_sign_t;
- #endif
-
- /* Get the sign bit of x. x should be of type IEEEl2bitsrep */
---
-1.7.1
-
diff --git a/dev-python/numpy/numpy-1.4.1.ebuild b/dev-python/numpy/numpy-1.4.1.ebuild
deleted file mode 100644
index 4b8c7d4..0000000
--- a/dev-python/numpy/numpy-1.4.1.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.4.1.ebuild,v 1.1 2010/04/22 19:26:48 bicatali Exp $
-
-EAPI="2"
-SUPPORT_PYTHON_ABIS="1"
-
-inherit distutils eutils flag-o-matic toolchain-funcs versionator
-
-NP="${PN}-1.3"
-
-DESCRIPTION="Fast array and numerical python library"
-HOMEPAGE="http://numpy.scipy.org/ http://pypi.python.org/pypi/numpy"
-SRC_URI="mirror://sourceforge/numpy/${P}.tar.gz
- doc? (
- http://docs.scipy.org/doc/${NP}.x/numpy-html.zip -> ${NP}-html.zip
- http://docs.scipy.org/doc/${NP}.x/numpy-ref.pdf -> ${NP}-ref.pdf
- http://docs.scipy.org/doc/${NP}.x/numpy-user.pdf -> ${NP}-user.pdf
- )"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 -ppc -ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="doc lapack test"
-
-RDEPEND="dev-python/setuptools
- lapack? ( virtual/cblas virtual/lapack )"
-DEPEND="${RDEPEND}
- lapack? ( dev-util/pkgconfig )
- test? ( >=dev-python/nose-0.10 )
- doc? ( app-arch/unzip )"
-RESTRICT_PYTHON_ABIS="3.*"
-
-pkg_setup() {
- # See progress in http://projects.scipy.org/scipy/numpy/ticket/573
- # with the subtle difference that we don't want to break Darwin where
- # -shared is not a valid linker argument
- if [[ ${CHOST} != *-darwin* ]] ; then
- append-ldflags -shared
- fi
-
- # only one fortran to link with:
- # linking with cblas and lapack library will force
- # autodetecting and linking to all available fortran compilers
- use lapack || return
- [[ -z ${FC} ]] && FC=$(tc-getFC)
- # when fortran flags are set, pic is removed.
- FFLAGS="${FFLAGS} -fPIC"
- export NUMPY_FCONFIG="config_fc --noopt --noarch"
-}
-
-src_unpack() {
- unpack ${P}.tar.gz
- if use doc; then
- unzip -qo "${DISTDIR}"/${NP}-html.zip -d html || die
- fi
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-1.1.0-f2py.patch
- epatch "${FILESDIR}"/${PN}-1.3.0-fenv-freebsd.patch # bug 279487
-
- # 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
- local libdir="${EPREFIX}"/usr/$(get_libdir)
- cat >> site.cfg <<-EOF
- [atlas]
- include_dirs = $(pkg-config --cflags-only-I \
- cblas | sed -e 's/^-I//' -e 's/ -I/:/g')
- library_dirs = $(pkg-config --libs-only-L \
- cblas blas lapack | sed -e 's/^-L//' -e 's/ -L/:/g' -e 's/ //g'):${libdir}
- atlas_libs = $(pkg-config --libs-only-l \
- cblas blas | sed -e 's/^-l//' -e 's/ -l/, /g' -e 's/,.pthread//g')
- lapack_libs = $(pkg-config --libs-only-l \
- lapack | sed -e 's/^-l//' -e 's/ -l/, /g' -e 's/,.pthread//g')
- [blas_opt]
- include_dirs = $(pkg-config --cflags-only-I \
- cblas | sed -e 's/^-I//' -e 's/ -I/:/g')
- library_dirs = $(pkg-config --libs-only-L \
- cblas blas | sed -e 's/^-L//' -e 's/ -L/:/g' -e 's/ //g'):${libdir}
- libraries = $(pkg-config --libs-only-l \
- cblas blas | sed -e 's/^-l//' -e 's/ -l/, /g' -e 's/,.pthread//g')
- [lapack_opt]
- library_dirs = $(pkg-config --libs-only-L \
- lapack | sed -e 's/^-L//' -e 's/ -L/:/g' -e 's/ //g'):${libdir}
- libraries = $(pkg-config --libs-only-l \
- lapack | sed -e 's/^-l//' -e 's/ -l/, /g' -e 's/,.pthread//g')
- EOF
- else
- export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
- fi
-
- epatch "${FILESDIR}"/${PN}-1.4.0-interix.patch
- epatch "${FILESDIR}"/${P}-loongson.patch
-}
-
-src_compile() {
- distutils_src_compile ${NUMPY_FCONFIG}
-}
-
-src_test() {
- testing() {
- "$(PYTHON)" setup.py ${NUMPY_FCONFIG} build -b "build-${PYTHON_ABI}" install \
- --home="${S}/test-${PYTHON_ABI}" --no-compile || die "install test failed"
- pushd "${S}/test-${PYTHON_ABI}/"lib* > /dev/null
- PYTHONPATH=python "$(PYTHON)" -c "import numpy; numpy.test()" 2>&1 | tee test.log
- grep -q '^ERROR' test.log && die "test failed"
- popd > /dev/null
- rm -fr test-${PYTHON_ABI}
- }
- python_execute_function testing
-}
-
-src_install() {
- [[ -z ${ED} ]] && local ED=${D}
- distutils_src_install ${NUMPY_FCONFIG}
- dodoc THANKS.txt DEV_README.txt COMPATIBILITY
- rm -f "${ED}"/usr/lib/python*/site-packages/numpy/*.txt || die
- docinto f2py
- dodoc numpy/f2py/docs/*.txt || die "dodoc f2py failed"
- doman numpy/f2py/f2py.1 || die "doman failed"
- if use doc; then
- insinto /usr/share/doc/${PF}
- doins -r "${WORKDIR}"/html || die
- doins "${DISTDIR}"/${NP}*pdf || die
- fi
-}
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2011-07-21 20:47 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-07-21 20:46 [gentoo-commits] proj/loongson:master commit in: dev-python/numpy/, dev-python/numpy/files/ Matt Turner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox