diff options
| author |   Sebastien Fabbro <bicatali@gentoo.org> | 2014-03-25 19:26:53 +0000 |
|---|---|---|
| committer | Sebastien Fabbro <bicatali@gentoo.org> | 2014-03-25 19:26:53 +0000 |
| commit | 80fc4812defa2799b5d9a7e333ddea896653e42e (patch) | |
| tree | f87b8d10cdfd3c82f94911d1ece5b8c28c9483b7 /dev-python/numpy | |
| parent | Don't depend on unzip. Remove old. (diff) | |
| download | gentoo-2-80fc4812defa2799b5d9a7e333ddea896653e42e.tar.gz gentoo-2-80fc4812defa2799b5d9a7e333ddea896653e42e.tar.bz2 gentoo-2-80fc4812defa2799b5d9a7e333ddea896653e42e.zip | |
More fixes to the site.cfg file generation
(Portage version: 2.2.8-prefix/cvs/Linux x86_64, signed Manifest commit with key 0x13CB1360)
Diffstat (limited to 'dev-python/numpy')
| -rw-r--r-- | dev-python/numpy/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-python/numpy/numpy-1.8.0-r1.ebuild | 8 |
2 files changed, 8 insertions, 5 deletions
diff --git a/dev-python/numpy/ChangeLog b/dev-python/numpy/ChangeLog index fd3d2b43bcf1..44a29ebf1b9a 100644 --- a/dev-python/numpy/ChangeLog +++ b/dev-python/numpy/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-python/numpy # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.233 2014/03/18 20:21:22 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.234 2014/03/25 19:26:53 bicatali Exp $ + + 25 Mar 2014; Sébastien Fabbro <bicatali@gentoo.org> numpy-1.8.0-r1.ebuild: + More fixes to the site.cfg file generation 18 Mar 2014; Sébastien Fabbro <bicatali@gentoo.org> numpy-1.8.0-r1.ebuild: Fix sed to allow complex pkg-config lines from mkl, thanks diff --git a/dev-python/numpy/numpy-1.8.0-r1.ebuild b/dev-python/numpy/numpy-1.8.0-r1.ebuild index 7b7746384182..096855d4d241 100644 --- a/dev-python/numpy/numpy-1.8.0-r1.ebuild +++ b/dev-python/numpy/numpy-1.8.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.8.0-r1.ebuild,v 1.12 2014/03/18 20:21:22 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.8.0-r1.ebuild,v 1.13 2014/03/25 19:26:53 bicatali Exp $ EAPI=5 @@ -51,19 +51,19 @@ src_unpack() { 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/[ ]*$//' \ - | tr ',' '\n' | sort | uniq | tr '\n' ',' + | tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||' } python_prepare_all() { |