[arch-commits] Commit in sage-mathematics-doc/trunk (3 files)

[Antonio Rojas]

    Date: Tuesday, February 17, 2015 @ 21:58:16
  Author: arojas
Revision: 127872

Sage 6.5

Added:
  sage-mathematics-doc/trunk/package.patch
Modified:
  sage-mathematics-doc/trunk/PKGBUILD
Deleted:
  sage-mathematics-doc/trunk/gap-hap.patch

---------------+
 PKGBUILD      |   25 ++++++++++++-------------
 gap-hap.patch |   11 -----------
 package.patch |   11 +++++++++++
 3 files changed, 23 insertions(+), 24 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-02-17 20:07:48 UTC (rev 127871)
+++ PKGBUILD	2015-02-17 20:58:16 UTC (rev 127872)
@@ -3,29 +3,27 @@
 
 pkgbase=sage-mathematics-doc
 pkgname=('sage-mathematics-doc' 'sage-mathematics-src')
-pkgver=6.4.1
-pkgrel=6
+pkgver=6.5
+pkgrel=1
 arch=('any')
 url="http://www.sagemath.org"
-license=('GPL')
-makedepends=('sage-notebook' 'python2-sphinx')
-source=("https://github.com/sagemath/sage/archive/$pkgver.tar.gz" 'paths.patch' 'gap-hap.patch' 'fes02.patch')
-md5sums=('e40736461992e62af3a84cf9a212c9d1'
+license=(GPL)
+makedepends=(sage-notebook python2-sphinx)
+source=("https://github.com/sagemath/sage/archive/$pkgver.tar.gz" 'package.patch' 'paths.patch' 'fes02.patch')
+md5sums=('5a173b1ecce89c845626653cfb3d199f'
+         '0eb5ac1537aac93bd67a2925c0cfd84d'
          '9a39301dedeb560f7bfddb81b6853f28'
-         '631ee6b8b3e7d12bb7858cfd841af483'
          '506944613082ba7f5b34360939ca90eb')
 
 prepare() {
   cd sage-$pkgver
 
-# add optional packages manually (Fedora)  
-  sed -e 's|is_package_installed("nauty")|True|' -i src/sage/graphs/graph_generators.py
+# assume all optional packages are installed
+  patch -p0 -i $srcdir/package.patch
 # fix paths in python imports
   patch -p0 -i $srcdir/paths.patch
 # fix linking to blas/cblas
   sed -e "s|cblas(), atlas(),|'cblas', 'blas',|" -i src/sage/misc/cython.py
-# don't use is_package_installed function
-  patch -p0 -i $srcdir/gap-hap.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
@@ -51,7 +49,7 @@
 
 package_sage-mathematics-doc() {
   pkgdesc="HTML documentation and inline help for Sage"
-  depends=('sage-notebook' 'python2-sphinx')
+  depends=(sage-notebook python2-sphinx)
   cd sage-$pkgver/src/doc
  
   mkdir -p "$pkgdir"/usr/share/doc/sage
@@ -64,7 +62,8 @@
   pkgdesc="Source files for sage-mathematics"
   
   mkdir -p "$pkgdir"/usr/share/sage/src
-  cp -r sage-$pkgver/src/sage "$pkgdir"/usr/share/sage/src
+  cp -r sage-$pkgver/src/{sage,sage_setup} "$pkgdir"/usr/share/sage/src
+  ln -s /usr/share/doc/sage "$pkgdir"/usr/share/sage/src/doc
 
   mkdir -p "$pkgdir"/usr/include/csage
   cp -r sage-$pkgver/src/c_lib/include/* "$pkgdir"/usr/include/csage

Deleted: gap-hap.patch
===================================================================
--- gap-hap.patch	2015-02-17 20:07:48 UTC (rev 127871)
+++ gap-hap.patch	2015-02-17 20:58:16 UTC (rev 127872)
@@ -1,11 +0,0 @@
---- src/sage/groups/perm_gps/permgroup.py.orig	2014-12-23 10:14:09.687176992 +0100
-+++ src/sage/groups/perm_gps/permgroup.py	2014-12-23 10:14:53.930669821 +0100
-@@ -180,8 +180,6 @@
-     """
-     @wraps(f)
-     def wrapped(self, n, p=0):
--        if not is_package_installed('gap_packages'):
--            raise RuntimeError("You must install the optional gap_packages package.")
-         load_hap()
-         from sage.rings.arith import is_prime
-         if not (p == 0 or is_prime(p)):

Added: package.patch
===================================================================
--- package.patch	                        (rev 0)
+++ package.patch	2015-02-17 20:58:16 UTC (rev 127872)
@@ -0,0 +1,11 @@
+--- src/sage/misc/package.py.orig	2014-11-23 15:58:13.000000000 +0100
++++ src/sage/misc/package.py	2015-01-22 20:32:25.651383902 +0100
+@@ -194,7 +194,7 @@
+         sage: is_package_installed('sage')
+         True
+     """
+-    return any(p.startswith(package) for p in install_package())
++    return True
+ 
+ def standard_packages():
+     """