[arch-commits] Commit in sage-mathematics/trunk (PKGBUILD)

2015-03-11 Thread Antonio Rojas
Date: Wednesday, March 11, 2015 @ 20:47:56
  Author: arojas
Revision: 129082

Correctly detect and use large Cremona database if installed

Modified:
  sage-mathematics/trunk/PKGBUILD

--+
 PKGBUILD |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-03-11 17:44:30 UTC (rev 129081)
+++ PKGBUILD2015-03-11 19:47:56 UTC (rev 129082)
@@ -71,8 +71,9 @@
   patch -p0 -i $srcdir/skip-check.patch
 # supress warning about GAP install dir
   sed -e s|gapdir = os.path.join(SAGE_LOCAL, 'gap', 'latest')|gapdir = 
'/usr/lib/gap'| -i src/sage/libs/gap/util.pyx 
-# use small Cremona database
-  sed -e s|is_package_installed('database_cremona_ellcurve')|False| -i 
src/sage/databases/cremona.py
+# fix Cremona database detection
+  sed -e 
s|is_package_installed('database_cremona_ellcurve')|os.path.exists('/usr/share/sage/cremona/cremona.db')|
 \
+   -i src/sage/databases/cremona.py
 
 # Upstream patches  
 # fix build against libfes 0.2 http://trac.sagemath.org/ticket/15209


[arch-commits] Commit in sage-mathematics/trunk (PKGBUILD blas.patch)

2015-03-11 Thread Antonio Rojas
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
===
--- PKGBUILD2015-03-11 06:53:43 UTC (rev 129047)
+++ PKGBUILD2015-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.orig2014-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'
- 
- 
- #


[arch-commits] Commit in sage-mathematics/trunk (PKGBUILD)

2015-03-11 Thread Antonio Rojas
Date: Wednesday, March 11, 2015 @ 08:21:34
  Author: arojas
Revision: 129049

Really remove patch

Modified:
  sage-mathematics/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-03-11 07:19:30 UTC (rev 129048)
+++ PKGBUILD2015-03-11 07:21:34 UTC (rev 129049)
@@ -29,7 +29,7 @@
 makedepends=('cython2' 'boost' 'scons' 'ratpoints' 'symmetrica' 'fflas-ffpack' 
'python2-jinja' 'coin-or-cbc' 'mcqd' 'libfes' 'coxeter3'
   'cryptominisat')
 
