Date: Saturday, December 19, 2015 @ 01:20:19 Author: arojas Revision: 153707
archrelease: copy trunk to community-testing-any Added: sagemath-doc/repos/community-testing-any/ sagemath-doc/repos/community-testing-any/PKGBUILD (from rev 153706, sagemath-doc/trunk/PKGBUILD) sagemath-doc/repos/community-testing-any/disable-fes.patch (from rev 153706, sagemath-doc/trunk/disable-fes.patch) sagemath-doc/repos/community-testing-any/package.patch (from rev 153706, sagemath-doc/trunk/package.patch) sagemath-doc/repos/community-testing-any/paths.patch (from rev 153706, sagemath-doc/trunk/paths.patch) -------------------+ PKGBUILD | 81 ++++++++++++++++++++++++++++++++++++++++++++++++++++ disable-fes.patch | 19 ++++++++++++ package.patch | 11 +++++++ paths.patch | 37 +++++++++++++++++++++++ 4 files changed, 148 insertions(+) Copied: sagemath-doc/repos/community-testing-any/PKGBUILD (from rev 153706, sagemath-doc/trunk/PKGBUILD) =================================================================== --- community-testing-any/PKGBUILD (rev 0) +++ community-testing-any/PKGBUILD 2015-12-19 00:20:19 UTC (rev 153707) @@ -0,0 +1,81 @@ +# $Id$ +# Maintainer: Antonio Rojas <aro...@archlinux.org> + +pkgbase=sagemath-doc +pkgname=(sagemath-doc sagemath-src) +pkgver=6.10 +pkgrel=1 +arch=(any) +url="http://www.sagemath.org" +license=(GPL) +makedepends=(sagemath sage-notebook python2-sphinx python2-pyzmq python2-pillow) +source=("$pkgbase-$pkgver.tar.gz::https://github.com/sagemath/sage/archive/$pkgver.tar.gz" + 'package.patch' 'paths.patch' 'disable-fes.patch') +md5sums=('3c92d9cc67e2be5bc7802427e84b9b71' + '9ba81f717ffd4e20b8b2f2a318307488' + 'fd8e3e07f5b7318e6a7200a3c64f5bc2' + '4eb23a3c7363258bc9ba764d6e5512ba') + +prepare() { + cd sage-$pkgver + +# Arch-specific patches +# assume all optional packages are installed + patch -p0 -i ../package.patch +# fix paths in python imports + patch -p0 -i ../paths.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 +# 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 +# find bliss headers + sed -e 's|graph.hh|bliss/graph.hh|' -i src/sage/graphs/bliss.pyx + +# Upstream patches +# fix build against libfes 0.2 http://trac.sagemath.org/ticket/15209 +# patch -p0 -i ../fes02.patch +# disable fes module, fails to build + patch -p0 -i ../disable-fes.patch + +# use python2 + sed -e 's|cython %s %s|cython2 %s %s|' -e 's|python setup.py|python2 setup.py|' -i src/sage/misc/cython.py + +# remove developer interface + rm -r src/sage/dev +} + +build() { + cd sage-$pkgver/src + + export SAGE_LOCAL="/usr" + export SAGE_SRC="$PWD" + export SAGE_DOC="$SAGE_SRC"/doc + export SAGE_DOC_MATHJAX=yes + export PYTHONPATH="/usr/lib/sage/site-packages" + python2 doc/common/builder.py -k all html +} + +package_sagemath-doc() { + pkgdesc="HTML documentation and inline help for SageMath" + depends=(sage-notebook python2-sphinx) + conflicts=(sage-mathematics-doc) + replaces=(sage-mathematics-doc) + + cd sage-$pkgver/src/doc + + mkdir -p "$pkgdir"/usr/share/doc/sage + cp -r * "$pkgdir"/usr/share/doc/sage + rm "$pkgdir"/usr/share/doc/sage/Makefile + rm -r "$pkgdir"/usr/share/doc/sage/output/doctrees +} + +package_sagemath-src() { + pkgdesc="Source files for SageMath" + conflicts=(sage-mathematics-src) + replaces=(sage-mathematics-src) + + mkdir -p "$pkgdir"/usr/share/sage/source + cp -r sage-$pkgver/src/{sage,sage_setup} "$pkgdir"/usr/share/sage/source + ln -s /usr/share/doc/sage "$pkgdir"/usr/share/sage/source/doc +} Copied: sagemath-doc/repos/community-testing-any/disable-fes.patch (from rev 153706, sagemath-doc/trunk/disable-fes.patch) =================================================================== --- community-testing-any/disable-fes.patch (rev 0) +++ community-testing-any/disable-fes.patch 2015-12-19 00:20:19 UTC (rev 153707) @@ -0,0 +1,19 @@ +--- src/module_list.py.orig 2015-06-07 11:29:30.710612146 +0200 ++++ src/module_list.py 2015-06-07 11:30:21.877506106 +0200 +@@ -685,11 +685,11 @@ + include_dirs = [SAGE_INC + '/ecl'], + depends = [SAGE_INC + '/ecl/ecl.h']), + +- OptionalExtension("sage.libs.fes", +- ["sage/libs/fes.pyx"], +- language = "c", +- libraries = ['fes'], +- package = 'fes'), ++# OptionalExtension("sage.libs.fes", ++# ["sage/libs/fes.pyx"], ++# language = "c", ++# libraries = ['fes'], ++# package = 'fes'), + + Extension('sage.libs.flint.flint', + sources = ["sage/libs/flint/flint.pyx"], Copied: sagemath-doc/repos/community-testing-any/package.patch (from rev 153706, sagemath-doc/trunk/package.patch) =================================================================== --- community-testing-any/package.patch (rev 0) +++ community-testing-any/package.patch 2015-12-19 00:20:19 UTC (rev 153707) @@ -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 +@@ -204,7 +204,7 @@ + Otherwise, installing "pillow" will cause this function to think + that "pil" is installed, for example. + """ +- return any(p.split('-')[0] == package for p in installed_packages()) ++ return True + + def package_versions(package_type, local=False): + r""" Copied: sagemath-doc/repos/community-testing-any/paths.patch (from rev 153706, sagemath-doc/trunk/paths.patch) =================================================================== --- community-testing-any/paths.patch (rev 0) +++ community-testing-any/paths.patch 2015-12-19 00:20:19 UTC (rev 153707) @@ -0,0 +1,37 @@ +--- src/sage/env.py.orig 2014-06-25 10:47:25.827203554 +1200 ++++ src/sage/env.py 2014-06-25 10:49:07.667402821 +1200 +@@ -87,24 +87,21 @@ + _add_variable_or_fallback('LOCAL_IDENTIFIER','$HOSTNAME.%s'%os.getpid()) + + # bunch of sage directories and files +-_add_variable_or_fallback('SAGE_ROOT', None) +-_add_variable_or_fallback('SAGE_LOCAL', opj('$SAGE_ROOT', 'local')) +-_add_variable_or_fallback('SAGE_ETC', opj('$SAGE_LOCAL', 'etc')) +-_add_variable_or_fallback('SAGE_INC', opj('$SAGE_LOCAL', 'include')) +-_add_variable_or_fallback('SAGE_SHARE', opj('$SAGE_LOCAL', 'share')) ++_add_variable_or_fallback('SAGE_ROOT', '/usr') ++_add_variable_or_fallback('SAGE_LOCAL', '/usr') ++_add_variable_or_fallback('SAGE_ETC', '/etc/sage') ++_add_variable_or_fallback('SAGE_INC', opj('$SAGE_LOCAL', 'include', 'sage')) ++_add_variable_or_fallback('SAGE_SHARE', opj('$SAGE_LOCAL', 'share', 'sage')) + + _add_variable_or_fallback('SAGE_SRC', opj('$SAGE_ROOT', 'src')) +-_add_variable_or_fallback('SITE_PACKAGES', site.getsitepackages()) ++_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_CYTHONIZED', opj('$SAGE_SRC', 'build', 'cythonized')) + +-_add_variable_or_fallback('SAGE_EXTCODE', opj('$SAGE_SHARE', 'sage', 'ext')) +-_add_variable_or_fallback('SAGE_LOGS', opj('$SAGE_ROOT', 'logs', 'pkgs')) +-_add_variable_or_fallback('SAGE_SPKG_INST', opj('$SAGE_LOCAL', 'var', 'lib', 'sage', 'installed')) +-_add_variable_or_fallback('SAGE_DOC', opj('$SAGE_SRC', 'doc')) +-_add_variable_or_fallback('DOT_SAGE', opj(os.environ.get('HOME','$SAGE_ROOT'), '.sage')) +-_add_variable_or_fallback('SAGE_DOT_GIT', opj('$SAGE_ROOT', '.git')) ++_add_variable_or_fallback('SAGE_EXTCODE', opj('$SAGE_SHARE', 'ext')) ++_add_variable_or_fallback('SAGE_DOC', '/usr/share/doc/sage') ++_add_variable_or_fallback('DOT_SAGE', opj(os.environ.get('HOME'), '.sage')) + _add_variable_or_fallback('SAGE_DISTFILES', opj('$SAGE_ROOT', 'upstream')) + + # misc +