Remove obsolete/unused patches.

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64
Manifest-Sign-Key: 0x42B9401D

7 files changed, 12 insertions, 189 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/Manifest b/dev-python/numpy/Manifest
index 493407995c48..96886a22a6b0 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -1,26 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX numpy-1.1.0-f2py.patch 1123 SHA256 cc67bc8ab7dba2febb91ba15cc51933021743a286c980e0068afd6fabdd065e7 SHA512 0fd24aeab938ee9b1622bb758d29479290903f20b60d2f57539e07f834a3079d71b2d7d87cd595708e0ea90eb0efa20ceb0b0907345618a1f58768749b2c5982 WHIRLPOOL 60bc7ec9139be43b44f77d782426de5b89aa215b3b59cddcdc792e12aac4737f840db10a9f1dae56235b8b260f4fa01d4cd1d11c5ab8eab770c16045e4b6238c
-AUX numpy-1.3.0-fenv-freebsd.patch 1177 SHA256 2fa3ed9fdeb9dc529d51da4ba8a3a7ea4cc4bb9998fffa66426b1606f2c637b5 SHA512 a95df02c4ace93ed4cf5a137410b465e32b38d834f2f2e231e17368a96a612e46e34f6fcd0715b3e8c1babe6debb9507c063cb53794e350433e3fa4a5d031e50 WHIRLPOOL 8d56a76b61cb79bae9abbf6edb433ecb364ce707bec46b7cf089d51d645bd8f61fe829ad3dcaa63de3ff4e0dd2b59510dc65027c8fff94ad447d34dfe0c83762
-AUX numpy-1.4.0-interix.patch 478 SHA256 4d6adcc1c66aa1399871c37f57e94ae7138c157ee5575945e83224a36c98c142 SHA512 8497e605873ddff66930fff21e70dcb273ab23c3c8b8392c27594c3277656339a85a678f4d289fda741daa4a9d1278525c6f74cd1f47eb5200be460c780f1ccf WHIRLPOOL c85048bf10c35eba5b91df372ef47fcb881c4635aa3b6c3f767a077b0ee39c91dcf537202ef9cb710ce860be5caed60e7f020e47314266d06dd90be1f82b3ff6
-AUX numpy-1.5.1-python-3.2.patch 971 SHA256 8add395a3f0a7e381fb96691024d7e2e1e062e2f3a1be8ffccbaf0cc060b4735 SHA512 a3f3d344cf3c2aa1b9fa6f0062d29fe05f5bc400c09864bb426a840c31d406bd082ce3c9e63675d53b6cef6b1895764aead9fe93a4e9f67b220b1e808ec9d898 WHIRLPOOL 8cf01d3254c6c6017a23835f09425875b78b1c4a29fc858f01f05576f58a4a0b2b337fd0e8f5de56a05b34574515c3df8a0ae49ccb0ece5563ab290c2dd0ae7b
 AUX numpy-1.6.1-atlas.patch 829 SHA256 5faada467f38931eb128144bdef72d19b227eb3583bcdc95b973bc2267e3705d SHA512 84e5a820fad9bb2c97c866891b7e4cd5d025c21b4ccff2703b57eabdf3597cb9162d528d13863e1f6fa6b1e50281b2066f12b975feb88cc905b6da6cc60adde5 WHIRLPOOL 1f14425a1dd6717611a77693a90a94e60bde5ecfe82e5d26c0c38aa33e0374b363c135e906ec51c382bf62761d95aa9293d0f98ccf04e07544ad184d39e9d965
