Merge tag '9.5.beta4' into t/29039/pip_installable_package_sage_boots…

…trap

SageMath version 9.5.beta4, Release Date: 2021-10-19

.github/workflows/ci-cygwin-minimal.yml

@@ -84,7 +84,7 @@ jobs:
   cygwin-stage-i-b:
     env:
       STAGE: i-b
-      TARGETS: cython setuptools_scm kiwisolver dateutil cycler pyparsing nose certifi pkgconfig pplpy
+      TARGETS: cython setuptools_scm kiwisolver dateutil cycler pyparsing certifi pkgconfig pplpy
       LOCAL_ARTIFACT_NAME: sage-local-commit-${{ github.sha }}-cygwin-${{ matrix.pkgs }}
       LOGS_ARTIFACT_NAME: logs-commit-${{ github.sha }}-cygwin-${{ matrix.pkgs }}
 

.github/workflows/ci-cygwin-standard.yml

@@ -84,7 +84,7 @@ jobs:
   cygwin-stage-i-b:
     env:
       STAGE: i-b
-      TARGETS: cython setuptools_scm kiwisolver dateutil cycler pyparsing nose certifi pkgconfig pplpy
+      TARGETS: cython setuptools_scm kiwisolver dateutil cycler pyparsing certifi pkgconfig pplpy
       LOCAL_ARTIFACT_NAME: sage-local-commit-${{ github.sha }}-cygwin-${{ matrix.pkgs }}
       LOGS_ARTIFACT_NAME: logs-commit-${{ github.sha }}-cygwin-${{ matrix.pkgs }}
 

.github/workflows/tox-experimental.yml

@@ -40,14 +40,17 @@ jobs:
       matrix:
         # This list is different from the one in tox.yml:
         # Trac #31526 switches gcc 4.x-based distributions to using the gcc_spkg configuration factor
-        tox_system_factor: [ubuntu-trusty-gcc_spkg, ubuntu-xenial, ubuntu-bionic, ubuntu-focal, ubuntu-groovy, ubuntu-hirsute, debian-jessie-gcc_spkg, debian-stretch, debian-buster, debian-bullseye, debian-sid, linuxmint-17-gcc_spkg, linuxmint-18, linuxmint-19, linuxmint-19.3, linuxmint-20.1, fedora-26, fedora-27, fedora-28, fedora-29, fedora-30, fedora-31, fedora-32, fedora-33, fedora-34, centos-7-gcc_spkg, centos-8, gentoo, archlinux-latest, opensuse-15, opensuse-15.3, opensuse-tumbleweed, slackware-14.2, conda-forge, ubuntu-bionic-i386, manylinux-2_24-i686, debian-buster-i386, centos-7-gcc_spkg]
+        # Trac #32281 removes gcc 4.x-based distributions whose binutils are unusable
+        tox_system_factor: [ubuntu-xenial, ubuntu-bionic, ubuntu-focal, ubuntu-groovy, ubuntu-hirsute, debian-jessie-gcc_spkg, debian-stretch, debian-buster, debian-bullseye, debian-sid, linuxmint-18, linuxmint-19, linuxmint-19.3, linuxmint-20.1, fedora-26, fedora-27, fedora-28, fedora-29, fedora-30, fedora-31, fedora-32, fedora-33, fedora-34, centos-7-gcc_spkg, centos-8, gentoo, archlinux-latest, opensuse-15, opensuse-15.3, opensuse-tumbleweed, slackware-14.2, conda-forge, ubuntu-bionic-i386, manylinux-2_24-i686, debian-buster-i386, centos-7-i386-gcc_spkg]
         tox_packages_factor: [maximal]
         targets_pattern: [0-g, h-o, p, q-z]
     env:
       TOX_ENV: docker-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}
       LOGS_ARTIFACT_NAME: logs-commit-${{ github.sha }}-tox-docker-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}
       DOCKER_TARGETS: configured with-targets with-targets-optional
