Merge branch 'matrix/acb_dense' into fsm/fourier_2

Makefile

@@ -19,7 +19,7 @@ build: all-build
 
 # If configure was run before, rerun it with the old arguments.
 # Otherwise, run configure with argument $PREREQ_OPTIONS.
-build/make/Makefile: configure
+build/make/Makefile: configure build/pkgs/*/*
 	rm -f config.log
 	mkdir -p logs/pkgs
 	ln -s logs/pkgs/config.log config.log
@@ -119,8 +119,7 @@ ptestoptional: ptestall # just an alias
 
 ptestoptionallong: ptestalllong # just an alias
 
-configure: configure.ac src/bin/sage-version.sh \
-        m4/ax_c_check_flag.m4 m4/ax_gcc_option.m4 m4/ax_gcc_version.m4 m4/ax_gxx_option.m4 m4/ax_gxx_version.m4 m4/ax_prog_perl_version.m4
+configure: configure.ac src/bin/sage-version.sh m4/*.m4
 	./bootstrap -d
 
 install:

README.txt

@@ -72,7 +72,6 @@ Installation Guide:
 1. Make sure you have the dependencies and 5 GB of free disk space.
 
    All Linux versions: gcc, make, m4, perl, ranlib, and tar.
-   Debian or Ubuntu systems: the dpkg-dev package.
    Fedora or RedHat systems: the perl-ExtUtils-MakeMaker package.
    (install these using your package manager)
 

VERSION.txt

@@ -1 +1 @@
-Sage version 6.10.beta2, released 2015-10-28
+Sage version 6.10.beta6, released 2015-11-27

build/bin/sage-spkg

@@ -637,8 +637,8 @@ if [ ! -x spkg-install ]; then
     echo >&2 "WARNING: spkg-install is not executable, making it executable"
     chmod +x spkg-install
 fi
-time ./spkg-install
 
+time ./spkg-install
 if [ $? -ne 0 ]; then
     error_msg "Error installing package $PKG_NAME" "make"
     exit 1
@@ -665,6 +665,12 @@ if [ "$SAGE_CHECK" = "yes" ]; then
     fi
 fi
 
+rm -f "$SAGE_LOCAL"/lib/*.la
+if [ $? -ne 0 ]; then
+    error_msg "Error deleting unnecessary libtool archive files"
+    exit 1
+fi
+
 # Mark that the new package has been installed (and tested, if
 # applicable).
 PKG_NAME_INSTALLED="$SAGE_SPKG_INST/$PKG_NAME"

build/pkgs/boost_cropped/SPKG.txt

@@ -24,6 +24,10 @@ None
 
 == Releases ==
 
+=== boost_cropped-1.58.0 (Emmanuel Charpentier, November 13th, 2015) ===
+ * Updated to boost_1_58_0/boost
+ * Created spkg-src
+
 === boost_cropped-1.52.0 (Timo Kluck, February 26th, 2013) ===
  * Drop sage patches; take all upstream headers
 

build/pkgs/boost_cropped/checksums.ini

@@ -1,4 +1,4 @@
 tarball=boost_cropped-VERSION.tar.bz2
-sha1=25daefce8a55f14bb56b72fffd573972cd2379d2
-md5=764a6c0aa03e39b70053135dc6edaa30
-cksum=111720154
+sha1=b49df7c91f384c991d73d9536d5a22805c2b2ad3
+md5=b7f01ecfcb43f088978479d8b71668f7
+cksum=3931350148

build/pkgs/boost_cropped/package-version.txt

@@ -1 +1 @@
-1.52.0
+1.58.0

build/pkgs/boost_cropped/spkg-src

@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+set -e
+
+VERSION=$(cat package-version.txt)
+SOURCE_VERSION=$(echo $VERSION | tr . _)
+SOURCE_DIR=boost_$SOURCE_VERSION
+SOURCE_TARBALL=$SOURCE_DIR.tar.bz2
+
+DEST_DIR=boost_cropped-$VERSION
+DEST_TARBALL=$DEST_DIR.tar.bz2
+
+CURDIR=$(pwd)
+TMPDIR=$(mktemp -d)
+
+cp $SOURCE_TARBALL $TMPDIR
+cd $TMPDIR
+
+tar xjf $SOURCE_TARBALL
+mkdir $DEST_DIR
+mv $SOURCE_DIR/boost $DEST_DIR
+tar cjf $DEST_TARBALL $DEST_DIR
+
+mv $DEST_TARBALL $CURDIR
+cd $CURDIR
+
+rm -Rf $TMPDIR

build/pkgs/configure/checksums.ini

@@ -1,4 +1,4 @@
 tarball=configure-VERSION.tar.gz
-sha1=d7f2ecde69b59bec3887fd0ba1f4e2784394fd6b
-md5=fa6127892f72b56b96a592fcec729f25
-cksum=1455899060
+sha1=8d5005d113eab69e9c43e9c0b7c506ced309e392
+md5=599302157657d7a00ea2936393b061c5
+cksum=2156332361

build/pkgs/configure/package-version.txt

@@ -1 +1 @@
-122
+126

build/pkgs/cycler/SPKG.txt

@@ -0,0 +1,24 @@
+= cycler =
+
+== Description ==
+
+Cycler is a small break of of matplotlib to
+deal with "composable cycles".
+It is a required dependency of matplotlib 1.5.0.
+
+== License ==
+BSD
+
+== Upstream Contact ==
+
+cycler is developed on github: https://github.com/matplotlib/cycler
+
+A more informative webpage about cycler, its motivation and usage
+is at http://tacaswell.github.io/cycler/
+
+== Dependencies ==
+
+ * python
+ * setuptools
+ * six
+

build/pkgs/cycler/checksums.ini

@@ -0,0 +1,4 @@
+tarball=cycler-VERSION.tar.gz
+sha1=cb50081b6f6d55796ab2ae2f5dfc6d4d59b94506
+md5=0b418dbaded3aba6021af03246e2f7d0
+cksum=229891196

build/pkgs/cycler/dependencies

@@ -0,0 +1,5 @@
+$(INST)/$(PYTHON) $(INST)/$(SETUPTOOLS) $(INST)/$(SIX)
+----------
+All lines of this file are ignored except the first.
+It is copied by SAGE_ROOT/build/make/install into SAGE_ROOT/build/make/Makefile.
+

build/pkgs/cycler/package-version.txt

@@ -0,0 +1 @@
+0.9.0

build/pkgs/cycler/spkg-install

@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+
+if [ "$SAGE_LOCAL" = "" ]; then
+   echo "SAGE_LOCAL undefined ... exiting";
+   echo "Maybe run 'sage -sh'?"
+   exit 1
+fi
+
+cd src
+
+python setup.py install
+if [ $? -ne 0 ]; then
+    echo "Error installing cycler ... exiting"
+    exit 1
+fi
+

build/pkgs/cycler/type

@@ -0,0 +1 @@
+standard

build/pkgs/ipykernel/checksums.ini

@@ -1,4 +1,4 @@
 tarball=ipykernel-VERSION.tar.gz
-sha1=53dc62e7cfd7582df4dc0a7d0da2463fcf294329
-md5=86b6a392e5ca727284220ea0034ec4d5
-cksum=55668233
+sha1=779512583ddd1ad257ce93ea4d326a55b5da91a0
+md5=6093813ebd95b790c7eb4c9841bd07ce
+cksum=3904063097

build/pkgs/ipykernel/package-version.txt

@@ -1 +1 @@
-4.0.3.p0
+4.1.1

build/pkgs/matplotlib/checksums.ini

@@ -1,4 +1,4 @@
 tarball=matplotlib-VERSION.tar.bz2
-sha1=09e2defc435f78b21e987bfe12cf458091d14880
-md5=fb66ed0a8b3494e0d9666eec04b6edc4
-cksum=3473042829
+sha1=bb9769b4433bd8b6625ef9050e697a3c27a0f0af
+md5=74a96a13fa77ec44fd6a2fd57302693a
+cksum=2922132423

build/pkgs/matplotlib/dependencies

@@ -1,4 +1,4 @@
-$(INST)/$(PYTHON) $(INST)/$(NUMPY) $(INST)/$(FREETYPE) $(INST)/$(LIBPNG) $(INST)/$(DATEUTIL) $(INST)/$(PYPARSING) $(INST)/$(SETUPTOOLS) $(INST)/$(TORNADO) $(INST)/$(SIX)
+$(INST)/$(PYTHON) $(INST)/$(NUMPY) $(INST)/$(FREETYPE) $(INST)/$(LIBPNG) $(INST)/$(DATEUTIL) $(INST)/$(PYPARSING) $(INST)/$(SETUPTOOLS) $(INST)/$(TORNADO) $(INST)/$(SIX) $(INST)/$(CYCLER)
 
 ----------
 All lines of this file are ignored except the first.

build/pkgs/matplotlib/package-version.txt

@@ -1 +1 @@
-1.4.3
+1.5.0

build/pkgs/matplotlib/spkg-src

@@ -6,26 +6,24 @@ set -e
 [ -n "${SAGE_ROOT}" ] || SAGE_ROOT="$(readlink -f $(dirname ${0})/../../../)"
 
 
-# determine the latest version and its download URL.
-DOWNLOAD_URL=$(curl "https://pypi.python.org/pypi?:action=doap&name=matplotlib" \
-               | grep download-page | sed 's/.*http/http/g' | sed s/.gz.*/.gz/g)
-LATEST_VERSION=$(echo ${DOWNLOAD_URL} | sed 's/.*matplotlib-//g' | sed 's/.tar.gz//g')
-
+# Set the version and its download URL.
+VERSION=1.5.0
+DOWNLOAD_URL="https://pypi.python.org/packages/source/m/matplotlib/matplotlib-${VERSION}.tar.gz"
 
 # fetch and unpack latest version
 tar xzf <( curl -L ${DOWNLOAD_URL} )
 
 
 # remove test images
