summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastien Fabbro <bicatali@gentoo.org>2014-03-18 20:26:21 +0000
committerSebastien Fabbro <bicatali@gentoo.org>2014-03-18 20:26:21 +0000
commit7fe5ea1a17a22fdb26d09b63c35e992e223f0a85 (patch)
treec4fa8df9d9c80606a588a51c61861cb824e9efa1 /sci-libs
parentFix sed to allow complex pkg-config lines from mkl, thanks weihan3@illinois.e... (diff)
downloadgentoo-2-7fe5ea1a17a22fdb26d09b63c35e992e223f0a85.tar.gz
gentoo-2-7fe5ea1a17a22fdb26d09b63c35e992e223f0a85.tar.bz2
gentoo-2-7fe5ea1a17a22fdb26d09b63c35e992e223f0a85.zip
Fix sed to allow complex pkg-config lines from mkl, thanks weihan3@illinois.edu, bug #504618
(Portage version: 2.2.8-prefix/cvs/Linux x86_64, signed Manifest commit with key 0x13CB1360)
Diffstat (limited to 'sci-libs')
-rw-r--r--sci-libs/scipy/ChangeLog7
-rw-r--r--sci-libs/scipy/metadata.xml16
-rw-r--r--sci-libs/scipy/scipy-0.13.3.ebuild6
3 files changed, 17 insertions, 12 deletions
diff --git a/sci-libs/scipy/ChangeLog b/sci-libs/scipy/ChangeLog
index bdeee0c909ae..45d5949131a8 100644
--- a/sci-libs/scipy/ChangeLog
+++ b/sci-libs/scipy/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for sci-libs/scipy
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/ChangeLog,v 1.112 2014/02/21 14:13:08 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/ChangeLog,v 1.113 2014/03/18 20:26:21 bicatali Exp $
+
+ 18 Mar 2014; Sébastien Fabbro <bicatali@gentoo.org> metadata.xml,
+ scipy-0.13.3.ebuild:
+ Fix sed to allow complex pkg-config lines from mkl, thanks
+ weihan3@illinois.edu, bug #504618
*scipy-0.13.3 (21 Feb 2014)
diff --git a/sci-libs/scipy/metadata.xml b/sci-libs/scipy/metadata.xml
index 350066e901ec..4ee19593821e 100644
--- a/sci-libs/scipy/metadata.xml
+++ b/sci-libs/scipy/metadata.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sci</herd>
- <longdescription lang="en">
+<herd>sci</herd>
+<longdescription lang="en">
SciPy is an open source library of scientific tools for Python. SciPy
supplements the popular numpy module, gathering a variety of high level
science and engineering modules together as a single package.
@@ -10,10 +10,10 @@
integration, special functions, signal and image processing, genetic
algorithms, ODE solvers, and others.
</longdescription>
- <use>
- <flag name="sparse">Adds support for sparse solving with <pkg>sci-libs/umfpack</pkg></flag>
- </use>
- <upstream>
- <remote-id type="pypi">scipy</remote-id>
- </upstream>
+<use>
+ <flag name="sparse">Adds support for sparse solving with <pkg>sci-libs/umfpack</pkg></flag>
+</use>
+<upstream>
+ <remote-id type="pypi">scipy</remote-id>
+</upstream>
</pkgmetadata>
diff --git a/sci-libs/scipy/scipy-0.13.3.ebuild b/sci-libs/scipy/scipy-0.13.3.ebuild
index a760a80ae646..f0f27dca3c87 100644
--- a/sci-libs/scipy/scipy-0.13.3.ebuild
+++ b/sci-libs/scipy/scipy-0.13.3.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/sci-libs/scipy/scipy-0.13.3.ebuild,v 1.1 2014/02/21 14:13:08 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/scipy-0.13.3.ebuild,v 1.2 2014/03/18 20:26:21 bicatali Exp $
EAPI=5
@@ -35,7 +35,7 @@ DEPEND="${CDEPEND}
test? (
dev-python/mpmath[${PYTHON_USEDEP}]
dev-python/nose[${PYTHON_USEDEP}]
- )"
+ )"
RDEPEND="${CDEPEND}
virtual/python-imaging[${PYTHON_USEDEP}]"
@@ -65,7 +65,7 @@ pc_libs() {
$(tc-getPKG_CONFIG) --libs-only-l $@ | \
sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \
-e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \
- | sort | uniq | tr '\n' ','
+ tr ',' '\n' | sort | uniq | tr '\n' ','
}
python_prepare_all() {