Version bump. Reintroduced ppc and ppc64 because mpmath is not mandatory anymore for testing

Package-Manager: portage-2.2.8-prefix/cvs/Linux x86_64
Manifest-Sign-Key: 0x13CB1360

7 files changed, 29 insertions, 378 deletions

diff --git a/sci-libs/scipy/ChangeLog b/sci-libs/scipy/ChangeLog
index e9973697f3ec..18395e976663 100644
--- a/sci-libs/scipy/ChangeLog
+++ b/sci-libs/scipy/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-libs/scipy
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/ChangeLog,v 1.115 2014/03/25 19:42:14 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/ChangeLog,v 1.116 2014/05/05 20:21:53 bicatali Exp $
+
+*scipy-0.14.0 (05 May 2014)
+
+  05 May 2014; Sébastien Fabbro <bicatali@gentoo.org> +scipy-0.14.0.ebuild,
+  -files/scipy-0.9.0-qhull.patch, -files/scipy-0.9.0-superlu.patch,
+  -scipy-0.13.0.ebuild, -scipy-0.13.1-r2.ebuild, -scipy-0.13.2-r1.ebuild:
+  Version bump. Reintroduced ppc and ppc64 because mpmath is not mandatory
+  anymore for testing
 
   25 Mar 2014; Sébastien Fabbro <bicatali@gentoo.org> scipy-0.13.3.ebuild:
   More fixes to the site.cfg file generation
diff --git a/sci-libs/scipy/Manifest b/sci-libs/scipy/Manifest
index 9f70c717d8f3..0271f3ba1d75 100644
--- a/sci-libs/scipy/Manifest
+++ b/sci-libs/scipy/Manifest
@@ -5,29 +5,24 @@ AUX scipy-0.12.0-blitz.patch 731 SHA256 4f487a746aa62a39cdab9381dd4191cef0ccb912
 AUX scipy-0.12.0-cephes-missing-include.patch 394 SHA256 0263ba4e9f13c7be0e7160ae73ce98ea37f698ea7e06c3fc090bc4ff7732bc66 SHA512 a4f9adf9b29743b6ca7f42de0695af23ddf7791330a4a58a2f47cd5599af1361aee3b141a016ea1a81a3bc5b8bfcaa3f0478370a09acd37bcd8e519765701510 WHIRLPOOL 59651015bf540ad2218dd65764d68fb5f2b907116245e3e83d14084579314af6c58c34be3f74300166c2450e00833fa4ae6d6de057392d3e947a979555add1bc
 AUX scipy-0.12.0-gerqf.patch 731 SHA256 1f3c2723f1094cb6834349f26d40d060ed4e09c722eea876e160fc9ce2b3ced2 SHA512 007bf3d85364c824c03532a07c2678e48c90858d82fa7248cb5139a6f74b853bc4a27e6932638a14bb61e72abbbfd95265e10502c4fd2eb363758f3132722a10 WHIRLPOOL c2d7de949048dcc76e1bf72f2165226b7a741212ef0c6cfc3709ddd91f11fd274ecfcdf62dd47fb11d824d73b41c57d468414b3ef9e8169f7841688f67bcf6af
 AUX scipy-0.12.0-restore-sys-argv.patch 483 SHA256 c00daf7d49c042972d2c59bf645c21f3bc437459a745da758e2548a973000170 SHA512 7c439aa7e1e0ccc7444c2c091ef03d3d39f2999a33ef487224c78e74cd3a1b84bd18a9e92d84ab2cd3fc7578644beb3b667fdaacb20a239600cb9b1765eeb7fc WHIRLPOOL f0d4a84e40ee26399b121f0d9159914d480789c83f749cf060bc65f63df315f27718359df7c13c64ae7a04eea00470ea109b110310abeba79944a90b97ebb102
