dev-python/numpy: Properly handle f2py stuff

Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=570760

Package-Manager: portage-2.2.26
Signed-off-by: Justin Lecher <jlec@gentoo.org>

diff --git a/dev-python/numpy/numpy-1.10.2-r1.ebuild b/dev-python/numpy/numpy-1.10.2-r2.ebuild
similarity index 89%
rename from dev-python/numpy/numpy-1.10.2-r1.ebuild
rename to dev-python/numpy/numpy-1.10.2-r2.ebuild
index 9dc68cdc08ffc9be7569bbb4d114140fa5387733..33f693b40a1c9ed7fc45274a31ec248ed7376e0f 100644 (file)
--- a/dev-python/numpy/numpy-1.10.2-r1.ebuild
+++ b/dev-python/numpy/numpy-1.10.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -105,12 +105,12 @@ python_prepare_all() {
                [[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95"
        fi
 
-       # don't version f2py, we will handle it.
-       sed -i -e '/f2py_exe/s:+os\.path.*$::' numpy/f2py/setup.py || die
+#      # don't version f2py, we will handle it.
+       sed -i -e '/f2py_exe/s: + os\.path.*$::' numpy/f2py/setup.py || die
 
-       # we don't have f2py-3.3
+#      # we don't have f2py-3.3
        sed \
-               -e "/f2py_cmd/s:'f2py'.*:'f2py'\]:g" \
+               -e 's:test_f2py:_&:g' \
                -i numpy/tests/test_scripts.py || die
 
        distutils-r1_python_prepare_all
@@ -135,17 +135,16 @@ python_install() {
 }
 
 python_install_all() {
-       distutils-r1_python_install_all
-
-       dodoc COMPATIBILITY DEV_README.txt THANKS.txt
+       DOCS+=( COMPATIBILITY DEV_README.txt THANKS.txt )
 
        if use doc; then
-               dohtml -r "${WORKDIR}"/html/*
-               dodoc "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf
+               HTML_DOCS=( "${WORKDIR}"/html/. )
+               DOCS+=( "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf )
        fi
 
-       # absent in 1.9
-       #docinto f2py
-       #dodoc numpy/f2py/docs/*.txt
-       #doman numpy/f2py/f2py.1
+       distutils-r1_python_install_all
+
+       docinto f2py
+       dodoc doc/f2py/*.txt
+       doman doc/f2py/f2py.1
 }