-rm -rf matplotlib-${LATEST_VERSION}/lib/matplotlib/tests/baseline_images/*
+rm -rf matplotlib-${VERSION}/lib/matplotlib/tests/baseline_images/*
 
 
 # repack and cleanup temporary directory
-tar cjf "$SAGE_ROOT/upstream/matplotlib-${LATEST_VERSION}.tar.bz2" matplotlib-${LATEST_VERSION}
-rm -rf matplotlib-${LATEST_VERSION}
+tar cjf "$SAGE_ROOT/upstream/matplotlib-${VERSION}.tar.bz2" matplotlib-${VERSION}
+rm -rf matplotlib-${VERSION}
 
 
 # update package info
-echo "${LATEST_VERSION}" > "${SAGE_ROOT}/build/pkgs/matplotlib/package-version.txt"
+echo "${VERSION}" > "${SAGE_ROOT}/build/pkgs/matplotlib/package-version.txt"
 "$SAGE_ROOT"/sage -sh 'sage-fix-pkg-checksums'
 

build/pkgs/mpir/checksums.ini

@@ -1,4 +1,4 @@
 tarball=mpir-VERSION.tar.bz2
-sha1=860f8de360feaca700b8fe5c0df8471709ddf4a3
-md5=4aec04108dd24c49d45beb959d837b40
-cksum=2007318477
+sha1=a285352d4299eb18d4f02a97e3232efab225e174
+md5=b31aa1ebc01b5fedf4ac43277c03feec
+cksum=3412099598

build/pkgs/mpir/package-version.txt

@@ -1 +1 @@
-2.7.0.p1
+2.7.2