summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2013-02-03 13:48:49 +0000
committerMichał Górny <mgorny@gentoo.org>2013-02-03 13:48:49 +0000
commit81272de998a474ee2d35cb55e1b9a9a0452b16c7 (patch)
tree0ad05ecfae39d79dd871a739c51def13731a4129 /dev-python/numpy
parentAdd ~arm, wrt bug #450672 (diff)
downloadgentoo-2-81272de998a474ee2d35cb55e1b9a9a0452b16c7.tar.gz
gentoo-2-81272de998a474ee2d35cb55e1b9a9a0452b16c7.tar.bz2
gentoo-2-81272de998a474ee2d35cb55e1b9a9a0452b16c7.zip
Wrap f2py in the -r1 way.
(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key 42B9401D)
Diffstat (limited to 'dev-python/numpy')
-rw-r--r--dev-python/numpy/ChangeLog8
-rw-r--r--dev-python/numpy/numpy-1.6.2-r2.ebuild (renamed from dev-python/numpy/numpy-1.6.2-r1.ebuild)5
2 files changed, 11 insertions, 2 deletions
diff --git a/dev-python/numpy/ChangeLog b/dev-python/numpy/ChangeLog
index 57567669c4c3..246e2be2bb85 100644
--- a/dev-python/numpy/ChangeLog
+++ b/dev-python/numpy/ChangeLog
@@ -1,6 +1,12 @@
# 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.183 2013/02/01 23:15:19 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.184 2013/02/03 13:48:49 mgorny Exp $
+
+*numpy-1.6.2-r2 (03 Feb 2013)
+
+ 03 Feb 2013; Michał Górny <mgorny@gentoo.org> +numpy-1.6.2-r2.ebuild,
+ -numpy-1.6.2-r1.ebuild:
+ Wrap f2py in the -r1 way.
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,
diff --git a/dev-python/numpy/numpy-1.6.2-r1.ebuild b/dev-python/numpy/numpy-1.6.2-r2.ebuild
index 15f2889e600e..96c2c405878c 100644
--- a/dev-python/numpy/numpy-1.6.2-r1.ebuild
+++ b/dev-python/numpy/numpy-1.6.2-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.6.2-r1.ebuild,v 1.1 2013/02/01 20:44:54 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.6.2-r2.ebuild,v 1.1 2013/02/03 13:48:49 mgorny Exp $
EAPI=5
@@ -102,6 +102,9 @@ 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
+
distutils-r1_python_prepare_all
}