-AUX scipy-0.9.0-qhull.patch 1675 SHA256 725a4c74ffe401ba4ae385bcd0a891b9c16d9656d3241204a2b84b88e4bbea95 SHA512 3c151e74dd8797723772c738e94f5591cdcc572d1be9729835245abb0a59690d010d629d46e7c58ff1de46de0827f049984764b90fd58653503e7d56adef5d34 WHIRLPOOL 155ff2f897195390c9f4739c117301ca524896afb94724caea003c2e97091a82563bf57f1ac91042e39a9f54a500fb4657b2bd3a5e05a3195a5299f19caa2ebd
-AUX scipy-0.9.0-superlu.patch 1526 SHA256 10b58353b0cdd6a8a6713ca7186cdb37c33c0ae4e42014322c5ad94465359e8f SHA512 1326cf779bffb9e2046106fd771309a93c3b0d7b15f8200f9a6652b425e7b0b642776feda488d10b2b69f6d16fb9fc1beeae4a1ff57b5e7181b9473c4de07232 WHIRLPOOL ceb430b6cca1036e8c07836b1f6ed71a75a9921bda787973ceb6f46673963d70a0bf07f46fed68d85587208aab51065fdebfce8bcd85d35dfa760fae012098e8
 DIST scipy-0.12.1-html.zip 15578583 SHA256 07c773c6056e5fc0cb65d7048995d0ff056f48f1e482d610865361870ee07998 SHA512 71308ff306ee5556822a279e8dd21efd6c9174fbb5c100acf9e34308cf828789cd257aac5a447a6dbfa8b464447753ea49d6e5819555fbf8db73b3e51fddc2cb WHIRLPOOL 124b12ace1a297789b4f544a28539da964bc756aae72572b2926c9df81b2bd492fdcc4b39bb8b9d83305d21834c7e225a576225a8a94a316707c517583fa9dca
 DIST scipy-0.12.1-ref.pdf 11193207 SHA256 4a8298fba9c6d62aeb392ee6588ac45cb266ed6cffb59573f6c19d7779bfc18b SHA512 cad60983c74a447a0e3ba898b81bdea3101dbad7603f1ca8030e3ff9f431eeb8c7b2dd207a45af616ef596e85c0c1846944057ecc11482fe9b389869ee49b137 WHIRLPOOL af600c6cb5c59306b2f5a84df421465a97cae9138f0cf024a0748c80bd516d8fe6a2db135fd56d66eab25f36c99acb3c0825d50b7d376e0ed3d9bd0c4c282943
 DIST scipy-0.12.1.tar.gz 9012911 SHA256 15122afe6cb377b010982f9bc46cf41b12af703fd34088aa3971a80276b00e76 SHA512 13dba0b2ff9b69a109403110aaaca892362935262e3999992de96b081eae036fe5dbb3ca209d84ade948377c6ccb4137777c36f76121f8745855dc1d08b86e97 WHIRLPOOL 71467b86b992b14b4bc6c354ac4b4ec138951ab0d17b28c07ac605a81852f4f55bdfe35553ffdecd9611ef0daf2c35012424e28db9c9ff8e2cf6eb3fe0d2583a
 DIST scipy-0.13.0-html.zip 18283054 SHA256 3010783ebdc18988440cd0047f061bbfcac98677782cd10e8b4f09e20bbbc23d SHA512 082cb1e0915f6095f80522a76fed4e106ed82889df613c1bcada9a4faded8917fd7e686448f585a5bee5478280ae21f6adf9bd4add125b9082f93eb93e61feef WHIRLPOOL 48b5e2ee9274f324969c413986110a87422b5f3667b617884dd01c660cdabeb05c5e17ca33e861b2fa2cc5caf89e1233aba9f2855386fe211255c5ceee437ac7
 DIST scipy-0.13.0-ref.pdf 14748179 SHA256 52caa5fd7e74f2e5a78f26296d2150808eee9e153ca3cee62d05892bbd1bac8c SHA512 9e2d40b154c73e9ad3405038e2c71e01650b9a05781355d499b09d647ae6a73d65d542c36b60a87ac530f9b7509bf1c023624952c2f4f2b2f9fb56394456ec91 WHIRLPOOL 5071c593b999db1a57057731e995153fead4155f04b69b770fd1b2203cc5eb13f6f9395a179c4a06e1d8fc5dfa559f51c494f52a27d524b2794d9683e487e273