-      TARGETS_OPTIONAL: "$( echo $(PATH=build/bin:$PATH build/bin/sage-package list :experimental: | grep -v  database_stein_watkins\\$ | grep -v polytopes_db_4d | grep '^[${{ matrix.targets_pattern }}]' ) )"
+      # Test all non-dummy experimental packages, but do not test huge packages
+      # and do not test packages that require external software
+      TARGETS_OPTIONAL: "$( echo $(export PATH=build/bin:$PATH && sage-package list :experimental: --has-file spkg-install.in && sage-package list :experimental: --has-file spkg-install && sage-package list :experimental: --has-file requirements.txt | grep -v ^_ | grep -v  database_stein_watkins\\$ | grep -v polytopes_db_4d | grep -v cplex | grep -v gurobi | grep '^[${{ matrix.targets_pattern }}]' ) )"
     steps:
       - uses: actions/checkout@v2
         with:
@@ -146,7 +149,9 @@ jobs:
     env:
       TOX_ENV: local-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}
       LOGS_ARTIFACT_NAME: logs-commit-${{ github.sha }}-tox-local-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}-${{ matrix.os }}-xcode_${{ matrix.xcode_version_factor }}
-      TARGETS_OPTIONAL: "$( echo $(PATH=build/bin:$PATH build/bin/sage-package list :experimental: | grep -v  database_stein_watkins\\$ | grep -v polytopes_db_4d | grep '^[${{ matrix.targets_pattern }}]' ) )"
+      # Test all non-dummy experimental packages, but do not test huge packages
+      # and do not test packages that require external software
+      TARGETS_OPTIONAL: "$( echo $(export PATH=build/bin:$PATH && sage-package list :experimental: --has-file spkg-install.in && sage-package list :experimental: --has-file spkg-install && sage-package list :experimental: --has-file requirements.txt | grep -v ^_ | grep -v  database_stein_watkins\\$ | grep -v polytopes_db_4d | grep -v cplex | grep -v gurobi | grep '^[${{ matrix.targets_pattern }}]' ) )"
     steps:
       - uses: actions/checkout@v2
       - name: Select Xcode version

.github/workflows/tox-optional.yml

@@ -40,16 +40,17 @@ jobs:
       matrix:
         # This list is different from the one in tox.yml:
         # Trac #31526 switches gcc 4.x-based distributions to using the gcc_spkg configuration factor
-        tox_system_factor: [ubuntu-trusty-gcc_spkg, ubuntu-xenial, ubuntu-bionic, ubuntu-focal, ubuntu-groovy, ubuntu-hirsute, debian-jessie-gcc_spkg, debian-stretch, debian-buster, debian-bullseye, debian-sid, linuxmint-17-gcc_spkg, linuxmint-18, linuxmint-19, linuxmint-19.3, linuxmint-20.1, fedora-26, fedora-27, fedora-28, fedora-29, fedora-30, fedora-31, fedora-32, fedora-33, fedora-34, centos-7-gcc_spkg, centos-8, gentoo, archlinux-latest, opensuse-15, opensuse-15.3, opensuse-tumbleweed, slackware-14.2, conda-forge, ubuntu-bionic-i386, manylinux-2_24-i686, debian-buster-i386, centos-7-gcc_spkg]
+        # Trac #32281 removes gcc 4.x-based distributions whose binutils are unusable
+        tox_system_factor: [ubuntu-xenial, ubuntu-bionic, ubuntu-focal, ubuntu-groovy, ubuntu-hirsute, debian-jessie-gcc_spkg, debian-stretch, debian-buster, debian-bullseye, debian-sid, linuxmint-18, linuxmint-19, linuxmint-19.3, linuxmint-20.1, fedora-26, fedora-27, fedora-28, fedora-29, fedora-30, fedora-31, fedora-32, fedora-33, fedora-34, centos-7-gcc_spkg, centos-8, gentoo, archlinux-latest, opensuse-15, opensuse-15.3, opensuse-tumbleweed, slackware-14.2, conda-forge, ubuntu-bionic-i386, manylinux-2_24-i686, debian-buster-i386, centos-7-i386-gcc_spkg]
         tox_packages_factor: [maximal]
         targets_pattern: [0-g, h-o, p, q-z]
     env:
       TOX_ENV: docker-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}
       LOGS_ARTIFACT_NAME: logs-commit-${{ github.sha }}-tox-docker-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}
       DOCKER_TARGETS: configured with-targets with-targets-optional
