dev-python/numpy: Fix Bug 563068 - dev-python/numpy-1.10.0_p2 -

unpack numpy-ref-1.9.1.pdf: file format not recognized -
mv: target ?/var/tmp/portage/dev-python/numpy-1.10.0_p2/work/numpy-1.10.0_p2? is not a directory
Thanks to Juergen Rose for reporting.

diff --git a/dev-python/numpy/numpy-1.10.0_p2.ebuild b/dev-python/numpy/numpy-1.10.0_p2.ebuild
index 1174f3a6b65200828b2fa5d78e7221829c0775a0..301e0be73dd291cc3bd056e6ba2739232e07f7a2 100644 (file)
--- a/dev-python/numpy/numpy-1.10.0_p2.ebuild
+++ b/dev-python/numpy/numpy-1.10.0_p2.ebuild
@@ -10,12 +10,15 @@ FORTRAN_NEEDED=lapack
 
 inherit distutils-r1 eutils flag-o-matic fortran-2 multilib multiprocessing toolchain-funcs versionator
 
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+
 DOC_PV="1.9.1"
 DOC_P="${PN}-${DOC_PV}"
 
 DESCRIPTION="Fast array and numerical python library"
 HOMEPAGE="http://www.numpy.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P/_p/.post}.tar.gz
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz
        doc? (
                http://docs.scipy.org/doc/${DOC_P}/${PN}-html-${DOC_PV}.zip
                http://docs.scipy.org/doc/${DOC_P}/${PN}-ref-${DOC_PV}.pdf
@@ -42,10 +45,10 @@ PATCHES=(
        "${FILESDIR}"/${PN}-1.9.2-no-hardcode-blas.patch
 )
 
+S="${WORKDIR}/${MY_P}"
+
 src_unpack() {
        default
-       mv "${WORKDIR}"/* "${S}" || die
-
        if use doc; then
                unzip -qo "${DISTDIR}"/${PN}-html-${DOC_PV}.zip -d html || die
        fi