-DIST scipy-0.13.0.tar.gz 10093476 SHA256 e7fe93ffc4b55d8357238406b1b9e47a4f932474238e2bfdb552423bcd45dc5e SHA512 5bd8f032560dba4796942c8cbbd341c449aae10c3de6023c62bf754bb48d84ba821dbbc24bfe371781e8a06958c104baf670bf167597ec5d4fd5fd2eeadc54b5 WHIRLPOOL 39df9a0c03962f0b5c16efe38d8900c523e45426e228951a5d84fbf7b742cd37c8775f628e6973da572b3b7e088aecba1f7277dbf1fd6e3b72f78a8ad6599a06
-DIST scipy-0.13.1.tar.gz 10092739 SHA256 409f429a85592c8a99afa2fc047b80efdbd7ab0c9aa1f1effdd4692958aef228 SHA512 a5522a368a51f7a746852e61ac60f2b46f4b18a323ebaac9e554788d31fbd270757aab1edea3899970c6d753540120dd52a7248d46142c14da1938fc48a40a12 WHIRLPOOL f02265cbf8918f1b2da708dc8f21b2ac67fbc14e816cae69bc97c31b7736c32a8bc5cd710832f0ae0d459ff0732d4ab40ab1ef6604d12e6cc998cbee0608d005
 DIST scipy-0.13.2.tar.gz 10144409 SHA256 485f194c7fe46da92e63bff524346ccaed4040c27df536bbde7b1edc9a07b449 SHA512 ab9acb0a8b388eaf8528be4fd0bcbf954e9a6337a874d666bf1590d396018c5b818c08d0227b4655f45aa408d4e0f1c500588016a90c2dba0f03e2aa3f6a5c60 WHIRLPOOL 99258cc7e1438535849b85727afa5730be1a1b9f179515c1e1c297e825a56fae2ac385775a40156431c0031e08aa198387667fa92cb2f36fc5c49dadd9040013
 DIST scipy-0.13.3.tar.gz 10712509 SHA256 a9e33c7ee060c35cd5c6ee3ac9e5e9bbb99219d7ea8c89537c2e80e581670266 SHA512 8cf32c8ea4d8fe903bafae23dedb4d4ba80b580f5bddf351ea1d2bbbdcbd753389d7992f2db39d7a6b3f0629674daa697c2660d25396ef506f1e3b81c817170a WHIRLPOOL 5065bf05263d8633063705a2d55236e57e4d0861c105b50e7e5d8a1341e4840df37bbad16fc2d2c9f7d95880f875803b96d129f4e766b8bc5a13e926bc4e216d
+DIST scipy-0.14.0.tar.gz 10212944 SHA256 4b41a3e6bf178df1c7f0ef3bfeabf1f56610329aca5dbd7b6d64da8ac9af6b14 SHA512 ad1278740c1dc44c5e1b15335d61c4552b66c0439325ed6eeebc5872a1c0ba3fce1dd8509116b318d01e2d41da2ee49ec168da330a7fafd22511138b29f7235d WHIRLPOOL b15322cef988bbc910794f3b34ee8741edd227f223da4384b3a6471b7a37c1cb3efbacb3f6dde7b6e9929c93e683de5f5898a43d26fadaa2317c433cb3bbec72
 EBUILD scipy-0.12.1.ebuild 3794 SHA256 aa1a59f045d86e2cb7016682ea841913bb8429b87a3095a7a00ce3f75b2c48d8 SHA512 856b8b23e6a8ab3efb6526e7cc94b8eb742d04cfa1e460ee9364265743d655cfed4cbb296d41c07ccae3dc4d3945f41a53e0307b87a740b4b7f3fbae6d161f1f WHIRLPOOL d837a98eabb2e5feb143d94790f79c622ab8eba6f4d868bfa2bb0f010af29460389d7d46d6d2be5d11b679624540f87fb8f93a9f69982824397703d0dec4e9e0