-      # Test all optional packages, but do not test huge packages,
+      # Test all non-dummy optional packages, but do not test huge packages
       # and do not test packages that require external software
-      TARGETS_OPTIONAL: "$( echo $(PATH=build/bin:$PATH build/bin/sage-package list :optional: | grep -v  database_stein_watkins\\$ | grep -v polytopes_db_4d | grep -v cplex | grep -v gurobi | grep '^[${{ matrix.targets_pattern }}]' ) )"
+      TARGETS_OPTIONAL: "$( echo $(export PATH=build/bin:$PATH && (sage-package list :optional: --has-file spkg-install.in && sage-package list :optional: --has-file spkg-install && sage-package list :optional: --has-file requirements.txt) | grep -v ^_ | grep -v  database_stein_watkins\\$ | grep -v polytopes_db_4d | grep -v cplex | grep -v gurobi | grep '^[${{ matrix.targets_pattern }}]' ) )"
     steps:
       - uses: actions/checkout@v2
         with:
@@ -148,9 +149,9 @@ jobs:
     env:
       TOX_ENV: local-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}
       LOGS_ARTIFACT_NAME: logs-commit-${{ github.sha }}-tox-local-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}-${{ matrix.os }}-xcode_${{ matrix.xcode_version_factor }}
-      # Test all optional packages, but do not test huge packages
+      # Test all non-dummy optional packages, but do not test huge packages
       # and do not test packages that require external software
-      TARGETS_OPTIONAL: "$( echo $(PATH=build/bin:$PATH build/bin/sage-package list :optional: | grep -v  database_stein_watkins\\$ | grep -v polytopes_db_4d | grep -v cplex | grep -v gurobi | grep '^[${{ matrix.targets_pattern }}]' ) )"
+      TARGETS_OPTIONAL: "$( echo $(export PATH=build/bin:$PATH && (sage-package list :optional: --has-file spkg-install.in && sage-package list :optional: --has-file spkg-install && sage-package list :optional: --has-file requirements.txt) | grep -v ^_ | grep -v  database_stein_watkins\\$ | grep -v polytopes_db_4d | grep -v cplex | grep -v gurobi | grep '^[${{ matrix.targets_pattern }}]' ) )"
     steps:
       - uses: actions/checkout@v2
       - name: Select Xcode version

.gitignore

