bicatali 14/03/18 20:26:22 Modified: metadata.xml scipy-0.13.3.ebuild ChangeLog Log: Fix sed to allow complex pkg-config lines from mkl, thanks weih...@illinois.edu, bug #504618 (Portage version: 2.2.8-prefix/cvs/Linux x86_64, signed Manifest commit with key 0x13CB1360)
Revision Changes Path 1.14 sci-libs/scipy/metadata.xml file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/scipy/metadata.xml?rev=1.14&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/scipy/metadata.xml?rev=1.14&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/scipy/metadata.xml?r1=1.13&r2=1.14 Index: metadata.xml =================================================================== RCS file: /var/cvsroot/gentoo-x86/sci-libs/scipy/metadata.xml,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- metadata.xml 13 Oct 2013 17:54:35 -0000 1.13 +++ metadata.xml 18 Mar 2014 20:26:21 -0000 1.14 @@ -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> 1.2 sci-libs/scipy/scipy-0.13.3.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/scipy/scipy-0.13.3.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/scipy/scipy-0.13.3.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/scipy/scipy-0.13.3.ebuild?r1=1.1&r2=1.2 Index: scipy-0.13.3.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sci-libs/scipy/scipy-0.13.3.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- scipy-0.13.3.ebuild 21 Feb 2014 14:13:08 -0000 1.1 +++ scipy-0.13.3.ebuild 18 Mar 2014 20:26:21 -0000 1.2 @@ -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 @@ test? ( dev-python/mpmath[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] - )" + )" RDEPEND="${CDEPEND} virtual/python-imaging[${PYTHON_USEDEP}]" @@ -65,7 +65,7 @@ $(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() { 1.113 sci-libs/scipy/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/scipy/ChangeLog?rev=1.113&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/scipy/ChangeLog?rev=1.113&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/scipy/ChangeLog?r1=1.112&r2=1.113 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sci-libs/scipy/ChangeLog,v retrieving revision 1.112 retrieving revision 1.113 diff -u -r1.112 -r1.113 --- ChangeLog 21 Feb 2014 14:13:08 -0000 1.112 +++ ChangeLog 18 Mar 2014 20:26:21 -0000 1.113 @@ -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 <bicat...@gentoo.org> metadata.xml, + scipy-0.13.3.ebuild: + Fix sed to allow complex pkg-config lines from mkl, thanks + weih...@illinois.edu, bug #504618 *scipy-0.13.3 (21 Feb 2014)
