[arch-commits] Commit in sage-mathematics/trunk (PKGBUILD paths.patch)
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 paths.patch)
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 paths.patch)
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'))