-EBUILD scipy-0.13.0.ebuild 3619 SHA256 f934647eceef2c326878d31bdf9289ca86726ed1ced5f29568df1935ba6a37f1 SHA512 370aa07dba0e61fe23dc57a33cb460058cfa1708a5d2e21dc7bb41cdfa7bb987e71281ab16dca0e056e1192cf6e69653e689eb5aa87231bbe105544ff69c2f93 WHIRLPOOL 300028a9c33c9010650dfd12437ec9b5e0ccb44b5404b20b2ec897ea4d15dceabf4d2ff89678c90ba567847581d4c03ea12524193ccbff63bc1c3a83421a77ce
-EBUILD scipy-0.13.1-r2.ebuild 3788 SHA256 83773fbd8dc2906d2e809378e45f939d88211785f12014db26cc34e8adc7aa24 SHA512 1a48a5ee02b1c53860cd9afd53d78e2f115ec92b431053f8ebb3de74c13e8aa1a52fbff33d57043390b70aa64171f0f5035f23e0a1a333cb0d15bc2f11284c0c WHIRLPOOL 18333f4e53ac4a88355b4bb4a02cd1a3eb22d3d312ace1aa26e2f07eeefd5cfa03113ef1cd01a2ed85798b5e28a017a4c54ac80bed12652ccf33b1e4c005a05d
-EBUILD scipy-0.13.2-r1.ebuild 3856 SHA256 fe6cb1e6fd7a8dafe8bbc0d8158ef5d7ba4ee4d8c7d1a5d095a3f5e010465f11 SHA512 fadf57e152b9ba2b8ad0b08274d2c0e9ddd9044aaa8e64e1ed1d3a76ce092d776c55876d72b75a4d2c0fb1e34e6f931cf9f074a44fdbab13d1cf3ac21fcbdffe WHIRLPOOL 07c78c273d806476e9bc0d56adaae39b13bbc495d622a8d88f81580650cc73754f7bf2170d864c8504d012cc90e2cd1a485f13f84c999b7d7b82345c73cca459
 EBUILD scipy-0.13.2.ebuild 3821 SHA256 7fbd1d0be83c47969d44a79eab7b5d5045d4fc02633e038a7ce870a782c3aca8 SHA512 4a9a5a14d1386dfdf46dc1701508b0be052ab9b6cf05e7972689d6842808491eb952cf2269fcf926aec8664ed40953fe11f62b3bfb5f2bc9dc940d60681a642d WHIRLPOOL 45018cacda91ce0f7ea2692994ea6e608fa7996a6f92e6eb8f73c0bd4f29d42fe0e3c4efc1d60cd3fddc082f961695a4706bfdcf6caac3a693b4657c76cf4346
 EBUILD scipy-0.13.3.ebuild 3908 SHA256 84f2c632747009664ccb54a824693774756c3c6d8d0b7358b4af918423402794 SHA512 12198a238908a6634a4d932fc109d99232bbd2229d844a68bf72f1a3f963d39187e1526182e1db6e9a2367a4b0ba7e314f4bf49b3b9880801c79b76f2cf56bed WHIRLPOOL 1c82ffb86698348aca2cd6b020809df3d112933eb2bb2fbc469c4e541f021737fb0fd211e7dd9dca0bc0633cd651656393fedbac00d04efa6dbba99f3499dd84
-MISC ChangeLog 20725 SHA256 40fdfdf8372721dea223bcdf29539c9f458770bfa90d7f362e3d6125a6ca5d42 SHA512 4d0a009e568d48035051dcd5158fceb9816489a993b414280087e7434af3f3b69821b776a762ca2463b31170434e38e18a6de156af69cbd014269d975cbcb142 WHIRLPOOL 75199c3af0f8d6140d4ea0743aeb56d84ac1eab9427df8e1c1d02f4f0378faec34f45e1a652ced7d7c02684f018daae7b12711ade1e2725f59815032b8ed00fc
+EBUILD scipy-0.14.0.ebuild 3921 SHA256 663215a533e78e73244cb178bd60d2c9a45e4f1ba994077df9aa04ab8582dd56 SHA512 5d03a46e0b5bcbe8e9842f41361bb1d9b090567b3253b29b5326b6a8382390ef288e10e40aa80a2d52a3ac7c7c6680aec980efbb77c80cdb734980afa89afe60 WHIRLPOOL a6056dc28f146ab4d1bbdc2dd922c235b6ec106b723bfd8da2f120f1d442e3f31e308c785b6baac167e50f33232acb27e8eecb42576d540b94d534de13c45d27
+MISC ChangeLog 21071 SHA256 ced1635ab3c201167ed92b7c798987f102448283105528c13b796b68a0e88181 SHA512 4cda66f935297f4754bbfec986b917cfe44f770c084692c4011f29f3b27997d5fc5acef473cf80314277a2d09115234e15eeef5f54964662a6684672edd79201 WHIRLPOOL f6d45443cda614f67ed12695bdce109bcb4c5a7be5da4cac76eef1cdd5e2d7eda865ba06c425b8266844c1aa493449443e531d957e8b1138e708d659d4d7f480
 MISC metadata.xml 762 SHA256 b7a3a5110f5a2446485192ef06b28ce3d67c607b8badf892e764855f74677e59 SHA512 78f48ed6f5cb05e33c96f16ca583a4a6f80b1684e40e355e16ebc3457eaf03b79f7c4893792a0669168edb6e6de1a255e480266adc0e42c797ed5aec8b7c04dd WHIRLPOOL d9277e0e18ced1233e4d724799307eab3f02dfe7c14d80b375727e2dccd22b660b296653c90dadf671da72ff95c627c5ffc2baf5ba062542de44803c2a7c3ea7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlMx3BgACgkQ1ycZbhPLE2A85ACfcurs14jts0tlc0H22nkeR136
