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

[Antonio Rojas]

    Date: Tuesday, January 19, 2016 @ 18:29:32
  Author: arojas
Revision: 157706

Update to 7.0, switch to system pexpect

Modified:
  sagemath/trunk/PKGBUILD

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-01-19 17:13:12 UTC (rev 157705)
+++ PKGBUILD	2016-01-19 17:29:32 UTC (rev 157706)
@@ -8,8 +8,8 @@
 # Special thanks to Nareto for moving the compile from the .install to the PKGBUILD
 
 pkgname=sagemath
-pkgver=6.10
-pkgrel=2
+pkgver=7.0
+pkgrel=1
 pkgdesc="Open Source Mathematics Software, free alternative to Magma, Maple, Mathematica, and Matlab"
 arch=(i686 x86_64)
 url="http://www.sagemath.org"
@@ -30,11 +30,9 @@
 replaces=(sage-mathematics)
 provides=(sage-mathematics)
 source=("$pkgname-$pkgver.tar.gz::https://github.com/sagemath/sage/archive/$pkgver.tar.gz" 
-	"http://mirrors.mit.edu/sage/spkg/upstream/pexpect/pexpect-2.0.tar.bz2"
 	anal.h package.patch env.patch paths.patch clean.patch skip-check.patch
-	pexpect-env.patch pexpect-del.patch disable-fes.patch jupyter-path.patch test-optional.patch python-2.7.11.patch)
-md5sums=('3c92d9cc67e2be5bc7802427e84b9b71'
-         'd9a3e113ed147dcee8f89962a8dccd43'
+	disable-fes.patch jupyter-path.patch test-optional.patch python-2.7.11.patch)
+md5sums=('34807a7cf5dd79c008abd377ba1427fa'
          'a906a180d198186a39820b0a2f9a9c63'
          '9ba81f717ffd4e20b8b2f2a318307488'
          'e1b1d0d2e6b187309ae2b74489356b9a'
@@ -41,8 +39,6 @@
          'fd8e3e07f5b7318e6a7200a3c64f5bc2'
          '6d9ae0978ce6a05a0da2cafdfb178a09'
          '5947a420a0b1483f0cbc74c76895789b'
-         'a83a3b1bc7fcb7cbf752a83a8311fc42'
-         'f333939ea6c41377b66407c81016cee4'
          '4eb23a3c7363258bc9ba764d6e5512ba'
          '16b529194c6105c3364127bd8f1efa83'
          'cdcabd475b80afe0534a5621e972736e'
@@ -99,12 +95,6 @@
 
 # remove developer interface
   rm -r src/sage/dev
-
-  cd "$srcdir"/pexpect-2.0
-# fix env in pexpect
-  patch -p1 -i ../pexpect-env.patch
-# hide exceptions in pexpect
-  patch -p1 -i ../pexpect-del.patch
 }
 
 
@@ -119,11 +109,6 @@
   make sage/ext/interpreters/__init__.py
 
   python2 setup.py build
-
-# build pexpect
-  pushd "$srcdir"/pexpect-2.0
-    python2 setup.py build
-  popd
 }
 
 package() {
@@ -152,10 +137,4 @@
   
 # Create SAGE_SRC, needed for the notebook
   mkdir "$pkgdir"/usr/share/sage/source
-
-# Install Sage's own pexpect
-  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/
 }