@@ -182,6 +182,7 @@ src/*.egg-info/
 /src/bin/sage-src-env-config
 
 # Virtual environments
+/venv
 src/.env
 src/.venv
 src/env/

.zenodo.json

@@ -1,10 +1,10 @@
 {
     "description": "Mirror of the Sage https://sagemath.org/ source tree", 
     "license": "other-open", 
-    "title": "sagemath/sage: 9.5.beta2", 
-    "version": "9.5.beta2", 
+    "title": "sagemath/sage: 9.5.beta4", 
+    "version": "9.5.beta4", 
     "upload_type": "software", 
-    "publication_date": "2021-09-26", 
+    "publication_date": "2021-10-19", 
     "creators": [
         {
             "affiliation": "SageMath.org", 
@@ -15,7 +15,7 @@
     "related_identifiers": [
         {
             "scheme": "url", 
-            "identifier": "https://github.com/sagemath/sage/tree/9.5.beta2", 
+            "identifier": "https://github.com/sagemath/sage/tree/9.5.beta4", 
             "relation": "isSupplementTo"
         }, 
         {

COPYING.txt

@@ -32,7 +32,6 @@ 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
 boost_cropped               Boost Software License (see below)
@@ -86,7 +85,6 @@ mistune                     Modified BSD
 mpc                         LGPLv3+
 mpfi                        COPYING is GPLv2, source files state LGPLv2.1+
 mpfr                        LGPLv3+
-mpir                        LGPLv3+
 mpmath                      Modified BSD
 networkx                    Modified BSD
 ntl                         GPLv2+

Makefile

@@ -118,6 +118,7 @@ distclean: build-clean
 	@echo "Deleting all remaining output from build system ..."
 	rm -rf local
 	rm -f src/bin/sage-env-config
+	rm -f prefix venv
 
 # Delete all auto-generated files which are distributed as part of the
 # source tarball

README.md

@@ -349,7 +349,7 @@ Simplified directory layout (only essential files/directories):
 SAGE_ROOT                 Root directory (sage-x.y.z in Sage tarball)
 ├── build
 │   └── pkgs              Every package is a subdirectory here
-│       ├── atlas
+│       ├── 4ti2
 │       …
 │       └── zn_poly
 ├── configure             Top-level configure script
@@ -381,9 +381,9 @@ SAGE_ROOT                 Root directory (sage-x.y.z in Sage tarball)
 │   ├── dochtml.log       Log of the documentation build
 │   ├── install.log       Full install log
 │   └── pkgs              Build logs of individual packages
-│       ├── atlas-3.10.1.p7.log
+│       ├── alabaster-0.7.12.log
 │       …
-│       └── zn_poly-0.9.p11.log
+│       └── zn_poly-0.9.2.log
 ├── m4                    M4 macros for configure
 │   └── *.m4
 ├── Makefile              Running "make" uses this file
@@ -394,9 +394,9 @@ SAGE_ROOT                 Root directory (sage-x.y.z in Sage tarball)
 │   ├── doc               Sage documentation sources
 │   └── sage              The Sage library source code
 ├── upstream              Source tarballs of packages
-│   ├── atlas-3.10.1.tar.bz2
+│   ├── Babel-2.9.1.tar.gz
 │   …
-│   └── zn_poly-0.9.tar.bz2
+│   └── zn_poly-0.9.2.tar.gz
 └── VERSION.txt
 ```
 For more details see [our Developer's Guide](https://doc.sagemath.org/html/en/developer/coding_basics.html#files-and-directory-structure).

VERSION.txt

@@ -1 +1 @@
-SageMath version 9.5.beta2, Release Date: 2021-09-26
+SageMath version 9.5.beta4, Release Date: 2021-10-19

bootstrap

@@ -97,8 +97,13 @@ AS_VAR_SET_IF([SAGE_ENABLE_$pkgname], [], [AS_VAR_SET([SAGE_ENABLE_$pkgname], [y
                     case "$pkgname" in
                         _*) ;;
                         *)  spkg_configures="$spkg_configures
-AC_SUBST(SAGE_ENABLE_$pkgname, [if_installed])
-SAGE_SPKG_ENABLE([$pkgname], [$pkgtype], [$(head -n1 build/pkgs/$pkgname/SPKG.rst 2>/dev/null || echo $pkgname)])" ;;
+AC_SUBST(SAGE_ENABLE_$pkgname, [if_installed])"
+                            if [ -f build/pkgs/$pkgname/spkg-install -o -f build/pkgs/$pkgname/spkg-install.in ]; then
+                                # Trac #31163: Not just an optional dummy package
+                                spkg_configures="$spkg_configures
+SAGE_SPKG_ENABLE([$pkgname], [$pkgtype], [$(head -n1 build/pkgs/$pkgname/SPKG.rst 2>/dev/null || echo $pkgname)])"
+                            fi
+                            ;;
                     esac
                 fi
     done

build/bin/sage-package

@@ -16,7 +16,6 @@
 #   $ sage-package list | sort
 #   4ti2
 #   arb
-#   atlas
 #   autotools
 #   [...]
 #   zn_poly

build/bin/sage-print-system-package-command

@@ -149,6 +149,9 @@ case $system:$command in
     pip:install)
         [ -n "$system_packages" ] && print_shell_command "sage -pip install $system_packages"
         ;;
+    cpan:install)
+        [ -n "$system_packages" ] && print_shell_command "cpan -i $system_packages"
+        ;;
     repology:install)
         if [ -n "$system_packages" ]; then
             links=""

build/bin/sage-spkg-info

@@ -57,6 +57,7 @@ if [ $have_repology = yes ]; then
     systems="$systems repology"
 fi
 for system in $systems; do
+        system_package_file="$PKG_DISTROS"/$system.txt
         system_packages="$(echo $(sed 's/#.*//;' $system_package_file))"
         case $system in
             debian)

