Remove obsolete/unused patches.

(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key 42B9401D)

6 files changed, 6 insertions, 178 deletions

diff --git a/dev-python/numpy/ChangeLog b/dev-python/numpy/ChangeLog
index 838cbe99d800..57567669c4c3 100644
--- a/dev-python/numpy/ChangeLog
+++ b/dev-python/numpy/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/numpy
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.182 2013/02/01 20:44:54 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.183 2013/02/01 23:15:19 mgorny Exp $
+
+  01 Feb 2013; Michał Górny <mgorny@gentoo.org> -files/numpy-1.1.0-f2py.patch,
+  -files/numpy-1.3.0-fenv-freebsd.patch, -files/numpy-1.4.0-interix.patch,
+  -files/numpy-1.5.1-python-3.2.patch, -files/numpy-1.6.1-import_umath.patch:
+  Remove obsolete/unused patches.
 
 *numpy-1.6.2-r1 (01 Feb 2013)
 
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 1ec18a937f82..000000000000
--- 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-fenv-freebsd.patch b/dev-python/numpy/files/numpy-1.3.0-fenv-freebsd.patch
deleted file mode 100644
index 629fc761ced3..000000000000
--- 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.4.0-interix.patch b/dev-python/numpy/files/numpy-1.4.0-interix.patch
deleted file mode 100644
index b7558676bedd..000000000000
--- 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.5.1-python-3.2.patch b/dev-python/numpy/files/numpy-1.5.1-python-3.2.patch
deleted file mode 100644
index 44e05c5d50ab..000000000000
--- a/dev-python/numpy/files/numpy-1.5.1-python-3.2.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-https://github.com/numpy/numpy/commit/f1f52d6c962bf0ada57d8332b3fbd863bb1ca6cd
-
---- numpy/ctypeslib.py
-+++ numpy/ctypeslib.py
-@@ -93,7 +93,6 @@
-                           "with ctypes < 1.0.1")
- 
-         ext = os.path.splitext(libname)[1]
--
-         if not ext:
-             # Try to load library with platform-specific name, otherwise
-             # default to libname.[so|pyd].  Sometimes, these files are built
-@@ -112,14 +111,15 @@
-         else:
-             libdir = loader_path
- 
-+        # Need to save exception when using Python 3k, see PEP 3110.
-+        exc = None
-         for ln in libname_ext:
-             try:
-                 libpath = os.path.join(libdir, ln)
-                 return ctypes.cdll[libpath]
-             except OSError, e:
--                pass
--
--        raise e
-+                exc = e
-+        raise exc
- 
-     ctypes_load_library = deprecate(load_library, 'ctypes_load_library',
-                                     'load_library')
diff --git a/dev-python/numpy/files/numpy-1.6.1-import_umath.patch b/dev-python/numpy/files/numpy-1.6.1-import_umath.patch
deleted file mode 100644
index aedaa2024206..000000000000
--- a/dev-python/numpy/files/numpy-1.6.1-import_umath.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-http://projects.scipy.org/numpy/ticket/1919
-https://github.com/numpy/numpy/commit/4dac50bf1faf2c8189c277ec8f11ead506c243b1
-https://github.com/numpy/numpy/commit/418f070fc67d1ea2b6eae3259e9dcf7a980bbaaf
-
---- numpy/core/code_generators/generate_ufunc_api.py
-+++ numpy/core/code_generators/generate_ufunc_api.py
-@@ -75,14 +75,53 @@
-   return 0;
- }
- 
--#define import_umath() { UFUNC_NOFPE if (_import_umath() < 0) {PyErr_Print(); PyErr_SetString(PyExc_ImportError, "numpy.core.umath failed to import"); return; }}
--
--#define import_umath1(ret) { UFUNC_NOFPE if (_import_umath() < 0) {PyErr_Print(); PyErr_SetString(PyExc_ImportError, "numpy.core.umath failed to import"); return ret; }}
--
--#define import_umath2(msg, ret) { UFUNC_NOFPE if (_import_umath() < 0) {PyErr_Print(); PyErr_SetString(PyExc_ImportError, msg); return ret; }}
--
--#define import_ufunc() { UFUNC_NOFPE if (_import_umath() < 0) {PyErr_Print(); PyErr_SetString(PyExc_ImportError, "numpy.core.umath failed to import"); }}
-+#if PY_VERSION_HEX >= 0x03000000
-+#define NUMPY_IMPORT_UMATH_RETVAL NULL
-+#else
-+#define NUMPY_IMPORT_UMATH_RETVAL
-+#endif
- 
-+#define import_umath() \
-+    do {\
-+        UFUNC_NOFPE\
-+        if (_import_umath() < 0) {\
-+            PyErr_Print();\
-+            PyErr_SetString(PyExc_ImportError,\
-+                    "numpy.core.umath failed to import");\
-+            return NUMPY_IMPORT_UMATH_RETVAL;\
-+        }\
-+    } while(0)
-+
-+#define import_umath1(ret) \
-+    do {\
-+        UFUNC_NOFPE\
-+        if (_import_umath() < 0) {\
-+            PyErr_Print();\
-+            PyErr_SetString(PyExc_ImportError,\
-+                    "numpy.core.umath failed to import");\
-+            return ret;\
-+        }\
-+    } while(0)
-+
-+#define import_umath2(ret, msg) \
-+    do {\
-+        UFUNC_NOFPE\
-+        if (_import_umath() < 0) {\
-+            PyErr_Print();\
-+            PyErr_SetString(PyExc_ImportError, msg);\
-+            return ret;\
-+        }\
-+    } while(0)
-+
-+#define import_ufunc() \
-+    do {\
-+        UFUNC_NOFPE\
-+        if (_import_umath() < 0) {\
-+            PyErr_Print();\
-+            PyErr_SetString(PyExc_ImportError,\
-+                    "numpy.core.umath failed to import");\
-+        }\
-+    } while(0)
- 
- #endif
- """