Update to latest beta

COPYING.txt

@@ -28,6 +28,7 @@ the licenses of the components of Sage are included below as well.
 
 SOFTWARE                    LICENSE
 -----------------------------------------------------------------------
+arb                         GPLv2+
 atlas                       Modified BSD
 boehm_gc                    MIT-like license (see below)
 backports_ssl_match_hostname  Python License

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:

VERSION.txt

@@ -1 +1 @@
-Sage version 6.10.beta0, released 2015-10-15
+Sage version 6.10.beta3, released 2015-11-05

build/make/deps

@@ -100,7 +100,9 @@ base: $(INST)/$(BZIP2) $(INST)/$(PATCH) $(INST)/$(PKGCONF)
 # Sage library (e.g. CYTHON, JINJA2), and on the other hand all
 # dependencies for Cython files (e.g. PARI, NTL, SAGE_MP_LIBRARY).
 sagelib: \
+		$(INST)/$(ARB) \
 		$(INST)/$(ATLAS) \
+		$(INST)/$(BRIAL) \
 		$(INST)/$(CEPHES) \
 		$(INST)/$(CLIQUER) \
 		$(INST)/$(CYTHON) \
@@ -115,6 +117,7 @@ sagelib: \
 		$(INST)/$(GSL) \
 		$(INST)/$(IML) \
 		$(INST)/$(JINJA2) \
+		$(INST)/$(JUPYTER_CORE) \
 		$(INST)/$(LCALC) \
 		$(INST)/$(LRCALC) \
 		$(INST)/$(LIBGAP) \
@@ -130,7 +133,6 @@ sagelib: \
 		$(INST)/$(NUMPY) \
 		$(INST)/$(PARI) \
 		$(INST)/$(PLANARITY) \
-		$(INST)/$(BRIAL) \
 		$(INST)/$(PPL) \
 		$(INST)/$(PYNAC) \
 		$(INST)/$(PYTHON) \
@@ -140,7 +142,8 @@ sagelib: \
 		$(INST)/$(SINGULAR) \
 		$(INST)/$(SIX) \
 		$(INST)/$(SYMMETRICA) \
-		$(INST)/$(ZN_POLY)
+		$(INST)/$(ZN_POLY) \
+		$(EXTCODE)
 	if [ -z "$$SAGE_INSTALL_FETCH_ONLY" ]; then \
 		cd $(SAGE_SRC) && source bin/sage-env && \
 		sage-logger 'time $(MAKE) sage' '$(SAGE_LOGS)/sage-$(SAGE_VERSION).log'; \

build/pkgs/arb/type

@@ -1 +1 @@
-optional
+standard

build/pkgs/bliss/SPKG.txt

@@ -7,7 +7,7 @@ forms of graphs.
 
 == License ==
 
-GPL
+LGPL
 
 == Upstream Contact ==
 

build/pkgs/bliss/checksums.ini

@@ -1,4 +1,4 @@
-tarball=bliss-VERSION.tar.bz2
-sha1=500796365fdf142dcfb34f979d678ffa456f1431
-md5=4e57118f9acad9a80baaefd93f967bdf
-cksum=662785944
+tarball=bliss-VERSION.tar.gz
+sha1=46322da1a03750e199e156d8967d88b89ebad5de
+md5=b936d5d54b618a77ed59dfeeced3fa58
+cksum=76340303

build/pkgs/bliss/package-version.txt

@@ -1 +1 @@
-0.72.p1
+0.73

build/pkgs/bliss/spkg-install