build/bin/write-dockerfile.sh

@@ -219,7 +219,7 @@ ARG NUMPROC=8
 ENV MAKE="make -j\${NUMPROC}"
 ARG USE_MAKEFLAGS="-k V=0"
 ENV SAGE_CHECK=warn
-ENV SAGE_CHECK_PACKAGES="!cython,!r,!python3,!python2,!nose,!pathpy,!gap,!cysignals,!linbox,!git,!ppl,!cmake,!networkx,!rpy2,!symengine_py,!sage_sws2rst"
+ENV SAGE_CHECK_PACKAGES="!cython,!r,!python3,!gap,!cysignals,!linbox,!git,!ppl,!cmake,!rpy2,!sage_sws2rst"
 #:toolchain:
 $RUN make \${USE_MAKEFLAGS} base-toolchain $ENDRUN
 
@@ -228,7 +228,7 @@ ARG NUMPROC=8
 ENV MAKE="make -j\${NUMPROC}"
 ARG USE_MAKEFLAGS="-k V=0"
 ENV SAGE_CHECK=warn
-ENV SAGE_CHECK_PACKAGES="!gfan,!cython,!r,!python3,!python2,!nose,!pathpy,!gap,!cysignals,!linbox,!git,!ppl,!cmake,!networkx,!rpy2,!symengine_py,!sage_sws2rst"
+ENV SAGE_CHECK_PACKAGES="!gfan,!cython,!r,!python3,!gap,!cysignals,!linbox,!git,!ppl,!cmake,!rpy2,!sage_sws2rst"
 #:make:
 ARG TARGETS_PRE="all-sage-local"
 $RUN make SAGE_SPKG="sage-spkg -y -o" \${USE_MAKEFLAGS} \${TARGETS_PRE} $ENDRUN
@@ -238,7 +238,7 @@ ARG NUMPROC=8
 ENV MAKE="make -j\${NUMPROC}"
 ARG USE_MAKEFLAGS="-k V=0"
 ENV SAGE_CHECK=warn
-ENV SAGE_CHECK_PACKAGES="!gfan,!cython,!r,!python3,!python2,!nose,!pathpy,!gap,!cysignals,!linbox,!git,!ppl,!cmake,!networkx,!rpy2,!symengine_py,!sage_sws2rst"
+ENV SAGE_CHECK_PACKAGES="!gfan,!cython,!r,!python3,!gap,!cysignals,!linbox,!git,!ppl,!cmake,!rpy2,!sage_sws2rst"
 ADD src src
 ARG TARGETS="build"
 $RUN make SAGE_SPKG="sage-spkg -y -o" \${USE_MAKEFLAGS} \${TARGETS} $ENDRUN
@@ -248,7 +248,7 @@ ARG NUMPROC=8
 ENV MAKE="make -j\${NUMPROC}"
 ARG USE_MAKEFLAGS="-k V=0"
 ENV SAGE_CHECK=warn
