jlec 14/11/14 20:34:09 Modified: metadata.xml ChangeLog Added: scipy-0.14.0-r1.ebuild Log: sci-libs/scipy: Backport fix for broken lsqr (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)
Revision Changes Path 1.15 sci-libs/scipy/metadata.xml file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/scipy/metadata.xml?rev=1.15&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/scipy/metadata.xml?rev=1.15&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/scipy/metadata.xml?r1=1.14&r2=1.15 Index: metadata.xml =================================================================== RCS file: /var/cvsroot/gentoo-x86/sci-libs/scipy/metadata.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- metadata.xml 18 Mar 2014 20:26:21 -0000 1.14 +++ metadata.xml 14 Nov 2014 20:34:09 -0000 1.15 @@ -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.118 sci-libs/scipy/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/scipy/ChangeLog?rev=1.118&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/scipy/ChangeLog?rev=1.118&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/scipy/ChangeLog?r1=1.117&r2=1.118 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sci-libs/scipy/ChangeLog,v retrieving revision 1.117 retrieving revision 1.118 diff -u -r1.117 -r1.118 --- ChangeLog 22 Jul 2014 17:47:47 -0000 1.117 +++ ChangeLog 14 Nov 2014 20:34:09 -0000 1.118 @@ -1,6 +1,12 @@ # 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.117 2014/07/22 17:47:47 zerochaos Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/ChangeLog,v 1.118 2014/11/14 20:34:09 jlec Exp $ + +*scipy-0.14.0-r1 (14 Nov 2014) + + 14 Nov 2014; Justin Lecher <[email protected]> +scipy-0.14.0-r1.ebuild, + +files/scipy-0.14.0-lsqr-backport.patch, metadata.xml: + Backport fix for broken lsqr 22 Jul 2014; Rick Farina <[email protected]> scipy-0.12.1.ebuild, scipy-0.13.2.ebuild, scipy-0.13.3.ebuild, scipy-0.14.0.ebuild: 1.1 sci-libs/scipy/scipy-0.14.0-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/scipy/scipy-0.14.0-r1.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/scipy/scipy-0.14.0-r1.ebuild?rev=1.1&content-type=text/plain Index: scipy-0.14.0-r1.ebuild =================================================================== # 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.14.0-r1.ebuild,v 1.1 2014/11/14 20:34:09 jlec Exp $ EAPI=5 PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} ) DOC_PV=0.13.0 inherit eutils fortran-2 distutils-r1 flag-o-matic multilib toolchain-funcs DESCRIPTION="Scientific algorithms library for Python" HOMEPAGE="http://www.scipy.org/"; SRC_URI=" mirror://sourceforge/${PN}/${P}.tar.gz doc? ( http://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-html.zip -> ${PN}-${DOC_PV}-html.zip http://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-ref.pdf -> ${PN}-${DOC_PV}-ref.pdf )" LICENSE="BSD LGPL-2" SLOT="0" IUSE="doc sparse test" KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" CDEPEND=" dev-python/numpy[lapack,${PYTHON_USEDEP}] sci-libs/arpack:0= virtual/cblas virtual/lapack sparse? ( sci-libs/umfpack:0= )" DEPEND="${CDEPEND} dev-lang/swig >=dev-python/cython-0.19.1[${PYTHON_USEDEP}] virtual/pkgconfig doc? ( app-arch/unzip ) test? ( dev-python/nose[${PYTHON_USEDEP}] ) " RDEPEND="${CDEPEND} virtual/python-imaging[${PYTHON_USEDEP}]" DOCS=( HACKING.rst.txt THANKS.txt ) DISTUTILS_IN_SOURCE_BUILD=1 src_unpack() { unpack ${P}.tar.gz if use doc; then unzip -qo "${DISTDIR}"/${PN}-${DOC_PV}-html.zip -d html || die fi } pc_incdir() { $(tc-getPKG_CONFIG) --cflags-only-I $@ | \ 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/[ ]*$//' -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 -u | tr '\n' ',' | sed -e 's|,$||' } python_prepare_all() { # scipy automatically detects libraries by default export {FFTW,FFTW3,UMFPACK}=None use sparse && unset UMFPACK # the missing symbols are in -lpythonX.Y, but since the version can # differ, we just introduce the same scaryness as on Linux/ELF [[ ${CHOST} == *-darwin* ]] \ && append-ldflags -bundle "-undefined dynamic_lookup" \ || append-ldflags -shared [[ -z ${FC} ]] && export FC="$(tc-getFC)" # hack to force F77 to be FC until bug #278772 is fixed [[ -z ${F77} ]] && export F77="$(tc-getFC)" export F90="${FC}" export SCIPY_FCONFIG="config_fc --noopt --noarch" append-fflags -fPIC local libdir="${EPREFIX}"/usr/$(get_libdir) cat >> site.cfg <<-EOF [blas] include_dirs = $(pc_incdir cblas) library_dirs = $(pc_libdir cblas blas):${libdir} blas_libs = $(pc_libs cblas blas) [lapack] library_dirs = $(pc_libdir lapack):${libdir} lapack_libs = $(pc_libs lapack) EOF # Drop hashes to force rebuild of cython based .c code rm cythonize.dat || die local PATCHES=( "${FILESDIR}"/${PN}-0.12.0-blitz.patch "${FILESDIR}"/${PN}-0.12.0-restore-sys-argv.patch "${FILESDIR}"/${PN}-0.12.0-cephes-missing-include.patch "${FILESDIR}"/${P}-lsqr-backport.patch ) distutils-r1_python_prepare_all } python_compile() { ${EPYTHON} tools/cythonize.py || die distutils-r1_python_compile ${SCIPY_FCONFIG} } python_test() { # fails with bdist_egg. should it be fixed in distutils-r1 eclass? distutils_install_for_testing ${SCIPY_FCONFIG} cd "${TEST_DIR}" || die "no ${TEST_DIR} available" "${EPYTHON}" -c " import scipy, sys r = scipy.test('fast',verbose=2) sys.exit(0 if r.wasSuccessful() else 1)" || die "Tests fail with ${EPYTHON}" } python_install_all() { if use doc; then dodoc "${DISTDIR}"/${PN}*pdf docinto html dodoc -r "${WORKDIR}"/html/. fi distutils-r1_python_install_all } python_install() { distutils-r1_python_install ${SCIPY_FCONFIG} } pkg_postinst() { elog "You might want to set the variable SCIPY_PIL_IMAGE_VIEWER" elog "to your prefered image viewer. Example:" elog "\t echo \"export SCIPY_PIL_IMAGE_VIEWER=display\" >> ~/.bashrc" }