@@ -18,7 +18,7 @@ for patch in ../patches/*.patch; do
 done
 
 
-$MAKE && mv libbliss.a "$SAGE_LOCAL/lib" && mv *.hh "$SAGE_LOCAL/include"
+$MAKE && cp libbliss.a "$SAGE_LOCAL/lib" && cp *.hh "$SAGE_LOCAL/include"
 
 if [ $? -ne 0 ]; then
     echo "An error occurred whilst building bliss"

build/pkgs/cliquer/spkg-install

@@ -24,7 +24,6 @@ fi
 
 # Flags for building a dynamically linked shared object.
 if [ "$UNAME" = "Darwin" ]; then
-    export MACOSX_DEPLOYMENT_TARGET="10.3"
     SAGESOFLAGS="-dynamiclib -single_module -flat_namespace -undefined dynamic_lookup"
 elif [ "$UNAME" = "SunOS" ]; then
     SAGESOFLAGS="-shared -Wl,-h,libcliquer.so -Wl,-ztext"
@@ -63,6 +62,7 @@ cp *.h "$SAGE_LOCAL/include/cliquer/"
 
 if [ "$UNAME" = "Darwin" ]; then
     cp -f libcliquer.so "$SAGE_LOCAL/lib/libcliquer.dylib"
+    install_name_tool -id "${SAGE_LOCAL}"/lib/libcliquer.dylib "${SAGE_LOCAL}"/lib/libcliquer.dylib
 elif [ "$UNAME" = "CYGWIN" ]; then
     cp -f libcliquer.so "$SAGE_LOCAL/lib/libcliquer.dll"
 fi

build/pkgs/configure/checksums.ini

@@ -1,4 +1,4 @@
 tarball=configure-VERSION.tar.gz
-sha1=3e0d10789b34d6f890e1575c2a06894a90e4807e
-md5=020a9b7f31e61b57056969b6816455f1
-cksum=2662451870
+sha1=ff6a33eb58523267e51397577213b038fe81fe38
+md5=b694e1f431bb6f8fe6fbfc63b7640078
+cksum=1772005708

build/pkgs/configure/package-version.txt

@@ -1 +1 @@
-120
+123

build/pkgs/conway_polynomials/spkg-install

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 import os
-from sage.all import save
+from sage.structure.sage_object import save
 from sage.env import SAGE_SHARE
 
 install_root = os.path.join(SAGE_SHARE, 'conway_polynomials')

build/pkgs/git/checksums.ini

@@ -1,4 +1,4 @@
 tarball=git-VERSION.tar.gz
-sha1=150efeb9c016cb8d3e768a408f3f407d18d69661
-md5=edf994cf34cd3354dadcdfa6b4292335
-cksum=995320395
+sha1=ff32a94936309ca3f0e3d56e479e7510a3c1c925
+md5=da293290da69f45a86a311ad3cd43dc8
+cksum=2025246710

build/pkgs/git/package-version.txt

@@ -1 +1 @@
-2.3.0
+2.6.2

build/pkgs/git/spkg-install

@@ -49,13 +49,10 @@ done
 export NO_FINK=1
 export NO_DARWIN_PORTS=1
 
-# Darwin 8 (Tiger) does not support common crypto
-if { uname -sr | grep 'Darwin 8' ;} &>/dev/null; then
-    export NO_APPLE_COMMON_CRYPTO=1
-fi
-
 # OSX Git with FSF GCC is broken, disable completely for now. See #17091
-export NO_APPLE_COMMON_CRYPTO=1
+if [ "$UNAME" = "Darwin" ]; then
+    export NO_OPENSSL=1
+fi
 
 # First make GIT-VERSION-FILE (we patched Makefile such that configure
 # no longer depends on this, so it's safer to explicitly build this).

build/pkgs/gp2c/SPKG.txt

@@ -0,0 +1,18 @@
+= gp2c =
+
+== Description ==
+
+The gp2c compiler is a package for translating GP routines into the C
+programming language, so that they can be compiled and used with the PARI
+system or the GP calculator.
+
+== License ==
+
+GPL version 2+
+
+== Upstream Contact ==
+ * http://pari.math.u-bordeaux.fr/
+
+== Dependencies ==
+ * PARI
+ * Perl

build/pkgs/gp2c/checksums.ini

@@ -0,0 +1,4 @@
+tarball=gp2c-VERSION.tar.gz
+sha1=5acb1a13e1ed8ee877ffb34baa3b817e720f3e50
+md5=cb263990e399153aca6a2540930b4600
+cksum=1931194041

build/pkgs/gp2c/dependencies

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

build/pkgs/gp2c/package-version.txt

@@ -0,0 +1 @@
+0.0.9pl3