source=($pkgname-$pkgver.tar.gz::https://github.com/sagemath/sage/archive/$pkgver.tar.gz;
 http://www.sagemath.org/packages/upstream/pexpect/pexpect-2.0.tar.bz2;
-'anal.h' 'package.patch' 'c_lib.patch' 'env.patch' 'paths.patch' 'blas.patch' 
'clean.patch' 'skip-check.patch'
+'anal.h' 'package.patch' 'c_lib.patch' 'env.patch' 'paths.patch' 'clean.patch' 
'skip-check.patch'
 'pexpect-env.patch' 'pexpect-del.patch' 'fes02.patch' 'tests_parallel.patch' 
'ipython3.patch')
 md5sums=('5a173b1ecce89c845626653cfb3d199f'
  'd9a3e113ed147dcee8f89962a8dccd43'


[arch-commits] Commit in sage-mathematics/trunk (PKGBUILD ipython3.patch)

2015-03-01 Thread Antonio Rojas
Date: Sunday, March 1, 2015 @ 13:37:57
  Author: arojas
Revision: 128483

Backport IPython 3 support

Added:
  sage-mathematics/trunk/ipython3.patch
Modified:
  sage-mathematics/trunk/PKGBUILD

+
 PKGBUILD   |   45 
 ipython3.patch |11325 +++
 2 files changed, 11352 insertions(+), 18 deletions(-)

The diff is longer than the limit of 200KB.
Use svn diff -r 128482:128483 to see the changes.


[arch-commits] Commit in sage-mathematics/trunk (PKGBUILD paths.patch)

2015-02-28 Thread Antonio Rojas
Date: Saturday, February 28, 2015 @ 22:13:28
  Author: arojas
Revision: 128431

NTL 8 rebuild

Modified:
  sage-mathematics/trunk/PKGBUILD
  sage-mathematics/trunk/paths.patch

-+
 PKGBUILD|   11 ---
 paths.patch |2 +-
 2 files changed, 5 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-02-28 19:44:17 UTC (rev 128430)
+++ PKGBUILD2015-02-28 21:13:28 UTC (rev 128431)
@@ -9,7 +9,7 @@
 
 pkgname=sage-mathematics
 pkgver=6.5
-pkgrel=1
+pkgrel=2
 pkgdesc=Open Source Mathematics Software, free alternative to Magma, Maple, 
Mathematica, and Matlab
 arch=('i686' 'x86_64')
 url=http://www.sagemath.org;
@@ -36,7 +36,7 @@
  '0eb5ac1537aac93bd67a2925c0cfd84d'
  '5216dbb3d80cecc8ec4a36cc9706f8b5'
  '563bc42699116d71ca6b06b9f149304e'
- '9a39301dedeb560f7bfddb81b6853f28'
+ 'acc25f13728517badafa70d220ab7b8e'
  'eee444d32b8a818a67b1e0ce0850b8bb'
  '46c212a3a6713b0f78c370c7186d0982'
  '5947a420a0b1483f0cbc74c76895789b'
@@ -78,10 +78,8 @@
   patch -p0 -i $srcdir/tests_parallel.patch
 
 # use python2
-  sed -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' -i src/bin/*
-  sed -e 's|exec python|exec python2|' -i src/bin/*
-  sed -e 's|cython %s %s|cython2 %s %s|' -i src/sage/misc/cython.py
-  sed -e 's|python setup.py|python2 setup.py|' -i src/sage/misc/cython.py
+  sed -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' -e 's|exec 
python|exec python2|' -i src/bin/*
+  sed -e 's|cython %s %s|cython2 %s %s|' -e 's|python setup.py|python2 
setup.py|' -i src/sage/misc/cython.py
   sed -e 's|exec ipython|exec ipython2|' -e 's|cygdb|cygdb2|' -i src/bin/sage
   sed -e s|'cython'|'cython2'| -i src/bin/sage-cython
 
@@ -150,4 +148,3 @@
   mkdir -p $pkgdir/usr/lib/sage/site-packages/
   mv $pkgdir/usr/lib/python2.7/site-packages/pexpect* 
$pkgdir/usr/lib/sage/site-packages/
 }
-

Modified: paths.patch
===
--- paths.patch 2015-02-28 19:44:17 UTC (rev 128430)
+++ paths.patch 2015-02-28 21:13:28 UTC (rev 128431)
@@ -15,7 +15,7 @@
  
  _add_variable_or_fallback('SAGE_SRC',opj('$SAGE_ROOT', 'src'))
 -_add_variable_or_fallback('SITE_PACKAGES',   site.getsitepackages())
-+_add_variable_or_fallback('SITE_PACKAGES',   '/usr/lib/sage/site-packages')
++_add_variable_or_fallback('SITE_PACKAGES',   
site.getsitepackages()+['/usr/lib/sage/site-packages'])
  _add_variable_or_fallback('SAGE_LIB',SITE_PACKAGES[0])
  
 -_add_variable_or_fallback('SAGE_EXTCODE',opj('$SAGE_SHARE', 'sage', 
'ext'))


[arch-commits] Commit in sage-mathematics/trunk (PKGBUILD)

2015-02-08 Thread Antonio Rojas
Date: Monday, February 9, 2015 @ 01:35:40
  Author: arojas
Revision: 127324

Coinutils 2.10.2 rebuild

Modified:
  sage-mathematics/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-02-08 22:59:03 UTC (rev 127323)
+++ PKGBUILD2015-02-09 00:35:40 UTC (rev 127324)
@@ -9,7 +9,7 @@
 
 pkgname=sage-mathematics
 pkgver=6.4.1
-pkgrel=8
+pkgrel=9
 pkgdesc=Open Source Mathematics Software, free alternative to Magma, Maple, 
Mathematica, and Matlab
 arch=('i686' 'x86_64')
 url=http://www.sagemath.org;


[arch-commits] Commit in sage-mathematics/trunk (PKGBUILD)

2015-01-25 Thread Antonio Rojas
Date: Sunday, January 25, 2015 @ 10:05:02
  Author: arojas
Revision: 126551

Add missing makedepends

Modified:
  sage-mathematics/trunk/PKGBUILD

--+
 PKGBUILD |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-01-25 09:03:58 UTC (rev 126550)
+++ PKGBUILD2015-01-25 09:05:02 UTC (rev 126551)
@@ -25,7 +25,8 @@
   '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: computing volume of polytopes'
   'coxeter3: Coxeter groups implementation' 'cryptominisat: SAT solver' 
'lrcalc: fast computation of LR coefficients')
-makedepends=('cython2' 'boost' 'scons' 'ratpoints' 'symmetrica' 'fflas-ffpack' 
'python2-jinja' 'coin-or-cbc' 'mcqd')
+makedepends=('cython2' 'boost' 'scons' 'ratpoints' 'symmetrica' 'fflas-ffpack' 
'python2-jinja' 'coin-or-cbc' 'mcqd' 'libfes' 'coxeter3'
+  'cryptominisat' 'lrcalc')
 source=(https://github.com/sagemath/sage/archive/$pkgver.tar.gz; 
http://www.sagemath.org/packages/upstream/pexpect/pexpect-2.0.tar.bz2; 
 'package.patch' 'c_lib.patch' 'env.patch' 'paths.patch' 'blas.patch' 
'clean.patch' 'skip-check.patch' 
 'pexpect-env.patch' 'pexpect-del.patch' 'fes02.patch')


[arch-commits] Commit in sage-mathematics/trunk (PKGBUILD)

2015-01-22 Thread Antonio Rojas
Date: Thursday, January 22, 2015 @ 23:00:44
  Author: arojas
Revision: 126436

Move more stuff to optdepends

Modified:
  sage-mathematics/trunk/PKGBUILD

--+
 PKGBUILD |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-01-22 21:51:05 UTC (rev 126435)
+++ PKGBUILD2015-01-22 22:00:44 UTC (rev 126436)
@@ -15,16 +15,16 @@
 url=http://www.sagemath.org;
 license=('GPL')
 depends=('ipython2' 'ppl' 'glpk' 'mpfi' 'palp' 'polybori' 'singular' 
'libcliquer' 'maxima-ecl' 'gfan' 'sympow' 'tachyon' 'python2-rpy2'
-  'python2-matplotlib' 'python2-scipy' 'python2-sympy' 'python2-networkx' 
'libgap' 'gap' 'genus2reduction' 'flintqs' 'lcalc' 'lrcalc'
-  'cryptominisat' 'eclib' 'gmp-ecm' 'zn_poly' 'python2-gd' 'python2-cvxopt' 
'pynac' 'linbox' 'gsl' 'rubiks' 'coxeter3'
-  'pari-galdata' 'pari-seadata-small' 'sage-data-combinatorial_designs' 
'sage-data-elliptic_curves' 'sage-data-graphs' 'sage-data-polytopes_db'
-  'sage-data-conway_polynomials')
+  'python2-matplotlib' 'python2-scipy' 'python2-sympy' 'python2-networkx' 
'libgap' 'gap' 'genus2reduction' 'flintqs' 'lcalc'
+  'eclib' 'gmp-ecm' 'zn_poly' 'python2-gd' 'python2-cvxopt' 'pynac' 'linbox' 
'gsl' 'rubiks' 'pari-galdata' 'pari-seadata-small'
+  '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'
   '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: computing volume of polytopes')
+  'libfes: exhaustive search of solutions for boolean polynomial systems' 
'lrs: computing volume of polytopes'
+  'coxeter3: Coxeter groups implementation' 'cryptominisat: SAT solver' 
'lrcalc: fast computation of LR coefficients')
 makedepends=('cython2' 'boost' 'scons' 'ratpoints' 'symmetrica' 'fflas-ffpack' 
'python2-jinja' 'coin-or-cbc' 'mcqd')
 source=(https://github.com/sagemath/sage/archive/$pkgver.tar.gz; 
http://www.sagemath.org/packages/upstream/pexpect/pexpect-2.0.tar.bz2; 
 'package.patch' 'c_lib.patch' 'env.patch' 'paths.patch' 'blas.patch' 
'clean.patch' 'skip-check.patch' 


[arch-commits] Commit in sage-mathematics/trunk (PKGBUILD)

2015-01-20 Thread Antonio Rojas
Date: Tuesday, January 20, 2015 @ 10:02:09
  Author: arojas
Revision: 126284

Coinutils 2.10 rebuild

Modified:
  sage-mathematics/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-01-20 08:38:19 UTC (rev 126283)
+++ PKGBUILD2015-01-20 09:02:09 UTC (rev 126284)
@@ -9,7 +9,7 @@
 
 pkgname=sage-mathematics
 pkgver=6.4.1
-pkgrel=7
+pkgrel=8
 pkgdesc=Open Source Mathematics Software, free alternative to Magma, Maple, 
Mathematica, and Matlab
 arch=('i686' 'x86_64')
 url=http://www.sagemath.org;


[arch-commits] Commit in sage-mathematics/trunk (PKGBUILD)

2015-01-20 Thread Antonio Rojas
Date: Tuesday, January 20, 2015 @ 20:27:01
  Author: arojas
Revision: 126319

mcqd is not needed at runtime

Modified:
  sage-mathematics/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-01-20 19:25:33 UTC (rev 126318)
+++ PKGBUILD2015-01-20 19:27:01 UTC (rev 126319)
@@ -16,7 +16,7 @@
 license=('GPL')
 depends=('ipython2' 'ppl' 'glpk' 'mpfi' 'palp' 'polybori' 'singular' 
'libcliquer' 'maxima-ecl' 'gfan' 'sympow' 'tachyon' 'python2-rpy2'
   'python2-matplotlib' 'python2-scipy' 'python2-sympy' 'python2-networkx' 
'libgap' 'gap' 'genus2reduction' 'flintqs' 'lcalc' 'lrcalc' 'libfes'
-  'cryptominisat' 'eclib' 'gmp-ecm' 'zn_poly' 'python2-gd' 'python2-cvxopt' 
'pynac' 'linbox' 'gsl' 'rubiks' 'coxeter3' 'nauty' 'mcqd'
+  'cryptominisat' 'eclib' 'gmp-ecm' 'zn_poly' 'python2-gd' 'python2-cvxopt' 
'pynac' 'linbox' 'gsl' 'rubiks' 'coxeter3' 'nauty'
   'pari-galdata' 'pari-seadata-small' '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: 
Web-based notebook interface'
@@ -23,7 +23,7 @@
   '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'
   'coin-or-cbc: COIN backend for numerical computations')
-makedepends=('cython2' 'boost' 'scons' 'ratpoints' 'symmetrica' 'fflas-ffpack' 
'python2-jinja' 'coin-or-cbc')
+makedepends=('cython2' 'boost' 'scons' 'ratpoints' 'symmetrica' 'fflas-ffpack' 
'python2-jinja' 'coin-or-cbc' 'mcqd')
 source=(https://github.com/sagemath/sage/archive/$pkgver.tar.gz; 
http://www.sagemath.org/packages/upstream/pexpect/pexpect-2.0.tar.bz2; 
 'extensions.patch' 'c_lib.patch' 'env.patch' 'paths.patch' 'blas.patch' 
'clean.patch' 'skip-check.patch' 'gap-hap.patch' 
 'pexpect-env.patch' 'pexpect-del.patch' 'fes02.patch')


[arch-commits] Commit in sage-mathematics/trunk (PKGBUILD pexpect-del.patch)

2015-01-19 Thread Antonio Rojas
Date: Monday, January 19, 2015 @ 20:49:17
  Author: arojas
Revision: 126245

Add upstream patch to hide exceptions in pexpect, fixes a few test failures

Added:
  sage-mathematics/trunk/pexpect-del.patch
Modified:
  sage-mathematics/trunk/PKGBUILD

---+
 PKGBUILD  |7 +--
 pexpect-del.patch |   15 +++
 2 files changed, 20 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-01-19 19:48:06 UTC (rev 126244)
+++ PKGBUILD2015-01-19 19:49:17 UTC (rev 126245)
@@ -26,7 +26,7 @@
 makedepends=('cython2' 'boost' 'scons' 'ratpoints' 'symmetrica' 'fflas-ffpack' 
'python2-jinja' 'coin-or-cbc')
 source=(https://github.com/sagemath/sage/archive/$pkgver.tar.gz; 
http://www.sagemath.org/packages/upstream/pexpect/pexpect-2.0.tar.bz2; 
 'extensions.patch' 'c_lib.patch' 'env.patch' 'paths.patch' 'blas.patch' 
'clean.patch' 'skip-check.patch' 'gap-hap.patch' 
-'pexpect-env.patch' 'fes02.patch')
+'pexpect-env.patch' 'pexpect-del.patch' 'fes02.patch')
 md5sums=('e40736461992e62af3a84cf9a212c9d1'
  'd9a3e113ed147dcee8f89962a8dccd43'
  '5770766ae676491f79162d2062ce7c02'
@@ -38,6 +38,7 @@
  '5947a420a0b1483f0cbc74c76895789b'
  '631ee6b8b3e7d12bb7858cfd841af483'
  'a83a3b1bc7fcb7cbf752a83a8311fc42'
+ 'f333939ea6c41377b66407c81016cee4'
  '506944613082ba7f5b34360939ca90eb')
 # changelog=ChangeLog
 
@@ -85,9 +86,11 @@
   sed -e 's|exec ipython|exec ipython2|' -e 's|cygdb|cygdb2|' -i src/bin/sage
   sed -e s|'cython'|'cython2'| -i src/bin/sage-cython
 
+  cd $srcdir/pexpect-2.0
 # fix env in pexpect
-  cd $srcdir/pexpect-2.0
   patch -p1 -i $srcdir/pexpect-env.patch
+# hide exceptions in pexpect
+  patch -p1 -i $srcdir/pexpect-del.patch
 }
 
 

Added: pexpect-del.patch
===
--- pexpect-del.patch   (rev 0)
+++ pexpect-del.patch   2015-01-19 19:49:17 UTC (rev 126245)
@@ -0,0 +1,15 @@
+diff -ru src/pexpect.py src.del/pexpect.py
+--- src/pexpect.py 2005-11-17 15:36:09.0 +0100
 src.del/pexpect.py 2012-01-13 10:24:01.0 +0100
+@@ -341,7 +341,10 @@
+ 
+ if self.closed:
+ return
+-self.close()
++try:
++self.close()
++except:
++pass
+ 
+ def __str__(self):
+ This returns the current state of the pexpect object as a string.


[arch-commits] Commit in sage-mathematics/trunk (PKGBUILD paths.patch)

2015-01-18 Thread Antonio Rojas
Date: Sunday, January 18, 2015 @ 17:24:33
  Author: arojas
Revision: 126110

- Enable COIN-OR module
- Move -src subpackage to -doc package, so it can be 'any' arch
- Only install scripts that can actually be run
- Fix PYTHONDIR in python imports
- Move cython to optdepends
- Drop unused SAGE_FAT_BINARY flag
- And yet more python - python2 fixes

Modified:
  sage-mathematics/trunk/PKGBUILD
  sage-mathematics/trunk/paths.patch

-+
 PKGBUILD|   55 ---
 paths.patch |   10 +-
 2 files changed, 29 insertions(+), 36 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-01-18 16:07:28 UTC (rev 126109)
+++ PKGBUILD2015-01-18 16:24:33 UTC (rev 126110)
@@ -7,17 +7,23 @@
 # Contributor: Stefan Husmann stefan-husmann at t-online dot de
 # Special thanks to Nareto for moving the compile from the .install to the 
PKGBUILD
 
-pkgbase=sage-mathematics
-pkgname=('sage-mathematics' 'sage-mathematics-src')
+pkgname=sage-mathematics
 pkgver=6.4.1
-pkgrel=5
+pkgrel=6
 pkgdesc=Open Source Mathematics Software, free alternative to Magma, Maple, 
Mathematica, and Matlab
 arch=('i686' 'x86_64')
 url=http://www.sagemath.org;
 license=('GPL')
-makedepends=('ipython2' 'cython2' 'ppl' 'glpk' 'mpfi' 'polybori' 'singular' 
'libcliquer' 'ecl' 'libgap' 'givaro' 'libmpc' 'lcalc' 'lrcalc'
-'libfes' 'cryptominisat' 'eclib' 'gmp-ecm' 'zn_poly' 'pynac' 'linbox' 'gsl' 
'boost' 'scons' 'ratpoints' 'symmetrica' 'fflas-ffpack' 'gd'
-'coxeter3' 'mcqd' 'python2-jinja' 'python2-numpy')
+depends=('ipython2' 'ppl' 'glpk' 'mpfi' 'palp' 'polybori' 'singular' 
'libcliquer' 'maxima-ecl' 'gfan' 'sympow' 'tachyon' 'python2-rpy2'
+  'python2-matplotlib' 'python2-scipy' 'python2-sympy' 'python2-networkx' 
'libgap' 'gap' 'genus2reduction' 'flintqs' 'lcalc' 'lrcalc' 'libfes'
+  'cryptominisat' 'eclib' 'gmp-ecm' 'zn_poly' 'python2-gd' 'python2-cvxopt' 
'pynac' 'linbox' 'gsl' 'rubiks' 'coxeter3' 'nauty' 'mcqd'
+  'pari-galdata' 'pari-seadata-small' '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: 
Web-based 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'
+  'coin-or-cbc: COIN backend for numerical computations')
+makedepends=('cython2' 'boost' 'scons' 'ratpoints' 'symmetrica' 'fflas-ffpack' 
'python2-jinja' 'coin-or-cbc')
 source=(https://github.com/sagemath/sage/archive/$pkgver.tar.gz; 
http://www.sagemath.org/packages/upstream/pexpect/pexpect-2.0.tar.bz2; 
 'extensions.patch' 'c_lib.patch' 'env.patch' 'paths.patch' 'blas.patch' 
'clean.patch' 'skip-check.patch' 'gap-hap.patch' 
 'pexpect-env.patch' 'fes02.patch')
@@ -26,7 +32,7 @@
  '5770766ae676491f79162d2062ce7c02'
  '5216dbb3d80cecc8ec4a36cc9706f8b5'
  'b980378df4bff2cd1ca002bbfae995a2'
- 'df2f56fb5845a83808b6724f6965ec6e'
+ '9a39301dedeb560f7bfddb81b6853f28'
  'eee444d32b8a818a67b1e0ce0850b8bb'
  '46c212a3a6713b0f78c370c7186d0982'
  '5947a420a0b1483f0cbc74c76895789b'
@@ -40,7 +46,7 @@
 
 # add optional packages manually (Fedora)  
   patch -p0 -i $srcdir/extensions.patch
-  for _ext in cryptominisat fes lrcalc coxeter3 mcqd
+  for _ext in cryptominisat fes lrcalc coxeter3 mcqd cbc
   do
sed -e s|is_package_installed('$_ext')|True| -i src/module_list.py
   done
@@ -76,6 +82,8 @@
   sed -e 's|exec python|exec python2|' -i src/bin/*
   sed -e 's|cython %s %s|cython2 %s %s|' -i src/sage/misc/cython.py
   sed -e 's|python setup.py|python2 setup.py|' -i src/sage/misc/cython.py
+  sed -e 's|exec ipython|exec ipython2|' -e 's|cygdb|cygdb2|' -i src/bin/sage
+  sed -e s|'cython'|'cython2'| -i src/bin/sage-cython
 
 # fix env in pexpect
   cd $srcdir/pexpect-2.0
@@ -86,7 +94,6 @@
 build() {
   cd sage-$pkgver/src
 
-  export SAGE_FAT_BINARY='yes'
   export SAGE_LOCAL=/usr
   export SAGE_SRC=$PWD
 
@@ -103,16 +110,7 @@
 }
 
 
-package_sage-mathematics() {
-  depends=('ipython2' 'cython2' 'ppl' 'glpk' 'mpfi' 'palp' 'polybori' 
'singular' 'libcliquer' 'maxima-ecl' 'gfan' 'sympow' 'tachyon' 'python2-rpy2'
-  'python2-matplotlib' 'python2-scipy' 'python2-sympy' 'python2-networkx' 
'libgap' 'gap' 'genus2reduction' 'flintqs' 'lcalc' 'lrcalc' 'libfes'
-  'cryptominisat' 'eclib' 'gmp-ecm' 'zn_poly' 'python2-gd' 'python2-cvxopt' 
'pynac' 'linbox' 'gsl' 'rubiks' 'coxeter3' 'nauty' 'mcqd'
-  'pari-galdata' 'pari-seadata-small' 'sage-data-combinatorial_designs' 
'sage-data-elliptic_curves' 'sage-data-graphs' 'sage-data-polytopes_db'
-  'sage-data-conway_polynomials')
-  optdepends=('jmol: 3D plots' 'sage-notebook: Web-based notebook interface' 

[arch-commits] Commit in sage-mathematics/trunk (PKGBUILD)

2015-01-18 Thread Antonio Rojas
Date: Sunday, January 18, 2015 @ 21:22:46
  Author: arojas
Revision: 126138

Fix missing sage-notebook

Modified:
  sage-mathematics/trunk/PKGBUILD

--+
 PKGBUILD |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-01-18 20:17:24 UTC (rev 126137)
+++ PKGBUILD2015-01-18 20:22:46 UTC (rev 126138)
@@ -9,7 +9,7 @@
 
 pkgname=sage-mathematics
 pkgver=6.4.1
-pkgrel=6
+pkgrel=7
 pkgdesc=Open Source Mathematics Software, free alternative to Magma, Maple, 
Mathematica, and Matlab
 arch=('i686' 'x86_64')
 url=http://www.sagemath.org;
@@ -123,7 +123,8 @@
   cp c_lib/libcsage.so $pkgdir/usr/lib
   cp bin/sage $pkgdir/usr/bin
   for _i in arch-env banner cachegrind callgrind cleaner coverage coverageall 
CSI CSI-helper.py cython env eval grep grepdoc inline-fortran ipython massif \
-maxima.lisp num-threads.py omega open preparse python rst2sws rst2txt run 
run-cython runtests startuptime.py sws2rst valgrind version.sh
+maxima.lisp notebook num-threads.py omega open preparse python rst2sws 
rst2txt run run-cython runtests startuptime.py sws2rst valgrind 
+version.sh
   do
 cp bin/sage-$_i $pkgdir/usr/bin
   done


[arch-commits] Commit in sage-mathematics/trunk (PKGBUILD)

2015-01-18 Thread Antonio Rojas
Date: Sunday, January 18, 2015 @ 21:34:49
  Author: arojas
Revision: 126142

sage-native-execute is needed too

Modified:
  sage-mathematics/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-01-18 20:32:33 UTC (rev 126141)
+++ PKGBUILD2015-01-18 20:34:49 UTC (rev 126142)
@@ -122,9 +122,9 @@
   mkdir -p $pkgdir/usr/{bin,lib}
   cp c_lib/libcsage.so $pkgdir/usr/lib
   cp bin/sage $pkgdir/usr/bin
-  for _i in arch-env banner cachegrind callgrind cleaner coverage coverageall 
CSI CSI-helper.py cython env eval grep grepdoc inline-fortran ipython massif \
-maxima.lisp notebook num-threads.py omega open preparse python rst2sws 
rst2txt run run-cython runtests startuptime.py sws2rst valgrind 
-version.sh
+  for _i in arch-env banner cachegrind callgrind cleaner coverage coverageall 
CSI CSI-helper.py cython env eval grep grepdoc inline-fortran ipython \
+massif maxima.lisp native-execute notebook num-threads.py omega open 
preparse python rst2sws rst2txt run run-cython runtests startuptime.py \
+sws2rst valgrind version.sh
   do
 cp bin/sage-$_i $pkgdir/usr/bin
   done


[arch-commits] Commit in sage-mathematics/trunk (PKGBUILD paths.patch)

2015-01-06 Thread Antonio Rojas
Date: Tuesday, January 6, 2015 @ 18:45:27
  Author: arojas
Revision: 125532

Add cvxopt dependency for next build

Modified:
  sage-mathematics/trunk/PKGBUILD
  sage-mathematics/trunk/paths.patch

-+
 PKGBUILD|4 ++--
 paths.patch |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-01-06 16:24:02 UTC (rev 125531)
+++ PKGBUILD2015-01-06 17:45:27 UTC (rev 125532)
@@ -106,8 +106,8 @@
 package_sage-mathematics() {
   depends=('ipython2' 'cython2' 'ppl' 'glpk' 'mpfi' 'palp' 'polybori' 
'singular' 'libcliquer' 'maxima-ecl' 'gfan' 'sympow' 'tachyon' 'python2-rpy2'
   'python2-matplotlib' 'python2-scipy' 'python2-sympy' 'python2-networkx' 
'libgap' 'gap' 'genus2reduction' 'flintqs' 'lcalc' 'lrcalc' 'libfes'
-  'cryptominisat' 'eclib' 'gmp-ecm' 'zn_poly' 'python2-gd' 'pynac' 'linbox' 
'gsl' 'rubiks' 'coxeter3' 'nauty' 'mcqd' 'pari-galdata'
-  'pari-seadata-small' 'sage-data-combinatorial_designs' 
'sage-data-elliptic_curves' 'sage-data-graphs' 'sage-data-polytopes_db'
+  'cryptominisat' 'eclib' 'gmp-ecm' 'zn_poly' 'python2-gd' 'python2-cvxopt' 
'pynac' 'linbox' 'gsl' 'rubiks' 'coxeter3' 'nauty' 'mcqd'
+  'pari-galdata' 'pari-seadata-small' 'sage-data-combinatorial_designs' 
'sage-data-elliptic_curves' 'sage-data-graphs' 'sage-data-polytopes_db'
   'sage-data-conway_polynomials')
   optdepends=('jmol: 3D plots' 'sage-notebook: Web-based notebook interface' 
'sage-mathematics-doc: Documentation and inline help'
   'sage-mathematics-src: source files needed to build cython code'

Modified: paths.patch
===
--- paths.patch 2015-01-06 16:24:02 UTC (rev 125531)
+++ paths.patch 2015-01-06 17:45:27 UTC (rev 125532)
@@ -10,7 +10,7 @@
 -_add_variable_or_fallback('SAGE_SHARE',  opj('$SAGE_LOCAL', 'share'))
 +_add_variable_or_fallback('SAGE_ROOT',   opj('/usr'))
 +_add_variable_or_fallback('SAGE_LOCAL',  opj('/usr'))
-+_add_variable_or_fallback('SAGE_ETC',opj('/etc'))
++_add_variable_or_fallback('SAGE_ETC',opj('/etc/sage'))
 +_add_variable_or_fallback('SAGE_SHARE',  opj('$SAGE_LOCAL', 'share', 
'sage'))
  
  _add_variable_or_fallback('SAGE_SRC',opj('$SAGE_ROOT', 'src'))


[arch-commits] Commit in sage-mathematics/trunk (PKGBUILD env.patch)

2015-01-04 Thread Antonio Rojas
Date: Monday, January 5, 2015 @ 00:01:47
  Author: arojas
Revision: 125366

- Add mcqd, nauty and coxeter3 support
- Install gprc.expect, prevents freezes when PARI throws errors

Modified:
  sage-mathematics/trunk/PKGBUILD
  sage-mathematics/trunk/env.patch

---+
 PKGBUILD  |   23 +++
 env.patch |2 +-
 2 files changed, 16 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-01-04 22:10:57 UTC (rev 125365)
+++ PKGBUILD2015-01-04 23:01:47 UTC (rev 125366)
@@ -10,12 +10,14 @@
 pkgbase=sage-mathematics
 pkgname=('sage-mathematics' 'sage-mathematics-src')
 pkgver=6.4.1
-pkgrel=4
+pkgrel=5
 pkgdesc=Open Source Mathematics Software, free alternative to Magma, Maple, 
Mathematica, and Matlab
 arch=('i686' 'x86_64')
 url=http://www.sagemath.org;
 license=('GPL')
-makedepends=('ipython2' 'cython2' 'ppl' 'glpk' 'mpfi' 'polybori' 'singular' 
'libcliquer' 'ecl' 'libgap' 'givaro' 'libmpc' 'lcalc' 'lrcalc' 'libfes' 
'cryptominisat' 'eclib' 'gmp-ecm' 'zn_poly' 'pynac' 'linbox' 'gsl' 'boost' 
'scons' 'ratpoints' 'symmetrica' 'fflas-ffpack' 'gd' 'python2-jinja' 
'python2-numpy')
+makedepends=('ipython2' 'cython2' 'ppl' 'glpk' 'mpfi' 'polybori' 'singular' 
'libcliquer' 'ecl' 'libgap' 'givaro' 'libmpc' 'lcalc' 'lrcalc'
+'libfes' 'cryptominisat' 'eclib' 'gmp-ecm' 'zn_poly' 'pynac' 'linbox' 'gsl' 
'boost' 'scons' 'ratpoints' 'symmetrica' 'fflas-ffpack' 'gd'
+'coxeter3' 'mcqd' 'python2-jinja' 'python2-numpy')
 source=(https://github.com/sagemath/sage/archive/$pkgver.tar.gz; 
http://www.sagemath.org/packages/upstream/pexpect/pexpect-2.0.tar.bz2; 
 'extensions.patch' 'c_lib.patch' 'env.patch' 'paths.patch' 'blas.patch' 
'clean.patch' 'skip-check.patch' 'gap-hap.patch' 
 'pexpect-env.patch' 'fes02.patch')
@@ -23,7 +25,7 @@
  'd9a3e113ed147dcee8f89962a8dccd43'
  '5770766ae676491f79162d2062ce7c02'
  '5216dbb3d80cecc8ec4a36cc9706f8b5'
- '0bb5d722e32359f9dc8516904316318f'
+ 'b980378df4bff2cd1ca002bbfae995a2'
  'df2f56fb5845a83808b6724f6965ec6e'
  'eee444d32b8a818a67b1e0ce0850b8bb'
  '46c212a3a6713b0f78c370c7186d0982'
@@ -38,10 +40,11 @@
 
 # add optional packages manually (Fedora)  
   patch -p0 -i $srcdir/extensions.patch
-  for _ext in cryptominisat fes lrcalc
+  for _ext in cryptominisat fes lrcalc coxeter3 mcqd
   do
-   sed -i s|is_package_installed('$_ext')|1| src/module_list.py
+   sed -e s|is_package_installed('$_ext')|True| -i src/module_list.py
   done
+  sed -e 's|is_package_installed(nauty)|True|' -i 
src/sage/graphs/graph_generators.py
 # don't assume Sage is already available (Fedora)
   patch -p0 -i $srcdir/c_lib.patch
 # find L.h header
@@ -103,8 +106,9 @@
 package_sage-mathematics() {
   depends=('ipython2' 'cython2' 'ppl' 'glpk' 'mpfi' 'palp' 'polybori' 
'singular' 'libcliquer' 'maxima-ecl' 'gfan' 'sympow' 'tachyon' 'python2-rpy2'
   'python2-matplotlib' 'python2-scipy' 'python2-sympy' 'python2-networkx' 
'libgap' 'gap' 'genus2reduction' 'flintqs' 'lcalc' 'lrcalc' 'libfes'
-  'cryptominisat' 'eclib' 'gmp-ecm' 'zn_poly' 'python2-gd' 'pynac' 'linbox' 
'gsl' 'rubiks' 'pari-galdata' 'pari-seadata-small'
-  'sage-data-combinatorial_designs' 'sage-data-elliptic_curves' 
'sage-data-graphs' 'sage-data-polytopes_db' 'sage-data-conway_polynomials')
+  'cryptominisat' 'eclib' 'gmp-ecm' 'zn_poly' 'python2-gd' 'pynac' 'linbox' 
'gsl' 'rubiks' 'coxeter3' 'nauty' 'mcqd' 'pari-galdata'
+  'pari-seadata-small' 'sage-data-combinatorial_designs' 
'sage-data-elliptic_curves' 'sage-data-graphs' 'sage-data-polytopes_db'
+  'sage-data-conway_polynomials')
   optdepends=('jmol: 3D plots' 'sage-notebook: Web-based 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')
@@ -127,8 +131,11 @@
 # Create SAGE_SRC, needed for the notebook
   mkdir $pkgdir/usr/share/sage/src
 
+# Install gprc.expect in SAGE_ETC
+  install -Dm644 ../build/pkgs/pari/gprc.expect $pkgdir/etc/sage/gprc.expect
+
 # Install Sage's own pexpect
-  cd $srcdir/pexpect-2.0
+  cd $srcdir/pexpect-2.0
   python2 setup.py install --root=$pkgdir --optimize=1
   mkdir -p $pkgdir/usr/lib/sage/site-packages/
   mv $pkgdir/usr/lib/python2.7/site-packages/pexpect* 
$pkgdir/usr/lib/sage/site-packages/

Modified: env.patch
===
--- env.patch   2015-01-04 22:10:57 UTC (rev 125365)
+++ env.patch   2015-01-04 23:01:47 UTC (rev 125366)
@@ -57,7 +57,7 @@
 -export SAGE_DOC=$SAGE_SRC/doc
 -export PATH=$SAGE_SRC/bin:$SAGE_LOCAL/bin:$PATH
 +export SAGE_LOCAL=$SAGE_ROOT
-+export SAGE_ETC=/etc
++export SAGE_ETC=/etc/sage
 +export SAGE_SHARE=$SAGE_LOCAL/share/sage
 +export SAGE_EXTCODE=$SAGE_SHARE/ext
 +export SAGE_SRC=$SAGE_SHARE/src


[arch-commits] Commit in sage-mathematics/trunk (PKGBUILD)

2015-01-03 Thread Antonio Rojas
Date: Sunday, January 4, 2015 @ 00:37:33
  Author: arojas
Revision: 125262

Another round of fixes
- Add missing python2-networkx dependency
- Remove bogus warning message about missing GAP
- Force using small Cremona database
- Fix cblas linking in cython code
- One more python - python2 fix
- Add c_lib include files in src subpackage, needed to compile cython code

Modified:
  sage-mathematics/trunk/PKGBUILD

--+
 PKGBUILD |   34 +++---
 1 file changed, 23 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-01-03 23:35:24 UTC (rev 125261)
+++ PKGBUILD2015-01-03 23:37:33 UTC (rev 125262)
@@ -10,7 +10,7 @@
 pkgbase=sage-mathematics
 pkgname=('sage-mathematics' 'sage-mathematics-src')
 pkgver=6.4.1
-pkgrel=3
+pkgrel=4
 pkgdesc=Open Source Mathematics Software, free alternative to Magma, Maple, 
Mathematica, and Matlab
 arch=('i686' 'x86_64')
 url=http://www.sagemath.org;
@@ -17,7 +17,8 @@
 license=('GPL')
 makedepends=('ipython2' 'cython2' 'ppl' 'glpk' 'mpfi' 'polybori' 'singular' 
'libcliquer' 'ecl' 'libgap' 'givaro' 'libmpc' 'lcalc' 'lrcalc' 'libfes' 
'cryptominisat' 'eclib' 'gmp-ecm' 'zn_poly' 'pynac' 'linbox' 'gsl' 'boost' 
'scons' 'ratpoints' 'symmetrica' 'fflas-ffpack' 'gd' 'python2-jinja' 
'python2-numpy')
 source=(https://github.com/sagemath/sage/archive/$pkgver.tar.gz; 
http://www.sagemath.org/packages/upstream/pexpect/pexpect-2.0.tar.bz2; 
-'extensions.patch' 'c_lib.patch' 'env.patch' 'paths.patch' 'blas.patch' 
'clean.patch' 'skip-check.patch' 'gap-hap.patch' 'pexpect-env.patch' 
'fes02.patch')
+'extensions.patch' 'c_lib.patch' 'env.patch' 'paths.patch' 'blas.patch' 
'clean.patch' 'skip-check.patch' 'gap-hap.patch' 
+'pexpect-env.patch' 'fes02.patch')
 md5sums=('e40736461992e62af3a84cf9a212c9d1'
  'd9a3e113ed147dcee8f89962a8dccd43'
  '5770766ae676491f79162d2062ce7c02'
@@ -44,9 +45,9 @@
 # don't assume Sage is already available (Fedora)
   patch -p0 -i $srcdir/c_lib.patch
 # find L.h header
-  sed -i 's|libLfunction|Lfunction|' src/module_list.py
+  sed -e 's|libLfunction|Lfunction|' -i src/module_list.py
 # don't try to link against libpng 1.2
-  sed -i 's|png12|png|' src/module_list.py
+  sed -e 's|png12|png|' -i src/module_list.py
 # set env variables
   patch -p0 -i $srcdir/env.patch
 # fix paths in python imports
@@ -53,6 +54,7 @@
   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
 # don't try to remove installed files
   patch -p0 -i $srcdir/clean.patch
 # skip checking build status
@@ -59,13 +61,18 @@
   patch -p0 -i $srcdir/skip-check.patch
 # don't use is_package_installed function
   patch -p0 -i $srcdir/gap-hap.patch
-# fix build against libfes 0.2
-  patch -p0 -i $srcdir/fes02.patch # http://trac.sagemath.org/ticket/15209
+# supress warning about GAP install dir
+  sed -e s|gapdir = os.path.join(SAGE_LOCAL, 'gap', 'latest')|gapdir = 
'/usr/lib/gap'| -i src/sage/libs/gap/util.pyx 
+# use small Cremona database
+  sed -e s|is_package_installed('database_cremona_ellcurve')|False| -i 
src/sage/databases/cremona.py
+# fix build against libfes 0.2 http://trac.sagemath.org/ticket/15209
+  patch -p0 -i $srcdir/fes02.patch
 
 # use python2
-  sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' src/bin/*
-  sed -i 's|exec python|exec python2|' src/bin/*
-  sed -i 's|cython %s %s|cython2 %s %s|' src/sage/misc/cython.py
+  sed -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' -i src/bin/*
+  sed -e 's|exec python|exec python2|' -i src/bin/*
+  sed -e 's|cython %s %s|cython2 %s %s|' -i src/sage/misc/cython.py
+  sed -e 's|python setup.py|python2 setup.py|' -i src/sage/misc/cython.py
 
 # fix env in pexpect
   cd $srcdir/pexpect-2.0
@@ -94,8 +101,10 @@
 
 
 package_sage-mathematics() {
-  depends=('ipython2' 'cython2' 'ppl' 'glpk' 'mpfi' 'palp' 'polybori' 
'singular' 'libcliquer' 'maxima-ecl' 'gfan' 'sympow' 'tachyon' 'python2-rpy2' 
-  'python2-matplotlib' 'python2-scipy' 'python2-sympy' 'libgap' 'gap' 
'genus2reduction' 'flintqs' 'lcalc' 'lrcalc' 'libfes' 'cryptominisat' 'eclib' 
'gmp-ecm' 'zn_poly' 'python2-gd' 'pynac' 'linbox' 'gsl' 'rubiks' 'pari-galdata' 
'pari-seadata-small' 'sage-data-combinatorial_designs' 
'sage-data-elliptic_curves' 'sage-data-graphs' 'sage-data-polytopes_db' 
'sage-data-conway_polynomials') # python2-pexpect
+  depends=('ipython2' 'cython2' 'ppl' 'glpk' 'mpfi' 'palp' 'polybori' 
'singular' 'libcliquer' 'maxima-ecl' 'gfan' 'sympow' 'tachyon' 'python2-rpy2'
+  'python2-matplotlib' 'python2-scipy' 'python2-sympy' 'python2-networkx' 
'libgap' 'gap' 'genus2reduction' 'flintqs' 'lcalc' 'lrcalc' 'libfes'
+  'cryptominisat' 'eclib' 'gmp-ecm' 'zn_poly' 'python2-gd' 'pynac' 'linbox' 
'gsl' 'rubiks' 'pari-galdata' 'pari-seadata-small'
+  'sage-data-combinatorial_designs' 'sage-data-elliptic_curves' 

[arch-commits] Commit in sage-mathematics/trunk (PKGBUILD fes02.patch)

2015-01-02 Thread Antonio Rojas
Date: Friday, January 2, 2015 @ 10:30:53
  Author: arojas
Revision: 125161

Fix build against libfes 0.2

Added:
  sage-mathematics/trunk/fes02.patch
Modified:
  sage-mathematics/trunk/PKGBUILD

-+
 PKGBUILD|7 +--
 fes02.patch |   45 +
 2 files changed, 50 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-01-02 08:51:10 UTC (rev 125160)
+++ PKGBUILD2015-01-02 09:30:53 UTC (rev 125161)
@@ -17,7 +17,7 @@
 license=('GPL')
 makedepends=('ipython2' 'cython2' 'ppl' 'glpk' 'mpfi' 'polybori' 'singular' 
'libcliquer' 'ecl' 'libgap' 'givaro' 'libmpc' 'lcalc' 'lrcalc' 'libfes' 
'cryptominisat' 'eclib' 'gmp-ecm' 'zn_poly' 'pynac' 'linbox' 'gsl' 'boost' 
'scons' 'ratpoints' 'symmetrica' 'fflas-ffpack' 'gd' 'python2-jinja' 
'python2-numpy')
 source=(https://github.com/sagemath/sage/archive/$pkgver.tar.gz; 
http://www.sagemath.org/packages/upstream/pexpect/pexpect-2.0.tar.bz2; 
-'extensions.patch' 'c_lib.patch' 'env.patch' 'paths.patch' 'blas.patch' 
'clean.patch' 'skip-check.patch' 'gap-hap.patch' 'pexpect-env.patch')
+'extensions.patch' 'c_lib.patch' 'env.patch' 'paths.patch' 'blas.patch' 
'clean.patch' 'skip-check.patch' 'gap-hap.patch' 'pexpect-env.patch' 
'fes02.patch')
 md5sums=('e40736461992e62af3a84cf9a212c9d1'
  'd9a3e113ed147dcee8f89962a8dccd43'
  '5770766ae676491f79162d2062ce7c02'
@@ -28,7 +28,8 @@
  '46c212a3a6713b0f78c370c7186d0982'
  '5947a420a0b1483f0cbc74c76895789b'
  '631ee6b8b3e7d12bb7858cfd841af483'
- 'a83a3b1bc7fcb7cbf752a83a8311fc42')
+ 'a83a3b1bc7fcb7cbf752a83a8311fc42'
+ '506944613082ba7f5b34360939ca90eb')
 # changelog=ChangeLog
 
 prepare(){
@@ -58,6 +59,8 @@
   patch -p0 -i $srcdir/skip-check.patch
 # don't use is_package_installed function
   patch -p0 -i $srcdir/gap-hap.patch
+# fix build against libfes 0.2
+  patch -p0 -i $srcdir/fes02.patch
 
 # use python2
   sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' src/bin/*

Added: fes02.patch
===
--- fes02.patch (rev 0)
+++ fes02.patch 2015-01-02 09:30:53 UTC (rev 125161)
@@ -0,0 +1,45 @@
+diff --git a/src/sage/libs/fes.pyx b/src/sage/libs/fes.pyx
+index 40b9c23..d188cf0 100644
+--- src/sage/libs/fes.pyx
 src/sage/libs/fes.pyx
+@@ -1,17 +1,19 @@
+ 
+-Binding for the FES library.
++Binding for the libFES library.
+ 
+ Finding solutions of systems of boolean equations by exhaustive
+ search, via the fes library. This is usually (much) faster than
+ computing a Groebner basis, except in special cases where the latter
+ is particularly easy.
+ 
+-The FES library is presently only able to deal with polynomials in 64
++More information is available at [http://www.lifl.fr/~bouillag/fes].
++
++The libFES library is presently only able to deal with polynomials in 64
+ variables. Performing a full exhaustive search over 64 variables will
+ take a **long** time. The number of variables can be artificially
+ reduced to 64 by specializing some of them.
+ 
+-Note that the FES library **requires** at least of the equations to be
++Note that the libFES library **requires** at least of the equations to be
+ non-linear.
+ 
+ AUTHORS:
+@@ -71,7 +73,7 @@ from libc.stdint cimport uint64_t
+ cdef extern from fes_interface.h:
+ ctypedef int (*solution_callback_t)(void *, uint64_t)
+ 
+-void exhaustive_search_wrapper(int n, int n_eqs, int degree, int 
***coeffs, solution_callback_t callback, void* callback_state, int verbose)
++void exhaustive_search_wrapper(int n, int n_eqs, int degree, int 
***coeffs, solution_callback_t callback, void* callback_state, int verbose, int 
T)
+ 
+ 
+ include 'sage/ext/interrupt.pxi'  #sig_on(), sig_off()
+@@ -219,7 +221,7 @@ def exhaustive_search(eqs,  max_sols=Infinity, 
verbose=False):
+ 
+ # --- runs the library
+ sig_on()
+-exhaustive_search_wrapper(n, len(eqs), degree, coeffs, report_solution, 
void * internal_state, verbose)
++exhaustive_search_wrapper(n, len(eqs), degree, coeffs, report_solution, 
void * internal_state, verbose, 0)
+ sig_off()
+ 
+ # --- frees memory occupied by the dense representation of the 
equations


[arch-commits] Commit in sage-mathematics/trunk (PKGBUILD)

2015-01-02 Thread Antonio Rojas
Date: Friday, January 2, 2015 @ 11:22:29
  Author: arojas
Revision: 125162

upgpkg: sage-mathematics 6.4.1-3

Modified:
  sage-mathematics/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-01-02 09:30:53 UTC (rev 125161)
+++ PKGBUILD2015-01-02 10:22:29 UTC (rev 125162)
@@ -60,7 +60,7 @@
 # don't use is_package_installed function
   patch -p0 -i $srcdir/gap-hap.patch
 # fix build against libfes 0.2
-  patch -p0 -i $srcdir/fes02.patch
+  patch -p0 -i $srcdir/fes02.patch # http://trac.sagemath.org/ticket/15209
 
 # use python2
   sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' src/bin/*
@@ -95,7 +95,7 @@
 
 package_sage-mathematics() {
   depends=('ipython2' 'cython2' 'ppl' 'glpk' 'mpfi' 'palp' 'polybori' 
'singular' 'libcliquer' 'maxima-ecl' 'gfan' 'sympow' 'tachyon' 'python2-rpy2' 
-  'python2-matplotlib' 'python2-scipy' 'python2-sympy' 'libgap' 'gap' 
'genus2reduction' 'flintqs' 'givaro' 'libmpc' 'lcalc' 'lrcalc' 'libfes' 
'cryptominisat' 'eclib' 'gmp-ecm' 'zn_poly' 'python2-gd' 'pynac' 'linbox' 'gsl' 
'rubiks' 'pari-galdata' 'pari-seadata-small' 'sage-data-combinatorial_designs' 
'sage-data-elliptic_curves' 'sage-data-graphs' 'sage-data-polytopes_db' 
'sage-data-conway_polynomials') # python2-pexpect
+  'python2-matplotlib' 'python2-scipy' 'python2-sympy' 'libgap' 'gap' 
'genus2reduction' 'flintqs' 'lcalc' 'lrcalc' 'libfes' 'cryptominisat' 'eclib' 
'gmp-ecm' 'zn_poly' 'python2-gd' 'pynac' 'linbox' 'gsl' 'rubiks' 'pari-galdata' 
'pari-seadata-small' 'sage-data-combinatorial_designs' 
'sage-data-elliptic_curves' 'sage-data-graphs' 'sage-data-polytopes_db' 
'sage-data-conway_polynomials') # python2-pexpect
   optdepends=('jmol: 3D plots' 'sage-notebook: Web-based 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')


[arch-commits] Commit in sage-mathematics/trunk (PKGBUILD extensions.patch)

2015-01-01 Thread Antonio Rojas
Date: Friday, January 2, 2015 @ 01:49:36
  Author: arojas
Revision: 125148

- Add libfes and cryptominisat support
- Create SAGE_SRC dir in main package (FS#43271)

Modified:
  sage-mathematics/trunk/PKGBUILD
  sage-mathematics/trunk/extensions.patch

--+
 PKGBUILD |   18 +++---
 extensions.patch |   13 ++---
 2 files changed, 13 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-01-02 00:21:24 UTC (rev 125147)
+++ PKGBUILD2015-01-02 00:49:36 UTC (rev 125148)
@@ -10,18 +10,17 @@
 pkgbase=sage-mathematics
 pkgname=('sage-mathematics' 'sage-mathematics-src')
 pkgver=6.4.1
-pkgrel=2
+pkgrel=3
 pkgdesc=Open Source Mathematics Software, free alternative to Magma, Maple, 
Mathematica, and Matlab
 arch=('i686' 'x86_64')
 url=http://www.sagemath.org;
 license=('GPL')
-makedepends=('ipython2' 'cython2' 'ppl' 'glpk' 'mpfi' 'polybori' 'singular' 
'libcliquer' 'ecl' 'libgap' 'givaro' 'libmpc' 'lcalc' 'lrcalc'
-  'eclib' 'gmp-ecm' 'zn_poly' 'pynac' 'linbox' 'gsl' 'boost' 'scons' 
'ratpoints' 'symmetrica' 'fflas-ffpack' 'gd' 'python2-jinja' 'python2-numpy')
+makedepends=('ipython2' 'cython2' 'ppl' 'glpk' 'mpfi' 'polybori' 'singular' 
'libcliquer' 'ecl' 'libgap' 'givaro' 'libmpc' 'lcalc' 'lrcalc' 'libfes' 
'cryptominisat' 'eclib' 'gmp-ecm' 'zn_poly' 'pynac' 'linbox' 'gsl' 'boost' 
'scons' 'ratpoints' 'symmetrica' 'fflas-ffpack' 'gd' 'python2-jinja' 
'python2-numpy')
 source=(https://github.com/sagemath/sage/archive/$pkgver.tar.gz; 
http://www.sagemath.org/packages/upstream/pexpect/pexpect-2.0.tar.bz2; 
 'extensions.patch' 'c_lib.patch' 'env.patch' 'paths.patch' 'blas.patch' 
'clean.patch' 'skip-check.patch' 'gap-hap.patch' 'pexpect-env.patch')
 md5sums=('e40736461992e62af3a84cf9a212c9d1'
  'd9a3e113ed147dcee8f89962a8dccd43'
- '43784811932f077c3c07b75825abda1b'
+ '5770766ae676491f79162d2062ce7c02'
  '5216dbb3d80cecc8ec4a36cc9706f8b5'
  '0bb5d722e32359f9dc8516904316318f'
  'df2f56fb5845a83808b6724f6965ec6e'
@@ -37,6 +36,10 @@
 
 # add optional packages manually (Fedora)  
   patch -p0 -i $srcdir/extensions.patch
+  for _ext in cryptominisat fes lrcalc
+  do
+   sed -i s|is_package_installed('$_ext')|1| src/module_list.py
+  done
 # don't assume Sage is already available (Fedora)
   patch -p0 -i $srcdir/c_lib.patch
 # find L.h header
@@ -89,9 +92,7 @@
 
 package_sage-mathematics() {
   depends=('ipython2' 'cython2' 'ppl' 'glpk' 'mpfi' 'palp' 'polybori' 
'singular' 'libcliquer' 'maxima-ecl' 'gfan' 'sympow' 'tachyon' 'python2-rpy2' 
-  'python2-matplotlib' 'python2-scipy' 'python2-mpmath' 'python2-sympy' 
'libgap' 'gap' 'genus2reduction' 'flintqs' 'givaro' 'libmpc' 'lcalc' 'lrcalc'
-  'eclib' 'gmp-ecm' 'zn_poly' 'python2-gd' 'pynac' 'linbox' 'gsl' 'rubiks' 
'pari-galdata' 'pari-seadata-small' 'sage-data-combinatorial_designs' 
-  'sage-data-elliptic_curves' 'sage-data-graphs' 'sage-data-polytopes_db' 
'sage-data-conway_polynomials') # python2-pexpect
+  'python2-matplotlib' 'python2-scipy' 'python2-sympy' 'libgap' 'gap' 
'genus2reduction' 'flintqs' 'givaro' 'libmpc' 'lcalc' 'lrcalc' 'libfes' 
'cryptominisat' 'eclib' 'gmp-ecm' 'zn_poly' 'python2-gd' 'pynac' 'linbox' 'gsl' 
'rubiks' 'pari-galdata' 'pari-seadata-small' 'sage-data-combinatorial_designs' 
'sage-data-elliptic_curves' 'sage-data-graphs' 'sage-data-polytopes_db' 
'sage-data-conway_polynomials') # python2-pexpect
   optdepends=('jmol: 3D plots' 'sage-notebook: Web-based 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')
@@ -110,6 +111,9 @@
 
   mkdir -p $pkgdir/usr/share/sage
   cp -r ext $pkgdir/usr/share/sage
+  
+# Create SAGE_SRC, needed for the notebook
+  mkdir $pkgdir/usr/share/sage/src
 
 # Install Sage's own pexpect
   cd $srcdir/pexpect-2.0

Modified: extensions.patch
===
--- extensions.patch2015-01-02 00:21:24 UTC (rev 125147)
+++ extensions.patch2015-01-02 00:49:36 UTC (rev 125148)
@@ -1,5 +1,5 @@
 src/module_list.py.orig2014-11-23 15:58:13.0 +0100
-+++ src/module_list.py 2014-12-23 10:43:44.412576412 +0100
+--- src/module_list.py.orig2015-01-02 01:37:15.614093528 +0100
 src/module_list.py 2015-01-02 01:37:26.140827483 +0100
 @@ -2126,7 +2126,8 @@
  # These extensions are to be compiled only if the
  # corresponding packages have been installed
@@ -10,12 +10,3 @@
  
  if is_package_installed('fes'):
  ext_modules.extend([
-@@ -2208,7 +2209,7 @@
- )
- 
- 
--if is_package_installed('lrcalc'):
-+if 1:
- ext_modules.append(
- Extension('sage.libs.lrcalc.lrcalc',
-   sources = [sage/libs/lrcalc/lrcalc.pyx],


[arch-commits] Commit in sage-mathematics/trunk (PKGBUILD)

2014-05-16 Thread Evgeniy Alekseev
Date: Friday, May 16, 2014 @ 12:02:16
  Author: arcanis
Revision: 111306

upgpkg: sage-mathematics 6.2-2
libatomic_ops rebuild

Modified:
  sage-mathematics/trunk/PKGBUILD

--+
 PKGBUILD |8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-05-16 09:27:14 UTC (rev 111305)
+++ PKGBUILD2014-05-16 10:02:16 UTC (rev 111306)
@@ -9,7 +9,7 @@
 
 pkgname=sage-mathematics
 pkgver=6.2
-pkgrel=1
+pkgrel=2
 pkgdesc=Open Source Mathematics Software, free alternative to Magma, Maple, 
Mathematica, and Matlab
 arch=('i686' 'x86_64')
 url=http://www.sagemath.org;
@@ -58,7 +58,7 @@
   sed -e 's/READLINE/#READLINE/' -i ${srcdir}/sage-${pkgver}/build/install
   # disable building gf2x with sse2 for i686
   if [ ${CARCH} == i686 ]; then
-cp ${srcdir}/gf2x-sse2-i686.patch 
${srcdir}/sage-${pkgver}/build/pkgs/gf2x/patches/sse2-i686.patch
+cp ${srcdir}/gf2x-sse2-i686.patch 
${srcdir}/sage-${pkgver}/build/pkgs/gf2x/patches/sse2.patch
   fi
 }
 
@@ -65,6 +65,10 @@
 build() {
   cd sage-${pkgver}
 
+  # disable default makepkg flags (needed for singular and libgap)
+  unset CFLAGS
+  unset CXXFLAGS
+  unset LDFLAGS
   ## flags
   # do not build own gcc
   export SAGE_INSTALL_GCC='no'



[arch-commits] Commit in sage-mathematics/trunk (PKGBUILD python-readline.patch)

2014-03-19 Thread Evgeniy Alekseev
Date: Thursday, March 20, 2014 @ 00:35:43
  Author: arcanis
Revision: 107814

upgpkg: sage-mathematics 6.1.1-2
fixed FS#39533, FS#39362, FS#38985

Added:
  sage-mathematics/trunk/python-readline.patch
Modified:
  sage-mathematics/trunk/PKGBUILD

---+
 PKGBUILD  |   31 +--
 python-readline.patch |   28 
 2 files changed, 53 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-03-19 21:41:00 UTC (rev 107813)
+++ PKGBUILD2014-03-19 23:35:43 UTC (rev 107814)
@@ -9,13 +9,13 @@
 
 pkgname=sage-mathematics
 pkgver=6.1.1
-pkgrel=1
+pkgrel=2
 pkgdesc=Open Source Mathematics Software, free alternative to Magma, Maple, 
Mathematica, and Matlab
 arch=('i686' 'x86_64')
 url=http://www.sagemath.org;
 license=('GPL')
 #depends=('desktop-file-utils' 'java-environment=7' 'libjpeg-turbo' 'libtiff' 
'libxmu' 'sqlite' 'xz')
-depends=('freetype2=2.3.5')
+depends=('libatomic_ops')
 makedepends=('desktop-file-utils' 'gcc-fortran' 'gendesk')
 optdepends=('imagemagick: some plotting functionality benefits from it'
 'texlive-core: some plotting functionality benefits from it, also 
to use SageTeX'
@@ -23,10 +23,12 @@
 'ffmpeg: to show animations'
 'cairo: R plots')
 
source=(http://sage.math.washington.edu/home/release/sage-${pkgver}/sage-${pkgver}.tar;
-sage.service)
+sage.service
+python-readline.patch)
 install=${pkgname}.install
 md5sums=('800c59f7cfa32c012f358ae240cdb2e6'
- '985da1c1d1dcdc3ea9aa73035cb7996b')
+ '985da1c1d1dcdc3ea9aa73035cb7996b'
+ 'dbfb66f38fb4d516d1078b73fd1d54a2')
 
 prepare() {
   # create *.desktop file
@@ -36,7 +38,7 @@
   --name=Sage \
   --exec=/opt/sage/sage -notebook \
   --terminal=true \
-  --categories=Science;Math \
+  --categories=Education;Science;Math \
   --custom=X-DCOP-ServiceType=
 X-KDE-SubstituteUID=false
 X-KDE-Username=
@@ -48,7 +50,24 @@
   mkdir ${srcdir}/build
   
   # according to FS#34769
-  sed -i -e 's/FREETYPE/#FREETYPE/' ${srcdir}/sage-${pkgver}/build/install
+  sed -e 's/FREETYPE/#FREETYPE/' -i ${srcdir}/sage-${pkgver}/build/install
+  # according to FS#39533
+  ## patching python
+  cd ${srcdir}/sage-${pkgver}/upstream
+  tar xjf python-2.7.5.tar.bz2
+  rm -rf python-2.7.5.tar.bz2
+  patch -p0 -i ${srcdir}/python-readline.patch
+  tar cjf python-2.7.5.tar.bz2 python-2.7.5
+  rm -rf python-2.7.5
+  ## fix checksums
+  SUMS=$(md5sum python-2.7.5.tar.bz2 | awk '{print $1}')
+  sed s/md5=[0-9a-f]\{32\}/md5=${SUMS}/ -i 
${srcdir}/sage-${pkgver}/build/pkgs/python/checksums.ini
+  SUMS=$(sha1sum python-2.7.5.tar.bz2 | awk '{print $1}')
+  sed s/sha1=[0-9a-f]\{40\}/sha1=${SUMS}/ -i 
${srcdir}/sage-${pkgver}/build/pkgs/python/checksums.ini
+  SUMS=$(cksum python-2.7.5.tar.bz2 | awk '{print $1}')
+  sed s/cksum=[0-9a-f]\{10\}/cksum=${SUMS}/ -i 
${srcdir}/sage-${pkgver}/build/pkgs/python/checksums.ini
+  ## disable readline build
+  sed -e 's/READLINE/#READLINE/' -i ${srcdir}/sage-${pkgver}/build/install
 }
 
 build() {

Added: python-readline.patch
===
--- python-readline.patch   (rev 0)
+++ python-readline.patch   2014-03-19 23:35:43 UTC (rev 107814)
@@ -0,0 +1,28 @@
+diff -ruN python-2.7.5.orig/Modules/readline.c python-2.7.5/Modules/readline.c
+--- python-2.7.5.orig/Modules/readline.c   2013-05-12 07:32:51.0 
+0400
 python-2.7.5/Modules/readline.c2014-03-19 16:06:05.663684577 +0400
+@@ -850,7 +850,7 @@
+  * before calling the normal completer */
+ 
+ static char **
+-flex_complete(char *text, int start, int end)
++flex_complete(const char *text, int start, int end)
+ {
+ #ifdef HAVE_RL_COMPLETION_APPEND_CHARACTER
+ rl_completion_append_character ='\0';
+@@ -898,12 +898,12 @@
+ rl_bind_key_in_map ('\t', rl_complete, emacs_meta_keymap);
+ rl_bind_key_in_map ('\033', rl_complete, emacs_meta_keymap);
+ /* Set our hook functions */
+-rl_startup_hook = (Function *)on_startup_hook;
++rl_startup_hook = on_startup_hook;
+ #ifdef HAVE_RL_PRE_INPUT_HOOK
+-rl_pre_input_hook = (Function *)on_pre_input_hook;
++rl_pre_input_hook = on_pre_input_hook;
+ #endif
+ /* Set our completion function */
+-rl_attempted_completion_function = (CPPFunction *)flex_complete;
++rl_attempted_completion_function = flex_complete;
+ /* Set Python word break characters */
+ completer_word_break_characters =
+ rl_completer_word_break_characters =



[arch-commits] Commit in sage-mathematics/trunk (PKGBUILD)

2014-02-09 Thread Evgeniy Alekseev
Date: Sunday, February 9, 2014 @ 19:29:53
  Author: arcanis
Revision: 105530

upgpkg: sage-mathematics 6.1.1-1

Modified:
  sage-mathematics/trunk/PKGBUILD

--+
 PKGBUILD |   11 +--
 1 file changed, 5 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-02-09 17:42:22 UTC (rev 105529)
+++ PKGBUILD2014-02-09 18:29:53 UTC (rev 105530)
@@ -8,8 +8,8 @@
 # Special thanks to Nareto for moving the compile from the .install to the 
PKGBUILD
 
 pkgname=sage-mathematics
-pkgver=6.1
-pkgrel=3
+pkgver=6.1.1
+pkgrel=1
 pkgdesc=Open Source Mathematics Software, free alternative to Magma, Maple, 
Mathematica, and Matlab
 arch=('i686' 'x86_64')
 url=http://www.sagemath.org;
@@ -16,7 +16,7 @@
 license=('GPL')
 #depends=('desktop-file-utils' 'java-environment=7' 'libjpeg-turbo' 'libtiff' 
'libxmu' 'sqlite' 'xz')
 depends=('freetype2=2.3.5')
-makedepends=('gcc-fortran' 'gendesk' 'desktop-file-utils')
+makedepends=('desktop-file-utils' 'gcc-fortran' 'gendesk')
 optdepends=('imagemagick: some plotting functionality benefits from it'
 'texlive-core: some plotting functionality benefits from it, also 
to use SageTeX'
 'openssh: to use the notebook in secure mode'
@@ -25,7 +25,7 @@
 
source=(http://sage.math.washington.edu/home/release/sage-${pkgver}/sage-${pkgver}.tar;
 sage.service)
 install=${pkgname}.install
-md5sums=('75130374fcdb9395955db81f1ed28422'
+md5sums=('800c59f7cfa32c012f358ae240cdb2e6'
  '985da1c1d1dcdc3ea9aa73035cb7996b')
 
 prepare() {
@@ -48,7 +48,6 @@
   mkdir ${srcdir}/build
   
   # according to FS#34769
-  rm -rf freetype-*
   sed -i -e 's/FREETYPE/#FREETYPE/' ${srcdir}/sage-${pkgver}/build/install
 }
 
@@ -125,7 +124,7 @@
   # install *.desktop and icon files
   install -Dm644 ${srcdir}/sage-notebook.desktop \
  ${pkgdir}/usr/share/applications/sage-notebook.desktop
-  install -Dm644 
${pkgdir}/opt/sage/local/lib/python2.7/site-packages/sagenb-0.10.7.2-py2.7.egg/sagenb/data/sage/images/icon128x128.png
 \
+  install -Dm644 
${pkgdir}/opt/sage/local/lib/python2.7/site-packages/sagenb-0.10.8.2-py2.7.egg/sagenb/data/sage/images/icon48x48.png
 \
  ${pkgdir}/usr/share/pixmaps/sage-notebook.png
 }
 



[arch-commits] Commit in sage-mathematics/trunk (PKGBUILD)

2014-02-04 Thread Evgeniy Alekseev
Date: Wednesday, February 5, 2014 @ 05:55:46
  Author: arcanis
Revision: 105327

upgpkg: sage-mathematics 6.1-3
fix FS#38784

Modified:
  sage-mathematics/trunk/PKGBUILD

--+
 PKGBUILD |5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-02-05 03:32:19 UTC (rev 105326)
+++ PKGBUILD2014-02-05 04:55:46 UTC (rev 105327)
@@ -9,7 +9,7 @@
 
 pkgname=sage-mathematics
 pkgver=6.1
-pkgrel=2
+pkgrel=3
 pkgdesc=Open Source Mathematics Software, free alternative to Magma, Maple, 
Mathematica, and Matlab
 arch=('i686' 'x86_64')
 url=http://www.sagemath.org;
@@ -100,6 +100,7 @@
   # remove build logs
   rm -f *.log
   rm -rf ${srcdir}/sage-${pkgver}/{logs,upstream}
+  # do NOT remove build directory!
   
   # cp because make install is experimental and will corrupt the install
   install -dm755 ${pkgdir}/opt/sage
@@ -118,8 +119,6 @@
 mv ${pkgdir}/usr/bin/${ITEM} ${pkgdir}/usr/bin/sage-${ITEM}
   done
   ln -s /opt/sage/sage ${pkgdir}/usr/bin/sage
-  # remove DOT_SAGE directory
-  rm -rf ${pkgdir}/opt/sage/build
   
   # install a systemd user unit
   install -Dm644 ${srcdir}/sage.service 
${pkgdir}/usr/lib/systemd/user/sage.service



[arch-commits] Commit in sage-mathematics/trunk (PKGBUILD fix-pil.patch)

2014-02-03 Thread Evgeniy Alekseev
Date: Monday, February 3, 2014 @ 20:58:07
  Author: arcanis
Revision: 105274

upgpkg: sage-mathematics 6.1-2
fixed FS#38765 and FS#38764

Modified:
  sage-mathematics/trunk/PKGBUILD
Deleted:
  sage-mathematics/trunk/fix-pil.patch

---+
 PKGBUILD  |   29 ++---
 fix-pil.patch |   12 
 2 files changed, 14 insertions(+), 27 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-02-03 18:00:50 UTC (rev 105273)
+++ PKGBUILD2014-02-03 19:58:07 UTC (rev 105274)
@@ -9,8 +9,8 @@
 
 pkgname=sage-mathematics
 pkgver=6.1
-pkgrel=1
-pkgdesc=SAGE: Open Source Mathematics Software, a viable free alternative to 
Magma, Maple, Mathematica, and Matlab
+pkgrel=2
+pkgdesc=Open Source Mathematics Software, free alternative to Magma, Maple, 
Mathematica, and Matlab
 arch=('i686' 'x86_64')
 url=http://www.sagemath.org;
 license=('GPL')
@@ -23,24 +23,21 @@
 'ffmpeg: to show animations'
 'cairo: R plots')
 
source=(http://sage.math.washington.edu/home/release/sage-${pkgver}/sage-${pkgver}.tar;
-fix-pil.patch
 sage.service)
 install=${pkgname}.install
 md5sums=('75130374fcdb9395955db81f1ed28422'
- 'de54cb818d74c070a524fc3fd5208b2c'
  '985da1c1d1dcdc3ea9aa73035cb7996b')
 
 prepare() {
   # create *.desktop file
-  gendesk -n \
+  gendesk -f -n \
   --pkgname=sage-notebook \
-  --pkgdesc=sage notebook \
-  --name=sage \
+  --pkgdesc=Sage notebook \
+  --name=Sage \
   --exec=/opt/sage/sage -notebook \
   --terminal=true \
   --categories=Science;Math \
-  --custom=StartupNotify=true
-X-DCOP-ServiceType=
+  --custom=X-DCOP-ServiceType=
 X-KDE-SubstituteUID=false
 X-KDE-Username=
   
@@ -102,19 +99,19 @@
   cd ${srcdir}/sage-${pkgver}/
   # remove build logs
   rm -f *.log
-  rm -rf spkg/{base,build,logs,standarts}
+  rm -rf ${srcdir}/sage-${pkgver}/{logs,upstream}
   
   # cp because make install is experimental and will corrupt the install
-  install -d ${pkgdir}/opt/sage
+  install -dm755 ${pkgdir}/opt/sage
   cp -r * ${pkgdir}/opt/sage/
   
   # move SageTeX files to more appropriate directory
-  install -d ${pkgdir}/usr/share
+  install -dm755 ${pkgdir}/usr/share
   mv ${pkgdir}/opt/sage/local/share/texmf ${pkgdir}/usr/share
   
   # according to FS#37090
   # install scripts
-  install -d ${pkgdir}/usr/bin
+  install -dm755 ${pkgdir}/usr/bin
   ./sage -c install_scripts('${pkgdir}/usr/bin', ignore_existing=True)
   # rename scripts to avoid conflicts
   for ITEM in $(ls ${pkgdir}/usr/bin); do
@@ -121,14 +118,16 @@
 mv ${pkgdir}/usr/bin/${ITEM} ${pkgdir}/usr/bin/sage-${ITEM}
   done
   ln -s /opt/sage/sage ${pkgdir}/usr/bin/sage
+  # remove DOT_SAGE directory
+  rm -rf ${pkgdir}/opt/sage/build
   
   # install a systemd user unit
   install -Dm644 ${srcdir}/sage.service 
${pkgdir}/usr/lib/systemd/user/sage.service
   # install *.desktop and icon files
   install -Dm644 ${srcdir}/sage-notebook.desktop \
- ${pkgdir}/usr/share/applications/SAGE-notebook.desktop
+ ${pkgdir}/usr/share/applications/sage-notebook.desktop
   install -Dm644 
${pkgdir}/opt/sage/local/lib/python2.7/site-packages/sagenb-0.10.7.2-py2.7.egg/sagenb/data/sage/images/icon128x128.png
 \
- ${pkgdir}/usr/share/pixmaps/SAGE-notebook.png
+ ${pkgdir}/usr/share/pixmaps/sage-notebook.png
 }
 
 # vim :set ts=2 sw=2 et:

Deleted: fix-pil.patch
===
--- fix-pil.patch   2014-02-03 18:00:50 UTC (rev 105273)
+++ fix-pil.patch   2014-02-03 19:58:07 UTC (rev 105274)
@@ -1,12 +0,0 @@
-diff -ruN pil-1.1.6.orig/_imagingft.c pil-1.1.6/_imagingft.c
 pil-1.1.6.orig/_imagingft.c2013-12-23 17:45:39.991183855 +0400
-+++ pil-1.1.6/_imagingft.c 2013-12-23 17:49:06.297861197 +0400
-@@ -65,7 +65,7 @@
- const char* message;
- } ft_errors[] =
- 
--#include freetype/fterrors.h
-+#include freetype2/fterrors.h
- 
- /*  */
- /* font objects */