-ENV SAGE_CHECK_PACKAGES="!gfan,!cython,!r,!python3,!python2,!nose,!pathpy,!gap,!cysignals,!linbox,!git,!ppl,!cmake,!networkx,!rpy2,!symengine_py,!sage_sws2rst"
+ENV SAGE_CHECK_PACKAGES="!gfan,!cython,!r,!python3,!gap,!cysignals,!linbox,!git,!ppl,!cmake,!rpy2,!sage_sws2rst"
 ARG TARGETS_OPTIONAL="ptest"
 $RUN make SAGE_SPKG="sage-spkg -y -o" \${USE_MAKEFLAGS} \${TARGETS_OPTIONAL} || echo "(error ignored)" $ENDRUN
 

build/make/Makefile.in

@@ -32,8 +32,8 @@ SPKG_INST_RELDIR = var/lib/sage/installed
 # Aliases for mutually exclusive standard packages selected at configure time
 TOOLCHAIN = @SAGE_TOOLCHAIN@
 PYTHON = python3
-MP_LIBRARY = @SAGE_MP_LIBRARY@
-BLAS = @SAGE_BLAS@
+MP_LIBRARY = gmp
+BLAS = openblas
 
 # pkgconfig files generated/installed at build time
 PCFILES = @SAGE_SYSTEM_FACADE_PC_FILES@
@@ -631,16 +631,29 @@ $$($(4))/$(SPKG_INST_RELDIR)/$(1)-$(2): $(3)
 $(1): $$($(4))/$(SPKG_INST_RELDIR)/$(1)-$(2)
 
 $(1)-$(4)-no-deps:
-	$(AM_V_at)cd '$$(SAGE_ROOT)/build/pkgs/$(1)' && \
+	@if [ -x '$$(SAGE_ROOT)/build/pkgs/$(1)/spkg-install' ]; then \
+	    $(AM_V_at)cd '$$(SAGE_ROOT)/build/pkgs/$(1)' && \
 		. '$$(SAGE_ROOT)/src/bin/sage-src-env-config' && \
 		. '$$(SAGE_ROOT)/src/bin/sage-env-config' && \
 		. '$$(SAGE_ROOT)/src/bin/sage-env' && \
 		. '$$(SAGE_ROOT)/build/bin/sage-build-env-config' && \
 		. '$$(SAGE_ROOT)/build/bin/sage-build-env' && \
 		SAGE_SPKG_WHEELS=$$($(4))/var/lib/sage/wheels \
 		SAGE_INST_LOCAL=$$($(4)) \
-		sage-logger -p '$$(SAGE_ROOT)/build/pkgs/$(1)/spkg-install' '$$(SAGE_LOGS)/$(1)-$(2).log'
-	touch "$$($(4))/$(SPKG_INST_RELDIR)/$(1)-$(2)"
+		sage-logger -p '$$(SAGE_ROOT)/build/pkgs/$(1)/spkg-install' '$$(SAGE_LOGS)/$(1)-$(2).log' && \
+	    touch "$$($(4))/$(SPKG_INST_RELDIR)/$(1)-$(2)"; \
+	else \
+	    echo; \
+	    echo "Error: $(1) is a dummy script package that the Sage distribution uses"; \
+	    echo "to provide information about equivalent system packages."; \
+	    echo "It cannot be installed using the Sage distribution."; \
+	    echo "Please install it manually, for example using the system packages"; \
+	    echo "recommended at the end of a run of './configure'"; \
+	    echo "See below for package-specific information."; \
+	    echo; \
+	    $$(SAGE_ROOT)/build/bin/sage-spkg-info $(1); \
+	    exit 1; \
+	fi
 
 $(1)-no-deps: $(1)-$(4)-no-deps
 

build/pkgs/4ti2/distros/arch.txt

@@ -0,0 +1 @@
+4ti2

build/pkgs/4ti2/distros/cygwin.txt

@@ -0,0 +1 @@
+lib4ti2-devel

build/pkgs/4ti2/distros/debian.txt