-AUX numpy-1.6.1-import_umath.patch 2240 SHA256 8c28b1b599934f366a5fd7cbc2f0926845d419caa2de6d63bcb0cbcae2768e9e SHA512 66899b3a7bfd3bf25a9f145ffaf2550344b3ad2f098794ed3b5952821a0172c3fc55a4159fa5fb609e6f045e3a0384b97a82a7aafddbf94159c79153bb161ca1 WHIRLPOOL 4df7881ebd7ee2614e5619e03e6148f77c7341c0b414287777f61d8614b85559df6aabcff60887ae97215352c2cdf58c16e9705d68d727cc54bcb856dae3df9c
 DIST numpy-1.6.0-html.zip 9242421 SHA256 555cfd5899ee54d129169fb70e418c2593d5377ea963d50c812f25bb182261e0 SHA512 b3a7df5b3bb4d307b9184ffa7a0f7a8d919a70f642d9be3d1b3d9c837516385423cc05ba114310e03e124fc80033216035ff389a7f56b74ac1a849c975dbdc8c WHIRLPOOL 6edeecf637e5ca23c906e51dd4933bb6ab4beb3014a9c2cc6d59459d76dd8bf617ea6e3c1d5d5a15af17022549812d358a37840b8d47841d14e156fb6b319600
 DIST numpy-1.6.0-ref.pdf 6106335 SHA256 cbeea9b1395e0576bbd256c5de11886c63321d434785c6777df7bdd50109ba9f SHA512 ff00333beae3d886cf96cd72687f68dd0f226c88c390824c3f0cfc18a50ea6b8d6e12035eda76e10a97d58e7bc9b48b6dff7e0447b6045cc4e40fff3225721ec WHIRLPOOL 3ccb0373f0ef0f22a0a1ad967cecc1c7fd8e663d9c4437cfd31bf42a23d121619d89bcfcbb25091609cfdc20f13b551f6d904b1d13b4da6104dfca094734ca19
 DIST numpy-1.6.0-user.pdf 474664 SHA256 d8d51913cb494228f69c5f16d659b8539cbd04c6e584fde72c00c382e86eea8f SHA512 6af1275e46cb0df11d2654f191871504683bb3b5752e45ec6cca92d302babc4e66bd35dc037fdb48c8aad2a8a6414ba239b8874cc590720150c94a832a8cce74 WHIRLPOOL da8fc8a074d8b5a01f566f3c844d668c7652dba03cc618d9d2c162b72fec864a580e05cd940417dd8fcef4bb2c8340bf8e17d166fb582909ff69098332844e91
 DIST numpy-1.6.2.tar.gz 2585329 SHA256 0b83d96ab79711b548470b7aeee1272c4ba8fcbba6586a67116b566a21ed16c6 SHA512 a92667b92ecf2942bef4715189facccb8726866dfd90522b8e4b1e65991d1e6448ab06962e40a7cb83adaebf37eb48cf61417e7ba367da425a2ad7b3302a60a5 WHIRLPOOL 7aa9d7a1ca69bb9a6ce1cc5930997a5b9b8c9573ba261812706c9f12ea9ed42c1fd948552e25049d7b606fd3fda27c6a3ea72e2ffe43fb16e999b0b62515b32d
 EBUILD numpy-1.6.2-r1.ebuild 3879 SHA256 91a4f0f4c5ed90d6ed4cca8d1d3a3801c0bb48ea6244c6671047453e295e2af0 SHA512 dd96adc481f3339e291d9263e88ed347a81e360c5d2d0294d7f5c12449dd0ce067a12176a42a4b07bfbce880bfab3050132f7e86942db6783a3e6e85d6c0e784 WHIRLPOOL bce5018d1e3029bd74de3a7aee84b26f028743b2c08c387925ff274a9ea8527e41a1601afb640d0c81fd86f900787ea5fbd3165f45f5ac5a09e4ad357fe7f32b
 EBUILD numpy-1.6.2.ebuild 4099 SHA256 70d34a03f6fda89ffaa1261ba10d0a4a1f9fd9dd5e203e98088d23367f660e7e SHA512 ca46002daa02f07648deb16dcbfc67894c61dc93c42279b23083716521a77150974bae2e7778902198591124d204db7e7ffd0f53297fe66291c6756c1f52ba30 WHIRLPOOL 8861957b2dfe125422de3efdb14dc2b6b8cace201cd64579845d1f8ac78020be67788444fb01745ca788f5ca2cfa8c545de0b7c038b55eab8db78a049323cf16
-MISC ChangeLog 25601 SHA256 fe6d1838a3a95bf577181ff427b66ef550abb44a858baa04bdec3bf2fa39a9e8 SHA512 0e8da2a09c3b107287cd3f4eb98450511a8d33c84cbd1bad7bd28fd6829750fa6c7b04116526a3c60a21a099aeccbf3853e169cd513d91318bbe5b8156b7d6ed WHIRLPOOL e02553e1b8be8ba0ef2ab222a25ab4e14719ed176e4c024176321e65687f37b009df138b7fe201c716196239530a9e9c81fdc869bedfe5f9e30b454e009a448e
+MISC ChangeLog 25870 SHA256 ac515a067430cb2abc3371bcac688536e20d8d60bbd3131187890164df40238b SHA512 3fcedbbcc024bb5822dd87242374b8f4eb7fb4e4b2892aa91ef27700a8af003ab0c92174b4df651f5ddd4bf19615719d924f0293590cbafa5d75e30eba407aa0 WHIRLPOOL 31e5129d273696425073be830361790f6810a66c8cceff183acf66a8bc2c19cd6833916a739c64d4139fe22e3cf81f37a747906fb5997e994b2f4b19332439fa
 MISC metadata.xml 618 SHA256 4610361cfafbcd8533c0982e1d804f7f1c4e247bbf41a07102591f22f1034305 SHA512 8c017dd0a066f11291188a3dadac6a23c5f8451231ac32f73771954c530e569de8212e581cd750ff071fc9c9b22e7dbbcedad6e8bfe0c0b0c7b7682f48269dbd WHIRLPOOL 90dbe9165a89a4f57e67859ce58076c3312caa0a75aa79ce635be1cdc5fcafce58bf771cd405630e3c72c795a13023f3374f70480a9e798c5dc3211813a0df60
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iJwEAQEIAAYFAlEMKX4ACgkQfXuS5UK5QB28sgP9GJat31nTprmmuE37zWZCowJg
-iMVs8Bb1sR0wCqlUBVvjdp5ShW+PW3poOy8ZkQHA2zYktAAMjX9PiuV6X1jufpxA
-/HBcd/xvkQHca0mW+SGeAzyCN+8UsXPuL6cPVZIgn+dfSMvnnEE+Q56sS2r8owgf
-3A87FHRRlx3md7cy6sA=
-=a8dx
+iJwEAQEIAAYFAlEMTL4ACgkQfXuS5UK5QB3HsQP5AUmyi/+ryguEoyiSa6VMuPbQ
+Mofs7SdJPi0nNv0Gu+6sc2nISRqMtXlqUWl7scFpJX8F9eVW6lMXrW9hdlkajIUY
+L1smvQSmwbOyF+BBt8TFJI6gsuz7GTOmTVukyPlTC6bEl04JZCDP/jNR84Bb+O6f
+vNrqb0vk5hJIvaA3b44=
+=c4xx
 -----END PGP SIGNATURE-----
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
- """