[arch-commits] Commit in sage-mathematics/trunk (PKGBUILD)

2014-02-01 Thread Evgeniy Alekseev
Date: Saturday, February 1, 2014 @ 22:21:17
  Author: arcanis
Revision: 105153

upgpkg: sage-mathematics 6.1-1

Modified:
  sage-mathematics/trunk/PKGBUILD

--+
 PKGBUILD |   37 -
 1 file changed, 8 insertions(+), 29 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-02-01 20:46:24 UTC (rev 105152)
+++ PKGBUILD2014-02-01 21:21:17 UTC (rev 105153)
@@ -8,8 +8,8 @@
 # Special thanks to Nareto for moving the compile from the .install to the 
PKGBUILD
 
 pkgname=sage-mathematics
-pkgver=6.0
-pkgrel=2
+pkgver=6.1
+pkgrel=1
 pkgdesc=SAGE: Open Source Mathematics Software, a viable free alternative to 
Magma, Maple, Mathematica, and Matlab
 arch=('i686' 'x86_64')
 url=http://www.sagemath.org;
@@ -26,7 +26,7 @@
 fix-pil.patch
 sage.service)
 install=${pkgname}.install
-md5sums=('da1bacf90fc291e736aaa71431e8874e'
+md5sums=('75130374fcdb9395955db81f1ed28422'
  'de54cb818d74c070a524fc3fd5208b2c'
  '985da1c1d1dcdc3ea9aa73035cb7996b')
 
@@ -51,21 +51,6 @@
   mkdir ${srcdir}/build
   
   # according to FS#34769
-  # NOTE: there is an error in pil build (freetype/fterrors.h not found)
-  cd ${srcdir}/sage-${pkgver}/upstream/
-  tar xjfv pil-1.1.6.tar.bz2
-  rm -r pil-1.1.6.tar.bz2
-  patch -p0 -i ${srcdir}/fix-pil.patch
-  tar cjvf pil-1.1.6.tar.bz2 pil-1.1.6
-  rm -rf pil-1.1.6
-  # fix checksums
-  SUMS=$(md5sum pil-1.1.6.tar.bz2 | awk '{print $1}')
-  sed s/md5=[0-9a-f]\{32\}/md5=${SUMS}/ -i 
${srcdir}/sage-${pkgver}/build/pkgs/pil/checksums.ini
-  SUMS=$(sha1sum pil-1.1.6.tar.bz2 | awk '{print $1}')
-  sed s/sha1=[0-9a-f]\{40\}/sha1=${SUMS}/ -i 
${srcdir}/sage-${pkgver}/build/pkgs/pil/checksums.ini
-  SUMS=$(cksum pil-1.1.6.tar.bz2 | awk '{print $1}')
-  sed s/cksum=[0-9a-f]\{10\}/cksum=${SUMS}/ -i 
${srcdir}/sage-${pkgver}/build/pkgs/pil/checksums.ini
-  # disable freetype build
   rm -rf freetype-*
   sed -i -e 's/FREETYPE/#FREETYPE/' ${srcdir}/sage-${pkgver}/build/install
 }
