From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 8E02F1388BF for ; Wed, 6 Jan 2016 17:15:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 04F14E0867; Wed, 6 Jan 2016 17:14:57 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9B6DEE0867 for ; Wed, 6 Jan 2016 17:14:56 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BAF45340A38 for ; Wed, 6 Jan 2016 17:14:54 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C7119D01 for ; Wed, 6 Jan 2016 17:14:52 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1452100488.b48b454b3056202c949e2f72f5f088eb93057da1.jlec@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/numpy/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/numpy/numpy-1.10.2-r1.ebuild dev-python/numpy/numpy-1.10.2-r2.ebuild X-VCS-Directories: dev-python/numpy/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: b48b454b3056202c949e2f72f5f088eb93057da1 X-VCS-Branch: master Date: Wed, 6 Jan 2016 17:14:52 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 83b52f55-8a44-4e0f-8725-3d508b5a0974 X-Archives-Hash: acc9f58d860dcbfb697560135108289f commit: b48b454b3056202c949e2f72f5f088eb93057da1 Author: Justin Lecher gentoo org> AuthorDate: Wed Jan 6 17:14:41 2016 +0000 Commit: Justin Lecher gentoo org> CommitDate: Wed Jan 6 17:14:48 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b48b454b 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 gentoo.org> ...mpy-1.10.2-r1.ebuild => numpy-1.10.2-r2.ebuild} | 27 +++++++++++----------- 1 file changed, 13 insertions(+), 14 deletions(-) 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 9dc68cd..33f693b 100644 --- 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 }