-WuoAoJwdc4c9rY9qty4dKypx0ky5+SLD
-=yzrW
+iEYEAREIAAYFAlNn8ukACgkQ1ycZbhPLE2C9QQCfcq6+Gacbau/c8G/JJmYlE5SN
+PdcAn0NoQ27Wqgp7/AeRZc/B0B7F7D1B
+=SwkE
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/scipy/files/scipy-0.9.0-qhull.patch b/sci-libs/scipy/files/scipy-0.9.0-qhull.patch
deleted file mode 100644
index b1a7a5a75891..000000000000
--- a/sci-libs/scipy/files/scipy-0.9.0-qhull.patch
+++ /dev/null
@@ -1,44 +0,0 @@
- scipy/spatial/qhull.c  |    4 ++--
- scipy/spatial/setup.py |   14 +++++++-------
- 2 files changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/scipy/spatial/qhull.c b/scipy/spatial/qhull.c
-index 91e22b3..e433ae9 100644
---- a/scipy/spatial/qhull.c
-+++ b/scipy/spatial/qhull.c
-@@ -202,8 +202,8 @@
- #include "numpy/arrayobject.h"
- #include "numpy/ufuncobject.h"
- #include "math.h"
--#include "qhull/src/qset.h"
--#include "qhull/src/qhull.h"
-+#include "qhull/qset.h"
-+#include "qhull/libqhull.h"
- #include "qhull_blas.h"
- 
- 
-diff --git a/scipy/spatial/setup.py b/scipy/spatial/setup.py
-index 7401d55..254c23d 100755
---- a/scipy/spatial/setup.py
-+++ b/scipy/spatial/setup.py
-@@ -16,13 +16,13 @@ def configuration(parent_package = '', top_path = None):
-                  'random.c', 'rboxlib.c', 'stat.c', 'user.c', 'usermem.c',
-                  'userprintf.c']
- 
--    config.add_library('qhull',
--                       sources=[join('qhull', 'src', x) for x in qhull_src],
--                       include_dirs=[get_python_inc(),
--                                     get_numpy_include_dirs()],
--                       # XXX: GCC dependency!
--                       #extra_compiler_args=['-fno-strict-aliasing'],
--                       )
-+#    config.add_library('qhull',
-+#                       sources=[join('qhull', 'src', x) for x in qhull_src],
-+#                       include_dirs=[get_python_inc(),
-+#                                     get_numpy_include_dirs()],
-+#                       # XXX: GCC dependency!
-+#                       #extra_compiler_args=['-fno-strict-aliasing'],
-+#                       )
- 
-     lapack = dict(get_info('lapack_opt'))
-     try:
diff --git a/sci-libs/scipy/files/scipy-0.9.0-superlu.patch b/sci-libs/scipy/files/scipy-0.9.0-superlu.patch
deleted file mode 100644
index 88f60be0cbbf..000000000000
--- a/sci-libs/scipy/files/scipy-0.9.0-superlu.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- scipy/sparse/linalg/dsolve/_superluobject.h.orig	2011-03-24 22:05:15.995923005 +1300
-+++ scipy/sparse/linalg/dsolve/_superluobject.h	2011-03-24 22:06:09.638923002 +1300
-@@ -9,11 +9,10 @@
- #define __SUPERLU_OBJECT
- 
- #include "Python.h"
--#include "SuperLU/SRC/slu_zdefs.h"
-+#include "superlu/slu_zdefs.h"
- #include "numpy/arrayobject.h"
--#include "SuperLU/SRC/slu_util.h"
--#include "SuperLU/SRC/slu_dcomplex.h"
--#include "SuperLU/SRC/slu_scomplex.h"
-+#include "superlu/slu_util.h"
-+#include "superlu/slu_dcomplex.h"
- 
- 
- #define _CHECK_INTEGER(x) (PyArray_ISINTEGER(x) && (x)->descr->elsize == sizeof(int))
- 
---- scipy/sparse/linalg/dsolve/setup.py.orig	2011-02-20 22:58:20.000000000 +1300
-+++ scipy/sparse/linalg/dsolve/setup.py	2011-03-25 11:08:02.691267018 +1300
-@@ -25,18 +25,12 @@
-         # when using MSVC + MKL, lsame is already in MKL
-         sources.remove(join(superlu_src, 'lsame.c'))
- 
--    config.add_library('superlu_src',
--                       sources = sources,
--                       macros = superlu_defs,
--                       include_dirs=[superlu_src],
--                       )
--
-     # Extension
-     config.add_extension('_superlu',
-                          sources = ['_superlumodule.c',
-                                     '_superlu_utils.c',
-                                     '_superluobject.c'],
--                         libraries = ['superlu_src'],
-+                         libraries = ['superlu'],
-                          extra_info = lapack_opt,
-                          )
- 
diff --git a/sci-libs/scipy/scipy-0.13.0.ebuild b/sci-libs/scipy/scipy-0.13.0.ebuild
deleted file mode 100644
index f7d4ec7ded1f..000000000000
--- a/sci-libs/scipy/scipy-0.13.0.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/scipy-0.13.0.ebuild,v 1.1 2013/10/28 22:42:53 bicatali Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-
-inherit eutils fortran-2 distutils-r1 flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="Scientific algorithms library for Python"
-HOMEPAGE="http://www.scipy.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	doc? (
-		http://docs.scipy.org/doc/${P}/${PN}-html.zip -> ${P}-html.zip
-		http://docs.scipy.org/doc/${P}/${PN}-ref.pdf -> ${P}-ref.pdf
-	)"
-
-LICENSE="BSD LGPL-2"
-SLOT="0"
-IUSE="doc sparse test"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-
-CDEPEND="
-	dev-python/numpy[lapack,${PYTHON_USEDEP}]
-	sci-libs/arpack
-	virtual/cblas
-	virtual/lapack
-	sparse? ( sci-libs/umfpack )"
-DEPEND="${CDEPEND}
-	dev-lang/swig
-	dev-python/cython[${PYTHON_USEDEP}]
-	virtual/pkgconfig
-	doc? ( app-arch/unzip )
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-RDEPEND="${CDEPEND}
-	virtual/python-imaging[${PYTHON_USEDEP}]"
-
-DOCS=( HACKING.rst.txt THANKS.txt )
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	if use doc; then
-		unzip -qo "${DISTDIR}"/${P}-html.zip -d html || die
-	fi
-}
-
-pc_incdir() {
-	$(tc-getPKG_CONFIG) --cflags-only-I $@ | \
-		sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//'
-}
-
-pc_libdir() {
-	$(tc-getPKG_CONFIG) --libs-only-L $@ | \
-		sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//'
-}
-
-pc_libs() {
-	$(tc-getPKG_CONFIG) --libs-only-l $@ | \
-		sed -e 's/[ ]-l*\(pthread\|m\)[ ]*//g' \
-		-e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//'
-}
-
-python_prepare_all() {
-	# scipy automatically detects libraries by default
-	export {FFTW,FFTW3,UMFPACK}=None
-	use sparse && unset UMFPACK
-	# the missing symbols are in -lpythonX.Y, but since the version can
-	# differ, we just introduce the same scaryness as on Linux/ELF
-	[[ ${CHOST} == *-darwin* ]] \
-		&& append-ldflags -bundle "-undefined dynamic_lookup" \
-		|| append-ldflags -shared
-	[[ -z ${FC}  ]] && export FC="$(tc-getFC)"
-	# hack to force F77 to be FC until bug #278772 is fixed
-	[[ -z ${F77} ]] && export F77="$(tc-getFC)"
-	export F90="${FC}"
-	export SCIPY_FCONFIG="config_fc --noopt --noarch"
-	append-fflags -fPIC
-
-	local libdir="${EPREFIX}"/usr/$(get_libdir)
-	cat >> site.cfg <<-EOF
-		[blas]
-		include_dirs = $(pc_incdir cblas)
-		library_dirs = $(pc_libdir cblas blas):${libdir}
-		blas_libs = $(pc_libs cblas blas)
-		[lapack]
-		library_dirs = $(pc_libdir lapack):${libdir}
-		lapack_libs = $(pc_libs lapack)
-	EOF
-
-	local PATCHES=(
-		"${FILESDIR}"/${PN}-0.12.0-blitz.patch
-		"${FILESDIR}"/${PN}-0.12.0-restore-sys-argv.patch
-		"${FILESDIR}"/${PN}-0.12.0-cephes-missing-include.patch
-	)
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	distutils-r1_python_compile ${SCIPY_FCONFIG}
-}
-
-python_test() {
-	# fails with bdist_egg. should it be fixed in distutils-r1 eclass?
-	distutils_install_for_testing ${SCIPY_FCONFIG}
-	cd "${TEST_DIR}" || die "no ${TEST_DIR} available"
-	"${EPYTHON}" -c "
-import scipy, sys
-r = scipy.test('fast',verbose=2)
-sys.exit(0 if r.wasSuccessful() else 1)" || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	if use doc; then
-		dohtml -r "${WORKDIR}"/html/.
-		dodoc "${DISTDIR}"/${P}*pdf
-	fi
-	distutils-r1_python_install_all
-}
-
-python_install() {
-	distutils-r1_python_install ${SCIPY_FCONFIG}
-}
-
-pkg_postinst() {
-	elog "You might want to set the variable SCIPY_PIL_IMAGE_VIEWER"
-	elog "to your prefered image viewer. Example:"
-	elog "\t echo \"export SCIPY_PIL_IMAGE_VIEWER=display\" >> ~/.bashrc"
-}
diff --git a/sci-libs/scipy/scipy-0.13.1-r2.ebuild b/sci-libs/scipy/scipy-0.13.1-r2.ebuild
deleted file mode 100644
index e27be9c0b324..000000000000
--- a/sci-libs/scipy/scipy-0.13.1-r2.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/scipy-0.13.1-r2.ebuild,v 1.2 2013/12/03 08:16:16 jlec Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-
-inherit eutils fortran-2 distutils-r1 flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="Scientific algorithms library for Python"
-HOMEPAGE="http://www.scipy.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	doc? (
-		http://docs.scipy.org/doc/${PN}-0.13.0/${PN}-html.zip -> ${PN}-0.13.0-html.zip
-		http://docs.scipy.org/doc/${PN}-0.13.0/${PN}-ref.pdf -> ${PN}-0.13.0-ref.pdf
-	)"
-
-LICENSE="BSD LGPL-2"
-SLOT="0"
-IUSE="doc sparse test"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-
-CDEPEND="
-	dev-python/numpy[lapack,${PYTHON_USEDEP}]
-	sci-libs/arpack
-	virtual/cblas
-	virtual/lapack
-	sparse? ( sci-libs/umfpack )"
-DEPEND="${CDEPEND}
-	dev-lang/swig
-	>=dev-python/cython-0.19.1[${PYTHON_USEDEP}]
-	virtual/pkgconfig
-	doc? ( app-arch/unzip )
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-RDEPEND="${CDEPEND}
-	virtual/python-imaging[${PYTHON_USEDEP}]"
-
-DOCS=( HACKING.rst.txt THANKS.txt )
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	if use doc; then
-		unzip -qo "${DISTDIR}"/${PN}-0.13.0-html.zip -d html || die
-	fi
-}
-
-pc_incdir() {
-	$(tc-getPKG_CONFIG) --cflags-only-I $@ | \
-		sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//'
-}
-
-pc_libdir() {
-	$(tc-getPKG_CONFIG) --libs-only-L $@ | \
-		sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//'
-}
-
-pc_libs() {
-	$(tc-getPKG_CONFIG) --libs-only-l $@ | \
-		sed -e 's/[ ]-l*\(pthread\|m\)[ ]*//g' \
-		-e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//'
-}
-
-python_prepare_all() {
-	# scipy automatically detects libraries by default
-	export {FFTW,FFTW3,UMFPACK}=None
-	use sparse && unset UMFPACK
-	# the missing symbols are in -lpythonX.Y, but since the version can
-	# differ, we just introduce the same scaryness as on Linux/ELF
-	[[ ${CHOST} == *-darwin* ]] \
-		&& append-ldflags -bundle "-undefined dynamic_lookup" \
-		|| append-ldflags -shared
-	[[ -z ${FC}  ]] && export FC="$(tc-getFC)"
-	# hack to force F77 to be FC until bug #278772 is fixed
-	[[ -z ${F77} ]] && export F77="$(tc-getFC)"
-	export F90="${FC}"
-	export SCIPY_FCONFIG="config_fc --noopt --noarch"
-	append-fflags -fPIC
-
-	local libdir="${EPREFIX}"/usr/$(get_libdir)
-	cat >> site.cfg <<-EOF
-		[blas]
-		include_dirs = $(pc_incdir cblas)
-		library_dirs = $(pc_libdir cblas blas):${libdir}
-		blas_libs = $(pc_libs cblas blas)
-		[lapack]
-		library_dirs = $(pc_libdir lapack):${libdir}
-		lapack_libs = $(pc_libs lapack)
-	EOF
-
-	# Drop hashes to force rebuild of cython based .c code
-	rm cythonize.dat || die
-
-	local PATCHES=(
-		"${FILESDIR}"/${PN}-0.12.0-blitz.patch
-		"${FILESDIR}"/${PN}-0.12.0-restore-sys-argv.patch
-		"${FILESDIR}"/${PN}-0.12.0-cephes-missing-include.patch
-	)
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	${EPYTHON} tools/cythonize.py || die
-	distutils-r1_python_compile ${SCIPY_FCONFIG}
-}
-
-python_test() {
-	# fails with bdist_egg. should it be fixed in distutils-r1 eclass?
-	distutils_install_for_testing ${SCIPY_FCONFIG}
-	cd "${TEST_DIR}" || die "no ${TEST_DIR} available"
-	"${EPYTHON}" -c "
-import scipy, sys
-r = scipy.test('fast',verbose=2)
-sys.exit(0 if r.wasSuccessful() else 1)" || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	if use doc; then
-		dohtml -r "${WORKDIR}"/html/.
-		dodoc "${DISTDIR}"/${PN}*pdf
-	fi
-	distutils-r1_python_install_all
-}
-
-python_install() {
-	distutils-r1_python_install ${SCIPY_FCONFIG}
-}
-
-pkg_postinst() {
-	elog "You might want to set the variable SCIPY_PIL_IMAGE_VIEWER"
-	elog "to your prefered image viewer. Example:"
-	elog "\t echo \"export SCIPY_PIL_IMAGE_VIEWER=display\" >> ~/.bashrc"
-}
diff --git a/sci-libs/scipy/scipy-0.13.2-r1.ebuild b/sci-libs/scipy/scipy-0.14.0.ebuild
index 348af206e78e..a0698a7d00a0 100644
--- a/sci-libs/scipy/scipy-0.13.2-r1.ebuild
+++ b/sci-libs/scipy/scipy-0.14.0.ebuild
@@ -1,41 +1,41 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/scipy-0.13.2-r1.ebuild,v 1.1 2013/12/26 20:52:20 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/scipy-0.14.0.ebuild,v 1.1 2014/05/05 20:21:53 bicatali Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} )
 