@@ -100,7 +85,6 @@
   # only build sage, no documents
   #make build
   make
-  ./sage --bdist ${pkgver}
 }
 
  COMMENT
@@ -115,24 +99,19 @@
 COMMENT
 
 package() {
-  cd sage-${pkgver}
+  cd ${srcdir}/sage-${pkgver}/
+  # remove build logs
+  rm -f *.log
+  rm -rf spkg/{base,build,logs,standarts}
   
   # cp because make install is experimental and will corrupt the install
   install -d ${pkgdir}/opt/sage
-  cp -dpr --no-preserve=ownership dist/sage-${pkgver}-$CARCH-Linux/* 
${pkgdir}/opt/sage/
+  cp -r * ${pkgdir}/opt/sage/
   
   # move SageTeX files to more appropriate directory
   install -d ${pkgdir}/usr/share
   mv ${pkgdir}/opt/sage/local/share/texmf ${pkgdir}/usr/share
   
-  # remove build logs
-  rm -f ${pkgdir}/opt/sage/*.log
-  rm -rf ${pkgdir}/opt/sage/spkg/logs
-  
-  # remove source packages, since they are rarely needed, they are 300mb in 
size (compressed)
-  rm -f ${pkgdir}/opt/sage/spkg/base/*spkg
-  rm -f ${pkgdir}/opt/sage/spkg/standard/*spkg
-  
   # according to FS#37090
   # install scripts
   install -d ${pkgdir}/usr/bin



[arch-commits] Commit in sage-mathematics/trunk (PKGBUILD)

2013-12-24 Thread Evgeniy Alekseev
Date: Tuesday, December 24, 2013 @ 16:19:06
  Author: arcanis
Revision: 102935

upgpkg: sage-mathematics 6.0-2
/usr/bin/sage-sage moved to /usr/bin/sage

Modified:
  sage-mathematics/trunk/PKGBUILD

--+
 PKGBUILD |8 +++-
 1 file changed, 3 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-12-24 12:57:11 UTC (rev 102934)
+++ PKGBUILD2013-12-24 15:19:06 UTC (rev 102935)
@@ -9,7 +9,7 @@
 
 pkgname=sage-mathematics
 pkgver=6.0
-pkgrel=1
+pkgrel=2
 pkgdesc=SAGE: Open Source Mathematics Software, a viable free alternative to 
Magma, Maple, Mathematica, and Matlab
 arch=('i686' 'x86_64')
 url=http://www.sagemath.org;
@@ -125,10 +125,6 @@
   install -d ${pkgdir}/usr/share
   mv ${pkgdir}/opt/sage/local/share/texmf ${pkgdir}/usr/share
   
-  # create link to main binary
-  install -d ${pkgdir}/usr/bin
-  ln -s /opt/sage/sage ${pkgdir}/usr/bin/sage
-  
   # remove build logs
   rm -f ${pkgdir}/opt/sage/*.log
   rm -rf ${pkgdir}/opt/sage/spkg/logs
@@ -139,11 +135,13 @@
   
   # according to FS#37090
   # install scripts
+  install -d ${pkgdir}/usr/bin
   ./sage -c install_scripts('${pkgdir}/usr/bin', ignore_existing=True)
   # rename scripts to avoid conflicts
   for ITEM in $(ls ${pkgdir}/usr/bin); do
 mv ${pkgdir}/usr/bin/${ITEM} ${pkgdir}/usr/bin/sage-${ITEM}
   done
+  ln -s /opt/sage/sage ${pkgdir}/usr/bin/sage
   
   # install a systemd user unit
   install -Dm644 ${srcdir}/sage.service 
${pkgdir}/usr/lib/systemd/user/sage.service



[arch-commits] Commit in sage-mathematics/trunk (PKGBUILD)

2013-12-17 Thread Evgeniy Alekseev
Date: Tuesday, December 17, 2013 @ 10:45:41
  Author: arcanis
Revision: 102653

upgpkg: sage-mathematics 5.13-1

Modified:
  sage-mathematics/trunk/PKGBUILD

--+
 PKGBUILD |   16 
 1 file changed, 8 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-12-17 09:06:19 UTC (rev 102652)
+++ PKGBUILD2013-12-17 09:45:41 UTC (rev 102653)
@@ -8,8 +8,8 @@
 # Special thanks to Nareto for moving the compile from the .install to the 
PKGBUILD
 
 pkgname=sage-mathematics
-pkgver=5.12
-pkgrel=2
+pkgver=5.13
+pkgrel=1
 pkgdesc=SAGE: Open Source Mathematics Software, a viable free alternative to 
Magma, Maple, Mathematica, and Matlab
 arch=('i686' 'x86_64')
 url=http://www.sagemath.org;
@@ -25,7 +25,7 @@
 'fix-atlas.patch'
 'sage.service')
 install=${pkgname}.install
-md5sums=('21d62a8a61e351c3c124167b3eead46f'
+md5sums=('b549c5ac6b292a2837d92ccf3740c451'
  '527a621b19dd93941cd018d2c1559f96'
  '985da1c1d1dcdc3ea9aa73035cb7996b')
 
@@ -45,13 +45,13 @@
   
   # fix ATLAS build 
http://sourceforge.net/p/math-atlas/discussion/75123/thread/dc45bb67/
   cd sage-${pkgver}/spkg/standard
-  tar xjf atlas-3.10.1.p5.spkg
-  rm atlas-3.10.1.p5.spkg
-  cd atlas-3.10.1.p5
+  tar xjf atlas-3.10.1.p7.spkg
+  rm atlas-3.10.1.p7.spkg
+  cd atlas-3.10.1.p7
   patch -p0 -i ${srcdir}/fix-atlas.patch
   cd ..
-  tar cjf atlas-3.10.1.p5.spkg atlas-3.10.1.p5
-  rm -r atlas-3.10.1.p5
+  tar cjf atlas-3.10.1.p7.spkg atlas-3.10.1.p7
+  rm -r atlas-3.10.1.p7
   
   # create DOT_SAGE directory
   if [[ -d ${srcdir}/build ]]; then



[arch-commits] Commit in sage-mathematics/trunk (PKGBUILD)

2013-12-07 Thread Evgeniy Alekseev
Date: Sunday, December 8, 2013 @ 08:48:52
  Author: arcanis
Revision: 102308

upgpkg: sage-mathematics 5.12-2
Removed *.desktop file

Modified:
  sage-mathematics/trunk/PKGBUILD

--+
 PKGBUILD |   28 +---
 1 file changed, 21 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-12-08 00:25:55 UTC (rev 102307)
+++ PKGBUILD2013-12-08 07:48:52 UTC (rev 102308)
@@ -9,13 +9,13 @@
 
 pkgname=sage-mathematics
 pkgver=5.12
-pkgrel=1
+pkgrel=2
 pkgdesc=SAGE: Open Source Mathematics Software, a viable free alternative to 
Magma, Maple, Mathematica, and Matlab
 arch=('i686' 'x86_64')
 url=http://www.sagemath.org;
 license=('GPL')
 #depends=('desktop-file-utils' 'java-environment=7' 'libjpeg-turbo' 'libtiff' 
'libxmu' 'sqlite' 'xz')
-makedepends=('gcc-fortran' 'freetype2' 'desktop-file-utils')
+makedepends=('gcc-fortran' 'freetype2' 'gendesk' 'desktop-file-utils')
 optdepends=('imagemagick: some plotting functionality benefits from it'
 'texlive-core: some plotting functionality benefits from it, also 
to use SageTeX'
 'openssh: to use the notebook in secure mode'
@@ -23,15 +23,26 @@
 'cairo: R plots')
 
source=(http://sage.math.washington.edu/home/release/sage-${pkgver}/sage-${pkgver}.tar;
 'fix-atlas.patch'
-'SAGE-notebook.desktop'
 'sage.service')
 install=${pkgname}.install
 md5sums=('21d62a8a61e351c3c124167b3eead46f'
  '527a621b19dd93941cd018d2c1559f96'
- 'b82f94383829eee26648feb977e2d89b'
  '985da1c1d1dcdc3ea9aa73035cb7996b')
 
 prepare() {
+  # create *.desktop file
+  gendesk -n \
+  --pkgname=SAGE-notebook \
+  --pkgdesc=SAGE notebook \
+  --name=SAGE \
+  --exec=/opt/sage/sage -notebook \
+  --terminal=true \
+  --categories=Science;Math \
+  --custom=StartupNotify=true
+X-DCOP-ServiceType=
+X-KDE-SubstituteUID=false
+X-KDE-Username=
+  
   # fix ATLAS build 
http://sourceforge.net/p/math-atlas/discussion/75123/thread/dc45bb67/
   cd sage-${pkgver}/spkg/standard
   tar xjf atlas-3.10.1.p5.spkg
@@ -117,9 +128,12 @@
   rm -f ${pkgdir}/opt/sage/spkg/standard/*spkg
   
   # install a systemd user unit
-  install -Dm755 ${srcdir}/sage.service 
${pkgdir}/usr/lib/systemd/user/sage.service
-  # install desktop file
-  desktop-file-install ${srcdir}/SAGE-notebook.desktop --dir 
${pkgdir}/usr/share/applications
+  install -Dm644 ${srcdir}/sage.service 
${pkgdir}/usr/lib/systemd/user/sage.service
+  # install *.desktop and icon files
+  install -Dm644 ${srcdir}/SAGE-notebook.desktop \
+ ${pkgdir}/usr/share/applications/SAGE-notebook.desktop
+  install -Dm644 
${pkgdir}/opt/sage/devel/sagenb-main/sagenb/data/sage/images/icon128x128.png \
+ ${pkgdir}/usr/share/pixmaps/SAGE-notebook.png
 }
 
 # vim :set ts=2 sw=2 et:



[arch-commits] Commit in sage-mathematics/trunk (PKGBUILD fix-atlas.patch)

2013-11-06 Thread Evgeniy Alekseev
Date: Wednesday, November 6, 2013 @ 20:54:28
  Author: arcanis
Revision: 100636

upgpkg: sage-mathematics 5.12-1

Update to 5.12-1

Added:
  sage-mathematics/trunk/fix-atlas.patch
Modified:
  sage-mathematics/trunk/PKGBUILD

-+
 PKGBUILD|  128 +-
 fix-atlas.patch |   10 
 2 files changed, 81 insertions(+), 57 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-11-06 19:53:24 UTC (rev 100635)
+++ PKGBUILD2013-11-06 19:54:28 UTC (rev 100636)
@@ -1,71 +1,93 @@
 # $Id$
-# Maintainer: Daniel Wallace danielwallace at gtmanfred dot com
-# Contributor: Antonio Rojas  nqn1976 @ gmail.com 
-# Contributor: Thomas Dziedzic  gostrc at gmail 
-# Contributor: Osman Ugus ugu...@yahoo.com
-# Contributor: Stefan Husmann stefan-husm...@t-online.de
+# Maintainer: Evgeniy Alekseev arcanis.arch at gmail dot com
+# Contributor: Daniel Wallace danielwallace at gtmanfred dot com
+# Contributor: Antonio Rojas nqn1976 at gmail dot com
+# Contributor: Thomas Dziedzic gostrc at gmail dot com
+# Contributor: Osman Ugus ugus11 at yahoo dot com
+# Contributor: Stefan Husmann stefan-husmann at t-online dot de
 # Special thanks to Nareto for moving the compile from the .install to the 
PKGBUILD
 
 pkgname=sage-mathematics
-pkgver=5.11
+pkgver=5.12
 pkgrel=1
-pkgdesc='SAGE: Open Source Mathematics Software, a viable free alternative to 
Magma, Maple, Mathematica, and Matlab.'
-url='http://www.sagemath.org'
+pkgdesc=SAGE: Open Source Mathematics Software, a viable free alternative to 
Magma, Maple, Mathematica, and Matlab
 arch=('i686' 'x86_64')
+url=http://www.sagemath.org;
 license=('GPL')
-#depends=('xz' 'java-environment=7' 'desktop-file-utils' 'libxmu' 'libtiff' 
'sqlite' 'libjpeg-turbo')
-depends=('desktop-file-utils')
-makedepends=('gcc-fortran' 'freetype2')
+#depends=('desktop-file-utils' 'java-environment=7' 'libjpeg-turbo' 'libtiff' 
'libxmu' 'sqlite' 'xz')
+makedepends=('gcc-fortran' 'freetype2' 'desktop-file-utils')
 optdepends=('imagemagick: some plotting functionality benefits from it'
 'texlive-core: some plotting functionality benefits from it, also 
to use SageTeX'
 'openssh: to use the notebook in secure mode'
 'ffmpeg: to show animations'
 'cairo: R plots')
-install=${pkgname}.install
 
source=(http://sage.math.washington.edu/home/release/sage-${pkgver}/sage-${pkgver}.tar;
+'fix-atlas.patch'
 'SAGE-notebook.desktop'
 'sage.service')
+install=${pkgname}.install
+md5sums=('21d62a8a61e351c3c124167b3eead46f'
+ '527a621b19dd93941cd018d2c1559f96'
+ 'b82f94383829eee26648feb977e2d89b'
+ '985da1c1d1dcdc3ea9aa73035cb7996b')
 
+prepare() {
+  # fix ATLAS build 
http://sourceforge.net/p/math-atlas/discussion/75123/thread/dc45bb67/
+  cd sage-${pkgver}/spkg/standard
+  tar xjf atlas-3.10.1.p5.spkg
+  rm atlas-3.10.1.p5.spkg
+  cd atlas-3.10.1.p5
+  patch -p0 -i ${srcdir}/fix-atlas.patch
+  cd ..
+  tar cjf atlas-3.10.1.p5.spkg atlas-3.10.1.p5
+  rm -r atlas-3.10.1.p5
+  
+  # create DOT_SAGE directory
+  if [[ -d ${srcdir}/build ]]; then
+rm -rf ${srcdir}/build
+  fi
+  mkdir ${srcdir}/build
+}
+
 build() {
-  cd sage-${pkgver}
-
+  cd sage-${pkgver}
+  
   # fix missing sage.all error during build
   unset CFLAGS
   unset CXXFLAGS
-
   # fix build errors
   unset LDFLAGS
-
-  # enable multiple threads while building, is this really needed? check if 
uses MAKEFLAGS
+  
   export MAKE=make -j$(nproc)
-
+  
   # use archlinux's fortran rather then the one that ships with sage to 
compile sage's fortran
   export FC=/usr/bin/gfortran
-
+  
   # disable building with debugging support
   export SAGE_DEBUG='no'
-
+  
   # enable fat binaries (disables processor specific optimizations)
   # comment out if you're only building it for yourself
   export SAGE_FAT_BINARY='yes'
-
+  
   # can't write to root in a clean chroot
-  mkdir $srcdir/buiild
-  export DOT_SAGE=$srcdir/build
-
-  # Singular is broken
+  export DOT_SAGE=${srcdir}/build
+  
+  # singular is broken
   export CPP='/usr/bin/cpp'
-
+  
   # only build sage, no documents
   #make build
   make
-  ./sage --bdist $pkgver
+  ./sage --bdist ${pkgver}
 }
 
  COMMENT
 check() {
-  cd sage-${pkgver}
-
+  cd sage-${pkgver}
+  
+  make test
+  
   # uncomment if we want to run all the tests (warning: very long)
   #make ptestlong
 }
@@ -72,40 +94,32 @@
 COMMENT
 
 package() {
-  cd sage-${pkgver}
-
+  cd sage-${pkgver}
+  
   # cp because make install is experimental and will corrupt the install
-  install -d ${pkgdir}/opt/sage
-  cp -dpr --no-preserve=ownership dist/sage-$pkgver-$CARCH-Linux/* 
${pkgdir}/opt/sage/
-
+  install -d ${pkgdir}/opt/sage
+  cp -dpr --no-preserve=ownership dist/sage-${pkgver}-$CARCH-Linux/* 
${pkgdir}/opt/sage/
+  
   # move SageTeX files to more appropriate directory
-  install -d ${pkgdir}/usr/share
-  mv 

[arch-commits] Commit in sage-mathematics/trunk (PKGBUILD)

2013-09-08 Thread Daniel Wallace
Date: Monday, September 9, 2013 @ 03:28:32
  Author: dwallace
Revision: 96933

upgpkg: sage-mathematics 5.11-1

upgpkg: sage-mathematics 5.11-1

Modified:
  sage-mathematics/trunk/PKGBUILD

--+
 PKGBUILD |9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-09-08 22:11:41 UTC (rev 96932)
+++ PKGBUILD2013-09-09 01:28:32 UTC (rev 96933)
@@ -7,8 +7,8 @@
 # Special thanks to Nareto for moving the compile from the .install to the 
PKGBUILD
 
 pkgname=sage-mathematics
-pkgver=5.10
-pkgrel=2
+pkgver=5.11
+pkgrel=1
 pkgdesc='SAGE: Open Source Mathematics Software, a viable free alternative to 
Magma, Maple, Mathematica, and Matlab.'
 url='http://www.sagemath.org'
 arch=('i686' 'x86_64')
@@ -103,6 +103,9 @@
 }
 
 # vim :set ts=2 sw=2 et:
-md5sums=('bfca3afc9030e63c7e7200287ee0135e'
+md5sums=('ceeccaa83f45a4fb674acf10f76543d8'
  'b82f94383829eee26648feb977e2d89b'
  '985da1c1d1dcdc3ea9aa73035cb7996b')
+md5sums=('ceeccaa83f45a4fb674acf10f76543d8'
+ 'b82f94383829eee26648feb977e2d89b'
+ '985da1c1d1dcdc3ea9aa73035cb7996b')



[arch-commits] Commit in sage-mathematics/trunk (PKGBUILD)

2013-08-06 Thread Daniel Wallace
Date: Wednesday, August 7, 2013 @ 04:55:26
  Author: dwallace
Revision: 95226

upgpkg: sage-mathematics 5.10-2

upgpkg: sage-mathematics 5.10-2 db rebuild

Modified:
  sage-mathematics/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-08-07 01:19:05 UTC (rev 95225)
+++ PKGBUILD2013-08-07 02:55:26 UTC (rev 95226)
@@ -8,7 +8,7 @@
 
 pkgname=sage-mathematics
 pkgver=5.10
-pkgrel=1
+pkgrel=2
 pkgdesc='SAGE: Open Source Mathematics Software, a viable free alternative to 
Magma, Maple, Mathematica, and Matlab.'
 url='http://www.sagemath.org'
 arch=('i686' 'x86_64')



[arch-commits] Commit in sage-mathematics/trunk (PKGBUILD)

2013-07-07 Thread Daniel Wallace
Date: Monday, July 8, 2013 @ 03:35:33
  Author: dwallace
Revision: 93632

upgpkg: sage-mathematics 5.10-1

upgpkg: sage-mathematics 5.10

Modified:
  sage-mathematics/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-07-08 00:21:27 UTC (rev 93631)
+++ PKGBUILD2013-07-08 01:35:33 UTC (rev 93632)
@@ -7,8 +7,8 @@
 # Special thanks to Nareto for moving the compile from the .install to the 
PKGBUILD
 
 pkgname=sage-mathematics
-pkgver=5.9
-pkgrel=2
+pkgver=5.10
+pkgrel=1
 pkgdesc='SAGE: Open Source Mathematics Software, a viable free alternative to 
Magma, Maple, Mathematica, and Matlab.'
 url='http://www.sagemath.org'
 arch=('i686' 'x86_64')
@@ -103,6 +103,6 @@
 }
 
 # vim :set ts=2 sw=2 et:
-md5sums=('708520904f2d42039c714ac72a631948'
+md5sums=('bfca3afc9030e63c7e7200287ee0135e'
  'b82f94383829eee26648feb977e2d89b'
  '985da1c1d1dcdc3ea9aa73035cb7996b')



[arch-commits] Commit in sage-mathematics/trunk (PKGBUILD)

2013-07-05 Thread Bartłomiej Piotrowski
Date: Friday, July 5, 2013 @ 19:35:04
  Author: bpiotrowski
Revision: 93564

upkgpkg: sage-mathematics 5.9-2

- rebuild against gd 2.1.0

Modified:
  sage-mathematics/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-07-05 17:26:50 UTC (rev 93563)
+++ PKGBUILD2013-07-05 17:35:04 UTC (rev 93564)
@@ -8,7 +8,7 @@
 
 pkgname=sage-mathematics
 pkgver=5.9
-pkgrel=1
+pkgrel=2
 pkgdesc='SAGE: Open Source Mathematics Software, a viable free alternative to 
Magma, Maple, Mathematica, and Matlab.'
 url='http://www.sagemath.org'
 arch=('i686' 'x86_64')



[arch-commits] Commit in sage-mathematics/trunk (PKGBUILD)

2013-03-27 Thread Daniel Wallace
Date: Wednesday, March 27, 2013 @ 20:51:32
  Author: dwallace
Revision: 87135

upgpkg: sage-mathematics 5.8-1

upgpkg: sage-mathematics 5.8-1

Modified:
  sage-mathematics/trunk/PKGBUILD

--+
 PKGBUILD |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-03-27 19:44:03 UTC (rev 87134)
+++ PKGBUILD2013-03-27 19:51:32 UTC (rev 87135)
@@ -7,7 +7,7 @@
 # Special thanks to Nareto for moving the compile from the .install to the 
PKGBUILD
 
 pkgname=sage-mathematics
-pkgver=5.7
+pkgver=5.8
 pkgrel=1
 pkgdesc='SAGE: Open Source Mathematics Software, a viable free alternative to 
Magma, Maple, Mathematica, and Matlab.'
 url='http://www.sagemath.org'
@@ -98,3 +98,5 @@
 }
 
 # vim :set ts=2 sw=2 et:
+md5sums=('b91d6c20798f396a9c875527c78b3587'
+ 'b82f94383829eee26648feb977e2d89b')



[arch-commits] Commit in sage-mathematics/trunk (PKGBUILD)

2013-02-24 Thread Daniel Wallace
Date: Sunday, February 24, 2013 @ 17:58:29
  Author: dwallace
Revision: 84792

upgpkg: sage-mathematics 5.7-1

upgpkg: sage-mathematics 5.7-1

Modified:
  sage-mathematics/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-02-24 15:55:43 UTC (rev 84791)
+++ PKGBUILD2013-02-24 16:58:29 UTC (rev 84792)
@@ -7,7 +7,7 @@
 # Special thanks to Nareto for moving the compile from the .install to the 
PKGBUILD
 
 pkgname=sage-mathematics
-pkgver=5.6
+pkgver=5.7
 pkgrel=1
 pkgdesc='SAGE: Open Source Mathematics Software, a viable free alternative to 
Magma, Maple, Mathematica, and Matlab.'
 url='http://www.sagemath.org'
@@ -24,7 +24,7 @@
 install=${pkgname}.install
 
source=(http://sage.math.washington.edu/home/release/sage-${pkgver}/sage-${pkgver}.tar;
 'SAGE-notebook.desktop')
-md5sums=('ce50c9e0c0ed1dca3038891c5c929509'
+md5sums=('fc5b401174ee1efa7aea163e804c2b42'
  'b82f94383829eee26648feb977e2d89b')
 
 build() {



[arch-commits] Commit in sage-mathematics/trunk (PKGBUILD sage-mathematics.install)

2013-02-03 Thread Daniel Wallace
Date: Sunday, February 3, 2013 @ 21:47:32
  Author: dwallace
Revision: 83603

upgpkg: sage-mathematics 5.6-1

upgpkg: sage-mathematics 5.6-1

Modified:
  sage-mathematics/trunk/PKGBUILD
  sage-mathematics/trunk/sage-mathematics.install

--+
 PKGBUILD |9 +
 sage-mathematics.install |2 ++
 2 files changed, 7 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-02-03 16:05:49 UTC (rev 83602)
+++ PKGBUILD2013-02-03 20:47:32 UTC (rev 83603)
@@ -7,14 +7,15 @@
 # Special thanks to Nareto for moving the compile from the .install to the 
PKGBUILD
 
 pkgname=sage-mathematics
-pkgver=5.5
+pkgver=5.6
 pkgrel=1
 pkgdesc='SAGE: Open Source Mathematics Software, a viable free alternative to 
Magma, Maple, Mathematica, and Matlab.'
 url='http://www.sagemath.org'
 arch=('i686' 'x86_64')
 license=('GPL')
-#depends=('readline')
-makedepends=('gcc-fortran' 'desktop-file-utils')
+#depends=('xz' 'java-environment=7' 'desktop-file-utils' 'libxmu' 'libtiff' 
'sqlite' 'libjpeg-turbo')
+depends=('desktop-file-utils')
+makedepends=('gcc-fortran' )
 optdepends=('imagemagick: some plotting functionality benefits from it'
 'texlive-core: some plotting functionality benefits from it, also 
to use SageTeX'
 'openssh: to use the notebook in secure mode'
@@ -23,7 +24,7 @@
 install=${pkgname}.install
 
source=(http://sage.math.washington.edu/home/release/sage-${pkgver}/sage-${pkgver}.tar;
 'SAGE-notebook.desktop')
-md5sums=('1162b607cf42859e31e81591600960d3'
+md5sums=('ce50c9e0c0ed1dca3038891c5c929509'
  'b82f94383829eee26648feb977e2d89b')
 
 build() {

Modified: sage-mathematics.install
===
--- sage-mathematics.install2013-02-03 16:05:49 UTC (rev 83602)
+++ sage-mathematics.install2013-02-03 20:47:32 UTC (rev 83603)
@@ -1,5 +1,6 @@
 post_install() {
   cd /opt/sage
+  update-desktop-database -q
 
   # set HOME because when sage updates its sage_root (after being moved) it 
will write files to ~/.sage with root ownership
   # the files it writes to ~/.sage can be safely ignored
@@ -44,6 +45,7 @@
 
 post_remove() {
   # Update LaTeX db to remove SageTeX entries
+  update-desktop-database -q
   if [ -f /usr/bin/texhash ]; then
 /usr/bin/texhash /usr/share/texmf
   fi