@@ -0,0 +1 @@
+4ti2

build/pkgs/4ti2/distros/fedora.txt

@@ -0,0 +1 @@
+4ti2

build/pkgs/4ti2/distros/freebsd.txt

@@ -0,0 +1 @@
+math/4ti2

build/pkgs/4ti2/distros/gentoo.txt

@@ -0,0 +1 @@
+sci-mathematics/4ti2

build/pkgs/4ti2/spkg-configure.m4

@@ -0,0 +1,32 @@
+SAGE_SPKG_CONFIGURE([4ti2], [
+    SAGE_SPKG_DEPCHECK([gmp mpir glpk zlib], [
+        dnl Debian installs these programs with an executable prefix "4ti2-",
+        dnl OpenSUSE uses the prefix "4ti2_".
+        dnl Singular checks for unprefixed and prefixed with "4ti2-".
+        dnl Polymake does not check for prefixed binaries.
+        m4_foreach([prog], [hilbert,markov,graver,zsolve,qsolve,rays,ppi,circuits,groebner], [
+            AC_CHECK_PROGS([FOURTITWO_]m4_toupper(prog), prog [4ti2-]prog [4ti2_]prog)
+            AS_VAR_IF([FOURTITWO_]m4_toupper(prog), [""], [sage_spkg_install_4ti2=yes])
+            AC_SUBST([FOURTITWO_]m4_toupper(prog))
+        ])
+        dnl Adapted from https://github.com/latte-int/latte/blob/master/m4/4ti2-check.m4
+        AC_MSG_CHECKING(for library 4ti2gmp)
+        BACKUP_CXXFLAGS=${CXXFLAGS}
+        BACKUP_LIBS=${LIBS}
+        FORTYTWO_CXXFLAGS="-D__STDC_LIMIT_MACROS -D_4ti2_GMP_"
+        FORTYTWO_LIBS="-l4ti2gmp -lzsolve"
+        CXXFLAGS="${BACKUP_CXXFLAGS} ${FORTYTWO_CXXFLAGS} ${GMP_CFLAGS}"
+        LIBS="${BACKUP_LIBS} ${FORTYTWO_LIBS} ${GMP_LIBS}"
+        AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+#include "4ti2/4ti2.h"
+]], [[ _4ti2_rays_create_state(_4ti2_PREC_INT_ARB);
+]])],[
+        AC_MSG_RESULT([yes])
+],[
+        AC_MSG_RESULT([no])
+        sage_spkg_install_4ti2=yes
+])
+        CXXFLAGS=${BACKUP_CXXFLAGS}
+        LIBS=${BACKUP_LIBS}
+    ])
+])

build/pkgs/_bootstrap/distros/void.txt

@@ -1,4 +1,4 @@
 # Packages needed for ./bootstrap
-gettext autoconf automake libtool pkg-config
+gettext autoconf automake libtool
 gettext-devel
 xtools mk-configure

build/pkgs/_prereq/distros/void.txt

@@ -2,6 +2,7 @@ binutils
 make
 m4
 perl
+pkg-config
 python3
 tar
 bc

build/pkgs/arb/SPKG.rst

@@ -25,14 +25,3 @@ Upstream Contact
  - https://arblib.org/
 
  - http://github.com/fredrik-johansson/arb/
-
-Dependencies
-------------
-
--  FLINT
--  MPIR or GMP
--  MPFR
-
-
-Special Update/Build Instructions
----------------------------------

build/pkgs/arb/distros/void.txt

@@ -0,0 +1 @@
+arb-devel

build/pkgs/argcomplete/SPKG.rst

@@ -0,0 +1,18 @@
+argcomplete: Bash tab completion for argparse
+=============================================
+
+Description
+-----------
+
+Bash tab completion for argparse
+
+License
+-------
+
+Apache Software License
+
+Upstream Contact
+----------------
+
+https://pypi.org/project/argcomplete/
+