+DOC_PV=0.13.0
 inherit eutils fortran-2 distutils-r1 flag-o-matic multilib toolchain-funcs
 
 DESCRIPTION="Scientific algorithms library for Python"
 HOMEPAGE="http://www.scipy.org/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 	doc? (
-		http://docs.scipy.org/doc/${PN}-0.13.0/${PN}-html.zip -> ${PN}-0.13.0-html.zip
-		http://docs.scipy.org/doc/${PN}-0.13.0/${PN}-ref.pdf -> ${PN}-0.13.0-ref.pdf
+		http://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-html.zip -> ${PN}-${DOC_PV}-html.zip
+		http://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-ref.pdf -> ${PN}-${DOC_PV}-ref.pdf
 	)"
 
 LICENSE="BSD LGPL-2"
 SLOT="0"
 IUSE="doc sparse test"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
 CDEPEND="
 	dev-python/numpy[lapack,${PYTHON_USEDEP}]
-	sci-libs/arpack
+	sci-libs/arpack:0=
 	virtual/cblas
 	virtual/lapack
-	sparse? ( sci-libs/umfpack )"
+	sparse? ( sci-libs/umfpack:0= )"
 DEPEND="${CDEPEND}
 	dev-lang/swig
 	>=dev-python/cython-0.19.1[${PYTHON_USEDEP}]
 	virtual/pkgconfig
 	doc? ( app-arch/unzip )
 	test? (
-		dev-python/mpmath[${PYTHON_USEDEP}]
 		dev-python/nose[${PYTHON_USEDEP}]
-		)"
+	)"
 
 RDEPEND="${CDEPEND}
 	virtual/python-imaging[${PYTHON_USEDEP}]"
@@ -47,25 +47,25 @@ DISTUTILS_IN_SOURCE_BUILD=1
 src_unpack() {
 	unpack ${P}.tar.gz
 	if use doc; then
-		unzip -qo "${DISTDIR}"/${PN}-0.13.0-html.zip -d html || die
+		unzip -qo "${DISTDIR}"/${PN}-${DOC_PV}-html.zip -d html || die
 	fi
 }
 
 pc_incdir() {
 	$(tc-getPKG_CONFIG) --cflags-only-I $@ | \
-		sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//'
+		sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||'
 }
 
 pc_libdir() {
 	$(tc-getPKG_CONFIG) --libs-only-L $@ | \
-		sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//'
+		sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||'
 }
 
 pc_libs() {
 	$(tc-getPKG_CONFIG) --libs-only-l $@ | \
 		sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \
 		-e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \
-		| sort | uniq | tr '\n' ','
+		| tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||'
 }
 
 python_prepare_all() {