Date: Wednesday, March 11, 2015 @ 08:19:30 Author: arojas Revision: 129048
- Use new ipython2-notebook virtual package in depends - Remove no longer needed patch Modified: sage-mathematics/trunk/PKGBUILD Deleted: sage-mathematics/trunk/blas.patch ------------+ PKGBUILD | 10 ++++------ blas.patch | 30 ------------------------------ 2 files changed, 4 insertions(+), 36 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-03-11 06:53:43 UTC (rev 129047) +++ PKGBUILD 2015-03-11 07:19:30 UTC (rev 129048) @@ -20,8 +20,8 @@ 'sage-data-combinatorial_designs' 'sage-data-elliptic_curves' 'sage-data-graphs' 'sage-data-polytopes_db' 'sage-data-conway_polynomials') optdepends=('cython2: to compile cython code' 'jmol: 3D plots' 'sage-notebook: Browser-based (flask) notebook interface' 'sage-mathematics-doc: Documentation and inline help' 'sage-mathematics-src: source files needed to build cython code' - 'python2-pyzmq: IPython notebook' 'python2-tornado: IPython notebook' 'python2-jinja: IPython notebook' 'python2-jsonschema: IPython notebook' - 'mathjax: IPython notebook' 'coin-or-cbc: COIN backend for numerical computations' 'nauty: for generating some classes of graphs' + 'ipython2-notebook: IPython notebook interface' 'mathjax: IPython notebook interface' + 'coin-or-cbc: COIN backend for numerical computations' 'nauty: for generating some classes of graphs' 'buckygen: for generating fullerene graphs' 'plantri: for generating some classes of graphs' 'benzene: for generating fusenes and benzenoids' 'libfes: exhaustive search of solutions for boolean polynomial systems' 'lrs: Algorithms for linear reverse search used in game theory and for computing volume of polytopes' @@ -38,7 +38,6 @@ '5216dbb3d80cecc8ec4a36cc9706f8b5' '563bc42699116d71ca6b06b9f149304e' 'acc25f13728517badafa70d220ab7b8e' - 'eee444d32b8a818a67b1e0ce0850b8bb' '46c212a3a6713b0f78c370c7186d0982' '5947a420a0b1483f0cbc74c76895789b' 'a83a3b1bc7fcb7cbf752a83a8311fc42' @@ -64,9 +63,8 @@ patch -p0 -i "$srcdir"/env.patch # fix paths in python imports patch -p0 -i "$srcdir"/paths.patch -# fix linking to blas/cblas - patch -p0 -i "$srcdir"/blas.patch - sed -e "s|cblas(), atlas(),|'cblas', 'blas',|" -i src/sage/misc/cython.py +# fix cython linking + sed -e "s| atlas(),||" -i src/sage/misc/cython.py # don't try to remove installed files patch -p0 -i "$srcdir"/clean.patch # skip checking build status Deleted: blas.patch =================================================================== --- blas.patch 2015-03-11 06:53:43 UTC (rev 129047) +++ blas.patch 2015-03-11 07:19:30 UTC (rev 129048) @@ -1,30 +0,0 @@ ---- src/module_list.py.orig 2014-11-12 20:34:01.861234916 +0100 -+++ src/module_list.py 2014-11-12 20:35:39.411508934 +0100 -@@ -10,25 +10,8 @@ - ### BLAS setup - ######################################################### - --## Choose cblas library -- note -- make sure to update sage/misc/cython.py --## if you change this!! --if os.environ.has_key('SAGE_BLAS'): -- BLAS=os.environ['SAGE_BLAS'] -- BLAS2=os.environ['SAGE_BLAS'] --elif os.path.exists('%s/lib/libatlas.so'%os.environ['SAGE_LOCAL']): -- BLAS='cblas' -- BLAS2='atlas' --elif os.path.exists('/usr/lib/libcblas.dylib') or \ -- os.path.exists('/usr/lib/libcblas.so'): -- BLAS='cblas' -- BLAS2='cblas' --elif os.path.exists('/usr/lib/libblas.dll.a'): -- BLAS='gslcblas' -- BLAS2='gslcblas' --else: -- # This is very slow (?), but *guaranteed* to be available. -- BLAS='gslcblas' -- BLAS2='gslcblas' -+BLAS='blas' -+BLAS2='cblas' - - - #########################################################