From c6d652131472b0fcb25fb31bf254f7eca7125ca2 Mon Sep 17 00:00:00 2001
From: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
Date: Mon, 21 Aug 2023 20:09:02 -0700
Subject: [PATCH 001/247] build/pkgs/scipy: Update to 1.11.2

---
 build/pkgs/scipy/checksums.ini       | 6 +++---
 build/pkgs/scipy/package-version.txt | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/build/pkgs/scipy/checksums.ini b/build/pkgs/scipy/checksums.ini
index e56c56745e3..7015206d1e7 100644
--- a/build/pkgs/scipy/checksums.ini
+++ b/build/pkgs/scipy/checksums.ini
@@ -1,5 +1,5 @@
 tarball=scipy-VERSION.tar.gz
-sha1=ff83163396a70276c0441b541befc485b471b27b
-md5=de3db61d840456634ba37f2b5816e049
-cksum=3826133895
+sha1=856f8ac8498751b72d678ef64b88e436d04a957d
+md5=27baf613b6cf3f9600a05161f132151c
+cksum=1656738318
 upstream_url=https://pypi.io/packages/source/s/scipy/scipy-VERSION.tar.gz
diff --git a/build/pkgs/scipy/package-version.txt b/build/pkgs/scipy/package-version.txt
index 4dae2985b58..ca7176690dd 100644
--- a/build/pkgs/scipy/package-version.txt
+++ b/build/pkgs/scipy/package-version.txt
@@ -1 +1 @@
-1.10.1
+1.11.2

From 9c9de7bc869759fb885236a79257e96d96ab3538 Mon Sep 17 00:00:00 2001
From: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
Date: Mon, 21 Aug 2023 20:10:26 -0700
Subject: [PATCH 002/247] build/pkgs/pythran: Update to 0.13.1

---
 build/pkgs/pythran/checksums.ini       | 6 +++---
 build/pkgs/pythran/package-version.txt | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/build/pkgs/pythran/checksums.ini b/build/pkgs/pythran/checksums.ini
index cb4704c4bc4..dc9beccf6b6 100644
--- a/build/pkgs/pythran/checksums.ini
+++ b/build/pkgs/pythran/checksums.ini
@@ -1,5 +1,5 @@
 tarball=pythran-VERSION.tar.gz
-sha1=71bc7c868cf011d184a013211f4195d8f9c606a2
-md5=168c31e8d108f26440b663b44cd99379
-cksum=2086161839
+sha1=dd675e9ccc93379b529687328ca558d5617eb1c6
+md5=3090288af50566af75cb058d1878aaad
+cksum=3968085663
 upstream_url=https://pypi.io/packages/source/p/pythran/pythran-VERSION.tar.gz
diff --git a/build/pkgs/pythran/package-version.txt b/build/pkgs/pythran/package-version.txt
index 34a83616bb5..c317a91891f 100644
--- a/build/pkgs/pythran/package-version.txt
+++ b/build/pkgs/pythran/package-version.txt
@@ -1 +1 @@
-0.12.1
+0.13.1

From e70ddfcc13716e8c57df910cf87faac95e20efcb Mon Sep 17 00:00:00 2001
From: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
Date: Mon, 21 Aug 2023 20:10:34 -0700
Subject: [PATCH 003/247] build/pkgs/meson_python: Update to 0.13.2

---
 build/pkgs/meson_python/checksums.ini       | 6 +++---
 build/pkgs/meson_python/package-version.txt | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/build/pkgs/meson_python/checksums.ini b/build/pkgs/meson_python/checksums.ini
index 0e1c77874b7..da59c9577aa 100644
--- a/build/pkgs/meson_python/checksums.ini
+++ b/build/pkgs/meson_python/checksums.ini
@@ -1,5 +1,5 @@
 tarball=meson_python-VERSION.tar.gz
-sha1=bdaf002dc1ef314c32e2be76f3b2872f1282c4cc
-md5=39be4f0b7f036e1d5db4a76fdb031355
-cksum=2636510839
+sha1=e52e84fcd84ea7dd8c11f464390786686a1be8e6
+md5=0db4483e30df43dbd465254be9c7db8a
+cksum=1452585711
 upstream_url=https://pypi.io/packages/source/m/meson_python/meson_python-VERSION.tar.gz
diff --git a/build/pkgs/meson_python/package-version.txt b/build/pkgs/meson_python/package-version.txt
index 34a83616bb5..9beb74d490b 100644
--- a/build/pkgs/meson_python/package-version.txt
+++ b/build/pkgs/meson_python/package-version.txt
@@ -1 +1 @@
-0.12.1
+0.13.2

From 20c90ca0dfbbb6ab878112ffe31dec25f9f5f202 Mon Sep 17 00:00:00 2001
From: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
Date: Mon, 21 Aug 2023 20:10:42 -0700
Subject: [PATCH 004/247] build/pkgs/pybind11: Update to 2.11.1

---
 build/pkgs/pybind11/checksums.ini       | 6 +++---
 build/pkgs/pybind11/package-version.txt | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/build/pkgs/pybind11/checksums.ini b/build/pkgs/pybind11/checksums.ini
index 1cc6d36c174..c8b9c661568 100644
--- a/build/pkgs/pybind11/checksums.ini
+++ b/build/pkgs/pybind11/checksums.ini
@@ -1,5 +1,5 @@
 tarball=pybind11-VERSION.tar.gz
-sha1=d0e6e22c2ce36fad4bb60dbac4d6d498ceb464df
-md5=0b181dbb44c3cc632e724cef5081cae1
-cksum=4287838207
+sha1=3c75333a9056f0be18eb612803cd46a2bb0c87fc
+md5=67c58224e41c442e47fa84e7789c2c39
+cksum=419587142
 upstream_url=https://pypi.io/packages/source/p/pybind11/pybind11-VERSION.tar.gz
diff --git a/build/pkgs/pybind11/package-version.txt b/build/pkgs/pybind11/package-version.txt
index 8bbb6e406a7..6ceb272eecd 100644
--- a/build/pkgs/pybind11/package-version.txt
+++ b/build/pkgs/pybind11/package-version.txt
@@ -1 +1 @@
-2.10.1
+2.11.1

From b7227e3fed558523099073122e9e42b64bb64775 Mon Sep 17 00:00:00 2001
From: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
Date: Mon, 21 Aug 2023 20:11:30 -0700
Subject: [PATCH 005/247] build/pkgs/pyproject_metadata: Update to 0.7.1

---
 build/pkgs/pyproject_metadata/checksums.ini       | 6 +++---
 build/pkgs/pyproject_metadata/package-version.txt | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/build/pkgs/pyproject_metadata/checksums.ini b/build/pkgs/pyproject_metadata/checksums.ini
index 4fcc0ec49c2..6fb14a63679 100644
--- a/build/pkgs/pyproject_metadata/checksums.ini
+++ b/build/pkgs/pyproject_metadata/checksums.ini
@@ -1,5 +1,5 @@
 tarball=pyproject-metadata-VERSION.tar.gz
-sha1=c2b7679b1e56a341aa00c186c0d1a6bbd7bd5c2c
-md5=e13b11cb723da96f8397addddca963cc
-cksum=2246727402
+sha1=41fba5c33917d77b9364fadb76e590e86789634d
+md5=ca5e9527cff96153a976e14530b53746
+cksum=2053869519
 upstream_url=https://pypi.io/packages/source/p/pyproject_metadata/pyproject-metadata-VERSION.tar.gz
diff --git a/build/pkgs/pyproject_metadata/package-version.txt b/build/pkgs/pyproject_metadata/package-version.txt
index ee6cdce3c29..39e898a4f95 100644
--- a/build/pkgs/pyproject_metadata/package-version.txt
+++ b/build/pkgs/pyproject_metadata/package-version.txt
@@ -1 +1 @@
-0.6.1
+0.7.1

From ddf8efe277d933ba4ee287de1ab7bd4f621a8c8e Mon Sep 17 00:00:00 2001
From: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
Date: Mon, 21 Aug 2023 20:17:42 -0700
Subject: [PATCH 006/247] build/pkgs/gast: Update to 0.5.4

---
 build/pkgs/gast/checksums.ini       | 6 +++---
 build/pkgs/gast/package-version.txt | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/build/pkgs/gast/checksums.ini b/build/pkgs/gast/checksums.ini
index 1aa653229f2..57bc0736a13 100644
--- a/build/pkgs/gast/checksums.ini
+++ b/build/pkgs/gast/checksums.ini
@@ -1,5 +1,5 @@
 tarball=gast-VERSION.tar.gz
-sha1=a84811eedebc5bca94b4eae978aab5f2c805b106
-md5=fdff900805e03e9dd76d377eb4cbaed7
-cksum=387443419
+sha1=6c113cf8d33cc654d33210335103485ab41d3dbb
+md5=907c689e3fdbc7a48cc010e665195baa
+cksum=218846575
 upstream_url=https://pypi.io/packages/source/g/gast/gast-VERSION.tar.gz
diff --git a/build/pkgs/gast/package-version.txt b/build/pkgs/gast/package-version.txt
index be14282b7ff..7d8568351b4 100644
--- a/build/pkgs/gast/package-version.txt
+++ b/build/pkgs/gast/package-version.txt
@@ -1 +1 @@
-0.5.3
+0.5.4

From a291fee2015437d07d815963076c93384e226ab2 Mon Sep 17 00:00:00 2001
From: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
Date: Mon, 21 Aug 2023 20:18:50 -0700
Subject: [PATCH 007/247] build/pkgs/meson_python/patches: Remove

---
 .../patches/ARCHFLAGS_empty.patch             | 21 -------------------
 1 file changed, 21 deletions(-)
 delete mode 100644 build/pkgs/meson_python/patches/ARCHFLAGS_empty.patch

diff --git a/build/pkgs/meson_python/patches/ARCHFLAGS_empty.patch b/build/pkgs/meson_python/patches/ARCHFLAGS_empty.patch
deleted file mode 100644
index 8857629f080..00000000000
--- a/build/pkgs/meson_python/patches/ARCHFLAGS_empty.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-commit caa435144b1b4fa40c51558f15fd8dae2c0b5868
-Author: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
-Date:   Sat Mar 11 10:16:56 2023 -0800
-
-    BUG: handle ARCHFLAGS set to the empty string
-
-diff --git a/mesonpy/__init__.py b/mesonpy/__init__.py
-index e312059..d798f4c 100644
---- a/mesonpy/__init__.py
-+++ b/mesonpy/__init__.py
-@@ -686,8 +686,8 @@ class Project():
- 
-         # setuptools-like ARCHFLAGS environment variable support
-         if sysconfig.get_platform().startswith('macosx-'):
--            archflags = self._env.get('ARCHFLAGS')
--            if archflags is not None:
-+            archflags = self._env.get('ARCHFLAGS', '').strip()
-+            if archflags:
-                 arch, *other = filter(None, (x.strip() for x in archflags.split('-arch')))
-                 if other:
-                     raise ConfigError(f'Multi-architecture builds are not supported but $ARCHFLAGS={archflags!r}')

From cb21d9f28755ff504dca4f7fb0809212f0d6b8de Mon Sep 17 00:00:00 2001
From: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
Date: Mon, 21 Aug 2023 21:30:20 -0700
Subject: [PATCH 008/247] build/pkgs/meson: Update to 1.2.1

---
 build/pkgs/meson/checksums.ini       | 6 +++---
 build/pkgs/meson/package-version.txt | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/build/pkgs/meson/checksums.ini b/build/pkgs/meson/checksums.ini
index d3dbb277dba..ef8b1ec0b21 100644
--- a/build/pkgs/meson/checksums.ini
+++ b/build/pkgs/meson/checksums.ini
@@ -1,5 +1,5 @@
 tarball=meson-VERSION.tar.gz
-sha1=a2d102eb6a37307c9b67283e9764ed57cf286223
-md5=843ba549bb2a199d9e04092116a7e749
-cksum=2108460988
+sha1=087da0ecbc065bb40361ba683b55c20cb42a948a
+md5=e3cc846536189aacd7d01858a45ca9af
+cksum=4011973902
 upstream_url=https://pypi.io/packages/source/m/meson/meson-VERSION.tar.gz
diff --git a/build/pkgs/meson/package-version.txt b/build/pkgs/meson/package-version.txt
index 7dea76edb3d..6085e946503 100644
--- a/build/pkgs/meson/package-version.txt
+++ b/build/pkgs/meson/package-version.txt
@@ -1 +1 @@
-1.0.1
+1.2.1

From d0be1a41e23ed16171ab07c51f42305fef9b3c50 Mon Sep 17 00:00:00 2001
From: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
Date: Mon, 21 Aug 2023 21:30:46 -0700
Subject: [PATCH 009/247] build/pkgs/ninja_build: Update to 1.11.1

---
 build/pkgs/ninja_build/checksums.ini       | 6 +++---
 build/pkgs/ninja_build/package-version.txt | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/build/pkgs/ninja_build/checksums.ini b/build/pkgs/ninja_build/checksums.ini
index d3914da794a..43ddbfd6334 100644
--- a/build/pkgs/ninja_build/checksums.ini
+++ b/build/pkgs/ninja_build/checksums.ini
@@ -1,5 +1,5 @@
 tarball=ninja_build-VERSION.tar.gz
-sha1=f8c9279bdd4efc63b1a6be3b8c5a5031699af9ac
-md5=7d1a1a2f5cdc06795b3054df5c17d5ef
-cksum=3142198237
+sha1=938723cdfc7a6f7c8f84c83b9a2cecdf1e5e1ad3
+md5=32151c08211d7ca3c1d832064f6939b0
+cksum=4040304461
 upstream_url=https://github.com/ninja-build/ninja/archive/refs/tags/vVERSION.tar.gz
diff --git a/build/pkgs/ninja_build/package-version.txt b/build/pkgs/ninja_build/package-version.txt
index 1cac385c6cb..720c7384c61 100644
--- a/build/pkgs/ninja_build/package-version.txt
+++ b/build/pkgs/ninja_build/package-version.txt
@@ -1 +1 @@
-1.11.0
+1.11.1

From 2461b37a4c505a8f7eac61f4c6f71ddfe2d12eaf Mon Sep 17 00:00:00 2001
From: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
Date: Mon, 21 Aug 2023 21:55:41 -0700
Subject: [PATCH 010/247] build/pkgs/cmake: Update to 3.27.3

---
 build/pkgs/cmake/checksums.ini       | 6 +++---
 build/pkgs/cmake/package-version.txt | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/build/pkgs/cmake/checksums.ini b/build/pkgs/cmake/checksums.ini
index c89abdf4277..a145b30dfb4 100644
--- a/build/pkgs/cmake/checksums.ini
+++ b/build/pkgs/cmake/checksums.ini
@@ -1,5 +1,5 @@
 tarball=cmake-VERSION.tar.gz
-sha1=256d6a57a57fa6ceaacd6a2daf708baefd33850c
-md5=226dd564164372f9f7d1e21e38e6e8c5
-cksum=2080281918
+sha1=3e9b980bfb16974f57ca02b5e2b403a2ef2d4eca
+md5=7228f5fcc8a858fdeac27e29bda0c144
+cksum=2027526722
 upstream_url=https://github.com/Kitware/CMake/releases/download/vVERSION/cmake-VERSION.tar.gz
diff --git a/build/pkgs/cmake/package-version.txt b/build/pkgs/cmake/package-version.txt
index 693bd59e3e6..a155471fc06 100644
--- a/build/pkgs/cmake/package-version.txt
+++ b/build/pkgs/cmake/package-version.txt
@@ -1 +1 @@
-3.24.3
+3.27.3

From 548160af88a3cc39eb291508a1342749173108f7 Mon Sep 17 00:00:00 2001
From: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
Date: Mon, 21 Aug 2023 22:00:08 -0700
Subject: [PATCH 011/247] build/pkgs/scipy/install-requires.txt: Allow 1.11.x

---
 build/pkgs/scipy/install-requires.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/pkgs/scipy/install-requires.txt b/build/pkgs/scipy/install-requires.txt
index 16d57fdb9b0..dd975a870e3 100644
--- a/build/pkgs/scipy/install-requires.txt
+++ b/build/pkgs/scipy/install-requires.txt
@@ -4,4 +4,4 @@
 # deprecations cannot be introduced in micro releases.
 # SciPy devs wait "at least 6 months", "in practice two (minor) releases"
 # from deprecation to removal of a feature.
-scipy >=1.5, <1.11
+scipy >=1.5, <1.12

From 3d17e4a417ebe230fc87bc202b1860e2384ef2bd Mon Sep 17 00:00:00 2001
From: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
Date: Tue, 22 Aug 2023 09:25:04 -0700
Subject: [PATCH 012/247] build/pkgs/meson/spkg-configure.m4: Require meson >=
 1.1.0

---
 build/pkgs/meson/spkg-configure.m4 | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/build/pkgs/meson/spkg-configure.m4 b/build/pkgs/meson/spkg-configure.m4
index efe863664f7..dbc575650fc 100644
--- a/build/pkgs/meson/spkg-configure.m4
+++ b/build/pkgs/meson/spkg-configure.m4
@@ -1,10 +1,11 @@
 SAGE_SPKG_CONFIGURE(
     [meson], [
-        AC_CACHE_CHECK([for meson >= 0.64], [ac_cv_path_MESON], [
+        dnl scipy 1.11.2 needs meson >= 1.1.0
+        AC_CACHE_CHECK([for meson >= 1.1.0], [ac_cv_path_MESON], [
         AC_PATH_PROGS_FEATURE_CHECK([MESON], [meson], [
             meson_version=`$ac_path_MESON --version 2>&1`
             AS_IF([test -n "$meson_version"], [
-                AX_COMPARE_VERSION([$meson_version], [ge], [0.64], [
+                AX_COMPARE_VERSION([$meson_version], [ge], [1.1.0], [
                     ac_cv_path_MESON="$ac_path_MESON"
                     ac_path_MESON_found=:
                 ])

From e955f3e6f7be7bdbbc2c77d3fb21983855872f11 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Sat, 9 Oct 2021 19:30:58 -0400
Subject: [PATCH 013/247] Trac #29665: add --enable-system-site-packages option
 to ./configure.

This new option is experimental and disabled by default. When it is
enabled, the string "--system-site-packages" is appended to a new
environment variable SAGE_VENV_FLAGS that is then passed to the
sage-venv command during the build using autoconf substitution.
Thusly the correct setting finds its way into local/pyvenv.cfg.
---
 build/make/Makefile.in |  2 +-
 configure.ac           | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/build/make/Makefile.in b/build/make/Makefile.in
index b6858173362..7622c5f0f13 100644
--- a/build/make/Makefile.in
+++ b/build/make/Makefile.in
@@ -242,7 +242,7 @@ endif
 inst_python3_venv = $(SAGE_VENV)/pyvenv.cfg
 
 $(inst_python3_venv):
-	$(PYTHON_FOR_VENV) $(SAGE_ROOT)/build/bin/sage-venv "$(SAGE_VENV)"
+	$(PYTHON_FOR_VENV) $(SAGE_ROOT)/build/bin/sage-venv @SAGE_VENV_FLAGS@ "$(SAGE_VENV)"
 endif
 
 # Build everything and start Sage.
diff --git a/configure.ac b/configure.ac
index 4a255967fc6..a21ff354ace 100644
--- a/configure.ac
+++ b/configure.ac
@@ -445,6 +445,17 @@ AC_ARG_ENABLE([download-from-upstream-url],
     [disallow downloading packages from their upstream URL if they cannot be found on the Sage mirrors])], [],
     [AS_VAR_SET([enable_download_from_upstream_url], [yes])])
 
+AC_ARG_ENABLE(
+  [system-site-packages], [AS_HELP_STRING(
+    [--enable-system-site-packages],
+    [allow sage to use python packages from the system (experimental; default: no)]
+  )], [
+  AS_IF([test "x$enable_system_site_packages" = "xyes"], [
+    SAGE_VENV_FLAGS="${SAGE_VENV_FLAGS} --system-site-packages"
+  ])
+])
+AC_SUBST([SAGE_VENV_FLAGS])
+
 SAGE_SPKG_OPTIONS=""
 AS_IF([test "x$enable_experimental_packages" = "xyes"], [
   AS_VAR_APPEND([SAGE_SPKG_OPTIONS], [" -y"])

From f80ce35bfbad7b247ac77a69c3431d4127efc872 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Mon, 11 Oct 2021 19:41:14 -0400
Subject: [PATCH 014/247] Trac #29665: new SAGE_PYTHON_PACKAGE_CHECK() autoconf
 macro.

This new macro encapsulates the check for system installations of
python packages. It uses setuptools.version's pkg_resources to
check if the contents of install-requires.txt are satisfied for
the given package; and if not, tells the build system to install
the SPKG instead.
---
 m4/sage_python_package_check.m4 | 49 +++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 m4/sage_python_package_check.m4

diff --git a/m4/sage_python_package_check.m4 b/m4/sage_python_package_check.m4
new file mode 100644
index 00000000000..77b0a0cb2f6
--- /dev/null
+++ b/m4/sage_python_package_check.m4
@@ -0,0 +1,49 @@
+#
+# SYNOPSIS
+#
+#   SAGE_PYTHON_PACKAGE_CHECK(package)
+#
+# DESCRIPTION
+#
+#   Determine if the system copy of a python package can be used by sage.
+#
+#   This macro uses setuptools.version's pkg_resources to check that the
+#   "install-requires.txt" file for the named package is satisfied, and
+#   it can typically fail in four ways:
+#
+#     1. If --enable-system-site-packages was not passed to ./configure,
+#
+#     2. If we are not using the system python (no $PYTHON_FOR_VENV),
+#
+#     3. If setuptools is not available to the system python,
+#
+#     4. If the contents of install-requires.txt are not met (wrong
+#        version, no version, etc.) by the system python.
+#
+#   In any of those cases, we set sage_spkg_install_$package to "yes"
+#   so that the corresponding SPKG is installed. Otherwise, we do
+#   nothing, since the default value of sage_spkg_install_$package
+#   is "no" (to use the system copy).
+#
+#   The SAGE_SPKG_CONFIGURE_PYTHON3() macro is AC_REQUIRE'd to ensure
+#   that $PYTHON_FOR_VENV is available, if it is going to be available.
+#
+
+AC_DEFUN([SAGE_PYTHON_PACKAGE_CHECK], [
+  AS_IF([test "${enable_system_site_packages}" = "yes"], [
+    AC_REQUIRE([SAGE_SPKG_CONFIGURE_PYTHON3])
+
+    dnl strip all comments from install-requires.txt; this should leave
+    dnl only a single line containing the version specification for this
+    dnl package.
+    SAGE_PKG_VERSPEC=$(sed '/^#/d' "./build/pkgs/$1/install-requires.txt")
+    AC_MSG_CHECKING([for python package $1 ("${SAGE_PKG_VERSPEC}")])
+    AS_IF(
+      ["${PYTHON_FOR_VENV}" -c "from setuptools.version import pkg_resources; pkg_resources.require('${SAGE_PKG_VERSPEC}'.splitlines())"],
+      [AC_MSG_RESULT(yes)],
+      [AC_MSG_RESULT(no); sage_spkg_install_$1=yes]
+    )
+  ], [
+    sage_spkg_install_$1=yes
+  ])
+])

From 19fa7c8bb4d8ebae9e57f42038d198314ec4fbcc Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Sat, 9 Oct 2021 20:21:29 -0400
Subject: [PATCH 015/247] Trac #29665: standard python spkg-configure.m4 for
 py.

---
 build/pkgs/py/spkg-configure.m4 | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/py/spkg-configure.m4

diff --git a/build/pkgs/py/spkg-configure.m4 b/build/pkgs/py/spkg-configure.m4
new file mode 100644
index 00000000000..ded70343090
--- /dev/null
+++ b/build/pkgs/py/spkg-configure.m4
@@ -0,0 +1 @@
+SAGE_SPKG_CONFIGURE([py], [SAGE_PYTHON_PACKAGE_CHECK([py])])

From dc39acce58ece96ed3354ad8a0a27a7a7ec66ccd Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Sat, 9 Oct 2021 20:24:15 -0400
Subject: [PATCH 016/247] Trac #29665: standard python spkg-configure.m4 for
 wheel.

---
 build/pkgs/wheel/spkg-configure.m4 | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/wheel/spkg-configure.m4

diff --git a/build/pkgs/wheel/spkg-configure.m4 b/build/pkgs/wheel/spkg-configure.m4
new file mode 100644
index 00000000000..7897ea96cc6
--- /dev/null
+++ b/build/pkgs/wheel/spkg-configure.m4
@@ -0,0 +1 @@
+SAGE_SPKG_CONFIGURE([wheel], [SAGE_PYTHON_PACKAGE_CHECK([wheel])])

From 3ede90459dc9b1c106b10b2817c6318e554f6ce5 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Sat, 9 Oct 2021 20:25:15 -0400
Subject: [PATCH 017/247] Trac #29665: new spkg-configure.m4 for cvxopt.

This includes a SAGE_SPKG_DEPCHECK([gsl glpk suitesparse],... because
those C dependencies wind up linked into shared libraries like,

  /usr/.../cvxopt/glpk.cpython-39-x86_64-linux-gnu.so

that could potentially conflict with (for example) the glpk SPKG.
---
 build/pkgs/cvxopt/spkg-configure.m4 | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 build/pkgs/cvxopt/spkg-configure.m4

diff --git a/build/pkgs/cvxopt/spkg-configure.m4 b/build/pkgs/cvxopt/spkg-configure.m4
new file mode 100644
index 00000000000..c4aa6198edb
--- /dev/null
+++ b/build/pkgs/cvxopt/spkg-configure.m4
@@ -0,0 +1,5 @@
+SAGE_SPKG_CONFIGURE([cvxopt], [
+  SAGE_SPKG_DEPCHECK([gsl glpk suitesparse], [
+    SAGE_PYTHON_PACKAGE_CHECK([cvxopt])
+  ])
+])

From a172e1be7bf3dd30de818123c5fd061a8704df48 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Sat, 9 Oct 2021 20:28:10 -0400
Subject: [PATCH 018/247] Trac #29665: new spkg-configure.m4 for pyzmq.

This includes a SAGE_SPKG_DEPCHECK([zeromq],... because libzmq winds
up linked into shared libraries like,

  /usr/.../zmq/backend/cython/message.cpython-39-x86_64-linux-gnu.so

that potentially conflict with the zeromq SPKG.
---
 build/pkgs/pyzmq/spkg-configure.m4 | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 build/pkgs/pyzmq/spkg-configure.m4

diff --git a/build/pkgs/pyzmq/spkg-configure.m4 b/build/pkgs/pyzmq/spkg-configure.m4
new file mode 100644
index 00000000000..ae2b126efb1
--- /dev/null
+++ b/build/pkgs/pyzmq/spkg-configure.m4
@@ -0,0 +1,5 @@
+SAGE_SPKG_CONFIGURE([pyzmq], [
+  SAGE_SPKG_DEPCHECK([zeromq], [
+    SAGE_PYTHON_PACKAGE_CHECK([pyzmq])
+  ])
+])

From a69bc99b29360261cea5ffd5d6a4d9de0c31b119 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Sat, 9 Oct 2021 20:31:24 -0400
Subject: [PATCH 019/247] Trac #29665: standard python spkg-configure.m4 for
 requests.

---
 build/pkgs/requests/spkg-configure.m4 | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/requests/spkg-configure.m4

diff --git a/build/pkgs/requests/spkg-configure.m4 b/build/pkgs/requests/spkg-configure.m4
new file mode 100644
index 00000000000..f50a66cdee3
--- /dev/null
+++ b/build/pkgs/requests/spkg-configure.m4
@@ -0,0 +1 @@
+SAGE_SPKG_CONFIGURE([requests], [SAGE_PYTHON_PACKAGE_CHECK([requests])])

From 9a81424b6b0c05654ea20c3f895f92f78eb77172 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Sun, 10 Oct 2021 18:13:34 -0400
Subject: [PATCH 020/247] Trac #29665: standard python spkg-configure.m4 for
 six.

---
 build/pkgs/six/spkg-configure.m4 | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/six/spkg-configure.m4

diff --git a/build/pkgs/six/spkg-configure.m4 b/build/pkgs/six/spkg-configure.m4
new file mode 100644
index 00000000000..a382b81a3dd
--- /dev/null
+++ b/build/pkgs/six/spkg-configure.m4
@@ -0,0 +1 @@
+SAGE_SPKG_CONFIGURE([six], [SAGE_PYTHON_PACKAGE_CHECK([six])])

From 40a17dd18aef041ea8681b750e0b840315b250ef Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Sun, 10 Oct 2021 18:14:29 -0400
Subject: [PATCH 021/247] Trac #29665: standard python spkg-configure.m4 for
 packaging.

---
 build/pkgs/packaging/spkg-configure.m4 | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/packaging/spkg-configure.m4

diff --git a/build/pkgs/packaging/spkg-configure.m4 b/build/pkgs/packaging/spkg-configure.m4
new file mode 100644
index 00000000000..398f9e13cd3
--- /dev/null
+++ b/build/pkgs/packaging/spkg-configure.m4
@@ -0,0 +1 @@
+SAGE_SPKG_CONFIGURE([packaging], [SAGE_PYTHON_PACKAGE_CHECK([packaging])])

From 0820e25a6e423e312064cc487647b6960c66bd70 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Sun, 10 Oct 2021 18:18:53 -0400
Subject: [PATCH 022/247] Trac #29665: new spkg-configure.m4 for numpy.

This includes a SAGE_SPKG_DEPCHECK([openblas],... because blas/lapack
wind up linked into shared libraries like,

  /usr/.../numpy/linalg/lapack_lite.cpython-39-x86_64-linux-gnu.so

that potentially conflict with the openblas SPKG.
---
 build/pkgs/numpy/spkg-configure.m4 | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 build/pkgs/numpy/spkg-configure.m4

diff --git a/build/pkgs/numpy/spkg-configure.m4 b/build/pkgs/numpy/spkg-configure.m4
new file mode 100644
index 00000000000..16f9a90fad2
--- /dev/null
+++ b/build/pkgs/numpy/spkg-configure.m4
@@ -0,0 +1,5 @@
+SAGE_SPKG_CONFIGURE([numpy], [
+  SAGE_SPKG_DEPCHECK([openblas], [
+   SAGE_PYTHON_PACKAGE_CHECK([numpy])
+  ])
+])

From b902f1b372029ca6c48c4ab11f82d63db80f989d Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Sun, 10 Oct 2021 18:58:48 -0400
Subject: [PATCH 023/247] Trac #29665: new spkg-configure.m4 for scipy.

This includes a SAGE_SPKG_DEPCHECK([openblas],... because blas/lapack
wind up linked into shared libraries like,

  /usr/.../scipy/linalg/_flinalg.cpython-39-x86_64-linux-gnu.so

that potentially conflict with the openblas SPKG.
---
 build/pkgs/scipy/spkg-configure.m4 | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 build/pkgs/scipy/spkg-configure.m4

diff --git a/build/pkgs/scipy/spkg-configure.m4 b/build/pkgs/scipy/spkg-configure.m4
new file mode 100644
index 00000000000..0b7294a02e8
--- /dev/null
+++ b/build/pkgs/scipy/spkg-configure.m4
@@ -0,0 +1,5 @@
+SAGE_SPKG_CONFIGURE([scipy], [
+  SAGE_SPKG_DEPCHECK([openblas], [
+    SAGE_PYTHON_PACKAGE_CHECK([scipy])
+  ])
+])

From 04cd2851649aa261c1f383595bf0c10e1fb1dac3 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Mon, 11 Oct 2021 07:19:24 -0400
Subject: [PATCH 024/247] Trac #29665: standard python spkg-configure.m4 for
 pluggy.

---
 build/pkgs/pluggy/spkg-configure.m4 | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/pluggy/spkg-configure.m4

diff --git a/build/pkgs/pluggy/spkg-configure.m4 b/build/pkgs/pluggy/spkg-configure.m4
new file mode 100644
index 00000000000..11b1fce4f94
--- /dev/null
+++ b/build/pkgs/pluggy/spkg-configure.m4
@@ -0,0 +1 @@
+SAGE_SPKG_CONFIGURE([pluggy], [SAGE_PYTHON_PACKAGE_CHECK([pluggy])])

From eec1c60f1cb1912295300b2e349d7f3aa531bf4a Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Mon, 11 Oct 2021 07:24:12 -0400
Subject: [PATCH 025/247] Trac #29665: standard python spkg-configure.m4 for
 pickleshare.

---
 build/pkgs/pickleshare/spkg-configure.m4 | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/pickleshare/spkg-configure.m4

diff --git a/build/pkgs/pickleshare/spkg-configure.m4 b/build/pkgs/pickleshare/spkg-configure.m4
new file mode 100644
index 00000000000..80e9b7ccba9
--- /dev/null
+++ b/build/pkgs/pickleshare/spkg-configure.m4
@@ -0,0 +1 @@
+SAGE_SPKG_CONFIGURE([pickleshare], [SAGE_PYTHON_PACKAGE_CHECK([pickleshare])])

From 2bf735f22074d5e25d055b40fbb35092a7730bc3 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Mon, 11 Oct 2021 08:53:29 -0400
Subject: [PATCH 026/247] Trac #29665: standard python spkg-configure.m4 for
 html5lib.

---
 build/pkgs/html5lib/spkg-configure.m4 | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/html5lib/spkg-configure.m4

diff --git a/build/pkgs/html5lib/spkg-configure.m4 b/build/pkgs/html5lib/spkg-configure.m4
new file mode 100644
index 00000000000..f421b7e87db
--- /dev/null
+++ b/build/pkgs/html5lib/spkg-configure.m4
@@ -0,0 +1 @@
+SAGE_SPKG_CONFIGURE([html5lib], [SAGE_PYTHON_PACKAGE_CHECK([html5lib])])

From 394e7e81aa3aac3a4072e50cf72fb18aa71af882 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Mon, 11 Oct 2021 18:30:47 -0400
Subject: [PATCH 027/247] Trac #29665: standard python spkg-configure.m4 for
 networkx.

---
 build/pkgs/networkx/spkg-configure.m4 | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/networkx/spkg-configure.m4

diff --git a/build/pkgs/networkx/spkg-configure.m4 b/build/pkgs/networkx/spkg-configure.m4
new file mode 100644
index 00000000000..926671e166e
--- /dev/null
+++ b/build/pkgs/networkx/spkg-configure.m4
@@ -0,0 +1 @@
+SAGE_SPKG_CONFIGURE([networkx], [SAGE_PYTHON_PACKAGE_CHECK([networkx])])

From 0fecd7841c42ae090f9d2936bf874ce4cb13435d Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Mon, 11 Oct 2021 20:33:24 -0400
Subject: [PATCH 028/247] Trac #29665: new spkg-configure.m4 for matplotlib.

This includes a SAGE_SPKG_DEPCHECK([bzip2 freetype libpng qhull],...
because those dependencies wind up linked into shared libraries like,

  /usr/lib/.../matplotlib/ft2font.cpython-39-x86_64-linux-gnu.so

that potentially conflict with their SPKG counterparts.
---
 build/pkgs/matplotlib/spkg-configure.m4 | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 build/pkgs/matplotlib/spkg-configure.m4

diff --git a/build/pkgs/matplotlib/spkg-configure.m4 b/build/pkgs/matplotlib/spkg-configure.m4
new file mode 100644
index 00000000000..39c2d2901d0
--- /dev/null
+++ b/build/pkgs/matplotlib/spkg-configure.m4
@@ -0,0 +1,5 @@
+SAGE_SPKG_CONFIGURE([matplotlib], [
+  SAGE_SPKG_DEPCHECK([bzip2 freetype libpng qhull], [
+    SAGE_PYTHON_PACKAGE_CHECK([matplotlib])
+  ])
+])

From 6647de2013a682fdf3192a33aef34132c04624e7 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Mon, 11 Oct 2021 20:35:00 -0400
Subject: [PATCH 029/247] Trac #29665: standard python spkg-configure.m4 for
 bleach.

---
 build/pkgs/bleach/spkg-configure.m4 | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/bleach/spkg-configure.m4

diff --git a/build/pkgs/bleach/spkg-configure.m4 b/build/pkgs/bleach/spkg-configure.m4
new file mode 100644
index 00000000000..3c9bb26bb05
--- /dev/null
+++ b/build/pkgs/bleach/spkg-configure.m4
@@ -0,0 +1 @@
+SAGE_SPKG_CONFIGURE([bleach], [SAGE_PYTHON_PACKAGE_CHECK([bleach])])

From ebb763a34d86d7e0883081563ed929a4c00931d4 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Mon, 11 Oct 2021 20:37:03 -0400
Subject: [PATCH 030/247] Trac #29665: standard python spkg-configure.m4 for
 decorator.

---
 build/pkgs/decorator/spkg-configure.m4 | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/decorator/spkg-configure.m4

diff --git a/build/pkgs/decorator/spkg-configure.m4 b/build/pkgs/decorator/spkg-configure.m4
new file mode 100644
index 00000000000..e062778d6db
--- /dev/null
+++ b/build/pkgs/decorator/spkg-configure.m4
@@ -0,0 +1 @@
+SAGE_SPKG_CONFIGURE([decorator], [SAGE_PYTHON_PACKAGE_CHECK([decorator])])

From ca057c0884661bd1f3f6b6b5d7d877ac6ce4ff01 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Mon, 11 Oct 2021 20:38:03 -0400
Subject: [PATCH 031/247] Trac #29665: standard python spkg-configure.m4 for
 idna.

---
 build/pkgs/idna/spkg-configure.m4 | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/idna/spkg-configure.m4

diff --git a/build/pkgs/idna/spkg-configure.m4 b/build/pkgs/idna/spkg-configure.m4
new file mode 100644
index 00000000000..9d363f212e6
--- /dev/null
+++ b/build/pkgs/idna/spkg-configure.m4
@@ -0,0 +1 @@
+SAGE_SPKG_CONFIGURE([idna], [SAGE_PYTHON_PACKAGE_CHECK([idna])])

From f5e0319fa69b62ac7f39f99d92df30fd094fcc54 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Mon, 11 Oct 2021 20:39:23 -0400
Subject: [PATCH 032/247] Trac #29665: standard python spkg-configure.m4 for
 certifi.

---
 build/pkgs/certifi/spkg-configure.m4 | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/certifi/spkg-configure.m4

diff --git a/build/pkgs/certifi/spkg-configure.m4 b/build/pkgs/certifi/spkg-configure.m4
new file mode 100644
index 00000000000..ddd40613514
--- /dev/null
+++ b/build/pkgs/certifi/spkg-configure.m4
@@ -0,0 +1 @@
+SAGE_SPKG_CONFIGURE([certifi], [SAGE_PYTHON_PACKAGE_CHECK([certifi])])

From 745b69a4a40713996ca487d39203ba197a869f2b Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Mon, 11 Oct 2021 20:40:59 -0400
Subject: [PATCH 033/247] Trac #29665: new spkg-configure.m4 for pillow.

This includes an SAGE_SPKG_DEPCHECK([bzip2 freetype libpng zlib],...
because those dependencies wind up linked into shared libraries like,

  /usr/.../PIL/_imagingft.cpython-39-x86_64-linux-gnu.so

and potentially conflict with their SPKG counterparts.
---
 build/pkgs/pillow/spkg-configure.m4 | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 build/pkgs/pillow/spkg-configure.m4

diff --git a/build/pkgs/pillow/spkg-configure.m4 b/build/pkgs/pillow/spkg-configure.m4
new file mode 100644
index 00000000000..f2e68e230ac
--- /dev/null
+++ b/build/pkgs/pillow/spkg-configure.m4
@@ -0,0 +1,5 @@
+SAGE_SPKG_CONFIGURE([pillow], [
+  SAGE_SPKG_DEPCHECK([bzip2 freetype libpng zlib], [
+    SAGE_PYTHON_PACKAGE_CHECK([pillow])
+  ])
+])

From ca59e08617c9f9cbc1fdc371d3780a73f74000a8 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Mon, 11 Oct 2021 20:44:13 -0400
Subject: [PATCH 034/247] Trac #29665: standard python spkg-configure.m4 for
 mpmath.

---
 build/pkgs/mpmath/spkg-configure.m4 | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/mpmath/spkg-configure.m4

diff --git a/build/pkgs/mpmath/spkg-configure.m4 b/build/pkgs/mpmath/spkg-configure.m4
new file mode 100644
index 00000000000..f43c8388264
--- /dev/null
+++ b/build/pkgs/mpmath/spkg-configure.m4
@@ -0,0 +1 @@
+SAGE_SPKG_CONFIGURE([mpmath], [SAGE_PYTHON_PACKAGE_CHECK([mpmath])])

From 6340166825cabb1ad70f7e157a5284140f62befb Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Mon, 11 Oct 2021 20:44:56 -0400
Subject: [PATCH 035/247] Trac #29665: standard python spkg-configure.m4 for
 sympy.

---
 build/pkgs/sympy/spkg-configure.m4 | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/sympy/spkg-configure.m4

diff --git a/build/pkgs/sympy/spkg-configure.m4 b/build/pkgs/sympy/spkg-configure.m4
new file mode 100644
index 00000000000..fa0f1f54311
--- /dev/null
+++ b/build/pkgs/sympy/spkg-configure.m4
@@ -0,0 +1 @@
+SAGE_SPKG_CONFIGURE([sympy], [SAGE_PYTHON_PACKAGE_CHECK([sympy])])

From 3ad0ff08242a08e6c50de0b1686813dd6c20ad60 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Mon, 11 Oct 2021 20:47:06 -0400
Subject: [PATCH 036/247] Trac #29665: standard python spkg-configure.m4 for
 pygments.

---
 build/pkgs/pygments/spkg-configure.m4 | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/pygments/spkg-configure.m4

diff --git a/build/pkgs/pygments/spkg-configure.m4 b/build/pkgs/pygments/spkg-configure.m4
new file mode 100644
index 00000000000..99f29e3c9b3
--- /dev/null
+++ b/build/pkgs/pygments/spkg-configure.m4
@@ -0,0 +1 @@
+SAGE_SPKG_CONFIGURE([pygments], [SAGE_PYTHON_PACKAGE_CHECK([pygments])])

From d278e15587ab17ad7a39707ac9c1f3b794b703cc Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Mon, 11 Oct 2021 20:48:50 -0400
Subject: [PATCH 037/247] Trac #29665: standard python spkg-configure.m4 for
 jinja2.

---
 build/pkgs/jinja2/spkg-configure.m4 | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/jinja2/spkg-configure.m4

diff --git a/build/pkgs/jinja2/spkg-configure.m4 b/build/pkgs/jinja2/spkg-configure.m4
new file mode 100644
index 00000000000..0970d1c8bea
--- /dev/null
+++ b/build/pkgs/jinja2/spkg-configure.m4
@@ -0,0 +1 @@
+SAGE_SPKG_CONFIGURE([jinja2], [SAGE_PYTHON_PACKAGE_CHECK([jinja2])])

From c687b66da742bceed548f925ce23e16cf15105f5 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Tue, 12 Oct 2021 08:43:24 -0400
Subject: [PATCH 038/247] Trac #29665: standard python spkg-configure.m4 for
 pandocfilters.

---
 build/pkgs/pandocfilters/spkg-configure.m4 | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 build/pkgs/pandocfilters/spkg-configure.m4

diff --git a/build/pkgs/pandocfilters/spkg-configure.m4 b/build/pkgs/pandocfilters/spkg-configure.m4
new file mode 100644
index 00000000000..3e9537f818c
--- /dev/null
+++ b/build/pkgs/pandocfilters/spkg-configure.m4
@@ -0,0 +1,3 @@
+SAGE_SPKG_CONFIGURE([pandocfilters], [
+  SAGE_PYTHON_PACKAGE_CHECK([pandocfilters])
+])

From e1bc792305bb65a405beb5616f0cb1be325f264f Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Tue, 12 Oct 2021 08:44:46 -0400
Subject: [PATCH 039/247] Trac #29665: standard python spkg-configure.m4 for
 webencodings.

---
 build/pkgs/webencodings/spkg-configure.m4 | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 build/pkgs/webencodings/spkg-configure.m4

diff --git a/build/pkgs/webencodings/spkg-configure.m4 b/build/pkgs/webencodings/spkg-configure.m4
new file mode 100644
index 00000000000..1b9a5c431f3
--- /dev/null
+++ b/build/pkgs/webencodings/spkg-configure.m4
@@ -0,0 +1,3 @@
+SAGE_SPKG_CONFIGURE([webencodings], [
+  SAGE_PYTHON_PACKAGE_CHECK([webencodings])
+])

From d18924ae37a69c9249f56f6dc21e45b1dd20770e Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Tue, 12 Oct 2021 08:48:26 -0400
Subject: [PATCH 040/247] Trac #29665: standard python spkg-configure.m4 for
 pytz.

---
 build/pkgs/pytz/spkg-configure.m4 | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/pytz/spkg-configure.m4

diff --git a/build/pkgs/pytz/spkg-configure.m4 b/build/pkgs/pytz/spkg-configure.m4
new file mode 100644
index 00000000000..366521be957
--- /dev/null
+++ b/build/pkgs/pytz/spkg-configure.m4
@@ -0,0 +1 @@
+SAGE_SPKG_CONFIGURE([pytz], [SAGE_PYTHON_PACKAGE_CHECK([pytz])])

From 43fe94271f6f3a4d0718b48a212d173c6c09bc97 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Tue, 12 Oct 2021 08:51:16 -0400
Subject: [PATCH 041/247] Trac #29665: standard python spkg-configure.m4 for
 texttable.

---
 build/pkgs/texttable/spkg-configure.m4 | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/texttable/spkg-configure.m4

diff --git a/build/pkgs/texttable/spkg-configure.m4 b/build/pkgs/texttable/spkg-configure.m4
new file mode 100644
index 00000000000..42a3de105b5
--- /dev/null
+++ b/build/pkgs/texttable/spkg-configure.m4
@@ -0,0 +1 @@
+SAGE_SPKG_CONFIGURE([texttable], [SAGE_PYTHON_PACKAGE_CHECK([texttable])])

From 76e58c2f3e7bdd829e92d092685a03b75ac4d1b0 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Tue, 12 Oct 2021 08:53:41 -0400
Subject: [PATCH 042/247] Trac #29665: standard python spkg-configure.m4 for
 babel.

---
 build/pkgs/babel/spkg-configure.m4 | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/babel/spkg-configure.m4

diff --git a/build/pkgs/babel/spkg-configure.m4 b/build/pkgs/babel/spkg-configure.m4
new file mode 100644
index 00000000000..d7b9a71c811
--- /dev/null
+++ b/build/pkgs/babel/spkg-configure.m4
@@ -0,0 +1 @@
+SAGE_SPKG_CONFIGURE([babel], [SAGE_PYTHON_PACKAGE_CHECK([babel])])

From efa5bc467b36969e32335f8107d9729879ccb139 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Thu, 14 Oct 2021 08:06:59 -0400
Subject: [PATCH 043/247] Trac #29665: force system python3 with
 --enable-system-site-packages.

When the python SPKG is used, the --enable-system-site-packages flag
will essentially do nothing, and that may confuse users who have
wasted a few hours building sage. (Generally, they will want to fix
detection of their system python3 first.)

To forestall that, we now set "--with-system-python3=force" whenever
the "--enable-system-site-packages" flag is passed.
---
 configure.ac | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index a21ff354ace..81e594b9561 100644
--- a/configure.ac
+++ b/configure.ac
@@ -448,10 +448,19 @@ AC_ARG_ENABLE([download-from-upstream-url],
 AC_ARG_ENABLE(
   [system-site-packages], [AS_HELP_STRING(
     [--enable-system-site-packages],
-    [allow sage to use python packages from the system (experimental; default: no)]
+    [allow the use of python packages from the system (experimental; default: no)]
   )], [
   AS_IF([test "x$enable_system_site_packages" = "xyes"], [
     SAGE_VENV_FLAGS="${SAGE_VENV_FLAGS} --system-site-packages"
+
+    dnl We want to raise an error if the user asked for "system site
+    dnl packages" but the system python will not be used. Technically
+    dnl that causes no problems (SAGE_PYTHON_PACKAGE_CHECK always fails,
+    dnl so SPKGs are used for all python packages), but it may be confusing
+    dnl to end users who expect the flag to actually give them access to
+    dnl their system python packages and who may not be paying close
+    dnl attention to their ./configure output.
+    with_system_python3="force"
   ])
 ])
 AC_SUBST([SAGE_VENV_FLAGS])

From 870939f8f4c8bdacdab63d15842f92f08570bab5 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Fri, 15 Oct 2021 01:18:35 -0400
Subject: [PATCH 044/247] Trac #29665: standard python spkg-configure.m4 for
 setuptools.

---
 build/pkgs/setuptools/spkg-configure.m4 | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/setuptools/spkg-configure.m4

diff --git a/build/pkgs/setuptools/spkg-configure.m4 b/build/pkgs/setuptools/spkg-configure.m4
new file mode 100644
index 00000000000..a2ad8119063
--- /dev/null
+++ b/build/pkgs/setuptools/spkg-configure.m4
@@ -0,0 +1 @@
+SAGE_SPKG_CONFIGURE([setuptools], [SAGE_PYTHON_PACKAGE_CHECK([setuptools])])

From 22e567e9d3c3c6f5099b0efb505646fca7aaf88b Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Fri, 15 Oct 2021 01:15:48 -0400
Subject: [PATCH 045/247] Trac #29665: poison PYTHONUSERBASE when testing for
 "system" packages.

When we're detecting system installations of python packages, we want
to hide anything that was installed with e.g. "pip install --user". To
accomplish that, we mimic the PYTHONUSERBASE poisoning from sage-env
within the SAGE_PYTHON_PACKAGE_CHECK() macro.
---
 m4/sage_python_package_check.m4 | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/m4/sage_python_package_check.m4 b/m4/sage_python_package_check.m4
index 77b0a0cb2f6..b8cdba48784 100644
--- a/m4/sage_python_package_check.m4
+++ b/m4/sage_python_package_check.m4
@@ -38,11 +38,27 @@ AC_DEFUN([SAGE_PYTHON_PACKAGE_CHECK], [
     dnl package.
     SAGE_PKG_VERSPEC=$(sed '/^#/d' "./build/pkgs/$1/install-requires.txt")
     AC_MSG_CHECKING([for python package $1 ("${SAGE_PKG_VERSPEC}")])
+
+    dnl To prevent user-site (pip install --user) packages from being
+    dnl detected as "system" packages, we poison PYTHONUSERBASE. The
+    dnl sage-env script also does this at runtime; we mimic that
+    dnl implementation to ensure that the behaviors at ./configure and
+    dnl runtime are identical. Beware that (as in sage-env) the poisoning
+    dnl is skipped if PYTHONUSERBASE is non-empty. In particular, if the
+    dnl user points PYTHONUSERBASE to any path (even the default), then
+    dnl his local pip packages will be detected.
+    PYTHONUSERBASE_SAVED="${PYTHONUSERBASE}"
+    AS_IF([test -z "${PYTHONUSERBASE}"], [
+      PYTHONUSERBASE="${HOME}/.sage/local"
+    ])
+
     AS_IF(
-      ["${PYTHON_FOR_VENV}" -c "from setuptools.version import pkg_resources; pkg_resources.require('${SAGE_PKG_VERSPEC}'.splitlines())"],
+      [PYTHONUSERBASE="${PYTHONUSERBASE}" "${PYTHON_FOR_VENV}" -c "from setuptools.version import pkg_resources; pkg_resources.require('${SAGE_PKG_VERSPEC}'.splitlines())" 2>/dev/null],
       [AC_MSG_RESULT(yes)],
       [AC_MSG_RESULT(no); sage_spkg_install_$1=yes]
     )
+
+    PYTHONUSERBASE="${PYTHONUSERBASE_SAVED}"
   ], [
     sage_spkg_install_$1=yes
   ])

From fa8bef3bad67ef29ad4c5993c08e96b528c7aea4 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Fri, 15 Oct 2021 11:20:04 -0400
Subject: [PATCH 046/247] Trac #29665: run SAGE_PYTHON_PACKAGE_CHECK() inside a
 venv.

To recreate the runtime environment as closely as possible, we now use
a venv (with system site packages enabled) when checking for system
copies of python packages.
---
 m4/sage_python_package_check.m4 | 76 ++++++++++++++++++++++-----------
 1 file changed, 51 insertions(+), 25 deletions(-)

diff --git a/m4/sage_python_package_check.m4 b/m4/sage_python_package_check.m4
index b8cdba48784..7cbd6c0a8f5 100644
--- a/m4/sage_python_package_check.m4
+++ b/m4/sage_python_package_check.m4
@@ -15,9 +15,11 @@
 #
 #     2. If we are not using the system python (no $PYTHON_FOR_VENV),
 #
-#     3. If setuptools is not available to the system python,
+#     3. If we are unable to create a venv with the system python,
 #
-#     4. If the contents of install-requires.txt are not met (wrong
+#     4. If setuptools is not available to the system python,
+#
+#     5. If the contents of install-requires.txt are not met (wrong
 #        version, no version, etc.) by the system python.
 #
 #   In any of those cases, we set sage_spkg_install_$package to "yes"
@@ -27,38 +29,62 @@
 #
 #   The SAGE_SPKG_CONFIGURE_PYTHON3() macro is AC_REQUIRE'd to ensure
 #   that $PYTHON_FOR_VENV is available, if it is going to be available.
+#   The check is run inside a new venv, and with the PYTHONUSERBASE
+#   variable poisoned in the same manner as sage-env poisons it, to
+#   ensure that the ./configure- and run-time views of the system
+#   are as similar as possible.
 #
 
 AC_DEFUN([SAGE_PYTHON_PACKAGE_CHECK], [
   AS_IF([test "${enable_system_site_packages}" = "yes"], [
     AC_REQUIRE([SAGE_SPKG_CONFIGURE_PYTHON3])
 
-    dnl strip all comments from install-requires.txt; this should leave
-    dnl only a single line containing the version specification for this
-    dnl package.
-    SAGE_PKG_VERSPEC=$(sed '/^#/d' "./build/pkgs/$1/install-requires.txt")
-    AC_MSG_CHECKING([for python package $1 ("${SAGE_PKG_VERSPEC}")])
+    dnl We run this check inside a python venv, because that's ultimately
+    dnl how the system $PYTHON_FOR_VENV will be used.
+    AC_MSG_CHECKING([if we can create a python venv in config.venv])
 
-    dnl To prevent user-site (pip install --user) packages from being
-    dnl detected as "system" packages, we poison PYTHONUSERBASE. The
-    dnl sage-env script also does this at runtime; we mimic that
-    dnl implementation to ensure that the behaviors at ./configure and
-    dnl runtime are identical. Beware that (as in sage-env) the poisoning
-    dnl is skipped if PYTHONUSERBASE is non-empty. In particular, if the
-    dnl user points PYTHONUSERBASE to any path (even the default), then
-    dnl his local pip packages will be detected.
-    PYTHONUSERBASE_SAVED="${PYTHONUSERBASE}"
-    AS_IF([test -z "${PYTHONUSERBASE}"], [
-      PYTHONUSERBASE="${HOME}/.sage/local"
-    ])
+    dnl Use --clear because ./configure typically clobbers its output files.
+    AS_IF(["${PYTHON_FOR_VENV}" -m venv --system-site-packages dnl
+                                        --clear                dnl
+                                        --without-pip          dnl
+					config.venv], [
+      AC_MSG_RESULT(yes)
+      dnl strip all comments from install-requires.txt; this should leave
+      dnl only a single line containing the version specification for this
+      dnl package.
+      SAGE_PKG_VERSPEC=$(sed '/^#/d' "./build/pkgs/$1/install-requires.txt")
+      AC_MSG_CHECKING([for python package $1 ("${SAGE_PKG_VERSPEC}")])
+
+      dnl To prevent user-site (pip install --user) packages from being
+      dnl detected as "system" packages, we poison PYTHONUSERBASE. The
+      dnl sage-env script also does this at runtime; we mimic that
+      dnl implementation to ensure that the behaviors at ./configure and
+      dnl runtime are identical. Beware that (as in sage-env) the poisoning
+      dnl is skipped if PYTHONUSERBASE is non-empty. In particular, if the
+      dnl user points PYTHONUSERBASE to any path (even the default), then
+      dnl his local pip packages will be detected.
+      PYTHONUSERBASE_SAVED="${PYTHONUSERBASE}"
+      AS_IF([test -z "${PYTHONUSERBASE}"], [
+        PYTHONUSERBASE="${HOME}/.sage/local"
+      ])
 
-    AS_IF(
-      [PYTHONUSERBASE="${PYTHONUSERBASE}" "${PYTHON_FOR_VENV}" -c "from setuptools.version import pkg_resources; pkg_resources.require('${SAGE_PKG_VERSPEC}'.splitlines())" 2>/dev/null],
-      [AC_MSG_RESULT(yes)],
-      [AC_MSG_RESULT(no); sage_spkg_install_$1=yes]
-    )
+      AS_IF(
+        [PYTHONUSERBASE="${PYTHONUSERBASE}" config.venv/bin/python3 -c dnl
+           "from setuptools.version import pkg_resources;              dnl
+            pkg_resources.require('${SAGE_PKG_VERSPEC}'.splitlines())" dnl
+	 2>/dev/null],
+        [AC_MSG_RESULT(yes)],
+        [AC_MSG_RESULT(no); sage_spkg_install_$1=yes]
+      )
+
+      PYTHONUSERBASE="${PYTHONUSERBASE_SAVED}"
+    ], [
+      dnl failed to create a venv for some reason
+      AC_MSG_RESULT(no)
+      sage_spkg_install_$1=yes
+    ])
 
-    PYTHONUSERBASE="${PYTHONUSERBASE_SAVED}"
+    rm -rf config.venv
   ], [
     sage_spkg_install_$1=yes
   ])

From 6d56387ae05caf0fd764f43718242c586ffc8bf5 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Fri, 15 Oct 2021 11:38:08 -0400
Subject: [PATCH 047/247] Trac #29665: log SAGE_PYTHON_PACKAGE_CHECK() failures
 to config.log.

---
 m4/sage_python_package_check.m4 | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/m4/sage_python_package_check.m4 b/m4/sage_python_package_check.m4
index 7cbd6c0a8f5..e0e0b9fe12d 100644
--- a/m4/sage_python_package_check.m4
+++ b/m4/sage_python_package_check.m4
@@ -47,7 +47,8 @@ AC_DEFUN([SAGE_PYTHON_PACKAGE_CHECK], [
     AS_IF(["${PYTHON_FOR_VENV}" -m venv --system-site-packages dnl
                                         --clear                dnl
                                         --without-pip          dnl
-					config.venv], [
+                                        config.venv            dnl
+                                        2>&AS_MESSAGE_LOG_FD], [
       AC_MSG_RESULT(yes)
       dnl strip all comments from install-requires.txt; this should leave
       dnl only a single line containing the version specification for this
@@ -72,7 +73,7 @@ AC_DEFUN([SAGE_PYTHON_PACKAGE_CHECK], [
         [PYTHONUSERBASE="${PYTHONUSERBASE}" config.venv/bin/python3 -c dnl
            "from setuptools.version import pkg_resources;              dnl
             pkg_resources.require('${SAGE_PKG_VERSPEC}'.splitlines())" dnl
-	 2>/dev/null],
+	 2>&AS_MESSAGE_LOG_FD],
         [AC_MSG_RESULT(yes)],
         [AC_MSG_RESULT(no); sage_spkg_install_$1=yes]
       )

From 3448ae684959e7c54a8bf9a69f54fa83dc575fc3 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Fri, 15 Oct 2021 11:45:37 -0400
Subject: [PATCH 048/247] Trac #29665: don't clobber a plain file named
 config.venv.

When SAGE_PYTHON_PACKAGE_CHECK() is cleaning up, we no longer remove
"config.venv" unconditionally. Instead, we remove it only if it is a
directory. This is also how "pyvenv --clear" works.
---
 m4/sage_python_package_check.m4 | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/m4/sage_python_package_check.m4 b/m4/sage_python_package_check.m4
index e0e0b9fe12d..127a07812de 100644
--- a/m4/sage_python_package_check.m4
+++ b/m4/sage_python_package_check.m4
@@ -85,7 +85,9 @@ AC_DEFUN([SAGE_PYTHON_PACKAGE_CHECK], [
       sage_spkg_install_$1=yes
     ])
 
-    rm -rf config.venv
+    dnl Clean up config.venv, but only if we could have created it.
+    dnl (The --clear flag to pyvenv will not clobber a plain file.)
+    AS_IF([test -d config.venv], [rm -rf config.venv])
   ], [
     sage_spkg_install_$1=yes
   ])

From 28e70e2deee8d6e7e9a08171715d9aefbdd1b917 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Sat, 16 Oct 2021 08:14:42 -0400
Subject: [PATCH 049/247] Trac #29665: don't announce system python packages
 that won't be used.

When --enable-system-site-packages was not given, the python packages
using SAGE_PYTHON_PACKAGE_CHECK() in spkg-configure.m4 cannot be used.
Rather than suggest that users install them anyway, that macro now
hacks the value of sage_use_system_$package to be "no" when the use
of system site packages is disabled at the python level.
---
 m4/sage_python_package_check.m4 | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/m4/sage_python_package_check.m4 b/m4/sage_python_package_check.m4
index 127a07812de..7ee82a7d14f 100644
--- a/m4/sage_python_package_check.m4
+++ b/m4/sage_python_package_check.m4
@@ -89,6 +89,23 @@ AC_DEFUN([SAGE_PYTHON_PACKAGE_CHECK], [
     dnl (The --clear flag to pyvenv will not clobber a plain file.)
     AS_IF([test -d config.venv], [rm -rf config.venv])
   ], [
+    dnl System site packages are disabled.
     sage_spkg_install_$1=yes
+
+    dnl We have to retroactively hack the --with-system-foo={no,yes,force}
+    dnl mechanism here because it wasn't designed with the ability to
+    dnl disable arbitrary chunks of system packages in mind. The easy cases
+    dnl are "no" and "force" which require no action; "no" means we won't
+    dnl suggest the package anyway, and "force" will raise an error when
+    dnl the system-package check fails.
+    dnl
+    dnl The default of "yes" is more troubling because it is the default. To
+    dnl avoid prompting users to install packages that won't be used, we want
+    dnl to ignore "yes" when reporting the "hint: install these packages..."
+    dnl at the end of ./configure. To accomplish that, we change "yes" to
+    dnl "no" here, essentially changing the default for packages using this
+    dnl macro when --enable-system-site-packages is disabled. Packages with
+    dnl "no" are not suggested to the user.
+    AS_IF([test "${sage_use_system_$1}" = "yes"],[sage_use_system_$1=no])
   ])
 ])

From eb4bf94b30bbe498374eb2320289eb1c8f6c522d Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Sun, 17 Oct 2021 06:16:21 -0400
Subject: [PATCH 050/247] Trac #29665: add Gentoo package information for
 python packages.

---
 build/pkgs/babel/distros/gentoo.txt         | 1 +
 build/pkgs/bleach/distros/gentoo.txt        | 1 +
 build/pkgs/certifi/distros/gentoo.txt       | 1 +
 build/pkgs/cvxopt/distros/gentoo.txt        | 1 +
 build/pkgs/decorator/distros/gentoo.txt     | 1 +
 build/pkgs/html5lib/distros/gentoo.txt      | 1 +
 build/pkgs/idna/distros/gentoo.txt          | 1 +
 build/pkgs/jinja2/distros/gentoo.txt        | 1 +
 build/pkgs/matplotlib/distros/gentoo.txt    | 1 +
 build/pkgs/mpmath/distros/gentoo.txt        | 1 +
 build/pkgs/networkx/distros/gentoo.txt      | 1 +
 build/pkgs/numpy/distros/gentoo.txt         | 1 +
 build/pkgs/packaging/distros/gentoo.txt     | 1 +
 build/pkgs/pandocfilters/distros/gentoo.txt | 1 +
 build/pkgs/pickleshare/distros/gentoo.txt   | 1 +
 build/pkgs/pillow/distros/gentoo.txt        | 1 +
 build/pkgs/pluggy/distros/gentoo.txt        | 1 +
 build/pkgs/pygments/distros/gentoo.txt      | 1 +
 build/pkgs/pytz/distros/gentoo.txt          | 1 +
 build/pkgs/pyzmq/distros/gentoo.txt         | 1 +
 build/pkgs/requests/distros/gentoo.txt      | 1 +
 build/pkgs/scipy/distros/gentoo.txt         | 1 +
 build/pkgs/setuptools/distros/gentoo.txt    | 1 +
 build/pkgs/six/distros/gentoo.txt           | 1 +
 build/pkgs/sympy/distros/gentoo.txt         | 1 +
 build/pkgs/texttable/distros/gentoo.txt     | 1 +
 build/pkgs/toml/distros/gentoo.txt          | 1 +
 build/pkgs/webencodings/distros/gentoo.txt  | 1 +
 28 files changed, 28 insertions(+)
 create mode 100644 build/pkgs/babel/distros/gentoo.txt
 create mode 100644 build/pkgs/bleach/distros/gentoo.txt
 create mode 100644 build/pkgs/certifi/distros/gentoo.txt
 create mode 100644 build/pkgs/cvxopt/distros/gentoo.txt
 create mode 100644 build/pkgs/decorator/distros/gentoo.txt
 create mode 100644 build/pkgs/html5lib/distros/gentoo.txt
 create mode 100644 build/pkgs/idna/distros/gentoo.txt
 create mode 100644 build/pkgs/jinja2/distros/gentoo.txt
 create mode 100644 build/pkgs/matplotlib/distros/gentoo.txt
 create mode 100644 build/pkgs/mpmath/distros/gentoo.txt
 create mode 100644 build/pkgs/networkx/distros/gentoo.txt
 create mode 100644 build/pkgs/numpy/distros/gentoo.txt
 create mode 100644 build/pkgs/packaging/distros/gentoo.txt
 create mode 100644 build/pkgs/pandocfilters/distros/gentoo.txt
 create mode 100644 build/pkgs/pickleshare/distros/gentoo.txt
 create mode 100644 build/pkgs/pillow/distros/gentoo.txt
 create mode 100644 build/pkgs/pluggy/distros/gentoo.txt
 create mode 100644 build/pkgs/pygments/distros/gentoo.txt
 create mode 100644 build/pkgs/pytz/distros/gentoo.txt
 create mode 100644 build/pkgs/pyzmq/distros/gentoo.txt
 create mode 100644 build/pkgs/requests/distros/gentoo.txt
 create mode 100644 build/pkgs/scipy/distros/gentoo.txt
 create mode 100644 build/pkgs/setuptools/distros/gentoo.txt
 create mode 100644 build/pkgs/six/distros/gentoo.txt
 create mode 100644 build/pkgs/sympy/distros/gentoo.txt
 create mode 100644 build/pkgs/texttable/distros/gentoo.txt
 create mode 100644 build/pkgs/toml/distros/gentoo.txt
 create mode 100644 build/pkgs/webencodings/distros/gentoo.txt

diff --git a/build/pkgs/babel/distros/gentoo.txt b/build/pkgs/babel/distros/gentoo.txt
new file mode 100644
index 00000000000..2d2c34fb697
--- /dev/null
+++ b/build/pkgs/babel/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/Babel
diff --git a/build/pkgs/bleach/distros/gentoo.txt b/build/pkgs/bleach/distros/gentoo.txt
new file mode 100644
index 00000000000..b4f9744eee9
--- /dev/null
+++ b/build/pkgs/bleach/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/bleach
diff --git a/build/pkgs/certifi/distros/gentoo.txt b/build/pkgs/certifi/distros/gentoo.txt
new file mode 100644
index 00000000000..72e2e91c6ae
--- /dev/null
+++ b/build/pkgs/certifi/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/certifi
diff --git a/build/pkgs/cvxopt/distros/gentoo.txt b/build/pkgs/cvxopt/distros/gentoo.txt
new file mode 100644
index 00000000000..b3123912bbe
--- /dev/null
+++ b/build/pkgs/cvxopt/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/cvxopt
diff --git a/build/pkgs/decorator/distros/gentoo.txt b/build/pkgs/decorator/distros/gentoo.txt
new file mode 100644
index 00000000000..fea5a67ac9e
--- /dev/null
+++ b/build/pkgs/decorator/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/decorator
diff --git a/build/pkgs/html5lib/distros/gentoo.txt b/build/pkgs/html5lib/distros/gentoo.txt
new file mode 100644
index 00000000000..6c2be76429c
--- /dev/null
+++ b/build/pkgs/html5lib/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/html5lib
diff --git a/build/pkgs/idna/distros/gentoo.txt b/build/pkgs/idna/distros/gentoo.txt
new file mode 100644
index 00000000000..68ef51c453e
--- /dev/null
+++ b/build/pkgs/idna/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/idna
diff --git a/build/pkgs/jinja2/distros/gentoo.txt b/build/pkgs/jinja2/distros/gentoo.txt
new file mode 100644
index 00000000000..15a27aecd44
--- /dev/null
+++ b/build/pkgs/jinja2/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/jinja
diff --git a/build/pkgs/matplotlib/distros/gentoo.txt b/build/pkgs/matplotlib/distros/gentoo.txt
new file mode 100644
index 00000000000..bcfefb5fcc4
--- /dev/null
+++ b/build/pkgs/matplotlib/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/matplotlib
diff --git a/build/pkgs/mpmath/distros/gentoo.txt b/build/pkgs/mpmath/distros/gentoo.txt
new file mode 100644
index 00000000000..946c62d9e1a
--- /dev/null
+++ b/build/pkgs/mpmath/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/mpmath
diff --git a/build/pkgs/networkx/distros/gentoo.txt b/build/pkgs/networkx/distros/gentoo.txt
new file mode 100644
index 00000000000..dd97742cff8
--- /dev/null
+++ b/build/pkgs/networkx/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/networkx
diff --git a/build/pkgs/numpy/distros/gentoo.txt b/build/pkgs/numpy/distros/gentoo.txt
new file mode 100644
index 00000000000..d2179d43851
--- /dev/null
+++ b/build/pkgs/numpy/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/numpy
diff --git a/build/pkgs/packaging/distros/gentoo.txt b/build/pkgs/packaging/distros/gentoo.txt
new file mode 100644
index 00000000000..e5309ed2b25
--- /dev/null
+++ b/build/pkgs/packaging/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/packaging
diff --git a/build/pkgs/pandocfilters/distros/gentoo.txt b/build/pkgs/pandocfilters/distros/gentoo.txt
new file mode 100644
index 00000000000..a726fda2817
--- /dev/null
+++ b/build/pkgs/pandocfilters/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/pandocfilters
diff --git a/build/pkgs/pickleshare/distros/gentoo.txt b/build/pkgs/pickleshare/distros/gentoo.txt
new file mode 100644
index 00000000000..14fad0fa428
--- /dev/null
+++ b/build/pkgs/pickleshare/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/pickleshare
diff --git a/build/pkgs/pillow/distros/gentoo.txt b/build/pkgs/pillow/distros/gentoo.txt
new file mode 100644
index 00000000000..12436496ed4
--- /dev/null
+++ b/build/pkgs/pillow/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/pillow
diff --git a/build/pkgs/pluggy/distros/gentoo.txt b/build/pkgs/pluggy/distros/gentoo.txt
new file mode 100644
index 00000000000..7b338764374
--- /dev/null
+++ b/build/pkgs/pluggy/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/pluggy
diff --git a/build/pkgs/pygments/distros/gentoo.txt b/build/pkgs/pygments/distros/gentoo.txt
new file mode 100644
index 00000000000..a584f321e71
--- /dev/null
+++ b/build/pkgs/pygments/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/pygments
diff --git a/build/pkgs/pytz/distros/gentoo.txt b/build/pkgs/pytz/distros/gentoo.txt
new file mode 100644
index 00000000000..902a18bf73e
--- /dev/null
+++ b/build/pkgs/pytz/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/pytz
diff --git a/build/pkgs/pyzmq/distros/gentoo.txt b/build/pkgs/pyzmq/distros/gentoo.txt
new file mode 100644
index 00000000000..77c24295bd0
--- /dev/null
+++ b/build/pkgs/pyzmq/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/pyzmq
diff --git a/build/pkgs/requests/distros/gentoo.txt b/build/pkgs/requests/distros/gentoo.txt
new file mode 100644
index 00000000000..d3dc9415e3d
--- /dev/null
+++ b/build/pkgs/requests/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/requests
diff --git a/build/pkgs/scipy/distros/gentoo.txt b/build/pkgs/scipy/distros/gentoo.txt
new file mode 100644
index 00000000000..11dabd2830f
--- /dev/null
+++ b/build/pkgs/scipy/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/scipy
diff --git a/build/pkgs/setuptools/distros/gentoo.txt b/build/pkgs/setuptools/distros/gentoo.txt
new file mode 100644
index 00000000000..3a4fa34a57f
--- /dev/null
+++ b/build/pkgs/setuptools/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/setuptools
diff --git a/build/pkgs/six/distros/gentoo.txt b/build/pkgs/six/distros/gentoo.txt
new file mode 100644
index 00000000000..f73f648ff75
--- /dev/null
+++ b/build/pkgs/six/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/six
diff --git a/build/pkgs/sympy/distros/gentoo.txt b/build/pkgs/sympy/distros/gentoo.txt
new file mode 100644
index 00000000000..b5a5034c731
--- /dev/null
+++ b/build/pkgs/sympy/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/sympy
diff --git a/build/pkgs/texttable/distros/gentoo.txt b/build/pkgs/texttable/distros/gentoo.txt
new file mode 100644
index 00000000000..b33a7a75d50
--- /dev/null
+++ b/build/pkgs/texttable/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/texttable
diff --git a/build/pkgs/toml/distros/gentoo.txt b/build/pkgs/toml/distros/gentoo.txt
new file mode 100644
index 00000000000..64fcea3559f
--- /dev/null
+++ b/build/pkgs/toml/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/toml
diff --git a/build/pkgs/webencodings/distros/gentoo.txt b/build/pkgs/webencodings/distros/gentoo.txt
new file mode 100644
index 00000000000..7539b0fdcde
--- /dev/null
+++ b/build/pkgs/webencodings/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/webencodings

From 84c61c7e214112ae362a406291482c04204a7d52 Mon Sep 17 00:00:00 2001
From: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
Date: Sun, 17 Oct 2021 18:43:04 -0700
Subject: [PATCH 051/247] build/pkgs: Add distros/fedora.txt for Python
 packages

---
 build/pkgs/babel/distros/fedora.txt         | 1 +
 build/pkgs/bleach/distros/fedora.txt        | 1 +
 build/pkgs/certifi/distros/fedora.txt       | 1 +
 build/pkgs/cvxopt/distros/fedora.txt        | 1 +
 build/pkgs/decorator/distros/fedora.txt     | 1 +
 build/pkgs/html5lib/distros/fedora.txt      | 1 +
 build/pkgs/idna/distros/fedora.txt          | 1 +
 build/pkgs/jinja2/distros/fedora.txt        | 1 +
 build/pkgs/matplotlib/distros/fedora.txt    | 1 +
 build/pkgs/mpmath/distros/fedora.txt        | 1 +
 build/pkgs/networkx/distros/fedora.txt      | 1 +
 build/pkgs/numpy/distros/fedora.txt         | 1 +
 build/pkgs/packaging/distros/fedora.txt     | 1 +
 build/pkgs/pandocfilters/distros/fedora.txt | 1 +
 build/pkgs/pickleshare/distros/fedora.txt   | 1 +
 build/pkgs/pillow/distros/fedora.txt        | 1 +
 build/pkgs/pluggy/distros/fedora.txt        | 1 +
 build/pkgs/py/distros/fedora.txt            | 1 +
 build/pkgs/pygments/distros/fedora.txt      | 1 +
 build/pkgs/pytz/distros/fedora.txt          | 1 +
 build/pkgs/pyzmq/distros/fedora.txt         | 1 +
 build/pkgs/requests/distros/fedora.txt      | 1 +
 build/pkgs/scipy/distros/fedora.txt         | 1 +
 build/pkgs/setuptools/distros/fedora.txt    | 1 +
 build/pkgs/six/distros/fedora.txt           | 1 +
 build/pkgs/sympy/distros/fedora.txt         | 1 +
 build/pkgs/texttable/distros/fedora.txt     | 1 +
 build/pkgs/toml/distros/fedora.txt          | 1 +
 build/pkgs/webencodings/distros/fedora.txt  | 1 +
 build/pkgs/wheel/distros/fedora.txt         | 1 +
 30 files changed, 30 insertions(+)
 create mode 100644 build/pkgs/babel/distros/fedora.txt
 create mode 100644 build/pkgs/bleach/distros/fedora.txt
 create mode 100644 build/pkgs/certifi/distros/fedora.txt
 create mode 100644 build/pkgs/cvxopt/distros/fedora.txt
 create mode 100644 build/pkgs/decorator/distros/fedora.txt
 create mode 100644 build/pkgs/html5lib/distros/fedora.txt
 create mode 100644 build/pkgs/idna/distros/fedora.txt
 create mode 100644 build/pkgs/jinja2/distros/fedora.txt
 create mode 100644 build/pkgs/matplotlib/distros/fedora.txt
 create mode 100644 build/pkgs/mpmath/distros/fedora.txt
 create mode 100644 build/pkgs/networkx/distros/fedora.txt
 create mode 100644 build/pkgs/numpy/distros/fedora.txt
 create mode 100644 build/pkgs/packaging/distros/fedora.txt
 create mode 100644 build/pkgs/pandocfilters/distros/fedora.txt
 create mode 100644 build/pkgs/pickleshare/distros/fedora.txt
 create mode 100644 build/pkgs/pillow/distros/fedora.txt
 create mode 100644 build/pkgs/pluggy/distros/fedora.txt
 create mode 100644 build/pkgs/py/distros/fedora.txt
 create mode 100644 build/pkgs/pygments/distros/fedora.txt
 create mode 100644 build/pkgs/pytz/distros/fedora.txt
 create mode 100644 build/pkgs/pyzmq/distros/fedora.txt
 create mode 100644 build/pkgs/requests/distros/fedora.txt
 create mode 100644 build/pkgs/scipy/distros/fedora.txt
 create mode 100644 build/pkgs/setuptools/distros/fedora.txt
 create mode 100644 build/pkgs/six/distros/fedora.txt
 create mode 100644 build/pkgs/sympy/distros/fedora.txt
 create mode 100644 build/pkgs/texttable/distros/fedora.txt
 create mode 100644 build/pkgs/toml/distros/fedora.txt
 create mode 100644 build/pkgs/webencodings/distros/fedora.txt
 create mode 100644 build/pkgs/wheel/distros/fedora.txt

diff --git a/build/pkgs/babel/distros/fedora.txt b/build/pkgs/babel/distros/fedora.txt
new file mode 100644
index 00000000000..98f65931c4c
--- /dev/null
+++ b/build/pkgs/babel/distros/fedora.txt
@@ -0,0 +1 @@
+babel
diff --git a/build/pkgs/bleach/distros/fedora.txt b/build/pkgs/bleach/distros/fedora.txt
new file mode 100644
index 00000000000..c5422ccff0c
--- /dev/null
+++ b/build/pkgs/bleach/distros/fedora.txt
@@ -0,0 +1 @@
+python-bleach
diff --git a/build/pkgs/certifi/distros/fedora.txt b/build/pkgs/certifi/distros/fedora.txt
new file mode 100644
index 00000000000..be421c8b4b2
--- /dev/null
+++ b/build/pkgs/certifi/distros/fedora.txt
@@ -0,0 +1 @@
+python-certifi
diff --git a/build/pkgs/cvxopt/distros/fedora.txt b/build/pkgs/cvxopt/distros/fedora.txt
new file mode 100644
index 00000000000..f15770f0506
--- /dev/null
+++ b/build/pkgs/cvxopt/distros/fedora.txt
@@ -0,0 +1 @@
+python-cvxopt
diff --git a/build/pkgs/decorator/distros/fedora.txt b/build/pkgs/decorator/distros/fedora.txt
new file mode 100644
index 00000000000..079560412f1
--- /dev/null
+++ b/build/pkgs/decorator/distros/fedora.txt
@@ -0,0 +1 @@
+python-decorator
diff --git a/build/pkgs/html5lib/distros/fedora.txt b/build/pkgs/html5lib/distros/fedora.txt
new file mode 100644
index 00000000000..b821491e116
--- /dev/null
+++ b/build/pkgs/html5lib/distros/fedora.txt
@@ -0,0 +1 @@
+python-html5lib
diff --git a/build/pkgs/idna/distros/fedora.txt b/build/pkgs/idna/distros/fedora.txt
new file mode 100644
index 00000000000..a73e70cade0
--- /dev/null
+++ b/build/pkgs/idna/distros/fedora.txt
@@ -0,0 +1 @@
+python-idna
diff --git a/build/pkgs/jinja2/distros/fedora.txt b/build/pkgs/jinja2/distros/fedora.txt
new file mode 100644
index 00000000000..f5f3caf99cc
--- /dev/null
+++ b/build/pkgs/jinja2/distros/fedora.txt
@@ -0,0 +1 @@
+python-jinja2
diff --git a/build/pkgs/matplotlib/distros/fedora.txt b/build/pkgs/matplotlib/distros/fedora.txt
new file mode 100644
index 00000000000..f6d856e585c
--- /dev/null
+++ b/build/pkgs/matplotlib/distros/fedora.txt
@@ -0,0 +1 @@
+python-matplotlib
diff --git a/build/pkgs/mpmath/distros/fedora.txt b/build/pkgs/mpmath/distros/fedora.txt
new file mode 100644
index 00000000000..a7dc8d568f3
--- /dev/null
+++ b/build/pkgs/mpmath/distros/fedora.txt
@@ -0,0 +1 @@
+python-mpmath
diff --git a/build/pkgs/networkx/distros/fedora.txt b/build/pkgs/networkx/distros/fedora.txt
new file mode 100644
index 00000000000..293f943529a
--- /dev/null
+++ b/build/pkgs/networkx/distros/fedora.txt
@@ -0,0 +1 @@
+python-networkx
diff --git a/build/pkgs/numpy/distros/fedora.txt b/build/pkgs/numpy/distros/fedora.txt
new file mode 100644
index 00000000000..c8722b9f663
--- /dev/null
+++ b/build/pkgs/numpy/distros/fedora.txt
@@ -0,0 +1 @@
+python-numpy
diff --git a/build/pkgs/packaging/distros/fedora.txt b/build/pkgs/packaging/distros/fedora.txt
new file mode 100644
index 00000000000..02ad855da9a
--- /dev/null
+++ b/build/pkgs/packaging/distros/fedora.txt
@@ -0,0 +1 @@
+python-packaging
diff --git a/build/pkgs/pandocfilters/distros/fedora.txt b/build/pkgs/pandocfilters/distros/fedora.txt
new file mode 100644
index 00000000000..e7a86d0373c
--- /dev/null
+++ b/build/pkgs/pandocfilters/distros/fedora.txt
@@ -0,0 +1 @@
+python-pandocfilters
diff --git a/build/pkgs/pickleshare/distros/fedora.txt b/build/pkgs/pickleshare/distros/fedora.txt
new file mode 100644
index 00000000000..6d991a27d41
--- /dev/null
+++ b/build/pkgs/pickleshare/distros/fedora.txt
@@ -0,0 +1 @@
+python-pickleshare
diff --git a/build/pkgs/pillow/distros/fedora.txt b/build/pkgs/pillow/distros/fedora.txt
new file mode 100644
index 00000000000..86dbb1d13b8
--- /dev/null
+++ b/build/pkgs/pillow/distros/fedora.txt
@@ -0,0 +1 @@
+python-pillow
diff --git a/build/pkgs/pluggy/distros/fedora.txt b/build/pkgs/pluggy/distros/fedora.txt
new file mode 100644
index 00000000000..c869e54c551
--- /dev/null
+++ b/build/pkgs/pluggy/distros/fedora.txt
@@ -0,0 +1 @@
+python-pluggy
diff --git a/build/pkgs/py/distros/fedora.txt b/build/pkgs/py/distros/fedora.txt
new file mode 100644
index 00000000000..b348d395fbd
--- /dev/null
+++ b/build/pkgs/py/distros/fedora.txt
@@ -0,0 +1 @@
+python-py
diff --git a/build/pkgs/pygments/distros/fedora.txt b/build/pkgs/pygments/distros/fedora.txt
new file mode 100644
index 00000000000..f3e72a89c38
--- /dev/null
+++ b/build/pkgs/pygments/distros/fedora.txt
@@ -0,0 +1 @@
+python-pygments
diff --git a/build/pkgs/pytz/distros/fedora.txt b/build/pkgs/pytz/distros/fedora.txt
new file mode 100644
index 00000000000..2cccc9e61ec
--- /dev/null
+++ b/build/pkgs/pytz/distros/fedora.txt
@@ -0,0 +1 @@
+python-pytz
diff --git a/build/pkgs/pyzmq/distros/fedora.txt b/build/pkgs/pyzmq/distros/fedora.txt
new file mode 100644
index 00000000000..23f64d1f1a3
--- /dev/null
+++ b/build/pkgs/pyzmq/distros/fedora.txt
@@ -0,0 +1 @@
+python-pyzmq
diff --git a/build/pkgs/requests/distros/fedora.txt b/build/pkgs/requests/distros/fedora.txt
new file mode 100644
index 00000000000..93a7bc19b60
--- /dev/null
+++ b/build/pkgs/requests/distros/fedora.txt
@@ -0,0 +1 @@
+python-requests
diff --git a/build/pkgs/scipy/distros/fedora.txt b/build/pkgs/scipy/distros/fedora.txt
new file mode 100644
index 00000000000..7ff2882c1bf
--- /dev/null
+++ b/build/pkgs/scipy/distros/fedora.txt
@@ -0,0 +1 @@
+python-scipy
diff --git a/build/pkgs/setuptools/distros/fedora.txt b/build/pkgs/setuptools/distros/fedora.txt
new file mode 100644
index 00000000000..e1ad17860cd
--- /dev/null
+++ b/build/pkgs/setuptools/distros/fedora.txt
@@ -0,0 +1 @@
+python-setuptools
diff --git a/build/pkgs/six/distros/fedora.txt b/build/pkgs/six/distros/fedora.txt
new file mode 100644
index 00000000000..787c5308ea4
--- /dev/null
+++ b/build/pkgs/six/distros/fedora.txt
@@ -0,0 +1 @@
+python-six
diff --git a/build/pkgs/sympy/distros/fedora.txt b/build/pkgs/sympy/distros/fedora.txt
new file mode 100644
index 00000000000..126c88afd85
--- /dev/null
+++ b/build/pkgs/sympy/distros/fedora.txt
@@ -0,0 +1 @@
+python-sympy
diff --git a/build/pkgs/texttable/distros/fedora.txt b/build/pkgs/texttable/distros/fedora.txt
new file mode 100644
index 00000000000..8d1ccec8c7d
--- /dev/null
+++ b/build/pkgs/texttable/distros/fedora.txt
@@ -0,0 +1 @@
+python-texttable
diff --git a/build/pkgs/toml/distros/fedora.txt b/build/pkgs/toml/distros/fedora.txt
new file mode 100644
index 00000000000..821ee775ac7
--- /dev/null
+++ b/build/pkgs/toml/distros/fedora.txt
@@ -0,0 +1 @@
+python-toml
diff --git a/build/pkgs/webencodings/distros/fedora.txt b/build/pkgs/webencodings/distros/fedora.txt
new file mode 100644
index 00000000000..12ddba901a4
--- /dev/null
+++ b/build/pkgs/webencodings/distros/fedora.txt
@@ -0,0 +1 @@
+python-webencodings
diff --git a/build/pkgs/wheel/distros/fedora.txt b/build/pkgs/wheel/distros/fedora.txt
new file mode 100644
index 00000000000..ae4cbb9f52f
--- /dev/null
+++ b/build/pkgs/wheel/distros/fedora.txt
@@ -0,0 +1 @@
+python-wheel

From 62b9a10d953cfcb68cd27e24815b78bc29222672 Mon Sep 17 00:00:00 2001
From: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
Date: Sun, 17 Oct 2021 21:04:04 -0700
Subject: [PATCH 052/247] build/pkgs: Add distros/arch.txt for Python packages

---
 build/pkgs/babel/distros/arch.txt         | 1 +
 build/pkgs/bleach/distros/arch.txt        | 1 +
 build/pkgs/certifi/distros/arch.txt       | 1 +
 build/pkgs/cvxopt/distros/arch.txt        | 1 +
 build/pkgs/decorator/distros/arch.txt     | 1 +
 build/pkgs/html5lib/distros/arch.txt      | 1 +
 build/pkgs/idna/distros/arch.txt          | 1 +
 build/pkgs/matplotlib/distros/arch.txt    | 1 +
 build/pkgs/mpmath/distros/arch.txt        | 1 +
 build/pkgs/networkx/distros/arch.txt      | 1 +
 build/pkgs/numpy/distros/arch.txt         | 1 +
 build/pkgs/packaging/distros/arch.txt     | 1 +
 build/pkgs/pandocfilters/distros/arch.txt | 1 +
 build/pkgs/pickleshare/distros/arch.txt   | 1 +
 build/pkgs/pillow/distros/arch.txt        | 1 +
 build/pkgs/pluggy/distros/arch.txt        | 1 +
 build/pkgs/py/distros/arch.txt            | 1 +
 build/pkgs/pygments/distros/arch.txt      | 1 +
 build/pkgs/pytz/distros/arch.txt          | 1 +
 build/pkgs/pyzmq/distros/arch.txt         | 1 +
 build/pkgs/requests/distros/arch.txt      | 1 +
 build/pkgs/scipy/distros/arch.txt         | 1 +
 build/pkgs/setuptools/distros/arch.txt    | 1 +
 build/pkgs/six/distros/arch.txt           | 1 +
 build/pkgs/sympy/distros/arch.txt         | 1 +
 build/pkgs/texttable/distros/arch.txt     | 1 +
 build/pkgs/toml/distros/arch.txt          | 1 +
 build/pkgs/webencodings/distros/arch.txt  | 1 +
 build/pkgs/wheel/distros/arch.txt         | 1 +
 29 files changed, 29 insertions(+)
 create mode 100644 build/pkgs/babel/distros/arch.txt
 create mode 100644 build/pkgs/bleach/distros/arch.txt
 create mode 100644 build/pkgs/certifi/distros/arch.txt
 create mode 100644 build/pkgs/cvxopt/distros/arch.txt
 create mode 100644 build/pkgs/decorator/distros/arch.txt
 create mode 100644 build/pkgs/html5lib/distros/arch.txt
 create mode 100644 build/pkgs/idna/distros/arch.txt
 create mode 100644 build/pkgs/matplotlib/distros/arch.txt
 create mode 100644 build/pkgs/mpmath/distros/arch.txt
 create mode 100644 build/pkgs/networkx/distros/arch.txt
 create mode 100644 build/pkgs/numpy/distros/arch.txt
 create mode 100644 build/pkgs/packaging/distros/arch.txt
 create mode 100644 build/pkgs/pandocfilters/distros/arch.txt
 create mode 100644 build/pkgs/pickleshare/distros/arch.txt
 create mode 100644 build/pkgs/pillow/distros/arch.txt
 create mode 100644 build/pkgs/pluggy/distros/arch.txt
 create mode 100644 build/pkgs/py/distros/arch.txt
 create mode 100644 build/pkgs/pygments/distros/arch.txt
 create mode 100644 build/pkgs/pytz/distros/arch.txt
 create mode 100644 build/pkgs/pyzmq/distros/arch.txt
 create mode 100644 build/pkgs/requests/distros/arch.txt
 create mode 100644 build/pkgs/scipy/distros/arch.txt
 create mode 100644 build/pkgs/setuptools/distros/arch.txt
 create mode 100644 build/pkgs/six/distros/arch.txt
 create mode 100644 build/pkgs/sympy/distros/arch.txt
 create mode 100644 build/pkgs/texttable/distros/arch.txt
 create mode 100644 build/pkgs/toml/distros/arch.txt
 create mode 100644 build/pkgs/webencodings/distros/arch.txt
 create mode 100644 build/pkgs/wheel/distros/arch.txt

diff --git a/build/pkgs/babel/distros/arch.txt b/build/pkgs/babel/distros/arch.txt
new file mode 100644
index 00000000000..f2d828ccc5c
--- /dev/null
+++ b/build/pkgs/babel/distros/arch.txt
@@ -0,0 +1 @@
+python-babel
diff --git a/build/pkgs/bleach/distros/arch.txt b/build/pkgs/bleach/distros/arch.txt
new file mode 100644
index 00000000000..c5422ccff0c
--- /dev/null
+++ b/build/pkgs/bleach/distros/arch.txt
@@ -0,0 +1 @@
+python-bleach
diff --git a/build/pkgs/certifi/distros/arch.txt b/build/pkgs/certifi/distros/arch.txt
new file mode 100644
index 00000000000..be421c8b4b2
--- /dev/null
+++ b/build/pkgs/certifi/distros/arch.txt
@@ -0,0 +1 @@
+python-certifi
diff --git a/build/pkgs/cvxopt/distros/arch.txt b/build/pkgs/cvxopt/distros/arch.txt
new file mode 100644
index 00000000000..f15770f0506
--- /dev/null
+++ b/build/pkgs/cvxopt/distros/arch.txt
@@ -0,0 +1 @@
+python-cvxopt
diff --git a/build/pkgs/decorator/distros/arch.txt b/build/pkgs/decorator/distros/arch.txt
new file mode 100644
index 00000000000..079560412f1
--- /dev/null
+++ b/build/pkgs/decorator/distros/arch.txt
@@ -0,0 +1 @@
+python-decorator
diff --git a/build/pkgs/html5lib/distros/arch.txt b/build/pkgs/html5lib/distros/arch.txt
new file mode 100644
index 00000000000..b821491e116
--- /dev/null
+++ b/build/pkgs/html5lib/distros/arch.txt
@@ -0,0 +1 @@
+python-html5lib
diff --git a/build/pkgs/idna/distros/arch.txt b/build/pkgs/idna/distros/arch.txt
new file mode 100644
index 00000000000..a73e70cade0
--- /dev/null
+++ b/build/pkgs/idna/distros/arch.txt
@@ -0,0 +1 @@
+python-idna
diff --git a/build/pkgs/matplotlib/distros/arch.txt b/build/pkgs/matplotlib/distros/arch.txt
new file mode 100644
index 00000000000..f6d856e585c
--- /dev/null
+++ b/build/pkgs/matplotlib/distros/arch.txt
@@ -0,0 +1 @@
+python-matplotlib
diff --git a/build/pkgs/mpmath/distros/arch.txt b/build/pkgs/mpmath/distros/arch.txt
new file mode 100644
index 00000000000..a7dc8d568f3
--- /dev/null
+++ b/build/pkgs/mpmath/distros/arch.txt
@@ -0,0 +1 @@
+python-mpmath
diff --git a/build/pkgs/networkx/distros/arch.txt b/build/pkgs/networkx/distros/arch.txt
new file mode 100644
index 00000000000..293f943529a
--- /dev/null
+++ b/build/pkgs/networkx/distros/arch.txt
@@ -0,0 +1 @@
+python-networkx
diff --git a/build/pkgs/numpy/distros/arch.txt b/build/pkgs/numpy/distros/arch.txt
new file mode 100644
index 00000000000..c8722b9f663
--- /dev/null
+++ b/build/pkgs/numpy/distros/arch.txt
@@ -0,0 +1 @@
+python-numpy
diff --git a/build/pkgs/packaging/distros/arch.txt b/build/pkgs/packaging/distros/arch.txt
new file mode 100644
index 00000000000..02ad855da9a
--- /dev/null
+++ b/build/pkgs/packaging/distros/arch.txt
@@ -0,0 +1 @@
+python-packaging
diff --git a/build/pkgs/pandocfilters/distros/arch.txt b/build/pkgs/pandocfilters/distros/arch.txt
new file mode 100644
index 00000000000..e7a86d0373c
--- /dev/null
+++ b/build/pkgs/pandocfilters/distros/arch.txt
@@ -0,0 +1 @@
+python-pandocfilters
diff --git a/build/pkgs/pickleshare/distros/arch.txt b/build/pkgs/pickleshare/distros/arch.txt
new file mode 100644
index 00000000000..6d991a27d41
--- /dev/null
+++ b/build/pkgs/pickleshare/distros/arch.txt
@@ -0,0 +1 @@
+python-pickleshare
diff --git a/build/pkgs/pillow/distros/arch.txt b/build/pkgs/pillow/distros/arch.txt
new file mode 100644
index 00000000000..86dbb1d13b8
--- /dev/null
+++ b/build/pkgs/pillow/distros/arch.txt
@@ -0,0 +1 @@
+python-pillow
diff --git a/build/pkgs/pluggy/distros/arch.txt b/build/pkgs/pluggy/distros/arch.txt
new file mode 100644
index 00000000000..c869e54c551
--- /dev/null
+++ b/build/pkgs/pluggy/distros/arch.txt
@@ -0,0 +1 @@
+python-pluggy
diff --git a/build/pkgs/py/distros/arch.txt b/build/pkgs/py/distros/arch.txt
new file mode 100644
index 00000000000..b348d395fbd
--- /dev/null
+++ b/build/pkgs/py/distros/arch.txt
@@ -0,0 +1 @@
+python-py
diff --git a/build/pkgs/pygments/distros/arch.txt b/build/pkgs/pygments/distros/arch.txt
new file mode 100644
index 00000000000..f3e72a89c38
--- /dev/null
+++ b/build/pkgs/pygments/distros/arch.txt
@@ -0,0 +1 @@
+python-pygments
diff --git a/build/pkgs/pytz/distros/arch.txt b/build/pkgs/pytz/distros/arch.txt
new file mode 100644
index 00000000000..2cccc9e61ec
--- /dev/null
+++ b/build/pkgs/pytz/distros/arch.txt
@@ -0,0 +1 @@
+python-pytz
diff --git a/build/pkgs/pyzmq/distros/arch.txt b/build/pkgs/pyzmq/distros/arch.txt
new file mode 100644
index 00000000000..23f64d1f1a3
--- /dev/null
+++ b/build/pkgs/pyzmq/distros/arch.txt
@@ -0,0 +1 @@
+python-pyzmq
diff --git a/build/pkgs/requests/distros/arch.txt b/build/pkgs/requests/distros/arch.txt
new file mode 100644
index 00000000000..93a7bc19b60
--- /dev/null
+++ b/build/pkgs/requests/distros/arch.txt
@@ -0,0 +1 @@
+python-requests
diff --git a/build/pkgs/scipy/distros/arch.txt b/build/pkgs/scipy/distros/arch.txt
new file mode 100644
index 00000000000..7ff2882c1bf
--- /dev/null
+++ b/build/pkgs/scipy/distros/arch.txt
@@ -0,0 +1 @@
+python-scipy
diff --git a/build/pkgs/setuptools/distros/arch.txt b/build/pkgs/setuptools/distros/arch.txt
new file mode 100644
index 00000000000..e1ad17860cd
--- /dev/null
+++ b/build/pkgs/setuptools/distros/arch.txt
@@ -0,0 +1 @@
+python-setuptools
diff --git a/build/pkgs/six/distros/arch.txt b/build/pkgs/six/distros/arch.txt
new file mode 100644
index 00000000000..787c5308ea4
--- /dev/null
+++ b/build/pkgs/six/distros/arch.txt
@@ -0,0 +1 @@
+python-six
diff --git a/build/pkgs/sympy/distros/arch.txt b/build/pkgs/sympy/distros/arch.txt
new file mode 100644
index 00000000000..126c88afd85
--- /dev/null
+++ b/build/pkgs/sympy/distros/arch.txt
@@ -0,0 +1 @@
+python-sympy
diff --git a/build/pkgs/texttable/distros/arch.txt b/build/pkgs/texttable/distros/arch.txt
new file mode 100644
index 00000000000..8d1ccec8c7d
--- /dev/null
+++ b/build/pkgs/texttable/distros/arch.txt
@@ -0,0 +1 @@
+python-texttable
diff --git a/build/pkgs/toml/distros/arch.txt b/build/pkgs/toml/distros/arch.txt
new file mode 100644
index 00000000000..821ee775ac7
--- /dev/null
+++ b/build/pkgs/toml/distros/arch.txt
@@ -0,0 +1 @@
+python-toml
diff --git a/build/pkgs/webencodings/distros/arch.txt b/build/pkgs/webencodings/distros/arch.txt
new file mode 100644
index 00000000000..12ddba901a4
--- /dev/null
+++ b/build/pkgs/webencodings/distros/arch.txt
@@ -0,0 +1 @@
+python-webencodings
diff --git a/build/pkgs/wheel/distros/arch.txt b/build/pkgs/wheel/distros/arch.txt
new file mode 100644
index 00000000000..ae4cbb9f52f
--- /dev/null
+++ b/build/pkgs/wheel/distros/arch.txt
@@ -0,0 +1 @@
+python-wheel

From de1473523adf23ad5d9e4e14664c95b8e00fafb3 Mon Sep 17 00:00:00 2001
From: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
Date: Sun, 17 Oct 2021 21:20:56 -0700
Subject: [PATCH 053/247] build/pkgs: Add distros/opensuse.txt for Python
 packages

---
 build/pkgs/bleach/distros/opensuse.txt        | 1 +
 build/pkgs/cvxopt/distros/opensuse.txt        | 1 +
 build/pkgs/html5lib/distros/opensuse.txt      | 1 +
 build/pkgs/idna/distros/opensuse.txt          | 1 +
 build/pkgs/jinja2/distros/opensuse.txt        | 2 +-
 build/pkgs/mpmath/distros/opensuse.txt        | 1 +
 build/pkgs/numpy/distros/opensuse.txt         | 1 +
 build/pkgs/packaging/distros/opensuse.txt     | 1 +
 build/pkgs/pandocfilters/distros/opensuse.txt | 1 +
 build/pkgs/pluggy/distros/opensuse.txt        | 1 +
 build/pkgs/py/distros/opensuse.txt            | 1 +
 build/pkgs/pygments/distros/opensuse.txt      | 2 +-
 build/pkgs/sympy/distros/opensuse.txt         | 1 +
 build/pkgs/texttable/distros/opensuse.txt     | 1 +
 build/pkgs/toml/distros/opensuse.txt          | 1 +
 15 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 build/pkgs/bleach/distros/opensuse.txt
 create mode 100644 build/pkgs/cvxopt/distros/opensuse.txt
 create mode 100644 build/pkgs/html5lib/distros/opensuse.txt
 create mode 100644 build/pkgs/idna/distros/opensuse.txt
 create mode 100644 build/pkgs/mpmath/distros/opensuse.txt
 create mode 100644 build/pkgs/numpy/distros/opensuse.txt
 create mode 100644 build/pkgs/packaging/distros/opensuse.txt
 create mode 100644 build/pkgs/pandocfilters/distros/opensuse.txt
 create mode 100644 build/pkgs/pluggy/distros/opensuse.txt
 create mode 100644 build/pkgs/py/distros/opensuse.txt
 create mode 100644 build/pkgs/sympy/distros/opensuse.txt
 create mode 100644 build/pkgs/texttable/distros/opensuse.txt
 create mode 100644 build/pkgs/toml/distros/opensuse.txt

diff --git a/build/pkgs/bleach/distros/opensuse.txt b/build/pkgs/bleach/distros/opensuse.txt
new file mode 100644
index 00000000000..6d37c4c79f0
--- /dev/null
+++ b/build/pkgs/bleach/distros/opensuse.txt
@@ -0,0 +1 @@
+python3-bleach
diff --git a/build/pkgs/cvxopt/distros/opensuse.txt b/build/pkgs/cvxopt/distros/opensuse.txt
new file mode 100644
index 00000000000..2bb6ad1e834
--- /dev/null
+++ b/build/pkgs/cvxopt/distros/opensuse.txt
@@ -0,0 +1 @@
+python3-cvxopt
diff --git a/build/pkgs/html5lib/distros/opensuse.txt b/build/pkgs/html5lib/distros/opensuse.txt
new file mode 100644
index 00000000000..6d7b8dfb001
--- /dev/null
+++ b/build/pkgs/html5lib/distros/opensuse.txt
@@ -0,0 +1 @@
+python3-html5lib
diff --git a/build/pkgs/idna/distros/opensuse.txt b/build/pkgs/idna/distros/opensuse.txt
new file mode 100644
index 00000000000..de48e70887b
--- /dev/null
+++ b/build/pkgs/idna/distros/opensuse.txt
@@ -0,0 +1 @@
+python3-idna
diff --git a/build/pkgs/jinja2/distros/opensuse.txt b/build/pkgs/jinja2/distros/opensuse.txt
index 5d90a223f55..f2db865ab36 100644
--- a/build/pkgs/jinja2/distros/opensuse.txt
+++ b/build/pkgs/jinja2/distros/opensuse.txt
@@ -1 +1 @@
-python3-Jinja2
+python3-jinja2
diff --git a/build/pkgs/mpmath/distros/opensuse.txt b/build/pkgs/mpmath/distros/opensuse.txt
new file mode 100644
index 00000000000..fbc82a97e07
--- /dev/null
+++ b/build/pkgs/mpmath/distros/opensuse.txt
@@ -0,0 +1 @@
+python3-mpmath
diff --git a/build/pkgs/numpy/distros/opensuse.txt b/build/pkgs/numpy/distros/opensuse.txt
new file mode 100644
index 00000000000..79d5c5a1429
--- /dev/null
+++ b/build/pkgs/numpy/distros/opensuse.txt
@@ -0,0 +1 @@
+python3-numpy
diff --git a/build/pkgs/packaging/distros/opensuse.txt b/build/pkgs/packaging/distros/opensuse.txt
new file mode 100644
index 00000000000..8f1c0ffc29f
--- /dev/null
+++ b/build/pkgs/packaging/distros/opensuse.txt
@@ -0,0 +1 @@
+python3-packaging
diff --git a/build/pkgs/pandocfilters/distros/opensuse.txt b/build/pkgs/pandocfilters/distros/opensuse.txt
new file mode 100644
index 00000000000..d0d4c24e15e
--- /dev/null
+++ b/build/pkgs/pandocfilters/distros/opensuse.txt
@@ -0,0 +1 @@
+python3-pandocfilters
diff --git a/build/pkgs/pluggy/distros/opensuse.txt b/build/pkgs/pluggy/distros/opensuse.txt
new file mode 100644
index 00000000000..43a3acf0462
--- /dev/null
+++ b/build/pkgs/pluggy/distros/opensuse.txt
@@ -0,0 +1 @@
+python3-pluggy
diff --git a/build/pkgs/py/distros/opensuse.txt b/build/pkgs/py/distros/opensuse.txt
new file mode 100644
index 00000000000..81fefe60903
--- /dev/null
+++ b/build/pkgs/py/distros/opensuse.txt
@@ -0,0 +1 @@
+python3-py
diff --git a/build/pkgs/pygments/distros/opensuse.txt b/build/pkgs/pygments/distros/opensuse.txt
index 9ff5740e79c..3ab37929b2c 100644
--- a/build/pkgs/pygments/distros/opensuse.txt
+++ b/build/pkgs/pygments/distros/opensuse.txt
@@ -1 +1 @@
-python3-Pygments
+python3-pygments
diff --git a/build/pkgs/sympy/distros/opensuse.txt b/build/pkgs/sympy/distros/opensuse.txt
new file mode 100644
index 00000000000..db423c87ba7
--- /dev/null
+++ b/build/pkgs/sympy/distros/opensuse.txt
@@ -0,0 +1 @@
+python3-sympy
diff --git a/build/pkgs/texttable/distros/opensuse.txt b/build/pkgs/texttable/distros/opensuse.txt
new file mode 100644
index 00000000000..8f8e7e29d7a
--- /dev/null
+++ b/build/pkgs/texttable/distros/opensuse.txt
@@ -0,0 +1 @@
+python3-texttable
diff --git a/build/pkgs/toml/distros/opensuse.txt b/build/pkgs/toml/distros/opensuse.txt
new file mode 100644
index 00000000000..543e89d2a6f
--- /dev/null
+++ b/build/pkgs/toml/distros/opensuse.txt
@@ -0,0 +1 @@
+python3-toml

From f66da0a711aad3454d49a8b72bdc4c2b1a66f62b Mon Sep 17 00:00:00 2001
From: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
Date: Sun, 17 Oct 2021 22:45:04 -0700
Subject: [PATCH 054/247] build/pkgs: Add distros/debian.txt for Python
 packages

---
 build/pkgs/babel/distros/debian.txt         | 1 +
 build/pkgs/bleach/distros/debian.txt        | 1 +
 build/pkgs/certifi/distros/debian.txt       | 1 +
 build/pkgs/cvxopt/distros/debian.txt        | 1 +
 build/pkgs/decorator/distros/debian.txt     | 1 +
 build/pkgs/html5lib/distros/debian.txt      | 1 +
 build/pkgs/idna/distros/debian.txt          | 1 +
 build/pkgs/jinja2/distros/debian.txt        | 1 +
 build/pkgs/matplotlib/distros/debian.txt    | 1 +
 build/pkgs/mpmath/distros/debian.txt        | 1 +
 build/pkgs/networkx/distros/debian.txt      | 1 +
 build/pkgs/numpy/distros/debian.txt         | 1 +
 build/pkgs/packaging/distros/debian.txt     | 1 +
 build/pkgs/pandocfilters/distros/debian.txt | 1 +
 build/pkgs/pickleshare/distros/debian.txt   | 1 +
 build/pkgs/pillow/distros/debian.txt        | 1 +
 build/pkgs/pluggy/distros/debian.txt        | 1 +
 build/pkgs/py/distros/debian.txt            | 1 +
 build/pkgs/pygments/distros/debian.txt      | 1 +
 build/pkgs/pytz/distros/debian.txt          | 1 +
 build/pkgs/requests/distros/debian.txt      | 1 +
 build/pkgs/scipy/distros/debian.txt         | 1 +
 build/pkgs/setuptools/distros/debian.txt    | 1 +
 build/pkgs/six/distros/debian.txt           | 1 +
 build/pkgs/sympy/distros/debian.txt         | 1 +
 build/pkgs/texttable/distros/debian.txt     | 1 +
 build/pkgs/toml/distros/debian.txt          | 1 +
 build/pkgs/webencodings/distros/debian.txt  | 1 +
 build/pkgs/wheel/distros/debian.txt         | 1 +
 29 files changed, 29 insertions(+)
 create mode 100644 build/pkgs/babel/distros/debian.txt
 create mode 100644 build/pkgs/bleach/distros/debian.txt
 create mode 100644 build/pkgs/certifi/distros/debian.txt
 create mode 100644 build/pkgs/cvxopt/distros/debian.txt
 create mode 100644 build/pkgs/decorator/distros/debian.txt
 create mode 100644 build/pkgs/html5lib/distros/debian.txt
 create mode 100644 build/pkgs/idna/distros/debian.txt
 create mode 100644 build/pkgs/jinja2/distros/debian.txt
 create mode 100644 build/pkgs/matplotlib/distros/debian.txt
 create mode 100644 build/pkgs/mpmath/distros/debian.txt
 create mode 100644 build/pkgs/networkx/distros/debian.txt
 create mode 100644 build/pkgs/numpy/distros/debian.txt
 create mode 100644 build/pkgs/packaging/distros/debian.txt
 create mode 100644 build/pkgs/pandocfilters/distros/debian.txt
 create mode 100644 build/pkgs/pickleshare/distros/debian.txt
 create mode 100644 build/pkgs/pillow/distros/debian.txt
 create mode 100644 build/pkgs/pluggy/distros/debian.txt
 create mode 100644 build/pkgs/py/distros/debian.txt
 create mode 100644 build/pkgs/pygments/distros/debian.txt
 create mode 100644 build/pkgs/pytz/distros/debian.txt
 create mode 100644 build/pkgs/requests/distros/debian.txt
 create mode 100644 build/pkgs/scipy/distros/debian.txt
 create mode 100644 build/pkgs/setuptools/distros/debian.txt
 create mode 100644 build/pkgs/six/distros/debian.txt
 create mode 100644 build/pkgs/sympy/distros/debian.txt
 create mode 100644 build/pkgs/texttable/distros/debian.txt
 create mode 100644 build/pkgs/toml/distros/debian.txt
 create mode 100644 build/pkgs/webencodings/distros/debian.txt
 create mode 100644 build/pkgs/wheel/distros/debian.txt

diff --git a/build/pkgs/babel/distros/debian.txt b/build/pkgs/babel/distros/debian.txt
new file mode 100644
index 00000000000..e623eb68a31
--- /dev/null
+++ b/build/pkgs/babel/distros/debian.txt
@@ -0,0 +1 @@
+python3-babel
diff --git a/build/pkgs/bleach/distros/debian.txt b/build/pkgs/bleach/distros/debian.txt
new file mode 100644
index 00000000000..6d37c4c79f0
--- /dev/null
+++ b/build/pkgs/bleach/distros/debian.txt
@@ -0,0 +1 @@
+python3-bleach
diff --git a/build/pkgs/certifi/distros/debian.txt b/build/pkgs/certifi/distros/debian.txt
new file mode 100644
index 00000000000..f585a823bf3
--- /dev/null
+++ b/build/pkgs/certifi/distros/debian.txt
@@ -0,0 +1 @@
+python3-certifi
diff --git a/build/pkgs/cvxopt/distros/debian.txt b/build/pkgs/cvxopt/distros/debian.txt
new file mode 100644
index 00000000000..2bb6ad1e834
--- /dev/null
+++ b/build/pkgs/cvxopt/distros/debian.txt
@@ -0,0 +1 @@
+python3-cvxopt
diff --git a/build/pkgs/decorator/distros/debian.txt b/build/pkgs/decorator/distros/debian.txt
new file mode 100644
index 00000000000..46c478e1513
--- /dev/null
+++ b/build/pkgs/decorator/distros/debian.txt
@@ -0,0 +1 @@
+python3-decorator
diff --git a/build/pkgs/html5lib/distros/debian.txt b/build/pkgs/html5lib/distros/debian.txt
new file mode 100644
index 00000000000..6d7b8dfb001
--- /dev/null
+++ b/build/pkgs/html5lib/distros/debian.txt
@@ -0,0 +1 @@
+python3-html5lib
diff --git a/build/pkgs/idna/distros/debian.txt b/build/pkgs/idna/distros/debian.txt
new file mode 100644
index 00000000000..de48e70887b
--- /dev/null
+++ b/build/pkgs/idna/distros/debian.txt
@@ -0,0 +1 @@
+python3-idna
diff --git a/build/pkgs/jinja2/distros/debian.txt b/build/pkgs/jinja2/distros/debian.txt
new file mode 100644
index 00000000000..f2db865ab36
--- /dev/null
+++ b/build/pkgs/jinja2/distros/debian.txt
@@ -0,0 +1 @@
+python3-jinja2
diff --git a/build/pkgs/matplotlib/distros/debian.txt b/build/pkgs/matplotlib/distros/debian.txt
new file mode 100644
index 00000000000..13743297213
--- /dev/null
+++ b/build/pkgs/matplotlib/distros/debian.txt
@@ -0,0 +1 @@
+python3-matplotlib
diff --git a/build/pkgs/mpmath/distros/debian.txt b/build/pkgs/mpmath/distros/debian.txt
new file mode 100644
index 00000000000..fbc82a97e07
--- /dev/null
+++ b/build/pkgs/mpmath/distros/debian.txt
@@ -0,0 +1 @@
+python3-mpmath
diff --git a/build/pkgs/networkx/distros/debian.txt b/build/pkgs/networkx/distros/debian.txt
new file mode 100644
index 00000000000..67790667af2
--- /dev/null
+++ b/build/pkgs/networkx/distros/debian.txt
@@ -0,0 +1 @@
+python3-networkx
diff --git a/build/pkgs/numpy/distros/debian.txt b/build/pkgs/numpy/distros/debian.txt
new file mode 100644
index 00000000000..79d5c5a1429
--- /dev/null
+++ b/build/pkgs/numpy/distros/debian.txt
@@ -0,0 +1 @@
+python3-numpy
diff --git a/build/pkgs/packaging/distros/debian.txt b/build/pkgs/packaging/distros/debian.txt
new file mode 100644
index 00000000000..8f1c0ffc29f
--- /dev/null
+++ b/build/pkgs/packaging/distros/debian.txt
@@ -0,0 +1 @@
+python3-packaging
diff --git a/build/pkgs/pandocfilters/distros/debian.txt b/build/pkgs/pandocfilters/distros/debian.txt
new file mode 100644
index 00000000000..d0d4c24e15e
--- /dev/null
+++ b/build/pkgs/pandocfilters/distros/debian.txt
@@ -0,0 +1 @@
+python3-pandocfilters
diff --git a/build/pkgs/pickleshare/distros/debian.txt b/build/pkgs/pickleshare/distros/debian.txt
new file mode 100644
index 00000000000..a00907d167b
--- /dev/null
+++ b/build/pkgs/pickleshare/distros/debian.txt
@@ -0,0 +1 @@
+python3-pickleshare
diff --git a/build/pkgs/pillow/distros/debian.txt b/build/pkgs/pillow/distros/debian.txt
new file mode 100644
index 00000000000..3319fcd7e0f
--- /dev/null
+++ b/build/pkgs/pillow/distros/debian.txt
@@ -0,0 +1 @@
+python3-pillow
diff --git a/build/pkgs/pluggy/distros/debian.txt b/build/pkgs/pluggy/distros/debian.txt
new file mode 100644
index 00000000000..43a3acf0462
--- /dev/null
+++ b/build/pkgs/pluggy/distros/debian.txt
@@ -0,0 +1 @@
+python3-pluggy
diff --git a/build/pkgs/py/distros/debian.txt b/build/pkgs/py/distros/debian.txt
new file mode 100644
index 00000000000..81fefe60903
--- /dev/null
+++ b/build/pkgs/py/distros/debian.txt
@@ -0,0 +1 @@
+python3-py
diff --git a/build/pkgs/pygments/distros/debian.txt b/build/pkgs/pygments/distros/debian.txt
new file mode 100644
index 00000000000..3ab37929b2c
--- /dev/null
+++ b/build/pkgs/pygments/distros/debian.txt
@@ -0,0 +1 @@
+python3-pygments
diff --git a/build/pkgs/pytz/distros/debian.txt b/build/pkgs/pytz/distros/debian.txt
new file mode 100644
index 00000000000..db209080161
--- /dev/null
+++ b/build/pkgs/pytz/distros/debian.txt
@@ -0,0 +1 @@
+python3-tz
diff --git a/build/pkgs/requests/distros/debian.txt b/build/pkgs/requests/distros/debian.txt
new file mode 100644
index 00000000000..43147b2be74
--- /dev/null
+++ b/build/pkgs/requests/distros/debian.txt
@@ -0,0 +1 @@
+python3-requests
diff --git a/build/pkgs/scipy/distros/debian.txt b/build/pkgs/scipy/distros/debian.txt
new file mode 100644
index 00000000000..12b366666d6
--- /dev/null
+++ b/build/pkgs/scipy/distros/debian.txt
@@ -0,0 +1 @@
+python3-scipy
diff --git a/build/pkgs/setuptools/distros/debian.txt b/build/pkgs/setuptools/distros/debian.txt
new file mode 100644
index 00000000000..1c0901c0374
--- /dev/null
+++ b/build/pkgs/setuptools/distros/debian.txt
@@ -0,0 +1 @@
+python3-setuptools
diff --git a/build/pkgs/six/distros/debian.txt b/build/pkgs/six/distros/debian.txt
new file mode 100644
index 00000000000..68ff8595d0b
--- /dev/null
+++ b/build/pkgs/six/distros/debian.txt
@@ -0,0 +1 @@
+python3-six
diff --git a/build/pkgs/sympy/distros/debian.txt b/build/pkgs/sympy/distros/debian.txt
new file mode 100644
index 00000000000..db423c87ba7
--- /dev/null
+++ b/build/pkgs/sympy/distros/debian.txt
@@ -0,0 +1 @@
+python3-sympy
diff --git a/build/pkgs/texttable/distros/debian.txt b/build/pkgs/texttable/distros/debian.txt
new file mode 100644
index 00000000000..8f8e7e29d7a
--- /dev/null
+++ b/build/pkgs/texttable/distros/debian.txt
@@ -0,0 +1 @@
+python3-texttable
diff --git a/build/pkgs/toml/distros/debian.txt b/build/pkgs/toml/distros/debian.txt
new file mode 100644
index 00000000000..543e89d2a6f
--- /dev/null
+++ b/build/pkgs/toml/distros/debian.txt
@@ -0,0 +1 @@
+python3-toml
diff --git a/build/pkgs/webencodings/distros/debian.txt b/build/pkgs/webencodings/distros/debian.txt
new file mode 100644
index 00000000000..ac30c2f3307
--- /dev/null
+++ b/build/pkgs/webencodings/distros/debian.txt
@@ -0,0 +1 @@
+python3-webencodings
diff --git a/build/pkgs/wheel/distros/debian.txt b/build/pkgs/wheel/distros/debian.txt
new file mode 100644
index 00000000000..3c066725a1d
--- /dev/null
+++ b/build/pkgs/wheel/distros/debian.txt
@@ -0,0 +1 @@
+python3-wheel

From e0080c57384ddb763ad4fab3d5c10b80e2c96115 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Mon, 18 Oct 2021 07:50:34 -0400
Subject: [PATCH 055/247] Trac #29665: add more documentation for
 SAGE_PYTHON_PACKAGE_CHECK().

An earlier commit allows SAGE_PYTHON_PACKAGE_CHECK(package) to tweak the
value of sage_use_system_$package if --enable-system-site-packages was
not used. This essentially changes the default --with-system-$package=yes
to "no" in that case. Here we update the documentation to reflect it.
---
 m4/sage_python_package_check.m4 | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/m4/sage_python_package_check.m4 b/m4/sage_python_package_check.m4
index 7ee82a7d14f..95eefd0e07a 100644
--- a/m4/sage_python_package_check.m4
+++ b/m4/sage_python_package_check.m4
@@ -34,6 +34,10 @@
 #   ensure that the ./configure- and run-time views of the system
 #   are as similar as possible.
 #
+#   To avoid suggesting these system packages to users who have not
+#   set --enable-system-site-packages, this macro also changes the
+#   default for --with-system-foo from "yes" to "no" in that case.
+#
 
 AC_DEFUN([SAGE_PYTHON_PACKAGE_CHECK], [
   AS_IF([test "${enable_system_site_packages}" = "yes"], [

From 6e405c43fd58da8a7c4c81a6080711314be5cece Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Mon, 18 Oct 2021 07:42:46 -0400
Subject: [PATCH 056/247] Trac #29665: improve SAGE_PYTHON_PACKAGE_CHECK()
 failure message.

When --enable-system-site-packages is off, SAGE_PYTHON_PACKAGE_CHECK()
will always install the corresponding SPKG. We improve the ./configure
output in that case to make it clear that the decision was based on
the value of --enable-system-site-packages and not the "real" check.
---
 m4/sage_python_package_check.m4 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/m4/sage_python_package_check.m4 b/m4/sage_python_package_check.m4
index 95eefd0e07a..5f0f084dd6b 100644
--- a/m4/sage_python_package_check.m4
+++ b/m4/sage_python_package_check.m4
@@ -40,7 +40,9 @@
 #
 
 AC_DEFUN([SAGE_PYTHON_PACKAGE_CHECK], [
+  AC_MSG_CHECKING([if --enable-system-site-packages was used])
   AS_IF([test "${enable_system_site_packages}" = "yes"], [
+    AC_MSG_RESULT(yes)
     AC_REQUIRE([SAGE_SPKG_CONFIGURE_PYTHON3])
 
     dnl We run this check inside a python venv, because that's ultimately
@@ -94,6 +96,7 @@ AC_DEFUN([SAGE_PYTHON_PACKAGE_CHECK], [
     AS_IF([test -d config.venv], [rm -rf config.venv])
   ], [
     dnl System site packages are disabled.
+    AC_MSG_RESULT(no; skipping check)
     sage_spkg_install_$1=yes
 
     dnl We have to retroactively hack the --with-system-foo={no,yes,force}

From b480c7f18955f8476fb16583add2c67d9816f380 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Sun, 24 Oct 2021 20:29:25 -0400
Subject: [PATCH 057/247] Trac #29665: use sage-venv in
 SAGE_PYTHON_PACKAGE_CHECK().

For consistency with the rest of the build system, we now use the
build/bin/sage-venv script to create the venv in this autoconf macro
rather than invoking $PYTHON_FOR_VENV with "-m venv" directly.
---
 m4/sage_python_package_check.m4 | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/m4/sage_python_package_check.m4 b/m4/sage_python_package_check.m4
index 5f0f084dd6b..5547b35a71f 100644
--- a/m4/sage_python_package_check.m4
+++ b/m4/sage_python_package_check.m4
@@ -50,11 +50,11 @@ AC_DEFUN([SAGE_PYTHON_PACKAGE_CHECK], [
     AC_MSG_CHECKING([if we can create a python venv in config.venv])
 
     dnl Use --clear because ./configure typically clobbers its output files.
-    AS_IF(["${PYTHON_FOR_VENV}" -m venv --system-site-packages dnl
-                                        --clear                dnl
-                                        --without-pip          dnl
-                                        config.venv            dnl
-                                        2>&AS_MESSAGE_LOG_FD], [
+    AS_IF(["${PYTHON_FOR_VENV}" build/bin/sage-venv      dnl
+                                  --system-site-packages dnl
+                                  --clear                dnl
+                                  config.venv            dnl
+                                  2>&AS_MESSAGE_LOG_FD], [
       AC_MSG_RESULT(yes)
       dnl strip all comments from install-requires.txt; this should leave
       dnl only a single line containing the version specification for this

From 659563eaaca2e4ea3b9fbb97848c92a0698deaab Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 3 Nov 2021 18:10:30 -0400
Subject: [PATCH 058/247] Trac #29665: standard python spkg-configure.m4 for
 urllib3.

---
 build/pkgs/urllib3/spkg-configure.m4 | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/urllib3/spkg-configure.m4

diff --git a/build/pkgs/urllib3/spkg-configure.m4 b/build/pkgs/urllib3/spkg-configure.m4
new file mode 100644
index 00000000000..d7ef3e1661c
--- /dev/null
+++ b/build/pkgs/urllib3/spkg-configure.m4
@@ -0,0 +1 @@
+SAGE_SPKG_CONFIGURE([urllib3], [SAGE_PYTHON_PACKAGE_CHECK([urllib3])])

From 09486f09c1e86bdc0e16e0126b7c03bfc331a36e Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 3 Nov 2021 18:15:18 -0400
Subject: [PATCH 059/247] Trac #29665: add Gentoo package information for
 urllib3.

---
 build/pkgs/urllib3/distros/gentoo.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/urllib3/distros/gentoo.txt

diff --git a/build/pkgs/urllib3/distros/gentoo.txt b/build/pkgs/urllib3/distros/gentoo.txt
new file mode 100644
index 00000000000..172a5357dba
--- /dev/null
+++ b/build/pkgs/urllib3/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/urllib3

From 527021355f3739467f2c624881baa43c0edc5299 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 3 Nov 2021 18:15:58 -0400
Subject: [PATCH 060/247] Trac #29665: add Gentoo package information for
 nbformat.

---
 build/pkgs/nbformat/distros/gentoo.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/nbformat/distros/gentoo.txt

diff --git a/build/pkgs/nbformat/distros/gentoo.txt b/build/pkgs/nbformat/distros/gentoo.txt
new file mode 100644
index 00000000000..006b1f2fc6d
--- /dev/null
+++ b/build/pkgs/nbformat/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/nbformat

From 59d679155714b9ffacab835fc239dcc73c575425 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 3 Nov 2021 18:34:16 -0400
Subject: [PATCH 061/247] Trac #29665: standard python spkg-configure.m4 for
 nbformat.

---
 build/pkgs/nbformat/spkg-configure.m4 | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/nbformat/spkg-configure.m4

diff --git a/build/pkgs/nbformat/spkg-configure.m4 b/build/pkgs/nbformat/spkg-configure.m4
new file mode 100644
index 00000000000..5a7f8c4ccec
--- /dev/null
+++ b/build/pkgs/nbformat/spkg-configure.m4
@@ -0,0 +1 @@
+SAGE_SPKG_CONFIGURE([nbformat], [SAGE_PYTHON_PACKAGE_CHECK([nbformat])])

From db773cd6c4abfe4fe95f59b4cd1dfacf1153e61e Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 3 Nov 2021 18:47:01 -0400
Subject: [PATCH 062/247] Trac #29665: add Gentoo package information for zipp.

---
 build/pkgs/zipp/distros/gentoo.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/zipp/distros/gentoo.txt

diff --git a/build/pkgs/zipp/distros/gentoo.txt b/build/pkgs/zipp/distros/gentoo.txt
new file mode 100644
index 00000000000..7f59450c2b7
--- /dev/null
+++ b/build/pkgs/zipp/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/zipp

From b155e86f556f4a971de7559c18187db364d0d8ab Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 3 Nov 2021 18:47:35 -0400
Subject: [PATCH 063/247] Trac #29665: standard python spkg-configure.m4 for
 zipp.

---
 build/pkgs/zipp/spkg-configure.m4 | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/zipp/spkg-configure.m4

diff --git a/build/pkgs/zipp/spkg-configure.m4 b/build/pkgs/zipp/spkg-configure.m4
new file mode 100644
index 00000000000..0fe3a9cd224
--- /dev/null
+++ b/build/pkgs/zipp/spkg-configure.m4
@@ -0,0 +1 @@
+SAGE_SPKG_CONFIGURE([zipp], [SAGE_PYTHON_PACKAGE_CHECK([zipp])])

From 35bd9935193b419a28c5696e28f84bcc8d436f18 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 3 Nov 2021 18:48:37 -0400
Subject: [PATCH 064/247] Trac #29665: add Gentoo package information for
 wcwidth.

---
 build/pkgs/wcwidth/distros/gentoo.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/wcwidth/distros/gentoo.txt

diff --git a/build/pkgs/wcwidth/distros/gentoo.txt b/build/pkgs/wcwidth/distros/gentoo.txt
new file mode 100644
index 00000000000..edeb80b62a1
--- /dev/null
+++ b/build/pkgs/wcwidth/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/wcwidth

From 884fe4be23b21331727ae2c844e2604f802a26b8 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 3 Nov 2021 18:51:10 -0400
Subject: [PATCH 065/247] Trac #29665: standard python spkg-configure.m4 for
 wcwidth.

---
 build/pkgs/wcwidth/spkg-configure.m4 | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/wcwidth/spkg-configure.m4

diff --git a/build/pkgs/wcwidth/spkg-configure.m4 b/build/pkgs/wcwidth/spkg-configure.m4
new file mode 100644
index 00000000000..5bde15af224
--- /dev/null
+++ b/build/pkgs/wcwidth/spkg-configure.m4
@@ -0,0 +1 @@
+SAGE_SPKG_CONFIGURE([wcwidth], [SAGE_PYTHON_PACKAGE_CHECK([wcwidth])])

From b877377fd9b65ef165a58e7b17c4d60109b1694a Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 3 Nov 2021 18:56:06 -0400
Subject: [PATCH 066/247] Trac #29665: add Gentoo package information for jedi.

---
 build/pkgs/jedi/distros/gentoo.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/jedi/distros/gentoo.txt

diff --git a/build/pkgs/jedi/distros/gentoo.txt b/build/pkgs/jedi/distros/gentoo.txt
new file mode 100644
index 00000000000..6c85a46cfcb
--- /dev/null
+++ b/build/pkgs/jedi/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/jedi

From 33a4f2a0f4185e9c958d9cace5c3aa2b18c9e0d8 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 3 Nov 2021 19:06:37 -0400
Subject: [PATCH 067/247] Trac #29665: standard python spkg-configure.m4 for
 jedi.

---
 build/pkgs/jedi/spkg-configure.m4 | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/jedi/spkg-configure.m4

diff --git a/build/pkgs/jedi/spkg-configure.m4 b/build/pkgs/jedi/spkg-configure.m4
new file mode 100644
index 00000000000..a37dbcc92db
--- /dev/null
+++ b/build/pkgs/jedi/spkg-configure.m4
@@ -0,0 +1 @@
+SAGE_SPKG_CONFIGURE([jedi], [SAGE_PYTHON_PACKAGE_CHECK([jedi])])

From 7b421e6ef83a81041edf5c417bb63845dbd985bf Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 3 Nov 2021 19:07:47 -0400
Subject: [PATCH 068/247] Trac #29665: add Gentoo package information for
 tomli.

---
 build/pkgs/tomli/distros/gentoo.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/tomli/distros/gentoo.txt

diff --git a/build/pkgs/tomli/distros/gentoo.txt b/build/pkgs/tomli/distros/gentoo.txt
new file mode 100644
index 00000000000..0458e252a4d
--- /dev/null
+++ b/build/pkgs/tomli/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/tomli

From 899c27f89131fab0de81345663b4b242c5f08289 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 3 Nov 2021 19:08:12 -0400
Subject: [PATCH 069/247] Trac #29665: standard python spkg-configure.m4 for
 tomli.

---
 build/pkgs/tomli/spkg-configure.m4 | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/tomli/spkg-configure.m4

diff --git a/build/pkgs/tomli/spkg-configure.m4 b/build/pkgs/tomli/spkg-configure.m4
new file mode 100644
index 00000000000..95a8b8b84c2
--- /dev/null
+++ b/build/pkgs/tomli/spkg-configure.m4
@@ -0,0 +1 @@
+SAGE_SPKG_CONFIGURE([tomli], [SAGE_PYTHON_PACKAGE_CHECK([tomli])])

From be31beda799d03c9720206de5d318ad4e53becbe Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 3 Nov 2021 19:09:22 -0400
Subject: [PATCH 070/247] Trac #29665: add Gentoo package information for
 defusedxml.

---
 build/pkgs/defusedxml/distros/gentoo.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/defusedxml/distros/gentoo.txt

diff --git a/build/pkgs/defusedxml/distros/gentoo.txt b/build/pkgs/defusedxml/distros/gentoo.txt
new file mode 100644
index 00000000000..2804214449e
--- /dev/null
+++ b/build/pkgs/defusedxml/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/defusedxml

From 03d7abcb3772f8481bba00ca3bcb77c8fea51b0b Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 3 Nov 2021 19:11:14 -0400
Subject: [PATCH 071/247] Trac #29665: standard python spkg-configure.m4 for
 defusedxml.

---
 build/pkgs/defusedxml/spkg-configure.m4 | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/defusedxml/spkg-configure.m4

diff --git a/build/pkgs/defusedxml/spkg-configure.m4 b/build/pkgs/defusedxml/spkg-configure.m4
new file mode 100644
index 00000000000..e02f34524ce
--- /dev/null
+++ b/build/pkgs/defusedxml/spkg-configure.m4
@@ -0,0 +1 @@
+SAGE_SPKG_CONFIGURE([defusedxml], [SAGE_PYTHON_PACKAGE_CHECK([defusedxml])])

From 2455becd083bf35932342369e20803243cb00719 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 3 Nov 2021 19:12:22 -0400
Subject: [PATCH 072/247] Trac #29665: add Gentoo package information for
 ipywidgets.

---
 build/pkgs/ipywidgets/distros/gentoo.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/ipywidgets/distros/gentoo.txt

diff --git a/build/pkgs/ipywidgets/distros/gentoo.txt b/build/pkgs/ipywidgets/distros/gentoo.txt
new file mode 100644
index 00000000000..7c76967c65b
--- /dev/null
+++ b/build/pkgs/ipywidgets/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/ipywidgets

From 8ea7f9233a39987ef6c190f4129cb78130d38797 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 3 Nov 2021 19:15:53 -0400
Subject: [PATCH 073/247] Trac #29665: add Gentoo package information for
 simplegeneric.

---
 build/pkgs/simplegeneric/distros/gentoo.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/simplegeneric/distros/gentoo.txt

diff --git a/build/pkgs/simplegeneric/distros/gentoo.txt b/build/pkgs/simplegeneric/distros/gentoo.txt
new file mode 100644
index 00000000000..a86e90d96ec
--- /dev/null
+++ b/build/pkgs/simplegeneric/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/simplegeneric

From 031e0e49da124243c3c13e476d67ff0a6fbf4621 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 3 Nov 2021 19:16:33 -0400
Subject: [PATCH 074/247] Trac #29665: standard python spkg-configure.m4 for
 simplegeneric.

---
 build/pkgs/simplegeneric/spkg-configure.m4 | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/simplegeneric/spkg-configure.m4

diff --git a/build/pkgs/simplegeneric/spkg-configure.m4 b/build/pkgs/simplegeneric/spkg-configure.m4
new file mode 100644
index 00000000000..13715ab5f2b
--- /dev/null
+++ b/build/pkgs/simplegeneric/spkg-configure.m4
@@ -0,0 +1 @@
+SAGE_SPKG_CONFIGURE([simplegeneric], [SAGE_PYTHON_PACKAGE_CHECK([simplegeneric])])

From ea5ce3eb9368b1462c56b42e812f93f7808a009c Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 3 Nov 2021 19:17:18 -0400
Subject: [PATCH 075/247] Trac #29665: add Gentoo package information for
 imagesize.

---
 build/pkgs/imagesize/distros/gentoo.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/imagesize/distros/gentoo.txt

diff --git a/build/pkgs/imagesize/distros/gentoo.txt b/build/pkgs/imagesize/distros/gentoo.txt
new file mode 100644
index 00000000000..54350ba2642
--- /dev/null
+++ b/build/pkgs/imagesize/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/imagesize

From cd93994ef6e32066b9f81838d934afa1441ab698 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 3 Nov 2021 19:17:48 -0400
Subject: [PATCH 076/247] Trac #29665: standard python spkg-configure.m4 for
 imagesize.

---
 build/pkgs/imagesize/spkg-configure.m4 | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/imagesize/spkg-configure.m4

diff --git a/build/pkgs/imagesize/spkg-configure.m4 b/build/pkgs/imagesize/spkg-configure.m4
new file mode 100644
index 00000000000..20210eff2f0
--- /dev/null
+++ b/build/pkgs/imagesize/spkg-configure.m4
@@ -0,0 +1 @@
+SAGE_SPKG_CONFIGURE([imagesize], [SAGE_PYTHON_PACKAGE_CHECK([imagesize])])

From ef9b7d03e3f8629ca8101f27eb03959e6aa23003 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 3 Nov 2021 19:18:49 -0400
Subject: [PATCH 077/247] Trac #29665: add Gentoo package information for
 mistune.

---
 build/pkgs/mistune/distros/gentoo.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/mistune/distros/gentoo.txt

diff --git a/build/pkgs/mistune/distros/gentoo.txt b/build/pkgs/mistune/distros/gentoo.txt
new file mode 100644
index 00000000000..56f0a4ebced
--- /dev/null
+++ b/build/pkgs/mistune/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/mistune

From 4b442dd63dcb2b5ce97605385361903cdcd34eb4 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 3 Nov 2021 19:21:30 -0400
Subject: [PATCH 078/247] Trac #29665: standard python spkg-configure.m4 for
 mistune.

---
 build/pkgs/mistune/spkg-configure.m4 | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/mistune/spkg-configure.m4

diff --git a/build/pkgs/mistune/spkg-configure.m4 b/build/pkgs/mistune/spkg-configure.m4
new file mode 100644
index 00000000000..972f33d086b
--- /dev/null
+++ b/build/pkgs/mistune/spkg-configure.m4
@@ -0,0 +1 @@
+SAGE_SPKG_CONFIGURE([mistune], [SAGE_PYTHON_PACKAGE_CHECK([mistune])])

From efe2ab2362e5d1b7afd22ffa5654cf785b071543 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 3 Nov 2021 19:22:48 -0400
Subject: [PATCH 079/247] Trac #29665: add Gentoo package information for
 backcall.

---
 build/pkgs/backcall/distros/gentoo.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/backcall/distros/gentoo.txt

diff --git a/build/pkgs/backcall/distros/gentoo.txt b/build/pkgs/backcall/distros/gentoo.txt
new file mode 100644
index 00000000000..266a222c558
--- /dev/null
+++ b/build/pkgs/backcall/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/backcall

From 8736fbcb886a295e371dca0f35071fa51a5a41fa Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 3 Nov 2021 19:25:10 -0400
Subject: [PATCH 080/247] Trac #29665: standard python spkg-configure.m4 for
 backcall.

---
 build/pkgs/backcall/spkg-configure.m4 | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/backcall/spkg-configure.m4

diff --git a/build/pkgs/backcall/spkg-configure.m4 b/build/pkgs/backcall/spkg-configure.m4
new file mode 100644
index 00000000000..d6b11c49884
--- /dev/null
+++ b/build/pkgs/backcall/spkg-configure.m4
@@ -0,0 +1 @@
+SAGE_SPKG_CONFIGURE([backcall], [SAGE_PYTHON_PACKAGE_CHECK([backcall])])

From 15fa92d3d02dd14ecdf2809f4fdddbd6e49bd350 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 3 Nov 2021 19:25:58 -0400
Subject: [PATCH 081/247] Trac #29665: add Gentoo package information for
 parso.

---
 build/pkgs/parso/distros/gentoo.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/parso/distros/gentoo.txt

diff --git a/build/pkgs/parso/distros/gentoo.txt b/build/pkgs/parso/distros/gentoo.txt
new file mode 100644
index 00000000000..f9ce4c7f2f2
--- /dev/null
+++ b/build/pkgs/parso/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/parso

From e6bd185cb730ffb766c9c06c5476e1098fcb0223 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 3 Nov 2021 19:26:22 -0400
Subject: [PATCH 082/247] Trac #29665: standard python spkg-configure.m4 for
 parso.

---
 build/pkgs/parso/spkg-configure.m4 | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/parso/spkg-configure.m4

diff --git a/build/pkgs/parso/spkg-configure.m4 b/build/pkgs/parso/spkg-configure.m4
new file mode 100644
index 00000000000..1ca6f1b909d
--- /dev/null
+++ b/build/pkgs/parso/spkg-configure.m4
@@ -0,0 +1 @@
+SAGE_SPKG_CONFIGURE([parso], [SAGE_PYTHON_PACKAGE_CHECK([parso])])

From f8547efa8ed34d494837d3284f3b427ae0e4b679 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 3 Nov 2021 19:27:00 -0400
Subject: [PATCH 083/247] Trac #29665: add Gentoo package information for
 pyparsing.

---
 build/pkgs/pyparsing/distros/gentoo.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/pyparsing/distros/gentoo.txt

diff --git a/build/pkgs/pyparsing/distros/gentoo.txt b/build/pkgs/pyparsing/distros/gentoo.txt
new file mode 100644
index 00000000000..ef0419f9cbc
--- /dev/null
+++ b/build/pkgs/pyparsing/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/pyparsing

From a563f1a5ae9bbfd9cbbf922e0832ce27fc19f1e2 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 3 Nov 2021 19:27:30 -0400
Subject: [PATCH 084/247] Trac #29665: standard python spkg-configure.m4 for
 pyparsing.

---
 build/pkgs/pyparsing/spkg-configure.m4 | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/pyparsing/spkg-configure.m4

diff --git a/build/pkgs/pyparsing/spkg-configure.m4 b/build/pkgs/pyparsing/spkg-configure.m4
new file mode 100644
index 00000000000..d2b4c0055e4
--- /dev/null
+++ b/build/pkgs/pyparsing/spkg-configure.m4
@@ -0,0 +1 @@
+SAGE_SPKG_CONFIGURE([pyparsing], [SAGE_PYTHON_PACKAGE_CHECK([pyparsing])])

From 9b18e4c4d801420e0c62b52a44740cf8b59fbc00 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Thu, 4 Nov 2021 18:17:42 -0400
Subject: [PATCH 085/247] Trac #29665: add Gentoo package information for
 debugpy.

---
 build/pkgs/debugpy/distros/gentoo.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/debugpy/distros/gentoo.txt

diff --git a/build/pkgs/debugpy/distros/gentoo.txt b/build/pkgs/debugpy/distros/gentoo.txt
new file mode 100644
index 00000000000..8b797ce715f
--- /dev/null
+++ b/build/pkgs/debugpy/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/debugpy

From cb6044ec431322551fce0d00dbf6a5242c2f127c Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Thu, 4 Nov 2021 18:21:17 -0400
Subject: [PATCH 086/247] Trac #29665: standard python spkg-configure.m4 for
 debugpy.

---
 build/pkgs/debugpy/spkg-configure.m4 | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/debugpy/spkg-configure.m4

diff --git a/build/pkgs/debugpy/spkg-configure.m4 b/build/pkgs/debugpy/spkg-configure.m4
new file mode 100644
index 00000000000..db605ff03c8
--- /dev/null
+++ b/build/pkgs/debugpy/spkg-configure.m4
@@ -0,0 +1 @@
+SAGE_SPKG_CONFIGURE([debugpy], [SAGE_PYTHON_PACKAGE_CHECK([debugpy])])

From ca904f2b40db04a1a5f05a516848a7be5034fb59 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Thu, 4 Nov 2021 18:23:56 -0400
Subject: [PATCH 087/247] Trac #29665: add Gentoo package information for
 tzlocal.

---
 build/pkgs/tzlocal/distros/gentoo.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/tzlocal/distros/gentoo.txt

diff --git a/build/pkgs/tzlocal/distros/gentoo.txt b/build/pkgs/tzlocal/distros/gentoo.txt
new file mode 100644
index 00000000000..2018442dcc4
--- /dev/null
+++ b/build/pkgs/tzlocal/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/tzlocal

From 4e313a628cdc38fa03d233e2f727069f62b81220 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Thu, 4 Nov 2021 18:24:51 -0400
Subject: [PATCH 088/247] Trac #29665: standard python spkg-configure.m4 for
 tzlocal.

---
 build/pkgs/tzlocal/spkg-configure.m4 | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/tzlocal/spkg-configure.m4

diff --git a/build/pkgs/tzlocal/spkg-configure.m4 b/build/pkgs/tzlocal/spkg-configure.m4
new file mode 100644
index 00000000000..e020b2823f9
--- /dev/null
+++ b/build/pkgs/tzlocal/spkg-configure.m4
@@ -0,0 +1 @@
+SAGE_SPKG_CONFIGURE([tzlocal], [SAGE_PYTHON_PACKAGE_CHECK([tzlocal])])

From fa170d5fb102be79ee80d79b53c28c37bdefcba7 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Thu, 4 Nov 2021 18:26:13 -0400
Subject: [PATCH 089/247] Trac #29665: add Gentoo package information for
 pycparser.

---
 build/pkgs/pycparser/distros/gentoo.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/pycparser/distros/gentoo.txt

diff --git a/build/pkgs/pycparser/distros/gentoo.txt b/build/pkgs/pycparser/distros/gentoo.txt
new file mode 100644
index 00000000000..5e87307c4b9
--- /dev/null
+++ b/build/pkgs/pycparser/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/pycparser

From 348d023035e15061c867e1b05aa924db9ee613b9 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Thu, 4 Nov 2021 18:27:27 -0400
Subject: [PATCH 090/247] Trac #29665: standard python spkg-configure.m4 for
 pycparser.

---
 build/pkgs/pycparser/spkg-configure.m4 | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/pycparser/spkg-configure.m4

diff --git a/build/pkgs/pycparser/spkg-configure.m4 b/build/pkgs/pycparser/spkg-configure.m4
new file mode 100644
index 00000000000..4b9b90079a9
--- /dev/null
+++ b/build/pkgs/pycparser/spkg-configure.m4
@@ -0,0 +1 @@
+SAGE_SPKG_CONFIGURE([pycparser], [SAGE_PYTHON_PACKAGE_CHECK([pycparser])])

From b8e05860d577e1c6c3e01bdf380da76264823ce3 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Thu, 4 Nov 2021 18:29:36 -0400
Subject: [PATCH 091/247] Trac #29665: add Gentoo package information for
 cycler.

---
 build/pkgs/cycler/distros/gentoo.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/cycler/distros/gentoo.txt

diff --git a/build/pkgs/cycler/distros/gentoo.txt b/build/pkgs/cycler/distros/gentoo.txt
new file mode 100644
index 00000000000..4b215438e8f
--- /dev/null
+++ b/build/pkgs/cycler/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/cycler

From c87529f575693b781f6b2f855c3e6aa08eb41da6 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Thu, 4 Nov 2021 18:30:27 -0400
Subject: [PATCH 092/247] Trac #29665: standard python spkg-configure.m4 for
 cycler.

---
 build/pkgs/cycler/spkg-configure.m4 | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/cycler/spkg-configure.m4

diff --git a/build/pkgs/cycler/spkg-configure.m4 b/build/pkgs/cycler/spkg-configure.m4
new file mode 100644
index 00000000000..239571a0f10
--- /dev/null
+++ b/build/pkgs/cycler/spkg-configure.m4
@@ -0,0 +1 @@
+SAGE_SPKG_CONFIGURE([cycler], [SAGE_PYTHON_PACKAGE_CHECK([cycler])])

From 89a2cdbdc60cc0c7511b78768c41d199ee63cc68 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Thu, 4 Nov 2021 18:31:19 -0400
Subject: [PATCH 093/247] Trac #29665: add Gentoo package information for
 traitlets.

---
 build/pkgs/traitlets/distros/gentoo.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/traitlets/distros/gentoo.txt

diff --git a/build/pkgs/traitlets/distros/gentoo.txt b/build/pkgs/traitlets/distros/gentoo.txt
new file mode 100644
index 00000000000..46bfaab6fef
--- /dev/null
+++ b/build/pkgs/traitlets/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/traitlets

From 076bc404149974c69789e8d4daf34d0bebb01edc Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Thu, 4 Nov 2021 18:31:50 -0400
Subject: [PATCH 094/247] Trac #29665: standard python spkg-configure.m4 for
 traitlets.

---
 build/pkgs/traitlets/spkg-configure.m4 | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/traitlets/spkg-configure.m4

diff --git a/build/pkgs/traitlets/spkg-configure.m4 b/build/pkgs/traitlets/spkg-configure.m4
new file mode 100644
index 00000000000..df2382b8f01
--- /dev/null
+++ b/build/pkgs/traitlets/spkg-configure.m4
@@ -0,0 +1 @@
+SAGE_SPKG_CONFIGURE([traitlets], [SAGE_PYTHON_PACKAGE_CHECK([traitlets])])

From 7f6654be14c674b34ff8116b1a5eba4c82bdf1e3 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Thu, 4 Nov 2021 18:36:21 -0400
Subject: [PATCH 095/247] Trac #29665: add Gentoo package information for
 ptyprocess.

---
 build/pkgs/ptyprocess/distros/gentoo.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/ptyprocess/distros/gentoo.txt

diff --git a/build/pkgs/ptyprocess/distros/gentoo.txt b/build/pkgs/ptyprocess/distros/gentoo.txt
new file mode 100644
index 00000000000..571a851d976
--- /dev/null
+++ b/build/pkgs/ptyprocess/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/ptyprocess

From ddfde004138ddbf6143c3732780cc8f09963e85c Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Thu, 4 Nov 2021 18:37:02 -0400
Subject: [PATCH 096/247] Trac #29665: standard python spkg-configure.m4 for
 ptyprocess.

---
 build/pkgs/ptyprocess/spkg-configure.m4 | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/ptyprocess/spkg-configure.m4

diff --git a/build/pkgs/ptyprocess/spkg-configure.m4 b/build/pkgs/ptyprocess/spkg-configure.m4
new file mode 100644
index 00000000000..bfacbaed935
--- /dev/null
+++ b/build/pkgs/ptyprocess/spkg-configure.m4
@@ -0,0 +1 @@
+SAGE_SPKG_CONFIGURE([ptyprocess], [SAGE_PYTHON_PACKAGE_CHECK([ptyprocess])])

From a995e8efd843c83155805c1680bfb13a0df71864 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Thu, 4 Nov 2021 18:38:22 -0400
Subject: [PATCH 097/247] Trac #29665: add Gentoo package information for
 attrs.

---
 build/pkgs/attrs/distros/gentoo.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/attrs/distros/gentoo.txt

diff --git a/build/pkgs/attrs/distros/gentoo.txt b/build/pkgs/attrs/distros/gentoo.txt
new file mode 100644
index 00000000000..3b906facd3a
--- /dev/null
+++ b/build/pkgs/attrs/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/attrs

From 1a711e93d08aecc3c53fabdc3abb5f8564c4060a Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Thu, 4 Nov 2021 18:38:55 -0400
Subject: [PATCH 098/247] Trac #29665: standard python spkg-configure.m4 for
 attrs.

---
 build/pkgs/attrs/spkg-configure.m4 | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/attrs/spkg-configure.m4

diff --git a/build/pkgs/attrs/spkg-configure.m4 b/build/pkgs/attrs/spkg-configure.m4
new file mode 100644
index 00000000000..ba6a9b71efa
--- /dev/null
+++ b/build/pkgs/attrs/spkg-configure.m4
@@ -0,0 +1 @@
+SAGE_SPKG_CONFIGURE([attrs], [SAGE_PYTHON_PACKAGE_CHECK([attrs])])

From 65d8485f366dc99c0166a01e1b8c44462590e078 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Thu, 4 Nov 2021 18:40:09 -0400
Subject: [PATCH 099/247] Trac #29665: add Gentoo package information for
 send2trash.

---
 build/pkgs/send2trash/distros/gentoo.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/send2trash/distros/gentoo.txt

diff --git a/build/pkgs/send2trash/distros/gentoo.txt b/build/pkgs/send2trash/distros/gentoo.txt
new file mode 100644
index 00000000000..a89b1798476
--- /dev/null
+++ b/build/pkgs/send2trash/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/send2trash

From 0fe106305ea3c17f94653cffe50e182f983fb3a9 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Thu, 4 Nov 2021 18:41:45 -0400
Subject: [PATCH 100/247] Trac #29665: standard python spkg-configure.m4 for
 send2trash.

---
 build/pkgs/send2trash/spkg-configure.m4 | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/send2trash/spkg-configure.m4

diff --git a/build/pkgs/send2trash/spkg-configure.m4 b/build/pkgs/send2trash/spkg-configure.m4
new file mode 100644
index 00000000000..3bbb727e430
--- /dev/null
+++ b/build/pkgs/send2trash/spkg-configure.m4
@@ -0,0 +1 @@
+SAGE_SPKG_CONFIGURE([send2trash], [SAGE_PYTHON_PACKAGE_CHECK([send2trash])])

From 9e0e66fb1d1bc877ba4552826a43bcc86425b922 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Thu, 4 Nov 2021 18:43:27 -0400
Subject: [PATCH 101/247] Trac #29665: add Gentoo package information for
 pyrsistent.

---
 build/pkgs/pyrsistent/distros/gentoo.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/pyrsistent/distros/gentoo.txt

diff --git a/build/pkgs/pyrsistent/distros/gentoo.txt b/build/pkgs/pyrsistent/distros/gentoo.txt
new file mode 100644
index 00000000000..83439cebfe4
--- /dev/null
+++ b/build/pkgs/pyrsistent/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/pyrsistent

From 5799c2ccaab532e729c72d88b02a9371a14698c0 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Thu, 4 Nov 2021 18:44:03 -0400
Subject: [PATCH 102/247] Trac #29665: standard python spkg-configure.m4 for
 pyrsistent.

---
 build/pkgs/pyrsistent/spkg-configure.m4 | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/pyrsistent/spkg-configure.m4

diff --git a/build/pkgs/pyrsistent/spkg-configure.m4 b/build/pkgs/pyrsistent/spkg-configure.m4
new file mode 100644
index 00000000000..f7ca75dbac5
--- /dev/null
+++ b/build/pkgs/pyrsistent/spkg-configure.m4
@@ -0,0 +1 @@
+SAGE_SPKG_CONFIGURE([pyrsistent], [SAGE_PYTHON_PACKAGE_CHECK([pyrsistent])])

From b0ec970e964e4a9994454eae2466d514a5a415d2 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Thu, 4 Nov 2021 18:45:45 -0400
Subject: [PATCH 103/247] Trac #29665: add Gentoo package information for
 entrypoints.

---
 build/pkgs/entrypoints/distros/gentoo.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/entrypoints/distros/gentoo.txt

diff --git a/build/pkgs/entrypoints/distros/gentoo.txt b/build/pkgs/entrypoints/distros/gentoo.txt
new file mode 100644
index 00000000000..684ddd036ee
--- /dev/null
+++ b/build/pkgs/entrypoints/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/entrypoints

From bc4e61e28b18606d164465c9e62b779b13e113e1 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Thu, 4 Nov 2021 18:46:24 -0400
Subject: [PATCH 104/247] Trac #29665: standard python spkg-configure.m4 for
 entrypoints.

---
 build/pkgs/entrypoints/spkg-configure.m4 | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/entrypoints/spkg-configure.m4

diff --git a/build/pkgs/entrypoints/spkg-configure.m4 b/build/pkgs/entrypoints/spkg-configure.m4
new file mode 100644
index 00000000000..caed658b69a
--- /dev/null
+++ b/build/pkgs/entrypoints/spkg-configure.m4
@@ -0,0 +1 @@
+SAGE_SPKG_CONFIGURE([entrypoints], [SAGE_PYTHON_PACKAGE_CHECK([entrypoints])])

From 0ef9d5df42dc3cc48d1a6fd7f9f39430946a57cd Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Thu, 4 Nov 2021 18:48:26 -0400
Subject: [PATCH 105/247] Trac #29665: add Gentoo package information for
 markupsafe.

---
 build/pkgs/markupsafe/distros/gentoo.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/markupsafe/distros/gentoo.txt

diff --git a/build/pkgs/markupsafe/distros/gentoo.txt b/build/pkgs/markupsafe/distros/gentoo.txt
new file mode 100644
index 00000000000..9654e3531b6
--- /dev/null
+++ b/build/pkgs/markupsafe/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/markupsafe

From a18a9c0d325532bcc855617dc43275557dcc596d Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Thu, 4 Nov 2021 18:48:55 -0400
Subject: [PATCH 106/247] Trac #29665: standard python spkg-configure.m4 for
 markupsafe.

---
 build/pkgs/markupsafe/spkg-configure.m4 | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/markupsafe/spkg-configure.m4

diff --git a/build/pkgs/markupsafe/spkg-configure.m4 b/build/pkgs/markupsafe/spkg-configure.m4
new file mode 100644
index 00000000000..79eb8dba6f1
--- /dev/null
+++ b/build/pkgs/markupsafe/spkg-configure.m4
@@ -0,0 +1 @@
+SAGE_SPKG_CONFIGURE([markupsafe], [SAGE_PYTHON_PACKAGE_CHECK([markupsafe])])

From 57011651ed5e9963f8d95833e25ab904c2320a26 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Fri, 5 Nov 2021 06:30:49 -0400
Subject: [PATCH 107/247] Trac #29665: add Gentoo package information for
 flit_core.

---
 build/pkgs/flit_core/distros/gentoo.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/flit_core/distros/gentoo.txt

diff --git a/build/pkgs/flit_core/distros/gentoo.txt b/build/pkgs/flit_core/distros/gentoo.txt
new file mode 100644
index 00000000000..fe6bea92362
--- /dev/null
+++ b/build/pkgs/flit_core/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/flit_core

From 37142aa763ab1c25ff22edbe2bce1da4a49daf8d Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Fri, 5 Nov 2021 06:32:11 -0400
Subject: [PATCH 108/247] Trac #29665: standard python spkg-configure.m4 for
 flit_core.

---
 build/pkgs/flit_core/spkg-configure.m4 | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/flit_core/spkg-configure.m4

diff --git a/build/pkgs/flit_core/spkg-configure.m4 b/build/pkgs/flit_core/spkg-configure.m4
new file mode 100644
index 00000000000..ee67557024f
--- /dev/null
+++ b/build/pkgs/flit_core/spkg-configure.m4
@@ -0,0 +1 @@
+SAGE_SPKG_CONFIGURE([flit_core], [SAGE_PYTHON_PACKAGE_CHECK([flit_core])])

From 274335b6363b7234378313eaa6c31e53c03f9d77 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Fri, 5 Nov 2021 06:34:06 -0400
Subject: [PATCH 109/247] Trac #29665: add Gentoo package information for
 nest_asyncio.

---
 build/pkgs/nest_asyncio/distros/gentoo.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/nest_asyncio/distros/gentoo.txt

diff --git a/build/pkgs/nest_asyncio/distros/gentoo.txt b/build/pkgs/nest_asyncio/distros/gentoo.txt
new file mode 100644
index 00000000000..ab742d2b0bd
--- /dev/null
+++ b/build/pkgs/nest_asyncio/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/nest_asyncio

From d5024513b31376397b05c0c507d41fbf887507af Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Fri, 5 Nov 2021 06:34:43 -0400
Subject: [PATCH 110/247] Trac #29665: standard python spkg-configure.m4 for
 nest_asyncio.

---
 build/pkgs/nest_asyncio/spkg-configure.m4 | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/nest_asyncio/spkg-configure.m4

diff --git a/build/pkgs/nest_asyncio/spkg-configure.m4 b/build/pkgs/nest_asyncio/spkg-configure.m4
new file mode 100644
index 00000000000..4d815276dfb
--- /dev/null
+++ b/build/pkgs/nest_asyncio/spkg-configure.m4
@@ -0,0 +1 @@
+SAGE_SPKG_CONFIGURE([nest_asyncio], [SAGE_PYTHON_PACKAGE_CHECK([nest_asyncio])])

From a92fb1350ee61e729aa8a256b49cc18b5d565c67 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Fri, 5 Nov 2021 06:37:02 -0400
Subject: [PATCH 111/247] Trac #29665: add Gentoo package information for
 ipython_genutils.

---
 build/pkgs/ipython_genutils/distros/gentoo.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/ipython_genutils/distros/gentoo.txt

diff --git a/build/pkgs/ipython_genutils/distros/gentoo.txt b/build/pkgs/ipython_genutils/distros/gentoo.txt
new file mode 100644
index 00000000000..01bc49d4e1a
--- /dev/null
+++ b/build/pkgs/ipython_genutils/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/ipython_genutils

From 61c99a97a5092fcc35a5fcf2a662a08706a2d0ba Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Fri, 5 Nov 2021 06:39:20 -0400
Subject: [PATCH 112/247] Trac #29665: standard python spkg-configure.m4 for
 ipython_genutils.

---
 build/pkgs/ipython_genutils/spkg-configure.m4 | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 build/pkgs/ipython_genutils/spkg-configure.m4

diff --git a/build/pkgs/ipython_genutils/spkg-configure.m4 b/build/pkgs/ipython_genutils/spkg-configure.m4
new file mode 100644
index 00000000000..b0ba86ac7a3
--- /dev/null
+++ b/build/pkgs/ipython_genutils/spkg-configure.m4
@@ -0,0 +1,4 @@
+SAGE_SPKG_CONFIGURE(
+  [ipython_genutils],
+  [SAGE_PYTHON_PACKAGE_CHECK([ipython_genutils])]
+)

From 78f2688342467ad25f52033c9a799815cd30ab32 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Fri, 5 Nov 2021 06:40:03 -0400
Subject: [PATCH 113/247] Trac #29665: add Gentoo package information for
 ipython.

---
 build/pkgs/ipython/distros/gentoo.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/ipython/distros/gentoo.txt

diff --git a/build/pkgs/ipython/distros/gentoo.txt b/build/pkgs/ipython/distros/gentoo.txt
new file mode 100644
index 00000000000..8b76f186ff8
--- /dev/null
+++ b/build/pkgs/ipython/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/ipython

From 2b244d0f5efa9866ac82e6c113d46995c35e4049 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Fri, 5 Nov 2021 07:37:56 -0400
Subject: [PATCH 114/247] Trac #29665: standard python spkg-configure.m4 for
 ipython.

---
 build/pkgs/ipython/spkg-configure.m4 | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/ipython/spkg-configure.m4

diff --git a/build/pkgs/ipython/spkg-configure.m4 b/build/pkgs/ipython/spkg-configure.m4
new file mode 100644
index 00000000000..02ab89f5193
--- /dev/null
+++ b/build/pkgs/ipython/spkg-configure.m4
@@ -0,0 +1 @@
+SAGE_SPKG_CONFIGURE([ipython], [SAGE_PYTHON_PACKAGE_CHECK([ipython])])

From e7d2f088a3e0cc41ebe604f9e6e873751201a5c8 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Fri, 5 Nov 2021 07:51:11 -0400
Subject: [PATCH 115/247] Trac #29665: standard python spkg-configure.m4 for
 ipywidgets.

---
 build/pkgs/ipywidgets/spkg-configure.m4 | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/ipywidgets/spkg-configure.m4

diff --git a/build/pkgs/ipywidgets/spkg-configure.m4 b/build/pkgs/ipywidgets/spkg-configure.m4
new file mode 100644
index 00000000000..51ca9be74db
--- /dev/null
+++ b/build/pkgs/ipywidgets/spkg-configure.m4
@@ -0,0 +1 @@
+SAGE_SPKG_CONFIGURE([ipywidgets], [SAGE_PYTHON_PACKAGE_CHECK([ipywidgets])])

From 36a0ad43249b26eff921861e8e4bd9f22596142a Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Fri, 5 Nov 2021 10:05:16 -0400
Subject: [PATCH 116/247] Trac #29665: add Gentoo package information for
 wheel.

---
 build/pkgs/wheel/distros/gentoo.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/wheel/distros/gentoo.txt

diff --git a/build/pkgs/wheel/distros/gentoo.txt b/build/pkgs/wheel/distros/gentoo.txt
new file mode 100644
index 00000000000..ec571d59d93
--- /dev/null
+++ b/build/pkgs/wheel/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/wheel

From cce69258a7e66f2871c9e41f3bb7fb18d1952d86 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 10 Nov 2021 08:51:44 -0500
Subject: [PATCH 117/247] Trac #29665: add Gentoo package information for
 terminado.

---
 build/pkgs/terminado/distros/gentoo.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/terminado/distros/gentoo.txt

diff --git a/build/pkgs/terminado/distros/gentoo.txt b/build/pkgs/terminado/distros/gentoo.txt
new file mode 100644
index 00000000000..1df16f18abb
--- /dev/null
+++ b/build/pkgs/terminado/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/terminado

From 9bbe3d289182978af2537d6f45cae5330f2f0b9d Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 10 Nov 2021 08:52:35 -0500
Subject: [PATCH 118/247] Trac #29665: standard python spkg-configure.m4 for
 terminado.

---
 build/pkgs/terminado/spkg-configure.m4 | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/terminado/spkg-configure.m4

diff --git a/build/pkgs/terminado/spkg-configure.m4 b/build/pkgs/terminado/spkg-configure.m4
new file mode 100644
index 00000000000..5defc2ff877
--- /dev/null
+++ b/build/pkgs/terminado/spkg-configure.m4
@@ -0,0 +1 @@
+SAGE_SPKG_CONFIGURE([terminado], [SAGE_PYTHON_PACKAGE_CHECK([terminado])])

From 1d2fff2dcbddfc99e80d7b906d8291b5b50c8e59 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 10 Nov 2021 08:56:15 -0500
Subject: [PATCH 119/247] Trac #29665: add Gentoo package information for cffi.

---
 build/pkgs/cffi/distros/gentoo.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/cffi/distros/gentoo.txt

diff --git a/build/pkgs/cffi/distros/gentoo.txt b/build/pkgs/cffi/distros/gentoo.txt
new file mode 100644
index 00000000000..81eeb8108c7
--- /dev/null
+++ b/build/pkgs/cffi/distros/gentoo.txt
@@ -0,0 +1 @@
+virtual/python-cffi

From 60b806dc66da1ef2ce7f6509909bcd107f184ab3 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 10 Nov 2021 08:57:04 -0500
Subject: [PATCH 120/247] Trac #29665: standard python spkg-configure.m4 for
 cffi.

---
 build/pkgs/cffi/spkg-configure.m4 | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/cffi/spkg-configure.m4

diff --git a/build/pkgs/cffi/spkg-configure.m4 b/build/pkgs/cffi/spkg-configure.m4
new file mode 100644
index 00000000000..dc81875927f
--- /dev/null
+++ b/build/pkgs/cffi/spkg-configure.m4
@@ -0,0 +1 @@
+SAGE_SPKG_CONFIGURE([cffi], [SAGE_PYTHON_PACKAGE_CHECK([cffi])])

From cdf50a54dc3bf525870a2bcc2b9c0f20c4cb00f8 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 10 Nov 2021 08:57:57 -0500
Subject: [PATCH 121/247] Trac #29665: add Gentoo package information for pip.

---
 build/pkgs/pip/distros/gentoo.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/pip/distros/gentoo.txt

diff --git a/build/pkgs/pip/distros/gentoo.txt b/build/pkgs/pip/distros/gentoo.txt
new file mode 100644
index 00000000000..1845454d6de
--- /dev/null
+++ b/build/pkgs/pip/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/pip[vanilla]

From 071eb642851382d66aa0a53551be43eac9fcaf5c Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 10 Nov 2021 09:07:26 -0500
Subject: [PATCH 122/247] Trac #29665: new spkg-configure.m4 for pip.

---
 build/pkgs/pip/spkg-configure.m4 | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 build/pkgs/pip/spkg-configure.m4

diff --git a/build/pkgs/pip/spkg-configure.m4 b/build/pkgs/pip/spkg-configure.m4
new file mode 100644
index 00000000000..c7a55621f48
--- /dev/null
+++ b/build/pkgs/pip/spkg-configure.m4
@@ -0,0 +1,12 @@
+SAGE_SPKG_CONFIGURE([pip], [
+  dnl always run this macro because it changes the default value of
+  dnl the --with-system-<package> option.
+  SAGE_PYTHON_PACKAGE_CHECK([pip])
+
+  dnl if we might not install the spkg, make sure that "pip" is in
+  dnl the user's PATH, too.
+  AS_IF([test "x$sage_spkg_install_pip" != "xyes"], [
+    AC_CHECK_PROG(HAVE_PIP, pip, yes, no)
+    AS_IF([test "x$HAVE_PIP" = "xno"], [sage_spkg_install_pip=yes])
+  ])
+])

From 610ba3ad9516d3e3760474babba012c9e8792e33 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Tue, 9 Nov 2021 09:09:04 -0500
Subject: [PATCH 123/247] Trac #29665: set $SAGE_PIP_INSTALL_FLAGS for
 --enable-system-site-packages.

We need to pass some special flags to "pip install" to make it do the
right thing in the precence of system-site packages. Here we introduce
a new autoconf variable, SAGE_PIP_INSTALL_FLAGS, that will be used
to pass those flags to the build system.

With autoconf aware of the variable, we substitute its value into the
sage-build-env-config script for use in spkg-install.in.
---
 build/bin/sage-build-env-config.in | 1 +
 configure.ac                       | 9 +++++++++
 2 files changed, 10 insertions(+)

diff --git a/build/bin/sage-build-env-config.in b/build/bin/sage-build-env-config.in
index b00fd2a3f99..df27cff4660 100644
--- a/build/bin/sage-build-env-config.in
+++ b/build/bin/sage-build-env-config.in
@@ -53,6 +53,7 @@ export SAGE_PARI_CFG="@SAGE_PARI_CFG@"
 
 export SAGE_GLPK_PREFIX="@SAGE_GLPK_PREFIX@"
 export SAGE_FREETYPE_PREFIX="@SAGE_FREETYPE_PREFIX@"
+export SAGE_PIP_INSTALL_FLAGS="@SAGE_PIP_INSTALL_FLAGS@"
 export SAGE_SUITESPARSE_PREFIX="@SAGE_SUITESPARSE_PREFIX@"
 
 export SAGE_CONFIGURE_FFLAS_FFPACK="@SAGE_CONFIGURE_FFLAS_FFPACK@"
diff --git a/configure.ac b/configure.ac
index 81e594b9561..fad8d00829a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -451,6 +451,14 @@ AC_ARG_ENABLE(
     [allow the use of python packages from the system (experimental; default: no)]
   )], [
   AS_IF([test "x$enable_system_site_packages" = "xyes"], [
+    dnl When installing python SPKGs in the presence of system-site
+    dnl packages, we need to --ignore-installed so that a patched SPKG
+    dnl can be installed in the presence of an unpatched system package
+    dnl that appears (to pip) to be identical. The --no-deps flag is
+    dnl then needed because --ignore-installed will make any installed
+    dnl dependencies invisible to pip, who does not appreciate that.
+    SAGE_PIP_INSTALL_FLAGS="${SAGE_PIP_INSTALL_FLAGS} --no-deps --ignore-installed"
+
     SAGE_VENV_FLAGS="${SAGE_VENV_FLAGS} --system-site-packages"
 
     dnl We want to raise an error if the user asked for "system site
@@ -463,6 +471,7 @@ AC_ARG_ENABLE(
     with_system_python3="force"
   ])
 ])
+AC_SUBST([SAGE_PIP_INSTALL_FLAGS])
 AC_SUBST([SAGE_VENV_FLAGS])
 
 SAGE_SPKG_OPTIONS=""

From cfe441f4da54639ce480b24b58733a8c5c005f25 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Tue, 9 Nov 2021 21:01:58 -0500
Subject: [PATCH 124/247] Trac #29665: pass $SAGE_PIP_INSTALL_FLAGS to
 sdh_pip_install.

Since sdh_pip_install is usually called from spkg-install.in, the
variables from sage-build-env-config will be available. Here we pass
the contents of $SAGE_PIP_INSTALL_FLAGS to sage-pip-install
unconditionally, and hope that the user ignores this variable unless
he truly knows what he is doing.
---
 build/bin/sage-dist-helpers | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/build/bin/sage-dist-helpers b/build/bin/sage-dist-helpers
index 4eac9626ffa..67a2201d31f 100644
--- a/build/bin/sage-dist-helpers
+++ b/build/bin/sage-dist-helpers
@@ -325,7 +325,11 @@ sdh_store_wheel() {
 }
 
 sdh_store_and_pip_install_wheel() {
-    local pip_options=""
+    # The $SAGE_PIP_INSTALL_FLAGS variable is set by sage-build-env-config.
+    # We skip sanity checking its contents since you should either let sage
+    # decide what it contains, or really know what you are doing.
+    local pip_options="${SAGE_PIP_INSTALL_FLAGS}"
+
     while [ $# -gt 0 ]; do
         case $1 in
             -*) pip_options="$pip_options $1"

From 44907bb4f74a25086c1b192f0857f7bbfc0aa72c Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 10 Nov 2021 13:10:46 -0500
Subject: [PATCH 125/247] Trac #29665: add Gentoo package information for
 pexpect.

---
 build/pkgs/pexpect/distros/gentoo.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/pexpect/distros/gentoo.txt

diff --git a/build/pkgs/pexpect/distros/gentoo.txt b/build/pkgs/pexpect/distros/gentoo.txt
new file mode 100644
index 00000000000..30c4b60d014
--- /dev/null
+++ b/build/pkgs/pexpect/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/pexpect

From 2d99751e06d31f383b3a02ecf3374ada34fe0d7a Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 10 Nov 2021 13:11:25 -0500
Subject: [PATCH 126/247] Trac #29665: standard python spkg-configure.m4 for
 pexpect.

---
 build/pkgs/pexpect/spkg-configure.m4 | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/pexpect/spkg-configure.m4

diff --git a/build/pkgs/pexpect/spkg-configure.m4 b/build/pkgs/pexpect/spkg-configure.m4
new file mode 100644
index 00000000000..6520856fbb5
--- /dev/null
+++ b/build/pkgs/pexpect/spkg-configure.m4
@@ -0,0 +1 @@
+SAGE_SPKG_CONFIGURE([pexpect], [SAGE_PYTHON_PACKAGE_CHECK([pexpect])])

From c76212e3713a4468e6575afdeed42a6d61384984 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 10 Nov 2021 13:12:05 -0500
Subject: [PATCH 127/247] Trac #29665: add Gentoo package information for
 docutils.

---
 build/pkgs/docutils/distros/gentoo.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/docutils/distros/gentoo.txt

diff --git a/build/pkgs/docutils/distros/gentoo.txt b/build/pkgs/docutils/distros/gentoo.txt
new file mode 100644
index 00000000000..fe4a4524cbb
--- /dev/null
+++ b/build/pkgs/docutils/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/docutils

From 87345a121a32893c6c775beeb3434325d882407f Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 10 Nov 2021 13:12:38 -0500
Subject: [PATCH 128/247] Trac #29665: standard python spkg-configure.m4 for
 docutils.

---
 build/pkgs/docutils/spkg-configure.m4 | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/docutils/spkg-configure.m4

diff --git a/build/pkgs/docutils/spkg-configure.m4 b/build/pkgs/docutils/spkg-configure.m4
new file mode 100644
index 00000000000..3584e4513c6
--- /dev/null
+++ b/build/pkgs/docutils/spkg-configure.m4
@@ -0,0 +1 @@
+SAGE_SPKG_CONFIGURE([docutils], [SAGE_PYTHON_PACKAGE_CHECK([docutils])])

From 05a92098f7236a760fb436be1298516c31265419 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 10 Nov 2021 13:14:37 -0500
Subject: [PATCH 129/247] Trac #29665: add Gentoo package information for
 nbclient.

---
 build/pkgs/nbclient/distros/gentoo.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/nbclient/distros/gentoo.txt

diff --git a/build/pkgs/nbclient/distros/gentoo.txt b/build/pkgs/nbclient/distros/gentoo.txt
new file mode 100644
index 00000000000..06ff18d206a
--- /dev/null
+++ b/build/pkgs/nbclient/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/nbclient

From 019ecdc8d9d6dfed6e290c239599814b4e3e946c Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 10 Nov 2021 13:15:11 -0500
Subject: [PATCH 130/247] Trac #29665: standard python spkg-configure.m4 for
 nbclient.

---
 build/pkgs/nbclient/spkg-configure.m4 | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/nbclient/spkg-configure.m4

diff --git a/build/pkgs/nbclient/spkg-configure.m4 b/build/pkgs/nbclient/spkg-configure.m4
new file mode 100644
index 00000000000..14178b793d2
--- /dev/null
+++ b/build/pkgs/nbclient/spkg-configure.m4
@@ -0,0 +1 @@
+SAGE_SPKG_CONFIGURE([nbclient], [SAGE_PYTHON_PACKAGE_CHECK([nbclient])])

From 5d0a8bd48be5089e4c2668effa2a0686967d849c Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 10 Nov 2021 13:17:36 -0500
Subject: [PATCH 131/247] Trac #29665: add Gentoo package information for
 argon2_cffi.

---
 build/pkgs/argon2_cffi/distros/gentoo.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/argon2_cffi/distros/gentoo.txt

diff --git a/build/pkgs/argon2_cffi/distros/gentoo.txt b/build/pkgs/argon2_cffi/distros/gentoo.txt
new file mode 100644
index 00000000000..2f12ca869e4
--- /dev/null
+++ b/build/pkgs/argon2_cffi/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/argon2-cffi

From b1ab86ecb41323808286fd0337172c007b5962ba Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 10 Nov 2021 13:18:35 -0500
Subject: [PATCH 132/247] Trac #29665: standard python spkg-configure.m4 for
 argon2_cffi.

---
 build/pkgs/argon2_cffi/spkg-configure.m4 | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/argon2_cffi/spkg-configure.m4

diff --git a/build/pkgs/argon2_cffi/spkg-configure.m4 b/build/pkgs/argon2_cffi/spkg-configure.m4
new file mode 100644
index 00000000000..03ebc634492
--- /dev/null
+++ b/build/pkgs/argon2_cffi/spkg-configure.m4
@@ -0,0 +1 @@
+SAGE_SPKG_CONFIGURE([argon2_cffi], [SAGE_PYTHON_PACKAGE_CHECK([argon2_cffi])])

From 7ced44684631cf4e6444dda10c8e5a119f1a9a5c Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 10 Nov 2021 19:30:48 -0500
Subject: [PATCH 133/247] Trac #29665: fix package name in dateutil's
 install-requires.txt.

---
 build/pkgs/dateutil/install-requires.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/pkgs/dateutil/install-requires.txt b/build/pkgs/dateutil/install-requires.txt
index 0ae93da485e..face537605d 100644
--- a/build/pkgs/dateutil/install-requires.txt
+++ b/build/pkgs/dateutil/install-requires.txt
@@ -1 +1 @@
-dateutil >=2.8.1
+python-dateutil >=2.8.1

From 69900e923ed2fd92a6ef0c816ca2ec147e0dbed0 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 10 Nov 2021 19:31:41 -0500
Subject: [PATCH 134/247] Trac #29665: add Gentoo package information for
 dateutil.

---
 build/pkgs/dateutil/distros/gentoo.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/dateutil/distros/gentoo.txt

diff --git a/build/pkgs/dateutil/distros/gentoo.txt b/build/pkgs/dateutil/distros/gentoo.txt
new file mode 100644
index 00000000000..e129df768dc
--- /dev/null
+++ b/build/pkgs/dateutil/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/python-dateutil

From 6100799e084febeaacdf903e43882fe4687e469e Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 10 Nov 2021 19:32:21 -0500
Subject: [PATCH 135/247] Trac #29665: standard python spkg-configure.m4 for
 dateutil.

---
 build/pkgs/dateutil/spkg-configure.m4 | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/dateutil/spkg-configure.m4

diff --git a/build/pkgs/dateutil/spkg-configure.m4 b/build/pkgs/dateutil/spkg-configure.m4
new file mode 100644
index 00000000000..fdcd1273975
--- /dev/null
+++ b/build/pkgs/dateutil/spkg-configure.m4
@@ -0,0 +1 @@
+SAGE_SPKG_CONFIGURE([dateutil], [SAGE_PYTHON_PACKAGE_CHECK([dateutil])])

From d8d7330c380a896e8a937bd91883065838c73c43 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 10 Nov 2021 19:33:51 -0500
Subject: [PATCH 136/247] Trac #29665: add Gentoo package information for
 setuptools_scm.

---
 build/pkgs/setuptools_scm/distros/gentoo.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/setuptools_scm/distros/gentoo.txt

diff --git a/build/pkgs/setuptools_scm/distros/gentoo.txt b/build/pkgs/setuptools_scm/distros/gentoo.txt
new file mode 100644
index 00000000000..89895971525
--- /dev/null
+++ b/build/pkgs/setuptools_scm/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/setuptools_scm

From 30ea202589dcfeb486fc4cc6b42bb7ed0a86bf43 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 10 Nov 2021 19:34:49 -0500
Subject: [PATCH 137/247] Trac #29665: standard python spkg-configure.m4 for
 setuptools_scm.

---
 build/pkgs/setuptools_scm/spkg-configure.m4 | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 build/pkgs/setuptools_scm/spkg-configure.m4

diff --git a/build/pkgs/setuptools_scm/spkg-configure.m4 b/build/pkgs/setuptools_scm/spkg-configure.m4
new file mode 100644
index 00000000000..437148c2a8f
--- /dev/null
+++ b/build/pkgs/setuptools_scm/spkg-configure.m4
@@ -0,0 +1,3 @@
+SAGE_SPKG_CONFIGURE([setuptools_scm], [
+  SAGE_PYTHON_PACKAGE_CHECK([setuptools_scm])
+])

From 98a6e07bbc52081555792bf8819226843de556b4 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 10 Nov 2021 19:36:33 -0500
Subject: [PATCH 138/247] Trac #29665: add Gentoo package information for
 nbconvert.

---
 build/pkgs/nbconvert/distros/gentoo.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/nbconvert/distros/gentoo.txt

diff --git a/build/pkgs/nbconvert/distros/gentoo.txt b/build/pkgs/nbconvert/distros/gentoo.txt
new file mode 100644
index 00000000000..6c45a107368
--- /dev/null
+++ b/build/pkgs/nbconvert/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/nbconvert

From 33c3c92a84df661c6314b657a5a31ae5e2beab2e Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 10 Nov 2021 19:37:37 -0500
Subject: [PATCH 139/247] Trac #29665: standard python spkg-configure.m4 for
 nbconvert.

---
 build/pkgs/nbconvert/spkg-configure.m4 | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/nbconvert/spkg-configure.m4

diff --git a/build/pkgs/nbconvert/spkg-configure.m4 b/build/pkgs/nbconvert/spkg-configure.m4
new file mode 100644
index 00000000000..9b5dee3b8b5
--- /dev/null
+++ b/build/pkgs/nbconvert/spkg-configure.m4
@@ -0,0 +1 @@
+SAGE_SPKG_CONFIGURE([nbconvert], [SAGE_PYTHON_PACKAGE_CHECK([nbconvert])])

From 751fae2695fa34a9bd92a355f5733b7a5d9cb16f Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 10 Nov 2021 19:41:51 -0500
Subject: [PATCH 140/247] Trac #29665: add Gentoo package information for
 jupyter_core.

---
 build/pkgs/jupyter_core/distros/gentoo.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/jupyter_core/distros/gentoo.txt

diff --git a/build/pkgs/jupyter_core/distros/gentoo.txt b/build/pkgs/jupyter_core/distros/gentoo.txt
new file mode 100644
index 00000000000..f168c5ad7ad
--- /dev/null
+++ b/build/pkgs/jupyter_core/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/jupyter_core

From af04655eef16fa304250a307eb36c8861491de30 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 10 Nov 2021 19:42:48 -0500
Subject: [PATCH 141/247] Trac #29665: standard python spkg-configure.m4 for
 jupyter_core.

---
 build/pkgs/jupyter_core/spkg-configure.m4 | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 build/pkgs/jupyter_core/spkg-configure.m4

diff --git a/build/pkgs/jupyter_core/spkg-configure.m4 b/build/pkgs/jupyter_core/spkg-configure.m4
new file mode 100644
index 00000000000..67df9c38b5b
--- /dev/null
+++ b/build/pkgs/jupyter_core/spkg-configure.m4
@@ -0,0 +1,3 @@
+SAGE_SPKG_CONFIGURE([jupyter_core], [
+  SAGE_PYTHON_PACKAGE_CHECK([jupyter_core])
+])

From 6a07c20c4f9ffb0aa6a982812528e7809f623356 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 10 Nov 2021 19:47:08 -0500
Subject: [PATCH 142/247] Trac #29665: add Gentoo package information for
 jupyter_client.

---
 build/pkgs/jupyter_client/distros/gentoo.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/jupyter_client/distros/gentoo.txt

diff --git a/build/pkgs/jupyter_client/distros/gentoo.txt b/build/pkgs/jupyter_client/distros/gentoo.txt
new file mode 100644
index 00000000000..4f1de883ca1
--- /dev/null
+++ b/build/pkgs/jupyter_client/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/jupyter_client

From 15c5ad971714451fa7815a691776dbd33df26e79 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 10 Nov 2021 19:48:04 -0500
Subject: [PATCH 143/247] Trac #29665: standard python spkg-configure.m4 for
 jupyter_client.

---
 build/pkgs/jupyter_client/spkg-configure.m4 | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 build/pkgs/jupyter_client/spkg-configure.m4

diff --git a/build/pkgs/jupyter_client/spkg-configure.m4 b/build/pkgs/jupyter_client/spkg-configure.m4
new file mode 100644
index 00000000000..fbd34982c14
--- /dev/null
+++ b/build/pkgs/jupyter_client/spkg-configure.m4
@@ -0,0 +1,3 @@
+SAGE_SPKG_CONFIGURE([jupyter_client], [
+  SAGE_PYTHON_PACKAGE_CHECK([jupyter_client])
+])

From 39462765f7b71ba84885cc4618551aebd06b7d46 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 10 Nov 2021 19:48:58 -0500
Subject: [PATCH 144/247] Trac #29665: add Gentoo package information for
 snowballstemmer.

---
 build/pkgs/snowballstemmer/distros/gentoo.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/snowballstemmer/distros/gentoo.txt

diff --git a/build/pkgs/snowballstemmer/distros/gentoo.txt b/build/pkgs/snowballstemmer/distros/gentoo.txt
new file mode 100644
index 00000000000..63fd8513221
--- /dev/null
+++ b/build/pkgs/snowballstemmer/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/snowballstemmer

From 1e48d6f47b3b72ecbf19404ee2b4d529d5962c6f Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 10 Nov 2021 19:49:38 -0500
Subject: [PATCH 145/247] Trac #29665: standard python spkg-configure.m4 for
 snowballstemmer.

---
 build/pkgs/snowballstemmer/spkg-configure.m4 | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 build/pkgs/snowballstemmer/spkg-configure.m4

diff --git a/build/pkgs/snowballstemmer/spkg-configure.m4 b/build/pkgs/snowballstemmer/spkg-configure.m4
new file mode 100644
index 00000000000..6aa08825d39
--- /dev/null
+++ b/build/pkgs/snowballstemmer/spkg-configure.m4
@@ -0,0 +1,3 @@
+SAGE_SPKG_CONFIGURE([snowballstemmer], [
+  SAGE_PYTHON_PACKAGE_CHECK([snowballstemmer])
+])

From 97e98ca54c325a80364e1cdc8a6b77c96fb25e33 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 10 Nov 2021 19:50:47 -0500
Subject: [PATCH 146/247] Trac #29665: add Gentoo package information for
 tornado.

---
 build/pkgs/tornado/distros/gentoo.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/tornado/distros/gentoo.txt

diff --git a/build/pkgs/tornado/distros/gentoo.txt b/build/pkgs/tornado/distros/gentoo.txt
new file mode 100644
index 00000000000..6ae4b9fc443
--- /dev/null
+++ b/build/pkgs/tornado/distros/gentoo.txt
@@ -0,0 +1 @@
+www-servers/tornado

From 373f7e224982b62d18929146a122fc14ce3db423 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 10 Nov 2021 19:51:26 -0500
Subject: [PATCH 147/247] Trac #29665: standard python spkg-configure.m4 for
 tornado.

---
 build/pkgs/tornado/spkg-configure.m4 | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/tornado/spkg-configure.m4

diff --git a/build/pkgs/tornado/spkg-configure.m4 b/build/pkgs/tornado/spkg-configure.m4
new file mode 100644
index 00000000000..1ee5bc9f544
--- /dev/null
+++ b/build/pkgs/tornado/spkg-configure.m4
@@ -0,0 +1 @@
+SAGE_SPKG_CONFIGURE([tornado], [SAGE_PYTHON_PACKAGE_CHECK([tornado])])

From bd485326bdc30ba5c65666b6adf3a24f2aa9d288 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 10 Nov 2021 19:52:21 -0500
Subject: [PATCH 148/247] Trac #29665: add Gentoo package information for
 jsonschema.

---
 build/pkgs/jsonschema/distros/gentoo.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/jsonschema/distros/gentoo.txt

diff --git a/build/pkgs/jsonschema/distros/gentoo.txt b/build/pkgs/jsonschema/distros/gentoo.txt
new file mode 100644
index 00000000000..d708e4c9990
--- /dev/null
+++ b/build/pkgs/jsonschema/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/jsonschema

From 39452a93c32a05d73e5c4ed424874a69bffd3f91 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 10 Nov 2021 19:54:03 -0500
Subject: [PATCH 149/247] Trac #29665: standard python spkg-configure.m4 for
 jsonschema.

---
 build/pkgs/jsonschema/spkg-configure.m4 | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/jsonschema/spkg-configure.m4

diff --git a/build/pkgs/jsonschema/spkg-configure.m4 b/build/pkgs/jsonschema/spkg-configure.m4
new file mode 100644
index 00000000000..b9e5e216a3b
--- /dev/null
+++ b/build/pkgs/jsonschema/spkg-configure.m4
@@ -0,0 +1 @@
+SAGE_SPKG_CONFIGURE([jsonschema], [SAGE_PYTHON_PACKAGE_CHECK([jsonschema])])

From 28afd2223241619c8d8d5012e94ad193bd7a3ad9 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 10 Nov 2021 19:55:54 -0500
Subject: [PATCH 150/247] Trac #29665: standard python spkg-configure.m4 for
 widgetsnbextension.

---
 build/pkgs/widgetsnbextension/spkg-configure.m4 | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 build/pkgs/widgetsnbextension/spkg-configure.m4

diff --git a/build/pkgs/widgetsnbextension/spkg-configure.m4 b/build/pkgs/widgetsnbextension/spkg-configure.m4
new file mode 100644
index 00000000000..bf82dafe209
--- /dev/null
+++ b/build/pkgs/widgetsnbextension/spkg-configure.m4
@@ -0,0 +1,3 @@
+SAGE_SPKG_CONFIGURE([widgetsnbextension], [
+  SAGE_PYTHON_PACKAGE_CHECK([widgetsnbextension])
+])

From 607cc41b282480c0e91f0eaf9022d262a5df0aea Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 10 Nov 2021 19:57:20 -0500
Subject: [PATCH 151/247] Trac #29665: add Gentoo package information for
 importlib_resources.

---
 build/pkgs/importlib_resources/distros/gentoo.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/importlib_resources/distros/gentoo.txt

diff --git a/build/pkgs/importlib_resources/distros/gentoo.txt b/build/pkgs/importlib_resources/distros/gentoo.txt
new file mode 100644
index 00000000000..d5e1f2cf6a8
--- /dev/null
+++ b/build/pkgs/importlib_resources/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/importlib_resources

From d4e513d58662ed96f56c45ff63c86a2bbb10fd42 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 10 Nov 2021 19:58:00 -0500
Subject: [PATCH 152/247] Trac #29665: standard python spkg-configure.m4 for
 importlib_resources.

---
 build/pkgs/importlib_resources/spkg-configure.m4 | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 build/pkgs/importlib_resources/spkg-configure.m4

diff --git a/build/pkgs/importlib_resources/spkg-configure.m4 b/build/pkgs/importlib_resources/spkg-configure.m4
new file mode 100644
index 00000000000..50df55b4643
--- /dev/null
+++ b/build/pkgs/importlib_resources/spkg-configure.m4
@@ -0,0 +1,3 @@
+SAGE_SPKG_CONFIGURE([importlib_resources], [
+  SAGE_PYTHON_PACKAGE_CHECK([importlib_resources])
+])

From c37bdcf5c413f201299b26b7989bd4a6e078ba85 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 10 Nov 2021 19:58:38 -0500
Subject: [PATCH 153/247] Trac #29665: add Gentoo package information for
 kiwisolver.

---
 build/pkgs/kiwisolver/distros/gentoo.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/kiwisolver/distros/gentoo.txt

diff --git a/build/pkgs/kiwisolver/distros/gentoo.txt b/build/pkgs/kiwisolver/distros/gentoo.txt
new file mode 100644
index 00000000000..7b30c9540ec
--- /dev/null
+++ b/build/pkgs/kiwisolver/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/kiwisolver

From 14be0d4793cd902792c08698626653b0e77c4217 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 10 Nov 2021 19:59:09 -0500
Subject: [PATCH 154/247] Trac #29665: standard python spkg-configure.m4 for
 kiwisolver.

---
 build/pkgs/kiwisolver/spkg-configure.m4 | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/kiwisolver/spkg-configure.m4

diff --git a/build/pkgs/kiwisolver/spkg-configure.m4 b/build/pkgs/kiwisolver/spkg-configure.m4
new file mode 100644
index 00000000000..4e7ac97b57d
--- /dev/null
+++ b/build/pkgs/kiwisolver/spkg-configure.m4
@@ -0,0 +1 @@
+SAGE_SPKG_CONFIGURE([kiwisolver], [SAGE_PYTHON_PACKAGE_CHECK([kiwisolver])])

From 2f2e2e9fd63d62dcc76823201b430ffaba14092d Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 10 Nov 2021 20:00:04 -0500
Subject: [PATCH 155/247] Trac #29665: add Gentoo package information for
 notebook.

---
 build/pkgs/notebook/distros/gentoo.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/notebook/distros/gentoo.txt

diff --git a/build/pkgs/notebook/distros/gentoo.txt b/build/pkgs/notebook/distros/gentoo.txt
new file mode 100644
index 00000000000..6475d72541e
--- /dev/null
+++ b/build/pkgs/notebook/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/notebook

From 9e1e9220f3f51425d375b4c25e21e2daf92223f7 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 10 Nov 2021 20:01:42 -0500
Subject: [PATCH 156/247] Trac #29665: standard python spkg-configure.m4 for
 notebook.

---
 build/pkgs/notebook/spkg-configure.m4 | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/notebook/spkg-configure.m4

diff --git a/build/pkgs/notebook/spkg-configure.m4 b/build/pkgs/notebook/spkg-configure.m4
new file mode 100644
index 00000000000..a17ba95eac6
--- /dev/null
+++ b/build/pkgs/notebook/spkg-configure.m4
@@ -0,0 +1 @@
+SAGE_SPKG_CONFIGURE([notebook], [SAGE_PYTHON_PACKAGE_CHECK([notebook])])

From 9e464585314a4c97a29e85354299f89f25a5fd01 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 10 Nov 2021 20:02:38 -0500
Subject: [PATCH 157/247] Trac #29665: add Gentoo package information for
 matplotlib_inline.

---
 build/pkgs/matplotlib_inline/distros/gentoo.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/matplotlib_inline/distros/gentoo.txt

diff --git a/build/pkgs/matplotlib_inline/distros/gentoo.txt b/build/pkgs/matplotlib_inline/distros/gentoo.txt
new file mode 100644
index 00000000000..6a5859ca074
--- /dev/null
+++ b/build/pkgs/matplotlib_inline/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/matplotlib-inline

From 532cd92915f9376d3d2f43f0fb981065ec64ac0f Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 10 Nov 2021 20:03:28 -0500
Subject: [PATCH 158/247] Trac #29665: standard python spkg-configure.m4 for
 matplotlib_inline.

---
 build/pkgs/matplotlib_inline/spkg-configure.m4 | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 build/pkgs/matplotlib_inline/spkg-configure.m4

diff --git a/build/pkgs/matplotlib_inline/spkg-configure.m4 b/build/pkgs/matplotlib_inline/spkg-configure.m4
new file mode 100644
index 00000000000..e59658ff159
--- /dev/null
+++ b/build/pkgs/matplotlib_inline/spkg-configure.m4
@@ -0,0 +1,3 @@
+SAGE_SPKG_CONFIGURE([matplotlib_inline], [
+  SAGE_PYTHON_PACKAGE_CHECK([matplotlib_inline])
+])

From 22b8e7870ddb2068104c87bbc2fde8a0efa291f7 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 10 Nov 2021 20:04:10 -0500
Subject: [PATCH 159/247] Trac #29665: add Gentoo package information for
 ipykernel.

---
 build/pkgs/ipykernel/distros/gentoo.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/ipykernel/distros/gentoo.txt

diff --git a/build/pkgs/ipykernel/distros/gentoo.txt b/build/pkgs/ipykernel/distros/gentoo.txt
new file mode 100644
index 00000000000..88aab61ef39
--- /dev/null
+++ b/build/pkgs/ipykernel/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/ipykernel

From 4385d14ab60355f9a9636da3cbaed494a0844e59 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 10 Nov 2021 20:04:46 -0500
Subject: [PATCH 160/247] Trac #29665: standard python spkg-configure.m4 for
 ipykernel.

---
 build/pkgs/ipykernel/spkg-configure.m4 | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/ipykernel/spkg-configure.m4

diff --git a/build/pkgs/ipykernel/spkg-configure.m4 b/build/pkgs/ipykernel/spkg-configure.m4
new file mode 100644
index 00000000000..94ecc2dcc4e
--- /dev/null
+++ b/build/pkgs/ipykernel/spkg-configure.m4
@@ -0,0 +1 @@
+SAGE_SPKG_CONFIGURE([ipykernel], [SAGE_PYTHON_PACKAGE_CHECK([ipykernel])])

From 95bc155048b6fa63512cbcf8f5af9a0c47887b7d Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 10 Nov 2021 20:05:26 -0500
Subject: [PATCH 161/247] Trac #29665: add Gentoo package information for
 prompt_toolkit.

---
 build/pkgs/prompt_toolkit/distros/gentoo.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/prompt_toolkit/distros/gentoo.txt

diff --git a/build/pkgs/prompt_toolkit/distros/gentoo.txt b/build/pkgs/prompt_toolkit/distros/gentoo.txt
new file mode 100644
index 00000000000..6902484e74c
--- /dev/null
+++ b/build/pkgs/prompt_toolkit/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/prompt_toolkit

From 342a1b4caebdb1731feac3a92021a58cb0d65f35 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 10 Nov 2021 20:10:39 -0500
Subject: [PATCH 162/247] Trac #29665: standard python spkg-configure.m4 for
 prompt_toolkit.

---
 build/pkgs/prompt_toolkit/spkg-configure.m4 | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 build/pkgs/prompt_toolkit/spkg-configure.m4

diff --git a/build/pkgs/prompt_toolkit/spkg-configure.m4 b/build/pkgs/prompt_toolkit/spkg-configure.m4
new file mode 100644
index 00000000000..fd8c1a67015
--- /dev/null
+++ b/build/pkgs/prompt_toolkit/spkg-configure.m4
@@ -0,0 +1,3 @@
+SAGE_SPKG_CONFIGURE([prompt_toolkit], [
+  SAGE_PYTHON_PACKAGE_CHECK([prompt_toolkit])
+])

From f4d8ca5bd93555faa1f2df46859b6c6cd59d0cfe Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 10 Nov 2021 20:12:10 -0500
Subject: [PATCH 163/247] Trac #29665: add Gentoo package information for
 charset_normalizer.

---
 build/pkgs/charset_normalizer/distros/gentoo.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/charset_normalizer/distros/gentoo.txt

diff --git a/build/pkgs/charset_normalizer/distros/gentoo.txt b/build/pkgs/charset_normalizer/distros/gentoo.txt
new file mode 100644
index 00000000000..eefeb89e31e
--- /dev/null
+++ b/build/pkgs/charset_normalizer/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/charset_normalizer

From 2c3707a72aff3282ccf6fbd135bf71c89f19b5b8 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 10 Nov 2021 20:12:54 -0500
Subject: [PATCH 164/247] Trac #29665: standard python spkg-configure.m4 for
 charset_normalizer.

---
 build/pkgs/charset_normalizer/spkg-configure.m4 | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 build/pkgs/charset_normalizer/spkg-configure.m4

diff --git a/build/pkgs/charset_normalizer/spkg-configure.m4 b/build/pkgs/charset_normalizer/spkg-configure.m4
new file mode 100644
index 00000000000..18b18cf32b4
--- /dev/null
+++ b/build/pkgs/charset_normalizer/spkg-configure.m4
@@ -0,0 +1,3 @@
+SAGE_SPKG_CONFIGURE([charset_normalizer], [
+  SAGE_PYTHON_PACKAGE_CHECK([charset_normalizer])
+])

From 66b3bf0f7b7b091afd5092b31b91da686f630edb Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 10 Nov 2021 20:13:37 -0500
Subject: [PATCH 165/247] Trac #29665: add Gentoo package information for
 prometheus_client.

---
 build/pkgs/prometheus_client/distros/gentoo.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/prometheus_client/distros/gentoo.txt

diff --git a/build/pkgs/prometheus_client/distros/gentoo.txt b/build/pkgs/prometheus_client/distros/gentoo.txt
new file mode 100644
index 00000000000..aa2889c913e
--- /dev/null
+++ b/build/pkgs/prometheus_client/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/prometheus_client

From c1930d07551ac73336a6ace6df46c0e81d190258 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 10 Nov 2021 20:15:09 -0500
Subject: [PATCH 166/247] Trac #29665: standard python spkg-configure.m4 for
 prometheus_client.

---
 build/pkgs/prometheus_client/spkg-configure.m4 | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 build/pkgs/prometheus_client/spkg-configure.m4

diff --git a/build/pkgs/prometheus_client/spkg-configure.m4 b/build/pkgs/prometheus_client/spkg-configure.m4
new file mode 100644
index 00000000000..b4945889131
--- /dev/null
+++ b/build/pkgs/prometheus_client/spkg-configure.m4
@@ -0,0 +1,3 @@
+SAGE_SPKG_CONFIGURE([prometheus_client], [
+  SAGE_PYTHON_PACKAGE_CHECK([prometheus_client])
+])

From 8089c92e0cd571471473d18056bc668cd1ade1d2 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 10 Nov 2021 20:17:23 -0500
Subject: [PATCH 167/247] Trac #29665: add Gentoo package information for
 pybind11.

---
 build/pkgs/pybind11/distros/gentoo.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/pybind11/distros/gentoo.txt

diff --git a/build/pkgs/pybind11/distros/gentoo.txt b/build/pkgs/pybind11/distros/gentoo.txt
new file mode 100644
index 00000000000..0c500b3c84d
--- /dev/null
+++ b/build/pkgs/pybind11/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/pybind11

From 251b381025e9838efcf3fe6874cf05a49e636e64 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 10 Nov 2021 20:17:51 -0500
Subject: [PATCH 168/247] Trac #29665: standard python spkg-configure.m4 for
 pybind11.

---
 build/pkgs/pybind11/spkg-configure.m4 | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/pybind11/spkg-configure.m4

diff --git a/build/pkgs/pybind11/spkg-configure.m4 b/build/pkgs/pybind11/spkg-configure.m4
new file mode 100644
index 00000000000..cce1cf5cff8
--- /dev/null
+++ b/build/pkgs/pybind11/spkg-configure.m4
@@ -0,0 +1 @@
+SAGE_SPKG_CONFIGURE([pybind11], [SAGE_PYTHON_PACKAGE_CHECK([pybind11])])

From ecad13c8da95099364736cac44c14aa08ea4f395 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 10 Nov 2021 20:19:23 -0500
Subject: [PATCH 169/247] Trac #29665: add Gentoo package information for
 pkgconfig.

---
 build/pkgs/pkgconfig/distros/gentoo.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/pkgconfig/distros/gentoo.txt

diff --git a/build/pkgs/pkgconfig/distros/gentoo.txt b/build/pkgs/pkgconfig/distros/gentoo.txt
new file mode 100644
index 00000000000..32e86187155
--- /dev/null
+++ b/build/pkgs/pkgconfig/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/pkgconfig

From 9036a5eada0d45f4b588b8b15fa16142d0c58890 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 10 Nov 2021 20:19:54 -0500
Subject: [PATCH 170/247] Trac #29665: standard python spkg-configure.m4 for
 pkgconfig.

---
 build/pkgs/pkgconfig/spkg-configure.m4 | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/pkgconfig/spkg-configure.m4

diff --git a/build/pkgs/pkgconfig/spkg-configure.m4 b/build/pkgs/pkgconfig/spkg-configure.m4
new file mode 100644
index 00000000000..67082934525
--- /dev/null
+++ b/build/pkgs/pkgconfig/spkg-configure.m4
@@ -0,0 +1 @@
+SAGE_SPKG_CONFIGURE([pkgconfig], [SAGE_PYTHON_PACKAGE_CHECK([pkgconfig])])

From 028e48a21bc6398c629c4662214ecd01cd1d67b3 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 10 Nov 2021 20:21:10 -0500
Subject: [PATCH 171/247] Trac #29665: add Gentoo package information for
 sphinxcontrib_serializinghtml.

---
 build/pkgs/sphinxcontrib_serializinghtml/distros/gentoo.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/sphinxcontrib_serializinghtml/distros/gentoo.txt

diff --git a/build/pkgs/sphinxcontrib_serializinghtml/distros/gentoo.txt b/build/pkgs/sphinxcontrib_serializinghtml/distros/gentoo.txt
new file mode 100644
index 00000000000..38bca8f1dcb
--- /dev/null
+++ b/build/pkgs/sphinxcontrib_serializinghtml/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/sphinxcontrib-serializinghtml

From 0eeedf4a76c55fba43a980e687ef4cc6d86d7cd8 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 10 Nov 2021 20:21:54 -0500
Subject: [PATCH 172/247] Trac #29665: standard python spkg-configure.m4 for
 sphinxcontrib_serializinghtml.

---
 build/pkgs/sphinxcontrib_serializinghtml/spkg-configure.m4 | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 build/pkgs/sphinxcontrib_serializinghtml/spkg-configure.m4

diff --git a/build/pkgs/sphinxcontrib_serializinghtml/spkg-configure.m4 b/build/pkgs/sphinxcontrib_serializinghtml/spkg-configure.m4
new file mode 100644
index 00000000000..be8e62555ac
--- /dev/null
+++ b/build/pkgs/sphinxcontrib_serializinghtml/spkg-configure.m4
@@ -0,0 +1,3 @@
+SAGE_SPKG_CONFIGURE([sphinxcontrib_serializinghtml], [
+  SAGE_PYTHON_PACKAGE_CHECK([sphinxcontrib_serializinghtml])
+])

From 0743475de2c3919aba374f1920e130448bb52d04 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 10 Nov 2021 20:22:54 -0500
Subject: [PATCH 173/247] Trac #29665: add Gentoo package information for
 sphinxcontrib_jsmath.

---
 build/pkgs/sphinxcontrib_jsmath/distros/gentoo.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/sphinxcontrib_jsmath/distros/gentoo.txt

diff --git a/build/pkgs/sphinxcontrib_jsmath/distros/gentoo.txt b/build/pkgs/sphinxcontrib_jsmath/distros/gentoo.txt
new file mode 100644
index 00000000000..041a4710e66
--- /dev/null
+++ b/build/pkgs/sphinxcontrib_jsmath/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/sphinxcontrib-jsmath

From bfb3ec22f3f58ac25b3ddc01b336210859e9eb1e Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 10 Nov 2021 20:23:49 -0500
Subject: [PATCH 174/247] Trac #29665: standard python spkg-configure.m4 for
 sphinxcontrib_jsmath.

---
 build/pkgs/sphinxcontrib_jsmath/spkg-configure.m4 | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 build/pkgs/sphinxcontrib_jsmath/spkg-configure.m4

diff --git a/build/pkgs/sphinxcontrib_jsmath/spkg-configure.m4 b/build/pkgs/sphinxcontrib_jsmath/spkg-configure.m4
new file mode 100644
index 00000000000..e46bde2bd9d
--- /dev/null
+++ b/build/pkgs/sphinxcontrib_jsmath/spkg-configure.m4
@@ -0,0 +1,3 @@
+SAGE_SPKG_CONFIGURE([sphinxcontrib_jsmath], [
+  SAGE_PYTHON_PACKAGE_CHECK([sphinxcontrib_jsmath])
+])

From 1d82256c89966ccefd04ef579e696d5ca921fb56 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 10 Nov 2021 20:24:26 -0500
Subject: [PATCH 175/247] Trac #29665: add Gentoo package information for
 sphinxcontrib_devhelp.

---
 build/pkgs/sphinxcontrib_devhelp/distros/gentoo.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/sphinxcontrib_devhelp/distros/gentoo.txt

diff --git a/build/pkgs/sphinxcontrib_devhelp/distros/gentoo.txt b/build/pkgs/sphinxcontrib_devhelp/distros/gentoo.txt
new file mode 100644
index 00000000000..9b5c899a706
--- /dev/null
+++ b/build/pkgs/sphinxcontrib_devhelp/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/sphinxcontrib-devhelp

From 7317583856b4893bb1544fc83cb242848576605a Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 10 Nov 2021 20:25:04 -0500
Subject: [PATCH 176/247] Trac #29665: standard python spkg-configure.m4 for
 sphinxcontrib_devhelp.

---
 build/pkgs/sphinxcontrib_devhelp/spkg-configure.m4 | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 build/pkgs/sphinxcontrib_devhelp/spkg-configure.m4

diff --git a/build/pkgs/sphinxcontrib_devhelp/spkg-configure.m4 b/build/pkgs/sphinxcontrib_devhelp/spkg-configure.m4
new file mode 100644
index 00000000000..8728136e92e
--- /dev/null
+++ b/build/pkgs/sphinxcontrib_devhelp/spkg-configure.m4
@@ -0,0 +1,3 @@
+SAGE_SPKG_CONFIGURE([sphinxcontrib_devhelp], [
+  SAGE_PYTHON_PACKAGE_CHECK([sphinxcontrib_devhelp])
+])

From 223a9806e0f6383f0e4d9f0c39849c656d53863c Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 10 Nov 2021 20:25:53 -0500
Subject: [PATCH 177/247] Trac #29665: add Gentoo package information for
 sphinxcontrib_qthelp.

---
 build/pkgs/sphinxcontrib_qthelp/distros/gentoo.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/sphinxcontrib_qthelp/distros/gentoo.txt

diff --git a/build/pkgs/sphinxcontrib_qthelp/distros/gentoo.txt b/build/pkgs/sphinxcontrib_qthelp/distros/gentoo.txt
new file mode 100644
index 00000000000..7210099b087
--- /dev/null
+++ b/build/pkgs/sphinxcontrib_qthelp/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/sphinxcontrib-qthelp

From 998f5b31a75537b629121e3cc824170f44c7d1bd Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 10 Nov 2021 20:26:28 -0500
Subject: [PATCH 178/247] Trac #29665: standard python spkg-configure.m4 for
 sphinxcontrib_qthelp.

---
 build/pkgs/sphinxcontrib_qthelp/spkg-configure.m4 | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 build/pkgs/sphinxcontrib_qthelp/spkg-configure.m4

diff --git a/build/pkgs/sphinxcontrib_qthelp/spkg-configure.m4 b/build/pkgs/sphinxcontrib_qthelp/spkg-configure.m4
new file mode 100644
index 00000000000..81ea5e1269f
--- /dev/null
+++ b/build/pkgs/sphinxcontrib_qthelp/spkg-configure.m4
@@ -0,0 +1,3 @@
+SAGE_SPKG_CONFIGURE([sphinxcontrib_qthelp], [
+  SAGE_PYTHON_PACKAGE_CHECK([sphinxcontrib_qthelp])
+])

From 477e3e339e76e74a46689f6a18a69ca81e76acda Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 10 Nov 2021 20:26:54 -0500
Subject: [PATCH 179/247] Trac #29665: add Gentoo package information for
 sphinxcontrib_applehelp.

---
 build/pkgs/sphinxcontrib_applehelp/distros/gentoo.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/sphinxcontrib_applehelp/distros/gentoo.txt

diff --git a/build/pkgs/sphinxcontrib_applehelp/distros/gentoo.txt b/build/pkgs/sphinxcontrib_applehelp/distros/gentoo.txt
new file mode 100644
index 00000000000..66ac8da7340
--- /dev/null
+++ b/build/pkgs/sphinxcontrib_applehelp/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/sphinxcontrib-applehelp

From d4f1faadcd2c1ddd5a0494a8e6610f3acbffe7c7 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 10 Nov 2021 20:27:19 -0500
Subject: [PATCH 180/247] Trac #29665: standard python spkg-configure.m4 for
 sphinxcontrib_applehelp.

---
 build/pkgs/sphinxcontrib_applehelp/spkg-configure.m4 | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 build/pkgs/sphinxcontrib_applehelp/spkg-configure.m4

diff --git a/build/pkgs/sphinxcontrib_applehelp/spkg-configure.m4 b/build/pkgs/sphinxcontrib_applehelp/spkg-configure.m4
new file mode 100644
index 00000000000..e834aed8fd8
--- /dev/null
+++ b/build/pkgs/sphinxcontrib_applehelp/spkg-configure.m4
@@ -0,0 +1,3 @@
+SAGE_SPKG_CONFIGURE([sphinxcontrib_applehelp], [
+  SAGE_PYTHON_PACKAGE_CHECK([sphinxcontrib_applehelp])
+])

From 8698129ed0cd8dd3a56ce8951bb83266cd155d17 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 10 Nov 2021 20:27:46 -0500
Subject: [PATCH 181/247] Trac #29665: add Gentoo package information for
 sphinxcontrib_htmlhelp.

---
 build/pkgs/sphinxcontrib_htmlhelp/distros/gentoo.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/sphinxcontrib_htmlhelp/distros/gentoo.txt

diff --git a/build/pkgs/sphinxcontrib_htmlhelp/distros/gentoo.txt b/build/pkgs/sphinxcontrib_htmlhelp/distros/gentoo.txt
new file mode 100644
index 00000000000..e080bacf8ba
--- /dev/null
+++ b/build/pkgs/sphinxcontrib_htmlhelp/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/sphinxcontrib-htmlhelp

From ab239f6316ab99bfe125ee36d2fdfddb6a18229f Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 10 Nov 2021 20:29:18 -0500
Subject: [PATCH 182/247] Trac #29665: standard python spkg-configure.m4 for
 sphinxcontrib_htmlhelp.

---
 build/pkgs/sphinxcontrib_htmlhelp/spkg-configure.m4 | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 build/pkgs/sphinxcontrib_htmlhelp/spkg-configure.m4

diff --git a/build/pkgs/sphinxcontrib_htmlhelp/spkg-configure.m4 b/build/pkgs/sphinxcontrib_htmlhelp/spkg-configure.m4
new file mode 100644
index 00000000000..c77b003dc37
--- /dev/null
+++ b/build/pkgs/sphinxcontrib_htmlhelp/spkg-configure.m4
@@ -0,0 +1,3 @@
+SAGE_SPKG_CONFIGURE([sphinxcontrib_htmlhelp], [
+  SAGE_PYTHON_PACKAGE_CHECK([sphinxcontrib_htmlhelp])
+])

From 7b1aa03b95696f1d2de9e41fb95a3cf35ba7c63b Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 10 Nov 2021 20:30:23 -0500
Subject: [PATCH 183/247] Trac #29665: add Gentoo package information for
 jupyterlab_pygments.

---
 build/pkgs/jupyterlab_pygments/distros/gentoo.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/jupyterlab_pygments/distros/gentoo.txt

diff --git a/build/pkgs/jupyterlab_pygments/distros/gentoo.txt b/build/pkgs/jupyterlab_pygments/distros/gentoo.txt
new file mode 100644
index 00000000000..c57b4f13403
--- /dev/null
+++ b/build/pkgs/jupyterlab_pygments/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/jupyterlab_pygments

From 7ba34034bb87ea443d2a0e6870506cf65a596346 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 10 Nov 2021 20:31:13 -0500
Subject: [PATCH 184/247] Trac #29665: standard python spkg-configure.m4 for
 jupyterlab_pygments.

---
 build/pkgs/jupyterlab_pygments/spkg-configure.m4 | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 build/pkgs/jupyterlab_pygments/spkg-configure.m4

diff --git a/build/pkgs/jupyterlab_pygments/spkg-configure.m4 b/build/pkgs/jupyterlab_pygments/spkg-configure.m4
new file mode 100644
index 00000000000..e46e21f461e
--- /dev/null
+++ b/build/pkgs/jupyterlab_pygments/spkg-configure.m4
@@ -0,0 +1,3 @@
+SAGE_SPKG_CONFIGURE([jupyterlab_pygments], [
+  SAGE_PYTHON_PACKAGE_CHECK([jupyterlab_pygments])
+])

From dfa9cbf87c201c7857cd1a510f6401f0963c7567 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Thu, 30 Dec 2021 20:29:15 -0500
Subject: [PATCH 185/247] Trac #29665: standard python spkg-configure.m4 for
 ply.

---
 build/pkgs/ply/spkg-configure.m4 | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/ply/spkg-configure.m4

diff --git a/build/pkgs/ply/spkg-configure.m4 b/build/pkgs/ply/spkg-configure.m4
new file mode 100644
index 00000000000..ffb0030d013
--- /dev/null
+++ b/build/pkgs/ply/spkg-configure.m4
@@ -0,0 +1 @@
+SAGE_SPKG_CONFIGURE([ply], [SAGE_PYTHON_PACKAGE_CHECK([ply])])

From c99e9faf5647216a2611203e4db32a53d33f7c03 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Thu, 30 Dec 2021 20:29:51 -0500
Subject: [PATCH 186/247] Trac #29665: add Gentoo package information for ply.

---
 build/pkgs/ply/distros/gentoo.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/ply/distros/gentoo.txt

diff --git a/build/pkgs/ply/distros/gentoo.txt b/build/pkgs/ply/distros/gentoo.txt
new file mode 100644
index 00000000000..c8b16309b09
--- /dev/null
+++ b/build/pkgs/ply/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/ply

From 3b2805b0f3beb58dca93eba3606f9b7915ea4efa Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Thu, 30 Dec 2021 20:30:33 -0500
Subject: [PATCH 187/247] Trac #29665: standard python spkg-configure.m4 for
 gast.

---
 build/pkgs/gast/spkg-configure.m4 | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/gast/spkg-configure.m4

diff --git a/build/pkgs/gast/spkg-configure.m4 b/build/pkgs/gast/spkg-configure.m4
new file mode 100644
index 00000000000..26ec59feaee
--- /dev/null
+++ b/build/pkgs/gast/spkg-configure.m4
@@ -0,0 +1 @@
+SAGE_SPKG_CONFIGURE([gast], [SAGE_PYTHON_PACKAGE_CHECK([gast])])

From 958367b7c55cf41f7105b3e9297891b03e0505c8 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Thu, 30 Dec 2021 20:31:15 -0500
Subject: [PATCH 188/247] Trac #29665: add Gentoo package information for gast.

---
 build/pkgs/gast/distros/gentoo.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/gast/distros/gentoo.txt

diff --git a/build/pkgs/gast/distros/gentoo.txt b/build/pkgs/gast/distros/gentoo.txt
new file mode 100644
index 00000000000..3be5e7e785c
--- /dev/null
+++ b/build/pkgs/gast/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/gast

From 5060d45170f3dba6c2968794089cdc384103730b Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Thu, 30 Dec 2021 20:32:20 -0500
Subject: [PATCH 189/247] Trac #29665: standard python spkg-configure.m4 for
 pythran.

---
 build/pkgs/pythran/spkg-configure.m4 | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/pythran/spkg-configure.m4

diff --git a/build/pkgs/pythran/spkg-configure.m4 b/build/pkgs/pythran/spkg-configure.m4
new file mode 100644
index 00000000000..592e95bcb3d
--- /dev/null
+++ b/build/pkgs/pythran/spkg-configure.m4
@@ -0,0 +1 @@
+SAGE_SPKG_CONFIGURE([pythran], [SAGE_PYTHON_PACKAGE_CHECK([pythran])])

From 728d207b91a1108a137164b78a4e141a53cf8605 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Thu, 30 Dec 2021 20:32:55 -0500
Subject: [PATCH 190/247] Trac #29665: add Gentoo package information for
 pythran.

---
 build/pkgs/pythran/distros/gentoo.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/pythran/distros/gentoo.txt

diff --git a/build/pkgs/pythran/distros/gentoo.txt b/build/pkgs/pythran/distros/gentoo.txt
new file mode 100644
index 00000000000..1bb7cdcd4eb
--- /dev/null
+++ b/build/pkgs/pythran/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/pythran

From 284caa41841a793291ca25ff70e04681e19b4551 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Thu, 30 Dec 2021 20:33:50 -0500
Subject: [PATCH 191/247] Trac #29665: standard python spkg-configure.m4 for
 beniget.

---
 build/pkgs/beniget/spkg-configure.m4 | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/beniget/spkg-configure.m4

diff --git a/build/pkgs/beniget/spkg-configure.m4 b/build/pkgs/beniget/spkg-configure.m4
new file mode 100644
index 00000000000..8ae6101333e
--- /dev/null
+++ b/build/pkgs/beniget/spkg-configure.m4
@@ -0,0 +1 @@
+SAGE_SPKG_CONFIGURE([beniget], [SAGE_PYTHON_PACKAGE_CHECK([beniget])])

From b0ae5fa287126a65d82f9abd02cfef46d3848aef Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Thu, 30 Dec 2021 20:34:22 -0500
Subject: [PATCH 192/247] Trac #29665: add Gentoo package information for
 beniget.

---
 build/pkgs/beniget/distros/gentoo.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/beniget/distros/gentoo.txt

diff --git a/build/pkgs/beniget/distros/gentoo.txt b/build/pkgs/beniget/distros/gentoo.txt
new file mode 100644
index 00000000000..1a5972cd23f
--- /dev/null
+++ b/build/pkgs/beniget/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/beniget

From e9530c488491bcd69aefc7ca0185fafe3ad04cf4 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Thu, 30 Dec 2021 20:35:37 -0500
Subject: [PATCH 193/247] Trac #29665: standard python spkg-configure.m4 for
 alabaster.

---
 build/pkgs/alabaster/spkg-configure.m4 | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/alabaster/spkg-configure.m4

diff --git a/build/pkgs/alabaster/spkg-configure.m4 b/build/pkgs/alabaster/spkg-configure.m4
new file mode 100644
index 00000000000..4eca6e05a5f
--- /dev/null
+++ b/build/pkgs/alabaster/spkg-configure.m4
@@ -0,0 +1 @@
+SAGE_SPKG_CONFIGURE([alabaster], [SAGE_PYTHON_PACKAGE_CHECK([alabaster])])

From a2262c59cab3da3d2152229879c81296ee7ec525 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Thu, 30 Dec 2021 20:36:06 -0500
Subject: [PATCH 194/247] Trac #29665: add Gentoo package information for
 alabaster.

---
 build/pkgs/alabaster/distros/gentoo.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/alabaster/distros/gentoo.txt

diff --git a/build/pkgs/alabaster/distros/gentoo.txt b/build/pkgs/alabaster/distros/gentoo.txt
new file mode 100644
index 00000000000..cffece61b27
--- /dev/null
+++ b/build/pkgs/alabaster/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/alabaster

From 2cbead4861a791da0cbbba1d08ab70b443af07c5 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Thu, 30 Dec 2021 20:43:59 -0500
Subject: [PATCH 195/247] Trac #29665: standard python spkg-configure.m4 for
 importlib_metadata.

---
 build/pkgs/importlib_metadata/spkg-configure.m4 | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 build/pkgs/importlib_metadata/spkg-configure.m4

diff --git a/build/pkgs/importlib_metadata/spkg-configure.m4 b/build/pkgs/importlib_metadata/spkg-configure.m4
new file mode 100644
index 00000000000..0554e522252
--- /dev/null
+++ b/build/pkgs/importlib_metadata/spkg-configure.m4
@@ -0,0 +1,3 @@
+SAGE_SPKG_CONFIGURE([importlib_metadata], [
+  SAGE_PYTHON_PACKAGE_CHECK([importlib_metadata])
+])

From a8a154470822fb701dd9d8ae038c695ebaced2cb Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Thu, 30 Dec 2021 20:44:28 -0500
Subject: [PATCH 196/247] Trac #29665: add Gentoo package information for
 importlib_metadata.

---
 build/pkgs/importlib_metadata/distros/gentoo.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/pkgs/importlib_metadata/distros/gentoo.txt

diff --git a/build/pkgs/importlib_metadata/distros/gentoo.txt b/build/pkgs/importlib_metadata/distros/gentoo.txt
new file mode 100644
index 00000000000..4f927864c2b
--- /dev/null
+++ b/build/pkgs/importlib_metadata/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/importlib_metadata

From 5c60ddf026059ee52bde7720453f40e31cee64fe Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Fri, 25 Aug 2023 01:51:31 -0400
Subject: [PATCH 197/247] m4/sage_python_package_check.m4: update pkg_resources
 import

The pkg_resources module is now imported with,

  import pkg_resources

instead of

  import setuptools.version.pkg_resources
---
 m4/sage_python_package_check.m4 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/m4/sage_python_package_check.m4 b/m4/sage_python_package_check.m4
index 5547b35a71f..e0713512ea0 100644
--- a/m4/sage_python_package_check.m4
+++ b/m4/sage_python_package_check.m4
@@ -77,7 +77,7 @@ AC_DEFUN([SAGE_PYTHON_PACKAGE_CHECK], [
 
       AS_IF(
         [PYTHONUSERBASE="${PYTHONUSERBASE}" config.venv/bin/python3 -c dnl
-           "from setuptools.version import pkg_resources;              dnl
+           "import pkg_resources;                                      dnl
             pkg_resources.require('${SAGE_PKG_VERSPEC}'.splitlines())" dnl
 	 2>&AS_MESSAGE_LOG_FD],
         [AC_MSG_RESULT(yes)],

From d87feed8f8ecf975bffe1184594a921a9317beb1 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Fri, 25 Aug 2023 02:36:55 -0400
Subject: [PATCH 198/247] build/pkgs/pip/distros/gentoo.txt: drop USE=vanilla
 requirement

---
 build/pkgs/pip/distros/gentoo.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/pkgs/pip/distros/gentoo.txt b/build/pkgs/pip/distros/gentoo.txt
index 1845454d6de..793fb731829 100644
--- a/build/pkgs/pip/distros/gentoo.txt
+++ b/build/pkgs/pip/distros/gentoo.txt
@@ -1 +1 @@
-dev-python/pip[vanilla]
+dev-python/pip

From 3cd6cb69ed457889b93fb71e0aea75ad060c786d Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Fri, 25 Aug 2023 08:04:26 -0400
Subject: [PATCH 199/247] build/pkgs/ipython/install-requires.txt: reject
 <ipython-8.11

Sage isn't ready for ipython-8.11 yet because it requires a newer
prompt_toolkit (https://github.com/sagemath/sage/issues/33428).
---
 build/pkgs/ipython/install-requires.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/pkgs/ipython/install-requires.txt b/build/pkgs/ipython/install-requires.txt
index a52df49c421..4616117aa08 100644
--- a/build/pkgs/ipython/install-requires.txt
+++ b/build/pkgs/ipython/install-requires.txt
@@ -1 +1 @@
-ipython >=7.13.0
+ipython >=7.13.0, <8.11.0

From 0f07a78e6472b19c9436669376653264e2cccb1e Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Sat, 26 Aug 2023 20:17:05 -0400
Subject: [PATCH 200/247] configure.ac: set/subst a variable for
 --enable-system-site-packages

We now set ENABLE_SYSTEM_SITE_PACKAGES=yes and call AC_SUBST on it
when --enable-system-site-packages was passed to ./configure. This
will let us reference it in the build scripts that list available
system packages.
---
 configure.ac | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/configure.ac b/configure.ac
index fad8d00829a..26515d45839 100644
--- a/configure.ac
+++ b/configure.ac
@@ -469,8 +469,13 @@ AC_ARG_ENABLE(
     dnl their system python packages and who may not be paying close
     dnl attention to their ./configure output.
     with_system_python3="force"
+
+    dnl This is substituted in to build/bin/sage-build-env-config.in for use
+    dnl by build/bin/sage-get-system-packages
+    ENABLE_SYSTEM_SITE_PACKAGES=yes
   ])
 ])
+AC_SUBST([ENABLE_SYSTEM_SITE_PACKAGES])
 AC_SUBST([SAGE_PIP_INSTALL_FLAGS])
 AC_SUBST([SAGE_VENV_FLAGS])
 

From b68a4d55aa115773957cb2e37639fcd9afba2b99 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Sat, 26 Aug 2023 20:19:22 -0400
Subject: [PATCH 201/247] build/bin/sage-build-env-config.in: export
 ENABLE_SYSTEM_SITE_PACKAGES

This variable is set in configure.ac when --enable-system-site-packages
was passed to ./configure. Having it in the build config allows us to
prune the list of system packages based on that ./configure flag.
---
 build/bin/sage-build-env-config.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/build/bin/sage-build-env-config.in b/build/bin/sage-build-env-config.in
index df27cff4660..b2f59343d25 100644
--- a/build/bin/sage-build-env-config.in
+++ b/build/bin/sage-build-env-config.in
@@ -60,3 +60,5 @@ export SAGE_CONFIGURE_FFLAS_FFPACK="@SAGE_CONFIGURE_FFLAS_FFPACK@"
 
 export CONFIGURED_SAGE_EDITABLE="@SAGE_EDITABLE@"
 export CONFIGURED_SAGE_WHEELS="@SAGE_WHEELS@"
+
+export ENABLE_SYSTEM_SITE_PACKAGES="@ENABLE_SYSTEM_SITE_PACKAGES@"

From 174def6e458e69b9e22ab47b929e8164be46a750 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Sat, 26 Aug 2023 20:21:22 -0400
Subject: [PATCH 202/247] build/bin/sage-get-system-packages: optionally skip
 python packages

Packages calling SAGE_PYTHON_PACKAGE_CHECK in spkg-configure.m4 are
python packages whose detection is enabled by passing the
--enable-system-site-packages flag to ./configure. But when the flag
is NOT passed, we don't want to list the corresponding packages in the
output of sage-get-system-packages. This commit checks for the
presence of such an spkg-configure.m4 file and filters those packages
according to the ENABLE_SYSTEM_SITE_PACKAGES variable.
---
 build/bin/sage-get-system-packages | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/build/bin/sage-get-system-packages b/build/bin/sage-get-system-packages
index c51c36ceab9..ffb3d339f98 100755
--- a/build/bin/sage-get-system-packages
+++ b/build/bin/sage-get-system-packages
@@ -1,4 +1,5 @@
 #!/bin/sh
+
 SYSTEM=$1
 if [ -z "$SYSTEM" ]; then
    echo >&2 "usage: $0 {auto|debian|arch|conda|pip|...} SPKGS..."
@@ -10,6 +11,12 @@ SPKGS="$*"
 if [ -z "$SAGE_ROOT" ]; then
     SAGE_ROOT=`pwd`
 fi
+
+# We source sage-build-env-config because we need to know if
+# --enable-system-site-packages was passed to ./configure.
+# (If not, we want to hide those packages.)
+. "${SAGE_ROOT}/build/bin/sage-build-env-config"
+
 case "$SYSTEM" in
     install-requires)
         # Collect install-requires.txt (falling back to requirements.txt) and output it in the format
@@ -44,6 +51,17 @@ case "$SYSTEM" in
         ;;
 esac
 for PKG_BASE in $SPKGS; do
+
+    # Skip this package if it uses the SAGE_PYTHON_PACKAGE_CHECK
+    # macro and if --enable-system-site-packages was NOT passed
+    # to ./configure.
+    SPKG_CONFIGURE="${SAGE_ROOT}/build/pkgs/${PKG_BASE}/spkg-configure.m4"
+    if grep -q SAGE_PYTHON_PACKAGE_CHECK "${SPKG_CONFIGURE}" 2>/dev/null; then
+	if [ -z "${ENABLE_SYSTEM_SITE_PACKAGES}" ]; then
+	    continue;
+	fi
+    fi
+
     for NAME in $SYSTEM_PACKAGES_FILE_NAMES; do
         SYSTEM_PACKAGES_FILE="$SAGE_ROOT"/build/pkgs/$PKG_BASE/$NAME
         if [ -f $SYSTEM_PACKAGES_FILE ]; then

From d2360b3b7a06991be6ec5b90d1172a39637a634a Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Sat, 26 Aug 2023 22:58:04 -0400
Subject: [PATCH 203/247] build/bin/write-dockerfile.sh: refactor using
 sage-get-system-packages

This avoids duplicating the check for ENABLE_SYSTEM_SITE_PACKAGES.
---
 build/bin/write-dockerfile.sh | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/build/bin/write-dockerfile.sh b/build/bin/write-dockerfile.sh
index 14cbaf786eb..2c705f842c6 100755
--- a/build/bin/write-dockerfile.sh
+++ b/build/bin/write-dockerfile.sh
@@ -5,7 +5,7 @@
 set -e
 SYSTEM="${1:-debian}"
 shopt -s extglob
-SAGE_PACKAGE_LIST_ARGS="${2:- --has-file=spkg-configure.m4 :standard:}"
+SAGE_PACKAGE_LIST_ARGS="${2:-:standard:}"
 WITH_SYSTEM_SPKG="${3:-yes}"
 IGNORE_MISSING_SYSTEM_PACKAGES="${4:-no}"
 EXTRA_SAGE_PACKAGES="${5:-_bootstrap}"
@@ -15,17 +15,14 @@ SAGE_ROOT=.
 export PATH="$SAGE_ROOT"/build/bin:$PATH
 SYSTEM_PACKAGES=$EXTRA_SYSTEM_PACKAGES
 CONFIGURE_ARGS="--enable-option-checking "
-for PKG_BASE in $(sage-package list --has-file=distros/$SYSTEM.txt $SAGE_PACKAGE_LIST_ARGS) $EXTRA_SAGE_PACKAGES; do
-    PKG_SCRIPTS="$SAGE_ROOT"/build/pkgs/$PKG_BASE
-    if [ -d $PKG_SCRIPTS ]; then
-       SYSTEM_PACKAGES_FILE=$PKG_SCRIPTS/distros/$SYSTEM.txt
-       PKG_SYSTEM_PACKAGES=$(echo $(${STRIP_COMMENTS} $SYSTEM_PACKAGES_FILE))
-       if [ -n "PKG_SYSTEM_PACKAGES" ]; then
-           SYSTEM_PACKAGES+=" $PKG_SYSTEM_PACKAGES"
-           if [ -f $PKG_SCRIPTS/spkg-configure.m4 ]; then
-               CONFIGURE_ARGS+="--with-system-$PKG_BASE=${WITH_SYSTEM_SPKG} "
-           fi
-       fi
+for SPKG in $(sage-package list $SAGE_PACKAGE_LIST_ARGS) $EXTRA_SAGE_PACKAGES; do
+    SYSTEM_PACKAGE=$(sage-get-system-packages $SYSTEM $SPKG)
+    if [ -n "${SYSTEM_PACKAGE}" ]; then
+	# SYSTEM_PACKAGE can be empty if, for example, it corresponds
+	# to a python package and --enable-system-site-packages was
+	# not passed to ./configure.
+	SYSTEM_PACKAGES+=" ${SYSTEM_PACKAGE}"
+	CONFIGURE_ARGS+="--with-system-${SPKG}=${WITH_SYSTEM_SPKG} "
     fi
 done
 echo "# Automatically generated by SAGE_ROOT/build/bin/write-dockerfile.sh"

From f8f6a80613799bdf85ac0d4fb227d00314dea790 Mon Sep 17 00:00:00 2001
From: Dima Pasechnik <dima@pasechnik.info>
Date: Sun, 27 Aug 2023 09:29:42 +0100
Subject: [PATCH 204/247] lb version in  install-requires.txt for flit

---
 build/pkgs/flit_core/install-requires.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/pkgs/flit_core/install-requires.txt b/build/pkgs/flit_core/install-requires.txt
index 14ccfd92035..88b912bf11a 100644
--- a/build/pkgs/flit_core/install-requires.txt
+++ b/build/pkgs/flit_core/install-requires.txt
@@ -1 +1 @@
-flit-core
+flit-core >= 3.7.1

From 1c1000ad85b49195471f4922ccc02264cc6131e7 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Sun, 27 Aug 2023 08:50:13 -0400
Subject: [PATCH 205/247] build/bin/write-dockerfile.sh: don't mention
 --enable-system-site-packages

Since this script can be invoked outside of a sage environment, we
mention the environment variable ENABLE_SYSTEM_SITE_PACKAGES instead.
---
 build/bin/write-dockerfile.sh | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/build/bin/write-dockerfile.sh b/build/bin/write-dockerfile.sh
index 2c705f842c6..74006a314ae 100755
--- a/build/bin/write-dockerfile.sh
+++ b/build/bin/write-dockerfile.sh
@@ -18,9 +18,8 @@ CONFIGURE_ARGS="--enable-option-checking "
 for SPKG in $(sage-package list $SAGE_PACKAGE_LIST_ARGS) $EXTRA_SAGE_PACKAGES; do
     SYSTEM_PACKAGE=$(sage-get-system-packages $SYSTEM $SPKG)
     if [ -n "${SYSTEM_PACKAGE}" ]; then
-	# SYSTEM_PACKAGE can be empty if, for example, it corresponds
-	# to a python package and --enable-system-site-packages was
-	# not passed to ./configure.
+	# SYSTEM_PACKAGE can be empty if, for example, the environment
+	# variable ENABLE_SYSTEM_SITE_PACKAGES is empty.
 	SYSTEM_PACKAGES+=" ${SYSTEM_PACKAGE}"
 	CONFIGURE_ARGS+="--with-system-${SPKG}=${WITH_SYSTEM_SPKG} "
     fi

From 5eafbaa04ffc858c1e1a714c3b8dff8ceffe41e9 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Sun, 27 Aug 2023 08:51:13 -0400
Subject: [PATCH 206/247] build/bin/write-dockerfile.sh: skip packages without
 spkg-configure.m4

We can't add --with-system-foo if foo doesn't have an
spkg-configure.m4 file.
---
 build/bin/write-dockerfile.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/bin/write-dockerfile.sh b/build/bin/write-dockerfile.sh
index 74006a314ae..85b51245b29 100755
--- a/build/bin/write-dockerfile.sh
+++ b/build/bin/write-dockerfile.sh
@@ -15,7 +15,7 @@ SAGE_ROOT=.
 export PATH="$SAGE_ROOT"/build/bin:$PATH
 SYSTEM_PACKAGES=$EXTRA_SYSTEM_PACKAGES
 CONFIGURE_ARGS="--enable-option-checking "
-for SPKG in $(sage-package list $SAGE_PACKAGE_LIST_ARGS) $EXTRA_SAGE_PACKAGES; do
+for SPKG in $(sage-package list --has-file=spkg-configure.m4 $SAGE_PACKAGE_LIST_ARGS) $EXTRA_SAGE_PACKAGES; do
     SYSTEM_PACKAGE=$(sage-get-system-packages $SYSTEM $SPKG)
     if [ -n "${SYSTEM_PACKAGE}" ]; then
 	# SYSTEM_PACKAGE can be empty if, for example, the environment

From 17455620020f7e524893a4c1c63dd6d5b684711d Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Sun, 27 Aug 2023 09:04:27 -0400
Subject: [PATCH 207/247] build/bin/sage-get-system-packages: don't source
 build-env-config

Since sage-get-system-packages is expected to work before ./configure
has been run, we instead rely on ENABLE_SYSTEM_SITE_PACKAGES having
already been set in the environment. When ./configure has not been
run, that variable will be empty, and the python packages will be
omitted from the list.
---
 build/bin/sage-get-system-packages | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/build/bin/sage-get-system-packages b/build/bin/sage-get-system-packages
index ffb3d339f98..800c47976f7 100755
--- a/build/bin/sage-get-system-packages
+++ b/build/bin/sage-get-system-packages
@@ -12,11 +12,6 @@ if [ -z "$SAGE_ROOT" ]; then
     SAGE_ROOT=`pwd`
 fi
 
-# We source sage-build-env-config because we need to know if
-# --enable-system-site-packages was passed to ./configure.
-# (If not, we want to hide those packages.)
-. "${SAGE_ROOT}/build/bin/sage-build-env-config"
-
 case "$SYSTEM" in
     install-requires)
         # Collect install-requires.txt (falling back to requirements.txt) and output it in the format
@@ -54,7 +49,7 @@ for PKG_BASE in $SPKGS; do
 
     # Skip this package if it uses the SAGE_PYTHON_PACKAGE_CHECK
     # macro and if --enable-system-site-packages was NOT passed
-    # to ./configure.
+    # to ./configure (or if ./configure has not yet been run).
     SPKG_CONFIGURE="${SAGE_ROOT}/build/pkgs/${PKG_BASE}/spkg-configure.m4"
     if grep -q SAGE_PYTHON_PACKAGE_CHECK "${SPKG_CONFIGURE}" 2>/dev/null; then
 	if [ -z "${ENABLE_SYSTEM_SITE_PACKAGES}" ]; then

From 4fe6c2c1c3875cea2b0deae82f14c31f570144ed Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Sun, 27 Aug 2023 13:42:39 -0400
Subject: [PATCH 208/247] build/bin/sage-get-system-packages: swap two "if"
 statements

It's faster to read a variable than it is to launch grep, so we should
do the easy one first (in case the hard one can be skipped).
---
 build/bin/sage-get-system-packages | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/build/bin/sage-get-system-packages b/build/bin/sage-get-system-packages
index 800c47976f7..c8b9314c3fe 100755
--- a/build/bin/sage-get-system-packages
+++ b/build/bin/sage-get-system-packages
@@ -51,10 +51,11 @@ for PKG_BASE in $SPKGS; do
     # macro and if --enable-system-site-packages was NOT passed
     # to ./configure (or if ./configure has not yet been run).
     SPKG_CONFIGURE="${SAGE_ROOT}/build/pkgs/${PKG_BASE}/spkg-configure.m4"
-    if grep -q SAGE_PYTHON_PACKAGE_CHECK "${SPKG_CONFIGURE}" 2>/dev/null; then
-	if [ -z "${ENABLE_SYSTEM_SITE_PACKAGES}" ]; then
-	    continue;
-	fi
+    if [ -z "${ENABLE_SYSTEM_SITE_PACKAGES}" ]; then
+        if grep -q SAGE_PYTHON_PACKAGE_CHECK "${SPKG_CONFIGURE}" 2>/dev/null;
+        then
+            continue;
+        fi
     fi
 
     for NAME in $SYSTEM_PACKAGES_FILE_NAMES; do

From 0960b9e15df23f0fac185ab07dc5d83c40ed270a Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Sun, 27 Aug 2023 13:57:14 -0400
Subject: [PATCH 209/247] build/bin/sage-spkg-info: mention
 --enable-system-site-packages

Instead of saying that Python packages will never be used, we update
the output of this script to suggest --enable-system-site-packages
when a Python package is queried (and it has an spkg-configure.m4).
---
 build/bin/sage-spkg-info | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/build/bin/sage-spkg-info b/build/bin/sage-spkg-info
index d02b3ac347f..7e25f70dc32 100755
--- a/build/bin/sage-spkg-info
+++ b/build/bin/sage-spkg-info
@@ -111,16 +111,17 @@ if [ -z "$system" ]; then
 else
     echo
     if [ -f "$PKG_SCRIPTS"/spkg-configure.m4 ]; then
-        echo "If the system package is installed, ./configure will check whether it can be used."
-    else
-        echo "However, these system packages will not be used for building Sage"
         if [ -f "$PKG_SCRIPTS"/install-requires.txt ]; then
-            echo "because using Python site-packages is not supported by the Sage distribution;"
-            echo "see https://github.com/sagemath/sage/issues/29023"
+            echo "If the system package is installed and if --enable-system-site-packages"
+            echo "is passed to ./configure, then ./configure will check if it can be used."
         else
-            echo "because spkg-configure.m4 has not been written for this package;"
-            echo "see https://github.com/sagemath/sage/issues/27330"
+            echo "If the system package is installed, ./configure will check if it can be used."
         fi
+
+    else
+        echo "However, these system packages will not be used for building Sage"
+        echo "because spkg-configure.m4 has not been written for this package;"
+        echo "see https://github.com/sagemath/sage/issues/27330"
     fi
 fi
 echo

From 0619e4cc2d9af7eb5f27e5ec336f800f7fda69dc Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Sun, 27 Aug 2023 14:19:11 -0400
Subject: [PATCH 210/247] build/bin/sage-spkg-info: improve test for system
 site packages

To avoid false positives with packages like tox (which has an
install-requires.txt but can also be detected without passing
--enable-system-site-packages), we update the test in this script to
grep spkg-configure.m4 rather than simply rely on the presence of both
spkg-configure.m4 and install-requires.txt.
---
 build/bin/sage-spkg-info | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/build/bin/sage-spkg-info b/build/bin/sage-spkg-info
index 7e25f70dc32..e43e516dc5b 100755
--- a/build/bin/sage-spkg-info
+++ b/build/bin/sage-spkg-info
@@ -110,14 +110,15 @@ if [ -z "$system" ]; then
     echo "(none known)"
 else
     echo
-    if [ -f "$PKG_SCRIPTS"/spkg-configure.m4 ]; then
-        if [ -f "$PKG_SCRIPTS"/install-requires.txt ]; then
-            echo "If the system package is installed and if --enable-system-site-packages"
-            echo "is passed to ./configure, then ./configure will check if it can be used."
+    SPKG_CONFIGURE="${PKG_SCRIPTS}/spkg-configure.m4"
+    if [ -f "${SPKG_CONFIGURE}" ]; then
+        if grep -q SAGE_PYTHON_PACKAGE_CHECK "${SPKG_CONFIGURE}"; then
+            echo "If the system package is installed and if the (experimental) option"
+            echo "--enable-system-site-packages is passed to ./configure, then ./configure"
+            echo "will check if the system package can be used."
         else
             echo "If the system package is installed, ./configure will check if it can be used."
         fi
-
     else
         echo "However, these system packages will not be used for building Sage"
         echo "because spkg-configure.m4 has not been written for this package;"

From e9c4710791e4d85d6d547351454d34efd9c1e128 Mon Sep 17 00:00:00 2001
From: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
Date: Sun, 27 Aug 2023 11:40:40 -0700
Subject: [PATCH 211/247] tox.ini: Add packages factor 'sitepackages'

---
 tox.ini | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index 9c74d31bbe5..94b42e39c25 100644
--- a/tox.ini
+++ b/tox.ini
@@ -187,6 +187,8 @@ setenv =
     develop:                 EXTRA_SAGE_PACKAGES_4=_develop $(head -n 1 build/pkgs/_develop/dependencies)
     minimal:               SAGE_PACKAGE_LIST_ARGS=_prereq
     maximal:               SAGE_PACKAGE_LIST_ARGS=:standard: :optional:
+    sitepackages:              ENABLE_SYSTEM_SITE_PACKAGES=yes
+    sitepackages:                CONFIG_CONFIGURE_ARGS_SITEPACKAGES=--enable-system-site-packages
     conda-environment:     SAGE_PACKAGE_LIST_ARGS=_prereq
     # Whether to add the system packages needed for bootstrapping
                            EXTRA_SAGE_PACKAGES_0=_bootstrap
@@ -601,7 +603,7 @@ setenv =
     #
     # Resulting full configuration args, including EXTRA_CONFIGURE_ARGS from the user environment
     #
-                      CONFIGURE_ARGS=--enable-experimental-packages --enable-download-from-upstream-url {env:CONFIG_CONFIGURE_ARGS_ROOT:} {env:CONFIG_CONFIGURE_ARGS_1:} {env:CONFIG_CONFIGURE_ARGS_2:} {env:EXTRA_CONFIGURE_ARGS:}
+                      CONFIGURE_ARGS=--enable-experimental-packages --enable-download-from-upstream-url {env:CONFIG_CONFIGURE_ARGS_ROOT:} {env:CONFIG_CONFIGURE_ARGS_SITEPACKAGES:} {env:CONFIG_CONFIGURE_ARGS_1:} {env:CONFIG_CONFIGURE_ARGS_2:} {env:EXTRA_CONFIGURE_ARGS:}
     #
     # Resulting EXTRA_SAGE_PACKAGES
     #

From 0ffc189598265884efae64326c8c604a712a5076 Mon Sep 17 00:00:00 2001
From: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
Date: Sun, 27 Aug 2023 17:35:38 -0700
Subject: [PATCH 212/247] build/pkgs/mathjax/distros/gentoo.txt: Shell-quote

---
 build/pkgs/mathjax/distros/gentoo.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/pkgs/mathjax/distros/gentoo.txt b/build/pkgs/mathjax/distros/gentoo.txt
index e0d633a9b98..a347f8c2348 100644
--- a/build/pkgs/mathjax/distros/gentoo.txt
+++ b/build/pkgs/mathjax/distros/gentoo.txt
@@ -1 +1 @@
->=dev-libs/mathjax-3
+">=dev-libs/mathjax-3"

From 5adb9d7ade2ed4b3d543768e712851fab1337dc3 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Tue, 29 Aug 2023 18:00:58 -0400
Subject: [PATCH 213/247] m4/sage_spkg_configure.m4: reduce python package
 ./configure noise

When --enable-system-site-packages is not given, the associated
./configure checks short-circuit and will not detect any system
packages. During this no-op it is however rather vociferous:

  ## ---------------------------------------------------------- ##
  ## Checking whether SageMath should install SPKG alabaster... ##
  ## ---------------------------------------------------------- ##
  configure:18401: checking if --enable-system-site-packages was used
  configure:18457: result: no; skipping check
  configure:18487: no suitable system package found for SPKG alabaster

This commit redirects the output from ./configure to hide those
messages in the absence of --enable-system-site-packages. They are
hidden only from the console; config.log retains everything for
debugging purposes.
---
 m4/sage_spkg_configure.m4 | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/m4/sage_spkg_configure.m4 b/m4/sage_spkg_configure.m4
index a0eeaa53a74..1f07d7cd294 100644
--- a/m4/sage_spkg_configure.m4
+++ b/m4/sage_spkg_configure.m4
@@ -58,6 +58,31 @@ dnl   indicate why
 m4_pushdef([SPKG_USE_SYSTEM], [sage_use_system_]SPKG_NAME)
 # BEGIN SAGE_SPKG_CONFIGURE_]m4_toupper($1)[
 
+dnl Hide the output from Python (system site package) checks
+dnl when --enable-system-site-packages was not given. This
+dnl doesn't affect the test results but it minimizes the noise
+dnl in the ./configure output. The config.log however retains
+dnl everything.
+dnl
+dnl Open descriptor 9 as a copy of AS_MESSAGE_FD, so that it
+dnl can later be used to restore AS_MESSAGE_FD. Afterwards,
+dnl send AS_MESSAGE_FD to /dev/null. We'll restore it if this
+dnl isn't a python package or if --enable-system-site-packages
+dnl was given (or at the end of this macro, if nothing else).
+exec 9<&AS_MESSAGE_FD
+exec AS_MESSAGE_FD>/dev/null
+
+AS_IF([test "${enable_system_site_packages}" = "yes"], [
+  dnl Python package checks are enabled, so restore AS_MESSAGE_FD
+  exec AS_MESSAGE_FD<&9
+])
+
+SPKG_CONFIGURE="${SAGE_ROOT}/build/pkgs/$1/spkg-configure.m4"
+AS_IF([! grep -q [SAGE_PYTHON_PACKAGE_CHECK] "${SPKG_CONFIGURE}"],[
+  dnl Not a python package, so restore AS_MESSAGE_FD
+  exec AS_MESSAGE_FD<&9
+])
+
 echo "-----------------------------------------------------------------------------" >& AS_MESSAGE_FD
 echo "Checking whether SageMath should install SPKG $1..." >& AS_MESSAGE_FD
 AS_BOX([Checking whether SageMath should install SPKG $1...]) >& AS_MESSAGE_LOG_FD
@@ -140,6 +165,13 @@ AS_VAR_IF(SPKG_INSTALL, [no], [
 dnl Run POST
 $5
 
+dnl Restore the message file descriptor that we clobbered earlier
+dnl for the sake of hiding site package check noise. It's possible
+dnl that we've already done this above, but it doesn't hurt to do
+dnl it again, and we want everything "back to normal" at the end
+dnl of this macro.
+exec AS_MESSAGE_FD<&9
+
 # END SAGE_SPKG_CONFIGURE_]m4_toupper($1)[
 m4_popdef([SPKG_USE_SYSTEM])
 m4_popdef([SPKG_REQUIRE])

From d8afc4c5123af7fd2bc24e2354b7fd69b14db4f1 Mon Sep 17 00:00:00 2001
From: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
Date: Tue, 29 Aug 2023 15:51:52 -0700
Subject: [PATCH 214/247] tox.ini (sitepackages): Use
 IGNORE_MISSING_SYSTEM_PACKAGES=yes

---
 tox.ini | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tox.ini b/tox.ini
index 94b42e39c25..0f4fb121c0d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -609,6 +609,8 @@ setenv =
     #
                       ALL_EXTRA_SAGE_PACKAGES={env:EXTRA_SAGE_PACKAGES_0:} {env:EXTRA_SAGE_PACKAGES_1:} {env:EXTRA_SAGE_PACKAGES_2:} {env:EXTRA_SAGE_PACKAGES_3:} {env:EXTRA_SAGE_PACKAGES_4:} {env:EXTRA_SAGE_PACKAGES_5:} {env:EXTRA_SAGE_PACKAGES:}
 
+    sitepackages:                              IGNORE_MISSING_SYSTEM_PACKAGES=yes
+
 # environment will be skipped if regular expression does not match against the sys.platform string
 platform =
     local-macos:   darwin

From 30013bb97b11dfc2c0b143c80e606c1229b98874 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Tue, 29 Aug 2023 18:57:18 -0400
Subject: [PATCH 215/247] build/pkgs/setuptools_scm/distros/gentoo.txt: fix
 package name

This was renamed from setuptools_scm to setuptools-scm in Gentoo
on Fri Mar 3 2023.
---
 build/pkgs/setuptools_scm/distros/gentoo.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/pkgs/setuptools_scm/distros/gentoo.txt b/build/pkgs/setuptools_scm/distros/gentoo.txt
index 89895971525..46efc2bdeb4 100644
--- a/build/pkgs/setuptools_scm/distros/gentoo.txt
+++ b/build/pkgs/setuptools_scm/distros/gentoo.txt
@@ -1 +1 @@
-dev-python/setuptools_scm
+dev-python/setuptools-scm

From 4e40f000b702cfa0027ef39626819a97947c8240 Mon Sep 17 00:00:00 2001
From: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
Date: Tue, 29 Aug 2023 18:07:21 -0700
Subject: [PATCH 216/247] .tox, .github/workflows/ci-linux.yml: Test
 -standard-sitepackages

---
 .github/workflows/ci-linux.yml | 20 ++++++++++++++++++++
 tox.ini                        |  3 ++-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci-linux.yml b/.github/workflows/ci-linux.yml
index 5f049741eab..e4f424380df 100644
--- a/.github/workflows/ci-linux.yml
+++ b/.github/workflows/ci-linux.yml
@@ -63,6 +63,26 @@ jobs:
           ["standard"]
       docker_push_repository: ghcr.io/${{ github.repository }}/
 
+  standard-sitepackages:
+    if: ${{ success() || failure() }}
+    needs: [standard-pre]
+    uses: ./.github/workflows/docker.yml
+    with:
+      # Build incrementally from previous stage (pre)
+      incremental: true
+      free_disk_space: true
+      from_docker_repository: ghcr.io/${{ github.repository }}/
+      from_docker_target: "with-targets-pre"
+      from_docker_tag: "$(echo $BUILD_TAG | sed s/-sitepackages//)"
+      docker_targets: "with-targets with-targets-optional"
+      # FIXME: duplicated from env.TARGETS
+      targets: build doc-html
+      targets_optional: ptest
+      tox_packages_factors: >-
+          ["standard-sitepackages"]
+      docker_push_repository: ghcr.io/${{ github.repository }}/
+      max_parallel: 10
+
   minimal-pre:
     if: ${{ success() || failure() }}
     # It does not really "need" it.
diff --git a/tox.ini b/tox.ini
index 0f4fb121c0d..939f1b7d0f4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -478,7 +478,8 @@ setenv =
     #
     docker:             FULL_BASE_IMAGE_AND_TAG={env:ARCH_IMAGE_PREFIX:}{env:BASE_IMAGE}{env:ARCH_IMAGE_SUFFIX:}:{env:ARCH_TAG_PREFIX:}{env:BASE_TAG}{env:ARCH_TAG_SUFFIX:}
     docker-incremental: FULL_BASE_IMAGE_AND_TAG={env:FROM_DOCKER_REPOSITORY:ghcr.io/sagemath/sage/}sage-$(echo {envname} | sed -E "s/(docker-|-incremental)//g")-{env:FROM_DOCKER_TARGET:with-targets}:{env:FROM_DOCKER_TAG:dev}
-    docker-incremental: SKIP_SYSTEM_PKG_INSTALL=yes
+    docker-incremental:              SKIP_SYSTEM_PKG_INSTALL=yes
+    docker-incremental-sitepackages: SKIP_SYSTEM_PKG_INSTALL=no
     #
     docker-nobootstrap: BOOTSTRAP=./bootstrap -D
     ###

From 5ca3ac9f9da40b5fe155f5f99c48f40c61a7f3d1 Mon Sep 17 00:00:00 2001
From: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
Date: Tue, 29 Aug 2023 19:53:31 -0700
Subject: [PATCH 217/247] build/pkgs: Add distros/*.txt for some Python
 packages

---
 build/pkgs/cython/distros/arch.txt                 | 1 +
 build/pkgs/cython/distros/debian.txt               | 1 +
 build/pkgs/cython/distros/fedora.txt               | 1 +
 build/pkgs/cython/distros/gentoo.txt               | 1 +
 build/pkgs/cython/distros/opensuse.txt             | 1 +
 build/pkgs/dateutil/distros/arch.txt               | 1 +
 build/pkgs/dateutil/distros/debian.txt             | 1 +
 build/pkgs/dateutil/distros/fedora.txt             | 1 +
 build/pkgs/dateutil/distros/freebsd.txt            | 1 +
 build/pkgs/dateutil/distros/opensuse.txt           | 1 +
 build/pkgs/importlib_metadata/distros/arch.txt     | 1 +
 build/pkgs/importlib_metadata/distros/debian.txt   | 1 +
 build/pkgs/importlib_metadata/distros/fedora.txt   | 1 +
 build/pkgs/importlib_metadata/distros/freebsd.txt  | 1 +
 build/pkgs/importlib_metadata/distros/opensuse.txt | 1 +
 build/pkgs/ipykernel/distros/arch.txt              | 1 +
 build/pkgs/ipykernel/distros/debian.txt            | 1 +
 build/pkgs/ipykernel/distros/fedora.txt            | 1 +
 build/pkgs/ipykernel/distros/freebsd.txt           | 1 +
 build/pkgs/ipykernel/distros/opensuse.txt          | 1 +
 build/pkgs/ipython/distros/arch.txt                | 1 +
 build/pkgs/ipython/distros/debian.txt              | 1 +
 build/pkgs/ipython/distros/fedora.txt              | 1 +
 build/pkgs/ipython/distros/freebsd.txt             | 1 +
 build/pkgs/jsonschema/distros/arch.txt             | 1 +
 build/pkgs/jsonschema/distros/debian.txt           | 1 +
 build/pkgs/jsonschema/distros/fedora.txt           | 1 +
 build/pkgs/jupyterlab_widgets/distros/arch.txt     | 1 +
 build/pkgs/jupyterlab_widgets/distros/freebsd.txt  | 1 +
 build/pkgs/jupyterlab_widgets/distros/opensuse.txt | 1 +
 build/pkgs/pexpect/distros/arch.txt                | 1 +
 build/pkgs/pexpect/distros/fedora.txt              | 1 +
 build/pkgs/pexpect/distros/freebsd.txt             | 1 +
 build/pkgs/pip/distros/debian.txt                  | 1 +
 build/pkgs/pip/distros/fedora.txt                  | 1 +
 build/pkgs/pip/distros/freebsd.txt                 | 1 +
 build/pkgs/prompt_toolkit/distros/arch.txt         | 1 +
 build/pkgs/prompt_toolkit/distros/debian.txt       | 1 +
 build/pkgs/prompt_toolkit/distros/fedora.txt       | 1 +
 build/pkgs/prompt_toolkit/distros/freebsd.txt      | 1 +
 build/pkgs/prompt_toolkit/distros/opensuse.txt     | 2 +-
 build/pkgs/ptyprocess/distros/arch.txt             | 1 +
 build/pkgs/ptyprocess/distros/fedora.txt           | 1 +
 build/pkgs/ptyprocess/distros/freebsd.txt          | 1 +
 build/pkgs/pycosat/distros/alpine.txt              | 1 +
 build/pkgs/pycosat/distros/arch.txt                | 1 +
 build/pkgs/pycosat/distros/fedora.txt              | 1 +
 build/pkgs/pycosat/distros/freebsd.txt             | 1 +
 build/pkgs/pyparsing/distros/arch.txt              | 1 +
 build/pkgs/pyparsing/distros/freebsd.txt           | 1 +
 build/pkgs/sphinx/distros/arch.txt                 | 1 +
 build/pkgs/sphinx/distros/debian.txt               | 1 +
 build/pkgs/sphinx/distros/fedora.txt               | 1 +
 build/pkgs/sphinx/distros/freebsd.txt              | 1 +
 build/pkgs/typing_extensions/distros/arch.txt      | 1 +
 build/pkgs/typing_extensions/distros/debian.txt    | 1 +
 build/pkgs/typing_extensions/distros/fedora.txt    | 1 +
 build/pkgs/typing_extensions/distros/freebsd.txt   | 1 +
 build/pkgs/typing_extensions/distros/gentoo.txt    | 1 +
 build/pkgs/typing_extensions/distros/opensuse.txt  | 1 +
 build/pkgs/tzlocal/distros/arch.txt                | 1 +
 build/pkgs/tzlocal/distros/debian.txt              | 1 +
 build/pkgs/tzlocal/distros/fedora.txt              | 1 +
 build/pkgs/tzlocal/distros/freebsd.txt             | 1 +
 build/pkgs/urllib3/distros/arch.txt                | 1 +
 build/pkgs/urllib3/distros/debian.txt              | 1 +
 build/pkgs/urllib3/distros/fedora.txt              | 1 +
 build/pkgs/urllib3/distros/freebsd.txt             | 1 +
 build/pkgs/urllib3/distros/opensuse.txt            | 1 +
 69 files changed, 69 insertions(+), 1 deletion(-)
 create mode 100644 build/pkgs/cython/distros/arch.txt
 create mode 100644 build/pkgs/cython/distros/debian.txt
 create mode 100644 build/pkgs/cython/distros/fedora.txt
 create mode 100644 build/pkgs/cython/distros/gentoo.txt
 create mode 100644 build/pkgs/cython/distros/opensuse.txt
 create mode 100644 build/pkgs/dateutil/distros/arch.txt
 create mode 100644 build/pkgs/dateutil/distros/debian.txt
 create mode 100644 build/pkgs/dateutil/distros/fedora.txt
 create mode 100644 build/pkgs/dateutil/distros/freebsd.txt
 create mode 100644 build/pkgs/dateutil/distros/opensuse.txt
 create mode 100644 build/pkgs/importlib_metadata/distros/arch.txt
 create mode 100644 build/pkgs/importlib_metadata/distros/debian.txt
 create mode 100644 build/pkgs/importlib_metadata/distros/fedora.txt
 create mode 100644 build/pkgs/importlib_metadata/distros/freebsd.txt
 create mode 100644 build/pkgs/importlib_metadata/distros/opensuse.txt
 create mode 100644 build/pkgs/ipykernel/distros/arch.txt
 create mode 100644 build/pkgs/ipykernel/distros/debian.txt
 create mode 100644 build/pkgs/ipykernel/distros/fedora.txt
 create mode 100644 build/pkgs/ipykernel/distros/freebsd.txt
 create mode 100644 build/pkgs/ipykernel/distros/opensuse.txt
 create mode 100644 build/pkgs/ipython/distros/arch.txt
 create mode 100644 build/pkgs/ipython/distros/debian.txt
 create mode 100644 build/pkgs/ipython/distros/fedora.txt
 create mode 100644 build/pkgs/ipython/distros/freebsd.txt
 create mode 100644 build/pkgs/jsonschema/distros/arch.txt
 create mode 100644 build/pkgs/jsonschema/distros/debian.txt
 create mode 100644 build/pkgs/jsonschema/distros/fedora.txt
 create mode 100644 build/pkgs/jupyterlab_widgets/distros/arch.txt
 create mode 100644 build/pkgs/jupyterlab_widgets/distros/freebsd.txt
 create mode 100644 build/pkgs/jupyterlab_widgets/distros/opensuse.txt
 create mode 100644 build/pkgs/pexpect/distros/arch.txt
 create mode 100644 build/pkgs/pexpect/distros/fedora.txt
 create mode 100644 build/pkgs/pexpect/distros/freebsd.txt
 create mode 100644 build/pkgs/pip/distros/debian.txt
 create mode 100644 build/pkgs/pip/distros/fedora.txt
 create mode 100644 build/pkgs/pip/distros/freebsd.txt
 create mode 100644 build/pkgs/prompt_toolkit/distros/arch.txt
 create mode 100644 build/pkgs/prompt_toolkit/distros/debian.txt
 create mode 100644 build/pkgs/prompt_toolkit/distros/fedora.txt
 create mode 100644 build/pkgs/prompt_toolkit/distros/freebsd.txt
 create mode 100644 build/pkgs/ptyprocess/distros/arch.txt
 create mode 100644 build/pkgs/ptyprocess/distros/fedora.txt
 create mode 100644 build/pkgs/ptyprocess/distros/freebsd.txt
 create mode 100644 build/pkgs/pycosat/distros/alpine.txt
 create mode 100644 build/pkgs/pycosat/distros/arch.txt
 create mode 100644 build/pkgs/pycosat/distros/fedora.txt
 create mode 100644 build/pkgs/pycosat/distros/freebsd.txt
 create mode 100644 build/pkgs/pyparsing/distros/arch.txt
 create mode 100644 build/pkgs/pyparsing/distros/freebsd.txt
 create mode 100644 build/pkgs/sphinx/distros/arch.txt
 create mode 100644 build/pkgs/sphinx/distros/debian.txt
 create mode 100644 build/pkgs/sphinx/distros/fedora.txt
 create mode 100644 build/pkgs/sphinx/distros/freebsd.txt
 create mode 100644 build/pkgs/typing_extensions/distros/arch.txt
 create mode 100644 build/pkgs/typing_extensions/distros/debian.txt
 create mode 100644 build/pkgs/typing_extensions/distros/fedora.txt
 create mode 100644 build/pkgs/typing_extensions/distros/freebsd.txt
 create mode 100644 build/pkgs/typing_extensions/distros/gentoo.txt
 create mode 100644 build/pkgs/typing_extensions/distros/opensuse.txt
 create mode 100644 build/pkgs/tzlocal/distros/arch.txt
 create mode 100644 build/pkgs/tzlocal/distros/debian.txt
 create mode 100644 build/pkgs/tzlocal/distros/fedora.txt
 create mode 100644 build/pkgs/tzlocal/distros/freebsd.txt
 create mode 100644 build/pkgs/urllib3/distros/arch.txt
 create mode 100644 build/pkgs/urllib3/distros/debian.txt
 create mode 100644 build/pkgs/urllib3/distros/fedora.txt
 create mode 100644 build/pkgs/urllib3/distros/freebsd.txt
 create mode 100644 build/pkgs/urllib3/distros/opensuse.txt

diff --git a/build/pkgs/cython/distros/arch.txt b/build/pkgs/cython/distros/arch.txt
new file mode 100644
index 00000000000..f6629e02456
--- /dev/null
+++ b/build/pkgs/cython/distros/arch.txt
@@ -0,0 +1 @@
+cython
diff --git a/build/pkgs/cython/distros/debian.txt b/build/pkgs/cython/distros/debian.txt
new file mode 100644
index 00000000000..f6629e02456
--- /dev/null
+++ b/build/pkgs/cython/distros/debian.txt
@@ -0,0 +1 @@
+cython
diff --git a/build/pkgs/cython/distros/fedora.txt b/build/pkgs/cython/distros/fedora.txt
new file mode 100644
index 00000000000..002d1b93c6f
--- /dev/null
+++ b/build/pkgs/cython/distros/fedora.txt
@@ -0,0 +1 @@
+Cython
diff --git a/build/pkgs/cython/distros/gentoo.txt b/build/pkgs/cython/distros/gentoo.txt
new file mode 100644
index 00000000000..bb1512a15ba
--- /dev/null
+++ b/build/pkgs/cython/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/cython
diff --git a/build/pkgs/cython/distros/opensuse.txt b/build/pkgs/cython/distros/opensuse.txt
new file mode 100644
index 00000000000..c6e300e6a2b
--- /dev/null
+++ b/build/pkgs/cython/distros/opensuse.txt
@@ -0,0 +1 @@
+python-Cython
diff --git a/build/pkgs/dateutil/distros/arch.txt b/build/pkgs/dateutil/distros/arch.txt
new file mode 100644
index 00000000000..0f08daace31
--- /dev/null
+++ b/build/pkgs/dateutil/distros/arch.txt
@@ -0,0 +1 @@
+python-dateutil
diff --git a/build/pkgs/dateutil/distros/debian.txt b/build/pkgs/dateutil/distros/debian.txt
new file mode 100644
index 00000000000..0f08daace31
--- /dev/null
+++ b/build/pkgs/dateutil/distros/debian.txt
@@ -0,0 +1 @@
+python-dateutil
diff --git a/build/pkgs/dateutil/distros/fedora.txt b/build/pkgs/dateutil/distros/fedora.txt
new file mode 100644
index 00000000000..0f08daace31
--- /dev/null
+++ b/build/pkgs/dateutil/distros/fedora.txt
@@ -0,0 +1 @@
+python-dateutil
diff --git a/build/pkgs/dateutil/distros/freebsd.txt b/build/pkgs/dateutil/distros/freebsd.txt
new file mode 100644
index 00000000000..c336f5e0b1d
--- /dev/null
+++ b/build/pkgs/dateutil/distros/freebsd.txt
@@ -0,0 +1 @@
+devel/py-dateutil
diff --git a/build/pkgs/dateutil/distros/opensuse.txt b/build/pkgs/dateutil/distros/opensuse.txt
new file mode 100644
index 00000000000..a6c93c7710a
--- /dev/null
+++ b/build/pkgs/dateutil/distros/opensuse.txt
@@ -0,0 +1 @@
+python-python-dateutil
diff --git a/build/pkgs/importlib_metadata/distros/arch.txt b/build/pkgs/importlib_metadata/distros/arch.txt
new file mode 100644
index 00000000000..b3c206287ec
--- /dev/null
+++ b/build/pkgs/importlib_metadata/distros/arch.txt
@@ -0,0 +1 @@
+python-importlib-metadata
diff --git a/build/pkgs/importlib_metadata/distros/debian.txt b/build/pkgs/importlib_metadata/distros/debian.txt
new file mode 100644
index 00000000000..b3c206287ec
--- /dev/null
+++ b/build/pkgs/importlib_metadata/distros/debian.txt
@@ -0,0 +1 @@
+python-importlib-metadata
diff --git a/build/pkgs/importlib_metadata/distros/fedora.txt b/build/pkgs/importlib_metadata/distros/fedora.txt
new file mode 100644
index 00000000000..b3c206287ec
--- /dev/null
+++ b/build/pkgs/importlib_metadata/distros/fedora.txt
@@ -0,0 +1 @@
+python-importlib-metadata
diff --git a/build/pkgs/importlib_metadata/distros/freebsd.txt b/build/pkgs/importlib_metadata/distros/freebsd.txt
new file mode 100644
index 00000000000..23518da7cff
--- /dev/null
+++ b/build/pkgs/importlib_metadata/distros/freebsd.txt
@@ -0,0 +1 @@
+devel/py-importlib-metadata
diff --git a/build/pkgs/importlib_metadata/distros/opensuse.txt b/build/pkgs/importlib_metadata/distros/opensuse.txt
new file mode 100644
index 00000000000..b3c206287ec
--- /dev/null
+++ b/build/pkgs/importlib_metadata/distros/opensuse.txt
@@ -0,0 +1 @@
+python-importlib-metadata
diff --git a/build/pkgs/ipykernel/distros/arch.txt b/build/pkgs/ipykernel/distros/arch.txt
new file mode 100644
index 00000000000..286458797f7
--- /dev/null
+++ b/build/pkgs/ipykernel/distros/arch.txt
@@ -0,0 +1 @@
+python-ipykernel
diff --git a/build/pkgs/ipykernel/distros/debian.txt b/build/pkgs/ipykernel/distros/debian.txt
new file mode 100644
index 00000000000..d919f6f3190
--- /dev/null
+++ b/build/pkgs/ipykernel/distros/debian.txt
@@ -0,0 +1 @@
+ipykernel
diff --git a/build/pkgs/ipykernel/distros/fedora.txt b/build/pkgs/ipykernel/distros/fedora.txt
new file mode 100644
index 00000000000..286458797f7
--- /dev/null
+++ b/build/pkgs/ipykernel/distros/fedora.txt
@@ -0,0 +1 @@
+python-ipykernel
diff --git a/build/pkgs/ipykernel/distros/freebsd.txt b/build/pkgs/ipykernel/distros/freebsd.txt
new file mode 100644
index 00000000000..92235f132be
--- /dev/null
+++ b/build/pkgs/ipykernel/distros/freebsd.txt
@@ -0,0 +1 @@
+devel/py-ipykernel
diff --git a/build/pkgs/ipykernel/distros/opensuse.txt b/build/pkgs/ipykernel/distros/opensuse.txt
new file mode 100644
index 00000000000..286458797f7
--- /dev/null
+++ b/build/pkgs/ipykernel/distros/opensuse.txt
@@ -0,0 +1 @@
+python-ipykernel
diff --git a/build/pkgs/ipython/distros/arch.txt b/build/pkgs/ipython/distros/arch.txt
new file mode 100644
index 00000000000..49a7ffe2a95
--- /dev/null
+++ b/build/pkgs/ipython/distros/arch.txt
@@ -0,0 +1 @@
+ipython
diff --git a/build/pkgs/ipython/distros/debian.txt b/build/pkgs/ipython/distros/debian.txt
new file mode 100644
index 00000000000..49a7ffe2a95
--- /dev/null
+++ b/build/pkgs/ipython/distros/debian.txt
@@ -0,0 +1 @@
+ipython
diff --git a/build/pkgs/ipython/distros/fedora.txt b/build/pkgs/ipython/distros/fedora.txt
new file mode 100644
index 00000000000..49a7ffe2a95
--- /dev/null
+++ b/build/pkgs/ipython/distros/fedora.txt
@@ -0,0 +1 @@
+ipython
diff --git a/build/pkgs/ipython/distros/freebsd.txt b/build/pkgs/ipython/distros/freebsd.txt
new file mode 100644
index 00000000000..3252ee7fbc1
--- /dev/null
+++ b/build/pkgs/ipython/distros/freebsd.txt
@@ -0,0 +1 @@
+devel/ipython
diff --git a/build/pkgs/jsonschema/distros/arch.txt b/build/pkgs/jsonschema/distros/arch.txt
new file mode 100644
index 00000000000..8943c30f9ed
--- /dev/null
+++ b/build/pkgs/jsonschema/distros/arch.txt
@@ -0,0 +1 @@
+python-jsonschema
diff --git a/build/pkgs/jsonschema/distros/debian.txt b/build/pkgs/jsonschema/distros/debian.txt
new file mode 100644
index 00000000000..8943c30f9ed
--- /dev/null
+++ b/build/pkgs/jsonschema/distros/debian.txt
@@ -0,0 +1 @@
+python-jsonschema
diff --git a/build/pkgs/jsonschema/distros/fedora.txt b/build/pkgs/jsonschema/distros/fedora.txt
new file mode 100644
index 00000000000..8943c30f9ed
--- /dev/null
+++ b/build/pkgs/jsonschema/distros/fedora.txt
@@ -0,0 +1 @@
+python-jsonschema
diff --git a/build/pkgs/jupyterlab_widgets/distros/arch.txt b/build/pkgs/jupyterlab_widgets/distros/arch.txt
new file mode 100644
index 00000000000..0800dc09838
--- /dev/null
+++ b/build/pkgs/jupyterlab_widgets/distros/arch.txt
@@ -0,0 +1 @@
+jupyterlab-widgets
diff --git a/build/pkgs/jupyterlab_widgets/distros/freebsd.txt b/build/pkgs/jupyterlab_widgets/distros/freebsd.txt
new file mode 100644
index 00000000000..6fc98fe86a0
--- /dev/null
+++ b/build/pkgs/jupyterlab_widgets/distros/freebsd.txt
@@ -0,0 +1 @@
+devel/py-jupyterlab-widgets
diff --git a/build/pkgs/jupyterlab_widgets/distros/opensuse.txt b/build/pkgs/jupyterlab_widgets/distros/opensuse.txt
new file mode 100644
index 00000000000..651221f2ba2
--- /dev/null
+++ b/build/pkgs/jupyterlab_widgets/distros/opensuse.txt
@@ -0,0 +1 @@
+python-jupyterlab-widgets
diff --git a/build/pkgs/pexpect/distros/arch.txt b/build/pkgs/pexpect/distros/arch.txt
new file mode 100644
index 00000000000..74d08141569
--- /dev/null
+++ b/build/pkgs/pexpect/distros/arch.txt
@@ -0,0 +1 @@
+python-pexpect
diff --git a/build/pkgs/pexpect/distros/fedora.txt b/build/pkgs/pexpect/distros/fedora.txt
new file mode 100644
index 00000000000..74d08141569
--- /dev/null
+++ b/build/pkgs/pexpect/distros/fedora.txt
@@ -0,0 +1 @@
+python-pexpect
diff --git a/build/pkgs/pexpect/distros/freebsd.txt b/build/pkgs/pexpect/distros/freebsd.txt
new file mode 100644
index 00000000000..767fd38a2fa
--- /dev/null
+++ b/build/pkgs/pexpect/distros/freebsd.txt
@@ -0,0 +1 @@
+misc/py-pexpect
diff --git a/build/pkgs/pip/distros/debian.txt b/build/pkgs/pip/distros/debian.txt
new file mode 100644
index 00000000000..311c1b821ca
--- /dev/null
+++ b/build/pkgs/pip/distros/debian.txt
@@ -0,0 +1 @@
+python-pip
diff --git a/build/pkgs/pip/distros/fedora.txt b/build/pkgs/pip/distros/fedora.txt
new file mode 100644
index 00000000000..311c1b821ca
--- /dev/null
+++ b/build/pkgs/pip/distros/fedora.txt
@@ -0,0 +1 @@
+python-pip
diff --git a/build/pkgs/pip/distros/freebsd.txt b/build/pkgs/pip/distros/freebsd.txt
new file mode 100644
index 00000000000..7b125c1bfa4
--- /dev/null
+++ b/build/pkgs/pip/distros/freebsd.txt
@@ -0,0 +1 @@
+devel/py-pip
diff --git a/build/pkgs/prompt_toolkit/distros/arch.txt b/build/pkgs/prompt_toolkit/distros/arch.txt
new file mode 100644
index 00000000000..89b0ac83a9b
--- /dev/null
+++ b/build/pkgs/prompt_toolkit/distros/arch.txt
@@ -0,0 +1 @@
+python-importlib_resources
diff --git a/build/pkgs/prompt_toolkit/distros/debian.txt b/build/pkgs/prompt_toolkit/distros/debian.txt
new file mode 100644
index 00000000000..2b0146fc669
--- /dev/null
+++ b/build/pkgs/prompt_toolkit/distros/debian.txt
@@ -0,0 +1 @@
+importlib-resources
diff --git a/build/pkgs/prompt_toolkit/distros/fedora.txt b/build/pkgs/prompt_toolkit/distros/fedora.txt
new file mode 100644
index 00000000000..967f8570d4f
--- /dev/null
+++ b/build/pkgs/prompt_toolkit/distros/fedora.txt
@@ -0,0 +1 @@
+python-prompt-toolkit
diff --git a/build/pkgs/prompt_toolkit/distros/freebsd.txt b/build/pkgs/prompt_toolkit/distros/freebsd.txt
new file mode 100644
index 00000000000..a2f0c05129b
--- /dev/null
+++ b/build/pkgs/prompt_toolkit/distros/freebsd.txt
@@ -0,0 +1 @@
+devel/py-importlib-resources
diff --git a/build/pkgs/prompt_toolkit/distros/opensuse.txt b/build/pkgs/prompt_toolkit/distros/opensuse.txt
index 424253f1340..89b0ac83a9b 100644
--- a/build/pkgs/prompt_toolkit/distros/opensuse.txt
+++ b/build/pkgs/prompt_toolkit/distros/opensuse.txt
@@ -1 +1 @@
-python3-prompt_toolkit
+python-importlib_resources
diff --git a/build/pkgs/ptyprocess/distros/arch.txt b/build/pkgs/ptyprocess/distros/arch.txt
new file mode 100644
index 00000000000..911a22468fc
--- /dev/null
+++ b/build/pkgs/ptyprocess/distros/arch.txt
@@ -0,0 +1 @@
+python-ptyprocess
diff --git a/build/pkgs/ptyprocess/distros/fedora.txt b/build/pkgs/ptyprocess/distros/fedora.txt
new file mode 100644
index 00000000000..911a22468fc
--- /dev/null
+++ b/build/pkgs/ptyprocess/distros/fedora.txt
@@ -0,0 +1 @@
+python-ptyprocess
diff --git a/build/pkgs/ptyprocess/distros/freebsd.txt b/build/pkgs/ptyprocess/distros/freebsd.txt
new file mode 100644
index 00000000000..bc587f2e5fc
--- /dev/null
+++ b/build/pkgs/ptyprocess/distros/freebsd.txt
@@ -0,0 +1 @@
+sysutils/py-ptyprocess
diff --git a/build/pkgs/pycosat/distros/alpine.txt b/build/pkgs/pycosat/distros/alpine.txt
new file mode 100644
index 00000000000..7eb034d6713
--- /dev/null
+++ b/build/pkgs/pycosat/distros/alpine.txt
@@ -0,0 +1 @@
+py3-pycosat
diff --git a/build/pkgs/pycosat/distros/arch.txt b/build/pkgs/pycosat/distros/arch.txt
new file mode 100644
index 00000000000..dab3122ef4c
--- /dev/null
+++ b/build/pkgs/pycosat/distros/arch.txt
@@ -0,0 +1 @@
+python-pycosat
diff --git a/build/pkgs/pycosat/distros/fedora.txt b/build/pkgs/pycosat/distros/fedora.txt
new file mode 100644
index 00000000000..dab3122ef4c
--- /dev/null
+++ b/build/pkgs/pycosat/distros/fedora.txt
@@ -0,0 +1 @@
+python-pycosat
diff --git a/build/pkgs/pycosat/distros/freebsd.txt b/build/pkgs/pycosat/distros/freebsd.txt
new file mode 100644
index 00000000000..35e4e7730cc
--- /dev/null
+++ b/build/pkgs/pycosat/distros/freebsd.txt
@@ -0,0 +1 @@
+math/py-pycosat
diff --git a/build/pkgs/pyparsing/distros/arch.txt b/build/pkgs/pyparsing/distros/arch.txt
new file mode 100644
index 00000000000..428820c215f
--- /dev/null
+++ b/build/pkgs/pyparsing/distros/arch.txt
@@ -0,0 +1 @@
+python-pyparsing
diff --git a/build/pkgs/pyparsing/distros/freebsd.txt b/build/pkgs/pyparsing/distros/freebsd.txt
new file mode 100644
index 00000000000..39fdc921fd0
--- /dev/null
+++ b/build/pkgs/pyparsing/distros/freebsd.txt
@@ -0,0 +1 @@
+devel/py-pyparsing
diff --git a/build/pkgs/sphinx/distros/arch.txt b/build/pkgs/sphinx/distros/arch.txt
new file mode 100644
index 00000000000..db9f745da4c
--- /dev/null
+++ b/build/pkgs/sphinx/distros/arch.txt
@@ -0,0 +1 @@
+python-sphinx
diff --git a/build/pkgs/sphinx/distros/debian.txt b/build/pkgs/sphinx/distros/debian.txt
new file mode 100644
index 00000000000..6966869c705
--- /dev/null
+++ b/build/pkgs/sphinx/distros/debian.txt
@@ -0,0 +1 @@
+sphinx
diff --git a/build/pkgs/sphinx/distros/fedora.txt b/build/pkgs/sphinx/distros/fedora.txt
new file mode 100644
index 00000000000..db9f745da4c
--- /dev/null
+++ b/build/pkgs/sphinx/distros/fedora.txt
@@ -0,0 +1 @@
+python-sphinx
diff --git a/build/pkgs/sphinx/distros/freebsd.txt b/build/pkgs/sphinx/distros/freebsd.txt
new file mode 100644
index 00000000000..f7f30dba25f
--- /dev/null
+++ b/build/pkgs/sphinx/distros/freebsd.txt
@@ -0,0 +1 @@
+textproc/py-sphinx
diff --git a/build/pkgs/typing_extensions/distros/arch.txt b/build/pkgs/typing_extensions/distros/arch.txt
new file mode 100644
index 00000000000..92ad68dabc4
--- /dev/null
+++ b/build/pkgs/typing_extensions/distros/arch.txt
@@ -0,0 +1 @@
+python-typing_extensions
diff --git a/build/pkgs/typing_extensions/distros/debian.txt b/build/pkgs/typing_extensions/distros/debian.txt
new file mode 100644
index 00000000000..8c13a4539ac
--- /dev/null
+++ b/build/pkgs/typing_extensions/distros/debian.txt
@@ -0,0 +1 @@
+python-typing-extensions
diff --git a/build/pkgs/typing_extensions/distros/fedora.txt b/build/pkgs/typing_extensions/distros/fedora.txt
new file mode 100644
index 00000000000..8c13a4539ac
--- /dev/null
+++ b/build/pkgs/typing_extensions/distros/fedora.txt
@@ -0,0 +1 @@
+python-typing-extensions
diff --git a/build/pkgs/typing_extensions/distros/freebsd.txt b/build/pkgs/typing_extensions/distros/freebsd.txt
new file mode 100644
index 00000000000..b4424d384df
--- /dev/null
+++ b/build/pkgs/typing_extensions/distros/freebsd.txt
@@ -0,0 +1 @@
+devel/py-typing-extensions
diff --git a/build/pkgs/typing_extensions/distros/gentoo.txt b/build/pkgs/typing_extensions/distros/gentoo.txt
new file mode 100644
index 00000000000..20b3d1de123
--- /dev/null
+++ b/build/pkgs/typing_extensions/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/typing-extensions
diff --git a/build/pkgs/typing_extensions/distros/opensuse.txt b/build/pkgs/typing_extensions/distros/opensuse.txt
new file mode 100644
index 00000000000..92ad68dabc4
--- /dev/null
+++ b/build/pkgs/typing_extensions/distros/opensuse.txt
@@ -0,0 +1 @@
+python-typing_extensions
diff --git a/build/pkgs/tzlocal/distros/arch.txt b/build/pkgs/tzlocal/distros/arch.txt
new file mode 100644
index 00000000000..1de39af60b2
--- /dev/null
+++ b/build/pkgs/tzlocal/distros/arch.txt
@@ -0,0 +1 @@
+python-tzlocal
diff --git a/build/pkgs/tzlocal/distros/debian.txt b/build/pkgs/tzlocal/distros/debian.txt
new file mode 100644
index 00000000000..1de39af60b2
--- /dev/null
+++ b/build/pkgs/tzlocal/distros/debian.txt
@@ -0,0 +1 @@
+python-tzlocal
diff --git a/build/pkgs/tzlocal/distros/fedora.txt b/build/pkgs/tzlocal/distros/fedora.txt
new file mode 100644
index 00000000000..1de39af60b2
--- /dev/null
+++ b/build/pkgs/tzlocal/distros/fedora.txt
@@ -0,0 +1 @@
+python-tzlocal
diff --git a/build/pkgs/tzlocal/distros/freebsd.txt b/build/pkgs/tzlocal/distros/freebsd.txt
new file mode 100644
index 00000000000..c42ec397d1c
--- /dev/null
+++ b/build/pkgs/tzlocal/distros/freebsd.txt
@@ -0,0 +1 @@
+devel/py-tzlocal
diff --git a/build/pkgs/urllib3/distros/arch.txt b/build/pkgs/urllib3/distros/arch.txt
new file mode 100644
index 00000000000..af6e58664fb
--- /dev/null
+++ b/build/pkgs/urllib3/distros/arch.txt
@@ -0,0 +1 @@
+python-urllib3
diff --git a/build/pkgs/urllib3/distros/debian.txt b/build/pkgs/urllib3/distros/debian.txt
new file mode 100644
index 00000000000..af6e58664fb
--- /dev/null
+++ b/build/pkgs/urllib3/distros/debian.txt
@@ -0,0 +1 @@
+python-urllib3
diff --git a/build/pkgs/urllib3/distros/fedora.txt b/build/pkgs/urllib3/distros/fedora.txt
new file mode 100644
index 00000000000..af6e58664fb
--- /dev/null
+++ b/build/pkgs/urllib3/distros/fedora.txt
@@ -0,0 +1 @@
+python-urllib3
diff --git a/build/pkgs/urllib3/distros/freebsd.txt b/build/pkgs/urllib3/distros/freebsd.txt
new file mode 100644
index 00000000000..751c1d25c41
--- /dev/null
+++ b/build/pkgs/urllib3/distros/freebsd.txt
@@ -0,0 +1 @@
+net/py-urllib3
diff --git a/build/pkgs/urllib3/distros/opensuse.txt b/build/pkgs/urllib3/distros/opensuse.txt
new file mode 100644
index 00000000000..af6e58664fb
--- /dev/null
+++ b/build/pkgs/urllib3/distros/opensuse.txt
@@ -0,0 +1 @@
+python-urllib3

From b0b6cc6edf3d9f90327e73bf37240869d66b5357 Mon Sep 17 00:00:00 2001
From: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
Date: Tue, 29 Aug 2023 21:23:40 -0700
Subject: [PATCH 218/247] build/pkgs: Add distros/*.txt for some more Python
 packages

---
 build/pkgs/cycler/distros/arch.txt                            | 1 +
 build/pkgs/cycler/distros/debian.txt                          | 1 +
 build/pkgs/cycler/distros/fedora.txt                          | 1 +
 build/pkgs/cycler/distros/freebsd.txt                         | 1 +
 build/pkgs/cycler/distros/opensuse.txt                        | 1 +
 build/pkgs/gmpy2/distros/arch.txt                             | 1 +
 build/pkgs/gmpy2/distros/debian.txt                           | 1 +
 build/pkgs/gmpy2/distros/fedora.txt                           | 1 +
 build/pkgs/gmpy2/distros/freebsd.txt                          | 1 +
 build/pkgs/gmpy2/distros/gentoo.txt                           | 1 +
 build/pkgs/gmpy2/distros/opensuse.txt                         | 1 +
 build/pkgs/pkgconfig/distros/arch.txt                         | 1 +
 build/pkgs/pkgconfig/distros/debian.txt                       | 1 +
 build/pkgs/pkgconfig/distros/fedora.txt                       | 1 +
 build/pkgs/pkgconfig/distros/freebsd.txt                      | 1 +
 build/pkgs/pplpy/distros/arch.txt                             | 1 +
 build/pkgs/pplpy/distros/fedora.txt                           | 1 +
 build/pkgs/pplpy/distros/freebsd.txt                          | 1 +
 build/pkgs/pplpy/distros/void.txt                             | 1 +
 build/pkgs/python_igraph/distros/arch.txt                     | 1 +
 build/pkgs/python_igraph/distros/debian.txt                   | 1 +
 build/pkgs/python_igraph/distros/fedora.txt                   | 1 +
 build/pkgs/python_igraph/distros/freebsd.txt                  | 1 +
 build/pkgs/rpy2/distros/arch.txt                              | 1 +
 build/pkgs/rpy2/distros/debian.txt                            | 1 +
 build/pkgs/rpy2/distros/freebsd.txt                           | 1 +
 build/pkgs/rpy2/distros/macports.txt                          | 1 +
 build/pkgs/rpy2/distros/opensuse.txt                          | 1 +
 build/pkgs/sphinxcontrib_applehelp/distros/arch.txt           | 1 +
 build/pkgs/sphinxcontrib_applehelp/distros/fedora.txt         | 1 +
 build/pkgs/sphinxcontrib_applehelp/distros/freebsd.txt        | 1 +
 build/pkgs/sphinxcontrib_applehelp/distros/opensuse.txt       | 2 +-
 build/pkgs/sphinxcontrib_devhelp/distros/arch.txt             | 1 +
 build/pkgs/sphinxcontrib_devhelp/distros/fedora.txt           | 1 +
 build/pkgs/sphinxcontrib_devhelp/distros/freebsd.txt          | 1 +
 build/pkgs/sphinxcontrib_devhelp/distros/opensuse.txt         | 1 +
 build/pkgs/sphinxcontrib_htmlhelp/distros/arch.txt            | 1 +
 build/pkgs/sphinxcontrib_htmlhelp/distros/fedora.txt          | 1 +
 build/pkgs/sphinxcontrib_htmlhelp/distros/freebsd.txt         | 1 +
 build/pkgs/sphinxcontrib_htmlhelp/distros/opensuse.txt        | 1 +
 build/pkgs/sphinxcontrib_jsmath/distros/arch.txt              | 1 +
 build/pkgs/sphinxcontrib_jsmath/distros/fedora.txt            | 1 +
 build/pkgs/sphinxcontrib_jsmath/distros/freebsd.txt           | 1 +
 build/pkgs/sphinxcontrib_jsmath/distros/opensuse.txt          | 1 +
 build/pkgs/sphinxcontrib_qthelp/distros/arch.txt              | 1 +
 build/pkgs/sphinxcontrib_qthelp/distros/fedora.txt            | 1 +
 build/pkgs/sphinxcontrib_qthelp/distros/freebsd.txt           | 1 +
 build/pkgs/sphinxcontrib_qthelp/distros/opensuse.txt          | 1 +
 build/pkgs/sphinxcontrib_serializinghtml/distros/arch.txt     | 1 +
 build/pkgs/sphinxcontrib_serializinghtml/distros/fedora.txt   | 1 +
 build/pkgs/sphinxcontrib_serializinghtml/distros/freebsd.txt  | 1 +
 build/pkgs/sphinxcontrib_serializinghtml/distros/opensuse.txt | 2 +-
 build/pkgs/sphinxcontrib_websupport/distros/arch.txt          | 1 +
 build/pkgs/sphinxcontrib_websupport/distros/fedora.txt        | 1 +
 build/pkgs/sphinxcontrib_websupport/distros/freebsd.txt       | 1 +
 build/pkgs/sphinxcontrib_websupport/distros/opensuse.txt      | 2 +-
 56 files changed, 56 insertions(+), 3 deletions(-)
 create mode 100644 build/pkgs/cycler/distros/arch.txt
 create mode 100644 build/pkgs/cycler/distros/debian.txt
 create mode 100644 build/pkgs/cycler/distros/fedora.txt
 create mode 100644 build/pkgs/cycler/distros/freebsd.txt
 create mode 100644 build/pkgs/cycler/distros/opensuse.txt
 create mode 100644 build/pkgs/gmpy2/distros/arch.txt
 create mode 100644 build/pkgs/gmpy2/distros/debian.txt
 create mode 100644 build/pkgs/gmpy2/distros/fedora.txt
 create mode 100644 build/pkgs/gmpy2/distros/freebsd.txt
 create mode 100644 build/pkgs/gmpy2/distros/gentoo.txt
 create mode 100644 build/pkgs/gmpy2/distros/opensuse.txt
 create mode 100644 build/pkgs/pkgconfig/distros/arch.txt
 create mode 100644 build/pkgs/pkgconfig/distros/debian.txt
 create mode 100644 build/pkgs/pkgconfig/distros/fedora.txt
 create mode 100644 build/pkgs/pkgconfig/distros/freebsd.txt
 create mode 100644 build/pkgs/pplpy/distros/arch.txt
 create mode 100644 build/pkgs/pplpy/distros/fedora.txt
 create mode 100644 build/pkgs/pplpy/distros/freebsd.txt
 create mode 100644 build/pkgs/pplpy/distros/void.txt
 create mode 100644 build/pkgs/python_igraph/distros/arch.txt
 create mode 100644 build/pkgs/python_igraph/distros/debian.txt
 create mode 100644 build/pkgs/python_igraph/distros/fedora.txt
 create mode 100644 build/pkgs/python_igraph/distros/freebsd.txt
 create mode 100644 build/pkgs/rpy2/distros/arch.txt
 create mode 100644 build/pkgs/rpy2/distros/debian.txt
 create mode 100644 build/pkgs/rpy2/distros/freebsd.txt
 create mode 100644 build/pkgs/rpy2/distros/macports.txt
 create mode 100644 build/pkgs/rpy2/distros/opensuse.txt
 create mode 100644 build/pkgs/sphinxcontrib_applehelp/distros/arch.txt
 create mode 100644 build/pkgs/sphinxcontrib_applehelp/distros/fedora.txt
 create mode 100644 build/pkgs/sphinxcontrib_applehelp/distros/freebsd.txt
 create mode 100644 build/pkgs/sphinxcontrib_devhelp/distros/arch.txt
 create mode 100644 build/pkgs/sphinxcontrib_devhelp/distros/fedora.txt
 create mode 100644 build/pkgs/sphinxcontrib_devhelp/distros/freebsd.txt
 create mode 100644 build/pkgs/sphinxcontrib_devhelp/distros/opensuse.txt
 create mode 100644 build/pkgs/sphinxcontrib_htmlhelp/distros/arch.txt
 create mode 100644 build/pkgs/sphinxcontrib_htmlhelp/distros/fedora.txt
 create mode 100644 build/pkgs/sphinxcontrib_htmlhelp/distros/freebsd.txt
 create mode 100644 build/pkgs/sphinxcontrib_htmlhelp/distros/opensuse.txt
 create mode 100644 build/pkgs/sphinxcontrib_jsmath/distros/arch.txt
 create mode 100644 build/pkgs/sphinxcontrib_jsmath/distros/fedora.txt
 create mode 100644 build/pkgs/sphinxcontrib_jsmath/distros/freebsd.txt
 create mode 100644 build/pkgs/sphinxcontrib_jsmath/distros/opensuse.txt
 create mode 100644 build/pkgs/sphinxcontrib_qthelp/distros/arch.txt
 create mode 100644 build/pkgs/sphinxcontrib_qthelp/distros/fedora.txt
 create mode 100644 build/pkgs/sphinxcontrib_qthelp/distros/freebsd.txt
 create mode 100644 build/pkgs/sphinxcontrib_qthelp/distros/opensuse.txt
 create mode 100644 build/pkgs/sphinxcontrib_serializinghtml/distros/arch.txt
 create mode 100644 build/pkgs/sphinxcontrib_serializinghtml/distros/fedora.txt
 create mode 100644 build/pkgs/sphinxcontrib_serializinghtml/distros/freebsd.txt
 create mode 100644 build/pkgs/sphinxcontrib_websupport/distros/arch.txt
 create mode 100644 build/pkgs/sphinxcontrib_websupport/distros/fedora.txt
 create mode 100644 build/pkgs/sphinxcontrib_websupport/distros/freebsd.txt

diff --git a/build/pkgs/cycler/distros/arch.txt b/build/pkgs/cycler/distros/arch.txt
new file mode 100644
index 00000000000..5727259aca6
--- /dev/null
+++ b/build/pkgs/cycler/distros/arch.txt
@@ -0,0 +1 @@
+python-cycler
diff --git a/build/pkgs/cycler/distros/debian.txt b/build/pkgs/cycler/distros/debian.txt
new file mode 100644
index 00000000000..5727259aca6
--- /dev/null
+++ b/build/pkgs/cycler/distros/debian.txt
@@ -0,0 +1 @@
+python-cycler
diff --git a/build/pkgs/cycler/distros/fedora.txt b/build/pkgs/cycler/distros/fedora.txt
new file mode 100644
index 00000000000..5727259aca6
--- /dev/null
+++ b/build/pkgs/cycler/distros/fedora.txt
@@ -0,0 +1 @@
+python-cycler
diff --git a/build/pkgs/cycler/distros/freebsd.txt b/build/pkgs/cycler/distros/freebsd.txt
new file mode 100644
index 00000000000..6da1dabb333
--- /dev/null
+++ b/build/pkgs/cycler/distros/freebsd.txt
@@ -0,0 +1 @@
+devel/py-cycler
diff --git a/build/pkgs/cycler/distros/opensuse.txt b/build/pkgs/cycler/distros/opensuse.txt
new file mode 100644
index 00000000000..93efd62d380
--- /dev/null
+++ b/build/pkgs/cycler/distros/opensuse.txt
@@ -0,0 +1 @@
+python-Cycler
diff --git a/build/pkgs/gmpy2/distros/arch.txt b/build/pkgs/gmpy2/distros/arch.txt
new file mode 100644
index 00000000000..d4464a5ce2c
--- /dev/null
+++ b/build/pkgs/gmpy2/distros/arch.txt
@@ -0,0 +1 @@
+python-gmpy2
diff --git a/build/pkgs/gmpy2/distros/debian.txt b/build/pkgs/gmpy2/distros/debian.txt
new file mode 100644
index 00000000000..d4464a5ce2c
--- /dev/null
+++ b/build/pkgs/gmpy2/distros/debian.txt
@@ -0,0 +1 @@
+python-gmpy2
diff --git a/build/pkgs/gmpy2/distros/fedora.txt b/build/pkgs/gmpy2/distros/fedora.txt
new file mode 100644
index 00000000000..d4464a5ce2c
--- /dev/null
+++ b/build/pkgs/gmpy2/distros/fedora.txt
@@ -0,0 +1 @@
+python-gmpy2
diff --git a/build/pkgs/gmpy2/distros/freebsd.txt b/build/pkgs/gmpy2/distros/freebsd.txt
new file mode 100644
index 00000000000..0d9d2c435a6
--- /dev/null
+++ b/build/pkgs/gmpy2/distros/freebsd.txt
@@ -0,0 +1 @@
+math/py-gmpy2
diff --git a/build/pkgs/gmpy2/distros/gentoo.txt b/build/pkgs/gmpy2/distros/gentoo.txt
new file mode 100644
index 00000000000..519f9d8729a
--- /dev/null
+++ b/build/pkgs/gmpy2/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/gmpy
diff --git a/build/pkgs/gmpy2/distros/opensuse.txt b/build/pkgs/gmpy2/distros/opensuse.txt
new file mode 100644
index 00000000000..d4464a5ce2c
--- /dev/null
+++ b/build/pkgs/gmpy2/distros/opensuse.txt
@@ -0,0 +1 @@
+python-gmpy2
diff --git a/build/pkgs/pkgconfig/distros/arch.txt b/build/pkgs/pkgconfig/distros/arch.txt
new file mode 100644
index 00000000000..38a18b3565f
--- /dev/null
+++ b/build/pkgs/pkgconfig/distros/arch.txt
@@ -0,0 +1 @@
+python-pkgconfig
diff --git a/build/pkgs/pkgconfig/distros/debian.txt b/build/pkgs/pkgconfig/distros/debian.txt
new file mode 100644
index 00000000000..38a18b3565f
--- /dev/null
+++ b/build/pkgs/pkgconfig/distros/debian.txt
@@ -0,0 +1 @@
+python-pkgconfig
diff --git a/build/pkgs/pkgconfig/distros/fedora.txt b/build/pkgs/pkgconfig/distros/fedora.txt
new file mode 100644
index 00000000000..38a18b3565f
--- /dev/null
+++ b/build/pkgs/pkgconfig/distros/fedora.txt
@@ -0,0 +1 @@
+python-pkgconfig
diff --git a/build/pkgs/pkgconfig/distros/freebsd.txt b/build/pkgs/pkgconfig/distros/freebsd.txt
new file mode 100644
index 00000000000..d26a4e96787
--- /dev/null
+++ b/build/pkgs/pkgconfig/distros/freebsd.txt
@@ -0,0 +1 @@
+devel/py-pkgconfig
diff --git a/build/pkgs/pplpy/distros/arch.txt b/build/pkgs/pplpy/distros/arch.txt
new file mode 100644
index 00000000000..579bdb042f6
--- /dev/null
+++ b/build/pkgs/pplpy/distros/arch.txt
@@ -0,0 +1 @@
+python-pplpy
diff --git a/build/pkgs/pplpy/distros/fedora.txt b/build/pkgs/pplpy/distros/fedora.txt
new file mode 100644
index 00000000000..579bdb042f6
--- /dev/null
+++ b/build/pkgs/pplpy/distros/fedora.txt
@@ -0,0 +1 @@
+python-pplpy
diff --git a/build/pkgs/pplpy/distros/freebsd.txt b/build/pkgs/pplpy/distros/freebsd.txt
new file mode 100644
index 00000000000..2006f870646
--- /dev/null
+++ b/build/pkgs/pplpy/distros/freebsd.txt
@@ -0,0 +1 @@
+math/py-pplpy
diff --git a/build/pkgs/pplpy/distros/void.txt b/build/pkgs/pplpy/distros/void.txt
new file mode 100644
index 00000000000..f39eaff76ae
--- /dev/null
+++ b/build/pkgs/pplpy/distros/void.txt
@@ -0,0 +1 @@
+python3-pplpy
diff --git a/build/pkgs/python_igraph/distros/arch.txt b/build/pkgs/python_igraph/distros/arch.txt
new file mode 100644
index 00000000000..03f8142066f
--- /dev/null
+++ b/build/pkgs/python_igraph/distros/arch.txt
@@ -0,0 +1 @@
+python-igraph
diff --git a/build/pkgs/python_igraph/distros/debian.txt b/build/pkgs/python_igraph/distros/debian.txt
new file mode 100644
index 00000000000..03f8142066f
--- /dev/null
+++ b/build/pkgs/python_igraph/distros/debian.txt
@@ -0,0 +1 @@
+python-igraph
diff --git a/build/pkgs/python_igraph/distros/fedora.txt b/build/pkgs/python_igraph/distros/fedora.txt
new file mode 100644
index 00000000000..03f8142066f
--- /dev/null
+++ b/build/pkgs/python_igraph/distros/fedora.txt
@@ -0,0 +1 @@
+python-igraph
diff --git a/build/pkgs/python_igraph/distros/freebsd.txt b/build/pkgs/python_igraph/distros/freebsd.txt
new file mode 100644
index 00000000000..d86a516f3ed
--- /dev/null
+++ b/build/pkgs/python_igraph/distros/freebsd.txt
@@ -0,0 +1 @@
+math/py-igraph
diff --git a/build/pkgs/rpy2/distros/arch.txt b/build/pkgs/rpy2/distros/arch.txt
new file mode 100644
index 00000000000..9748535a285
--- /dev/null
+++ b/build/pkgs/rpy2/distros/arch.txt
@@ -0,0 +1 @@
+python-rpy2
diff --git a/build/pkgs/rpy2/distros/debian.txt b/build/pkgs/rpy2/distros/debian.txt
new file mode 100644
index 00000000000..8f389862688
--- /dev/null
+++ b/build/pkgs/rpy2/distros/debian.txt
@@ -0,0 +1 @@
+rpy2
diff --git a/build/pkgs/rpy2/distros/freebsd.txt b/build/pkgs/rpy2/distros/freebsd.txt
new file mode 100644
index 00000000000..21caa8b9edd
--- /dev/null
+++ b/build/pkgs/rpy2/distros/freebsd.txt
@@ -0,0 +1 @@
+math/py-rpy2
diff --git a/build/pkgs/rpy2/distros/macports.txt b/build/pkgs/rpy2/distros/macports.txt
new file mode 100644
index 00000000000..71f03850a9b
--- /dev/null
+++ b/build/pkgs/rpy2/distros/macports.txt
@@ -0,0 +1 @@
+py-rpy2
diff --git a/build/pkgs/rpy2/distros/opensuse.txt b/build/pkgs/rpy2/distros/opensuse.txt
new file mode 100644
index 00000000000..9748535a285
--- /dev/null
+++ b/build/pkgs/rpy2/distros/opensuse.txt
@@ -0,0 +1 @@
+python-rpy2
diff --git a/build/pkgs/sphinxcontrib_applehelp/distros/arch.txt b/build/pkgs/sphinxcontrib_applehelp/distros/arch.txt
new file mode 100644
index 00000000000..3754baa21f5
--- /dev/null
+++ b/build/pkgs/sphinxcontrib_applehelp/distros/arch.txt
@@ -0,0 +1 @@
+python-sphinxcontrib-applehelp
diff --git a/build/pkgs/sphinxcontrib_applehelp/distros/fedora.txt b/build/pkgs/sphinxcontrib_applehelp/distros/fedora.txt
new file mode 100644
index 00000000000..3754baa21f5
--- /dev/null
+++ b/build/pkgs/sphinxcontrib_applehelp/distros/fedora.txt
@@ -0,0 +1 @@
+python-sphinxcontrib-applehelp
diff --git a/build/pkgs/sphinxcontrib_applehelp/distros/freebsd.txt b/build/pkgs/sphinxcontrib_applehelp/distros/freebsd.txt
new file mode 100644
index 00000000000..73fbc3bf7ad
--- /dev/null
+++ b/build/pkgs/sphinxcontrib_applehelp/distros/freebsd.txt
@@ -0,0 +1 @@
+textproc/py-sphinxcontrib-applehelp
diff --git a/build/pkgs/sphinxcontrib_applehelp/distros/opensuse.txt b/build/pkgs/sphinxcontrib_applehelp/distros/opensuse.txt
index adedbd455f8..3754baa21f5 100644
--- a/build/pkgs/sphinxcontrib_applehelp/distros/opensuse.txt
+++ b/build/pkgs/sphinxcontrib_applehelp/distros/opensuse.txt
@@ -1 +1 @@
-python3-sphinxcontrib-applehelp
+python-sphinxcontrib-applehelp
diff --git a/build/pkgs/sphinxcontrib_devhelp/distros/arch.txt b/build/pkgs/sphinxcontrib_devhelp/distros/arch.txt
new file mode 100644
index 00000000000..0b1b3e44a6b
--- /dev/null
+++ b/build/pkgs/sphinxcontrib_devhelp/distros/arch.txt
@@ -0,0 +1 @@
+python-sphinxcontrib-devhelp
diff --git a/build/pkgs/sphinxcontrib_devhelp/distros/fedora.txt b/build/pkgs/sphinxcontrib_devhelp/distros/fedora.txt
new file mode 100644
index 00000000000..0b1b3e44a6b
--- /dev/null
+++ b/build/pkgs/sphinxcontrib_devhelp/distros/fedora.txt
@@ -0,0 +1 @@
+python-sphinxcontrib-devhelp
diff --git a/build/pkgs/sphinxcontrib_devhelp/distros/freebsd.txt b/build/pkgs/sphinxcontrib_devhelp/distros/freebsd.txt
new file mode 100644
index 00000000000..86982bcbd27
--- /dev/null
+++ b/build/pkgs/sphinxcontrib_devhelp/distros/freebsd.txt
@@ -0,0 +1 @@
+textproc/py-sphinxcontrib-devhelp
diff --git a/build/pkgs/sphinxcontrib_devhelp/distros/opensuse.txt b/build/pkgs/sphinxcontrib_devhelp/distros/opensuse.txt
new file mode 100644
index 00000000000..0b1b3e44a6b
--- /dev/null
+++ b/build/pkgs/sphinxcontrib_devhelp/distros/opensuse.txt
@@ -0,0 +1 @@
+python-sphinxcontrib-devhelp
diff --git a/build/pkgs/sphinxcontrib_htmlhelp/distros/arch.txt b/build/pkgs/sphinxcontrib_htmlhelp/distros/arch.txt
new file mode 100644
index 00000000000..81390fd522f
--- /dev/null
+++ b/build/pkgs/sphinxcontrib_htmlhelp/distros/arch.txt
@@ -0,0 +1 @@
+python-sphinxcontrib-htmlhelp
diff --git a/build/pkgs/sphinxcontrib_htmlhelp/distros/fedora.txt b/build/pkgs/sphinxcontrib_htmlhelp/distros/fedora.txt
new file mode 100644
index 00000000000..81390fd522f
--- /dev/null
+++ b/build/pkgs/sphinxcontrib_htmlhelp/distros/fedora.txt
@@ -0,0 +1 @@
+python-sphinxcontrib-htmlhelp
diff --git a/build/pkgs/sphinxcontrib_htmlhelp/distros/freebsd.txt b/build/pkgs/sphinxcontrib_htmlhelp/distros/freebsd.txt
new file mode 100644
index 00000000000..9b97c55996b
--- /dev/null
+++ b/build/pkgs/sphinxcontrib_htmlhelp/distros/freebsd.txt
@@ -0,0 +1 @@
+textproc/py-sphinxcontrib-htmlhelp
diff --git a/build/pkgs/sphinxcontrib_htmlhelp/distros/opensuse.txt b/build/pkgs/sphinxcontrib_htmlhelp/distros/opensuse.txt
new file mode 100644
index 00000000000..81390fd522f
--- /dev/null
+++ b/build/pkgs/sphinxcontrib_htmlhelp/distros/opensuse.txt
@@ -0,0 +1 @@
+python-sphinxcontrib-htmlhelp
diff --git a/build/pkgs/sphinxcontrib_jsmath/distros/arch.txt b/build/pkgs/sphinxcontrib_jsmath/distros/arch.txt
new file mode 100644
index 00000000000..2b4927832ac
--- /dev/null
+++ b/build/pkgs/sphinxcontrib_jsmath/distros/arch.txt
@@ -0,0 +1 @@
+python-sphinxcontrib-jsmath
diff --git a/build/pkgs/sphinxcontrib_jsmath/distros/fedora.txt b/build/pkgs/sphinxcontrib_jsmath/distros/fedora.txt
new file mode 100644
index 00000000000..2b4927832ac
--- /dev/null
+++ b/build/pkgs/sphinxcontrib_jsmath/distros/fedora.txt
@@ -0,0 +1 @@
+python-sphinxcontrib-jsmath
diff --git a/build/pkgs/sphinxcontrib_jsmath/distros/freebsd.txt b/build/pkgs/sphinxcontrib_jsmath/distros/freebsd.txt
new file mode 100644
index 00000000000..78aa428cb13
--- /dev/null
+++ b/build/pkgs/sphinxcontrib_jsmath/distros/freebsd.txt
@@ -0,0 +1 @@
+textproc/py-sphinxcontrib-jsmath
diff --git a/build/pkgs/sphinxcontrib_jsmath/distros/opensuse.txt b/build/pkgs/sphinxcontrib_jsmath/distros/opensuse.txt
new file mode 100644
index 00000000000..2b4927832ac
--- /dev/null
+++ b/build/pkgs/sphinxcontrib_jsmath/distros/opensuse.txt
@@ -0,0 +1 @@
+python-sphinxcontrib-jsmath
diff --git a/build/pkgs/sphinxcontrib_qthelp/distros/arch.txt b/build/pkgs/sphinxcontrib_qthelp/distros/arch.txt
new file mode 100644
index 00000000000..2c11924a5df
--- /dev/null
+++ b/build/pkgs/sphinxcontrib_qthelp/distros/arch.txt
@@ -0,0 +1 @@
+python-sphinxcontrib-qthelp
diff --git a/build/pkgs/sphinxcontrib_qthelp/distros/fedora.txt b/build/pkgs/sphinxcontrib_qthelp/distros/fedora.txt
new file mode 100644
index 00000000000..2c11924a5df
--- /dev/null
+++ b/build/pkgs/sphinxcontrib_qthelp/distros/fedora.txt
@@ -0,0 +1 @@
+python-sphinxcontrib-qthelp
diff --git a/build/pkgs/sphinxcontrib_qthelp/distros/freebsd.txt b/build/pkgs/sphinxcontrib_qthelp/distros/freebsd.txt
new file mode 100644
index 00000000000..77ff8756694
--- /dev/null
+++ b/build/pkgs/sphinxcontrib_qthelp/distros/freebsd.txt
@@ -0,0 +1 @@
+textproc/py-sphinxcontrib-qthelp
diff --git a/build/pkgs/sphinxcontrib_qthelp/distros/opensuse.txt b/build/pkgs/sphinxcontrib_qthelp/distros/opensuse.txt
new file mode 100644
index 00000000000..2c11924a5df
--- /dev/null
+++ b/build/pkgs/sphinxcontrib_qthelp/distros/opensuse.txt
@@ -0,0 +1 @@
+python-sphinxcontrib-qthelp
diff --git a/build/pkgs/sphinxcontrib_serializinghtml/distros/arch.txt b/build/pkgs/sphinxcontrib_serializinghtml/distros/arch.txt
new file mode 100644
index 00000000000..46d22be403f
--- /dev/null
+++ b/build/pkgs/sphinxcontrib_serializinghtml/distros/arch.txt
@@ -0,0 +1 @@
+python-sphinxcontrib-serializinghtml
diff --git a/build/pkgs/sphinxcontrib_serializinghtml/distros/fedora.txt b/build/pkgs/sphinxcontrib_serializinghtml/distros/fedora.txt
new file mode 100644
index 00000000000..46d22be403f
--- /dev/null
+++ b/build/pkgs/sphinxcontrib_serializinghtml/distros/fedora.txt
@@ -0,0 +1 @@
+python-sphinxcontrib-serializinghtml
diff --git a/build/pkgs/sphinxcontrib_serializinghtml/distros/freebsd.txt b/build/pkgs/sphinxcontrib_serializinghtml/distros/freebsd.txt
new file mode 100644
index 00000000000..de7f59bad6e
--- /dev/null
+++ b/build/pkgs/sphinxcontrib_serializinghtml/distros/freebsd.txt
@@ -0,0 +1 @@
+textproc/py-sphinxcontrib-serializinghtml
diff --git a/build/pkgs/sphinxcontrib_serializinghtml/distros/opensuse.txt b/build/pkgs/sphinxcontrib_serializinghtml/distros/opensuse.txt
index 1a8ea8424a7..46d22be403f 100644
--- a/build/pkgs/sphinxcontrib_serializinghtml/distros/opensuse.txt
+++ b/build/pkgs/sphinxcontrib_serializinghtml/distros/opensuse.txt
@@ -1 +1 @@
-python3-sphinxcontrib-serializinghtml
+python-sphinxcontrib-serializinghtml
diff --git a/build/pkgs/sphinxcontrib_websupport/distros/arch.txt b/build/pkgs/sphinxcontrib_websupport/distros/arch.txt
new file mode 100644
index 00000000000..a9a5a1a1727
--- /dev/null
+++ b/build/pkgs/sphinxcontrib_websupport/distros/arch.txt
@@ -0,0 +1 @@
+python-sphinxcontrib-websupport
diff --git a/build/pkgs/sphinxcontrib_websupport/distros/fedora.txt b/build/pkgs/sphinxcontrib_websupport/distros/fedora.txt
new file mode 100644
index 00000000000..a9a5a1a1727
--- /dev/null
+++ b/build/pkgs/sphinxcontrib_websupport/distros/fedora.txt
@@ -0,0 +1 @@
+python-sphinxcontrib-websupport
diff --git a/build/pkgs/sphinxcontrib_websupport/distros/freebsd.txt b/build/pkgs/sphinxcontrib_websupport/distros/freebsd.txt
new file mode 100644
index 00000000000..b8911943237
--- /dev/null
+++ b/build/pkgs/sphinxcontrib_websupport/distros/freebsd.txt
@@ -0,0 +1 @@
+textproc/py-sphinxcontrib-websupport
diff --git a/build/pkgs/sphinxcontrib_websupport/distros/opensuse.txt b/build/pkgs/sphinxcontrib_websupport/distros/opensuse.txt
index 2c8e8e8d34d..a9a5a1a1727 100644
--- a/build/pkgs/sphinxcontrib_websupport/distros/opensuse.txt
+++ b/build/pkgs/sphinxcontrib_websupport/distros/opensuse.txt
@@ -1 +1 @@
-python3-sphinxcontrib-websupport
+python-sphinxcontrib-websupport

From 82436dee0cb09e76d55456e478968f04bb7fd228 Mon Sep 17 00:00:00 2001
From: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
Date: Tue, 29 Aug 2023 22:10:37 -0700
Subject: [PATCH 219/247] .tox, .github/workflows/ci-linux.yml: Test
 -standard-sitepackages (fixup)

---
 .github/workflows/ci-linux.yml | 1 -
 tox.ini                        | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/ci-linux.yml b/.github/workflows/ci-linux.yml
index e4f424380df..8a2ea35cfba 100644
--- a/.github/workflows/ci-linux.yml
+++ b/.github/workflows/ci-linux.yml
@@ -73,7 +73,6 @@ jobs:
       free_disk_space: true
       from_docker_repository: ghcr.io/${{ github.repository }}/
       from_docker_target: "with-targets-pre"
-      from_docker_tag: "$(echo $BUILD_TAG | sed s/-sitepackages//)"
       docker_targets: "with-targets with-targets-optional"
       # FIXME: duplicated from env.TARGETS
       targets: build doc-html
diff --git a/tox.ini b/tox.ini
index 939f1b7d0f4..020df1643bc 100644
--- a/tox.ini
+++ b/tox.ini
@@ -477,7 +477,7 @@ setenv =
     # Resulting full image:tag name
     #
     docker:             FULL_BASE_IMAGE_AND_TAG={env:ARCH_IMAGE_PREFIX:}{env:BASE_IMAGE}{env:ARCH_IMAGE_SUFFIX:}:{env:ARCH_TAG_PREFIX:}{env:BASE_TAG}{env:ARCH_TAG_SUFFIX:}
-    docker-incremental: FULL_BASE_IMAGE_AND_TAG={env:FROM_DOCKER_REPOSITORY:ghcr.io/sagemath/sage/}sage-$(echo {envname} | sed -E "s/(docker-|-incremental)//g")-{env:FROM_DOCKER_TARGET:with-targets}:{env:FROM_DOCKER_TAG:dev}
+    docker-incremental: FULL_BASE_IMAGE_AND_TAG={env:FROM_DOCKER_REPOSITORY:ghcr.io/sagemath/sage/}sage-$(echo {envname} | sed -E "s/(docker-|-incremental|-sitepackages)//g")-{env:FROM_DOCKER_TARGET:with-targets}:{env:FROM_DOCKER_TAG:dev}
     docker-incremental:              SKIP_SYSTEM_PKG_INSTALL=yes
     docker-incremental-sitepackages: SKIP_SYSTEM_PKG_INSTALL=no
     #

From 6d3ddc501d98295d51a186b877f64d151a1ea8ba Mon Sep 17 00:00:00 2001
From: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
Date: Tue, 29 Aug 2023 22:16:29 -0700
Subject: [PATCH 220/247] build/pkgs/*/distros/debian.txt: Use python3-*
 packages

---
 build/pkgs/cycler/distros/debian.txt             | 2 +-
 build/pkgs/dateutil/distros/debian.txt           | 2 +-
 build/pkgs/gmpy2/distros/debian.txt              | 2 +-
 build/pkgs/importlib_metadata/distros/debian.txt | 2 +-
 build/pkgs/jsonschema/distros/debian.txt         | 2 +-
 build/pkgs/pip/distros/debian.txt                | 2 +-
 build/pkgs/pkgconfig/distros/debian.txt          | 2 +-
 build/pkgs/python_igraph/distros/debian.txt      | 2 +-
 build/pkgs/typing_extensions/distros/debian.txt  | 2 +-
 build/pkgs/tzlocal/distros/debian.txt            | 2 +-
 build/pkgs/urllib3/distros/debian.txt            | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/build/pkgs/cycler/distros/debian.txt b/build/pkgs/cycler/distros/debian.txt
index 5727259aca6..c77685dd417 100644
--- a/build/pkgs/cycler/distros/debian.txt
+++ b/build/pkgs/cycler/distros/debian.txt
@@ -1 +1 @@
-python-cycler
+python3-cycler
diff --git a/build/pkgs/dateutil/distros/debian.txt b/build/pkgs/dateutil/distros/debian.txt
index 0f08daace31..2f46170765c 100644
--- a/build/pkgs/dateutil/distros/debian.txt
+++ b/build/pkgs/dateutil/distros/debian.txt
@@ -1 +1 @@
-python-dateutil
+python3-dateutil
diff --git a/build/pkgs/gmpy2/distros/debian.txt b/build/pkgs/gmpy2/distros/debian.txt
index d4464a5ce2c..afdd6281722 100644
--- a/build/pkgs/gmpy2/distros/debian.txt
+++ b/build/pkgs/gmpy2/distros/debian.txt
@@ -1 +1 @@
-python-gmpy2
+python3-gmpy2
diff --git a/build/pkgs/importlib_metadata/distros/debian.txt b/build/pkgs/importlib_metadata/distros/debian.txt
index b3c206287ec..c005bf38793 100644
--- a/build/pkgs/importlib_metadata/distros/debian.txt
+++ b/build/pkgs/importlib_metadata/distros/debian.txt
@@ -1 +1 @@
-python-importlib-metadata
+python3-importlib-metadata
diff --git a/build/pkgs/jsonschema/distros/debian.txt b/build/pkgs/jsonschema/distros/debian.txt
index 8943c30f9ed..047e6cc5d1d 100644
--- a/build/pkgs/jsonschema/distros/debian.txt
+++ b/build/pkgs/jsonschema/distros/debian.txt
@@ -1 +1 @@
-python-jsonschema
+python3-jsonschema
diff --git a/build/pkgs/pip/distros/debian.txt b/build/pkgs/pip/distros/debian.txt
index 311c1b821ca..39bd9fc5097 100644
--- a/build/pkgs/pip/distros/debian.txt
+++ b/build/pkgs/pip/distros/debian.txt
@@ -1 +1 @@
-python-pip
+python3-pip
diff --git a/build/pkgs/pkgconfig/distros/debian.txt b/build/pkgs/pkgconfig/distros/debian.txt
index 38a18b3565f..38e5106dd74 100644
--- a/build/pkgs/pkgconfig/distros/debian.txt
+++ b/build/pkgs/pkgconfig/distros/debian.txt
@@ -1 +1 @@
-python-pkgconfig
+python3-pkgconfig
diff --git a/build/pkgs/python_igraph/distros/debian.txt b/build/pkgs/python_igraph/distros/debian.txt
index 03f8142066f..218ba998007 100644
--- a/build/pkgs/python_igraph/distros/debian.txt
+++ b/build/pkgs/python_igraph/distros/debian.txt
@@ -1 +1 @@
-python-igraph
+python3-igraph
diff --git a/build/pkgs/typing_extensions/distros/debian.txt b/build/pkgs/typing_extensions/distros/debian.txt
index 8c13a4539ac..424ebf1a645 100644
--- a/build/pkgs/typing_extensions/distros/debian.txt
+++ b/build/pkgs/typing_extensions/distros/debian.txt
@@ -1 +1 @@
-python-typing-extensions
+python3-typing-extensions
diff --git a/build/pkgs/tzlocal/distros/debian.txt b/build/pkgs/tzlocal/distros/debian.txt
index 1de39af60b2..95d2d705c05 100644
--- a/build/pkgs/tzlocal/distros/debian.txt
+++ b/build/pkgs/tzlocal/distros/debian.txt
@@ -1 +1 @@
-python-tzlocal
+python3-tzlocal
diff --git a/build/pkgs/urllib3/distros/debian.txt b/build/pkgs/urllib3/distros/debian.txt
index af6e58664fb..918569f9677 100644
--- a/build/pkgs/urllib3/distros/debian.txt
+++ b/build/pkgs/urllib3/distros/debian.txt
@@ -1 +1 @@
-python-urllib3
+python3-urllib3

From 0d2da8c77f50f3f9325a96d24011e0712a6c43c7 Mon Sep 17 00:00:00 2001
From: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
Date: Tue, 29 Aug 2023 22:32:57 -0700
Subject: [PATCH 221/247] build/pkgs/ipython/distros/debian.txt: Fixup

---
 build/pkgs/ipython/distros/debian.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/pkgs/ipython/distros/debian.txt b/build/pkgs/ipython/distros/debian.txt
index 49a7ffe2a95..c32c6b449cf 100644
--- a/build/pkgs/ipython/distros/debian.txt
+++ b/build/pkgs/ipython/distros/debian.txt
@@ -1 +1 @@
-ipython
+python3-ipython

From 65a90e45018b0952a8c60cbf7ee2d11077a4cb7f Mon Sep 17 00:00:00 2001
From: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
Date: Wed, 30 Aug 2023 09:59:18 -0700
Subject: [PATCH 222/247] .github/workflows/docker.yml: Add opensuse-tumbleweed
 (currently using python3.11)

---
 .github/workflows/docker.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 3c53c936237..2e867ca1b54 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -59,6 +59,7 @@ on:
            "opensuse-15.4-gcc_11-python3.10",
            "opensuse-15.5-gcc_11-python3.11",
            "opensuse-tumbleweed-python3.10",
+           "opensuse-tumbleweed",
            "conda-forge",
            "ubuntu-bionic-gcc_8-i386",
            "debian-buster-i386",

From d809ea51436a1e1d817ee2a56bc6df5a7313ffda Mon Sep 17 00:00:00 2001
From: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
Date: Wed, 30 Aug 2023 10:00:13 -0700
Subject: [PATCH 223/247] build/pkgs/*/distros/opensuse.txt: Use
 python3${MINOR}-* packages

---
 build/pkgs/alabaster/distros/opensuse.txt                     | 2 +-
 build/pkgs/babel/distros/opensuse.txt                         | 2 +-
 build/pkgs/bleach/distros/opensuse.txt                        | 2 +-
 build/pkgs/certifi/distros/opensuse.txt                       | 2 +-
 build/pkgs/cffi/distros/opensuse.txt                          | 2 +-
 build/pkgs/cvxopt/distros/opensuse.txt                        | 2 +-
 build/pkgs/cycler/distros/opensuse.txt                        | 2 +-
 build/pkgs/cython/distros/opensuse.txt                        | 2 +-
 build/pkgs/dateutil/distros/opensuse.txt                      | 2 +-
 build/pkgs/decorator/distros/opensuse.txt                     | 2 +-
 build/pkgs/docutils/distros/opensuse.txt                      | 2 +-
 build/pkgs/gmpy2/distros/opensuse.txt                         | 2 +-
 build/pkgs/html5lib/distros/opensuse.txt                      | 2 +-
 build/pkgs/idna/distros/opensuse.txt                          | 2 +-
 build/pkgs/importlib_metadata/distros/opensuse.txt            | 2 +-
 build/pkgs/ipykernel/distros/opensuse.txt                     | 2 +-
 build/pkgs/ipython/distros/opensuse.txt                       | 2 +-
 build/pkgs/jinja2/distros/opensuse.txt                        | 2 +-
 build/pkgs/jsonschema/distros/opensuse.txt                    | 2 +-
 build/pkgs/jupyter_client/distros/opensuse.txt                | 2 +-
 build/pkgs/jupyter_core/distros/opensuse.txt                  | 2 +-
 build/pkgs/jupyterlab_widgets/distros/opensuse.txt            | 2 +-
 build/pkgs/markupsafe/distros/opensuse.txt                    | 2 +-
 build/pkgs/matplotlib/distros/opensuse.txt                    | 2 +-
 build/pkgs/mpmath/distros/opensuse.txt                        | 2 +-
 build/pkgs/networkx/distros/opensuse.txt                      | 2 +-
 build/pkgs/nibabel/distros/opensuse.txt                       | 2 +-
 build/pkgs/numpy/distros/opensuse.txt                         | 2 +-
 build/pkgs/packaging/distros/opensuse.txt                     | 2 +-
 build/pkgs/pandocfilters/distros/opensuse.txt                 | 2 +-
 build/pkgs/pexpect/distros/opensuse.txt                       | 2 +-
 build/pkgs/pickleshare/distros/opensuse.txt                   | 2 +-
 build/pkgs/pillow/distros/opensuse.txt                        | 2 +-
 build/pkgs/pip/distros/opensuse.txt                           | 2 +-
 build/pkgs/pluggy/distros/opensuse.txt                        | 2 +-
 build/pkgs/prometheus_client/distros/opensuse.txt             | 2 +-
 build/pkgs/prompt_toolkit/distros/opensuse.txt                | 2 +-
 build/pkgs/ptyprocess/distros/opensuse.txt                    | 2 +-
 build/pkgs/py/distros/opensuse.txt                            | 2 +-
 build/pkgs/pybtex/distros/opensuse.txt                        | 2 +-
 build/pkgs/pycparser/distros/opensuse.txt                     | 2 +-
 build/pkgs/pygments/distros/opensuse.txt                      | 2 +-
 build/pkgs/pyparsing/distros/opensuse.txt                     | 2 +-
 build/pkgs/python3/distros/opensuse.txt                       | 2 +-
 build/pkgs/pytz/distros/opensuse.txt                          | 2 +-
 build/pkgs/pyx/distros/opensuse.txt                           | 2 +-
 build/pkgs/pyzmq/distros/opensuse.txt                         | 2 +-
 build/pkgs/requests/distros/opensuse.txt                      | 2 +-
 build/pkgs/rpy2/distros/opensuse.txt                          | 2 +-
 build/pkgs/scipy/distros/opensuse.txt                         | 2 +-
 build/pkgs/send2trash/distros/opensuse.txt                    | 2 +-
 build/pkgs/setuptools/distros/opensuse.txt                    | 2 +-
 build/pkgs/setuptools_scm/distros/opensuse.txt                | 2 +-
 build/pkgs/simplegeneric/distros/opensuse.txt                 | 2 +-
 build/pkgs/six/distros/opensuse.txt                           | 2 +-
 build/pkgs/snowballstemmer/distros/opensuse.txt               | 2 +-
 build/pkgs/sphinx/distros/opensuse.txt                        | 2 +-
 build/pkgs/sphinxcontrib_applehelp/distros/opensuse.txt       | 2 +-
 build/pkgs/sphinxcontrib_devhelp/distros/opensuse.txt         | 2 +-
 build/pkgs/sphinxcontrib_htmlhelp/distros/opensuse.txt        | 2 +-
 build/pkgs/sphinxcontrib_jsmath/distros/opensuse.txt          | 2 +-
 build/pkgs/sphinxcontrib_qthelp/distros/opensuse.txt          | 2 +-
 build/pkgs/sphinxcontrib_serializinghtml/distros/opensuse.txt | 2 +-
 build/pkgs/sphinxcontrib_websupport/distros/opensuse.txt      | 2 +-
 build/pkgs/sqlalchemy/distros/opensuse.txt                    | 2 +-
 build/pkgs/sympy/distros/opensuse.txt                         | 2 +-
 build/pkgs/texttable/distros/opensuse.txt                     | 2 +-
 build/pkgs/toml/distros/opensuse.txt                          | 2 +-
 build/pkgs/tornado/distros/opensuse.txt                       | 2 +-
 build/pkgs/traitlets/distros/opensuse.txt                     | 2 +-
 build/pkgs/typing_extensions/distros/opensuse.txt             | 2 +-
 build/pkgs/tzlocal/distros/opensuse.txt                       | 2 +-
 build/pkgs/urllib3/distros/opensuse.txt                       | 2 +-
 build/pkgs/vcversioner/distros/opensuse.txt                   | 2 +-
 build/pkgs/wcwidth/distros/opensuse.txt                       | 2 +-
 build/pkgs/webencodings/distros/opensuse.txt                  | 2 +-
 build/pkgs/wheel/distros/opensuse.txt                         | 2 +-
 77 files changed, 77 insertions(+), 77 deletions(-)

diff --git a/build/pkgs/alabaster/distros/opensuse.txt b/build/pkgs/alabaster/distros/opensuse.txt
index dcc39f9e849..debe990ce19 100644
--- a/build/pkgs/alabaster/distros/opensuse.txt
+++ b/build/pkgs/alabaster/distros/opensuse.txt
@@ -1 +1 @@
-python3-alabaster
+python3${PYTHON_MINOR}-alabaster
diff --git a/build/pkgs/babel/distros/opensuse.txt b/build/pkgs/babel/distros/opensuse.txt
index 70bb05b1327..6372e2e77da 100644
--- a/build/pkgs/babel/distros/opensuse.txt
+++ b/build/pkgs/babel/distros/opensuse.txt
@@ -1 +1 @@
-python3-Babel
+python3${PYTHON_MINOR}-Babel
diff --git a/build/pkgs/bleach/distros/opensuse.txt b/build/pkgs/bleach/distros/opensuse.txt
index 6d37c4c79f0..0e329f6dd62 100644
--- a/build/pkgs/bleach/distros/opensuse.txt
+++ b/build/pkgs/bleach/distros/opensuse.txt
@@ -1 +1 @@
-python3-bleach
+python3${PYTHON_MINOR}-bleach
diff --git a/build/pkgs/certifi/distros/opensuse.txt b/build/pkgs/certifi/distros/opensuse.txt
index f585a823bf3..9f7a6b5c964 100644
--- a/build/pkgs/certifi/distros/opensuse.txt
+++ b/build/pkgs/certifi/distros/opensuse.txt
@@ -1 +1 @@
-python3-certifi
+python3${PYTHON_MINOR}-certifi
diff --git a/build/pkgs/cffi/distros/opensuse.txt b/build/pkgs/cffi/distros/opensuse.txt
index 68ec4dda5ba..6bce4cd18b5 100644
--- a/build/pkgs/cffi/distros/opensuse.txt
+++ b/build/pkgs/cffi/distros/opensuse.txt
@@ -1 +1 @@
-python3-cffi
+python3${PYTHON_MINOR}-cffi
diff --git a/build/pkgs/cvxopt/distros/opensuse.txt b/build/pkgs/cvxopt/distros/opensuse.txt
index 2bb6ad1e834..e254c198706 100644
--- a/build/pkgs/cvxopt/distros/opensuse.txt
+++ b/build/pkgs/cvxopt/distros/opensuse.txt
@@ -1 +1 @@
-python3-cvxopt
+python3${PYTHON_MINOR}-cvxopt
diff --git a/build/pkgs/cycler/distros/opensuse.txt b/build/pkgs/cycler/distros/opensuse.txt
index 93efd62d380..6aab7454acb 100644
--- a/build/pkgs/cycler/distros/opensuse.txt
+++ b/build/pkgs/cycler/distros/opensuse.txt
@@ -1 +1 @@
-python-Cycler
+python3${PYTHON_MINOR}-Cycler
diff --git a/build/pkgs/cython/distros/opensuse.txt b/build/pkgs/cython/distros/opensuse.txt
index c6e300e6a2b..09d8844feaf 100644
--- a/build/pkgs/cython/distros/opensuse.txt
+++ b/build/pkgs/cython/distros/opensuse.txt
@@ -1 +1 @@
-python-Cython
+python3${PYTHON_MINOR}-Cython
diff --git a/build/pkgs/dateutil/distros/opensuse.txt b/build/pkgs/dateutil/distros/opensuse.txt
index a6c93c7710a..ba37df671e5 100644
--- a/build/pkgs/dateutil/distros/opensuse.txt
+++ b/build/pkgs/dateutil/distros/opensuse.txt
@@ -1 +1 @@
-python-python-dateutil
+python3${PYTHON_MINOR}-python-dateutil
diff --git a/build/pkgs/decorator/distros/opensuse.txt b/build/pkgs/decorator/distros/opensuse.txt
index 46c478e1513..4b9085da296 100644
--- a/build/pkgs/decorator/distros/opensuse.txt
+++ b/build/pkgs/decorator/distros/opensuse.txt
@@ -1 +1 @@
-python3-decorator
+python3${PYTHON_MINOR}-decorator
diff --git a/build/pkgs/docutils/distros/opensuse.txt b/build/pkgs/docutils/distros/opensuse.txt
index a4bb792a5a4..a7fcdac14ef 100644
--- a/build/pkgs/docutils/distros/opensuse.txt
+++ b/build/pkgs/docutils/distros/opensuse.txt
@@ -1 +1 @@
-python3-docutils
+python3${PYTHON_MINOR}-docutils
diff --git a/build/pkgs/gmpy2/distros/opensuse.txt b/build/pkgs/gmpy2/distros/opensuse.txt
index d4464a5ce2c..36d52b88ba6 100644
--- a/build/pkgs/gmpy2/distros/opensuse.txt
+++ b/build/pkgs/gmpy2/distros/opensuse.txt
@@ -1 +1 @@
-python-gmpy2
+python3${PYTHON_MINOR}-gmpy2
diff --git a/build/pkgs/html5lib/distros/opensuse.txt b/build/pkgs/html5lib/distros/opensuse.txt
index 6d7b8dfb001..99d5afb4a02 100644
--- a/build/pkgs/html5lib/distros/opensuse.txt
+++ b/build/pkgs/html5lib/distros/opensuse.txt
@@ -1 +1 @@
-python3-html5lib
+python3${PYTHON_MINOR}-html5lib
diff --git a/build/pkgs/idna/distros/opensuse.txt b/build/pkgs/idna/distros/opensuse.txt
index de48e70887b..ea8400fa563 100644
--- a/build/pkgs/idna/distros/opensuse.txt
+++ b/build/pkgs/idna/distros/opensuse.txt
@@ -1 +1 @@
-python3-idna
+python3${PYTHON_MINOR}-idna
diff --git a/build/pkgs/importlib_metadata/distros/opensuse.txt b/build/pkgs/importlib_metadata/distros/opensuse.txt
index b3c206287ec..7a665131cd4 100644
--- a/build/pkgs/importlib_metadata/distros/opensuse.txt
+++ b/build/pkgs/importlib_metadata/distros/opensuse.txt
@@ -1 +1 @@
-python-importlib-metadata
+python3${PYTHON_MINOR}-importlib-metadata
diff --git a/build/pkgs/ipykernel/distros/opensuse.txt b/build/pkgs/ipykernel/distros/opensuse.txt
index 286458797f7..1485db27e0d 100644
--- a/build/pkgs/ipykernel/distros/opensuse.txt
+++ b/build/pkgs/ipykernel/distros/opensuse.txt
@@ -1 +1 @@
-python-ipykernel
+python3${PYTHON_MINOR}-ipykernel
diff --git a/build/pkgs/ipython/distros/opensuse.txt b/build/pkgs/ipython/distros/opensuse.txt
index c32c6b449cf..32aac30ae1e 100644
--- a/build/pkgs/ipython/distros/opensuse.txt
+++ b/build/pkgs/ipython/distros/opensuse.txt
@@ -1 +1 @@
-python3-ipython
+python3${PYTHON_MINOR}-ipython
diff --git a/build/pkgs/jinja2/distros/opensuse.txt b/build/pkgs/jinja2/distros/opensuse.txt
index f2db865ab36..8ad585a7ef3 100644
--- a/build/pkgs/jinja2/distros/opensuse.txt
+++ b/build/pkgs/jinja2/distros/opensuse.txt
@@ -1 +1 @@
-python3-jinja2
+python3${PYTHON_MINOR}-jinja2
diff --git a/build/pkgs/jsonschema/distros/opensuse.txt b/build/pkgs/jsonschema/distros/opensuse.txt
index 047e6cc5d1d..2a587a55946 100644
--- a/build/pkgs/jsonschema/distros/opensuse.txt
+++ b/build/pkgs/jsonschema/distros/opensuse.txt
@@ -1 +1 @@
-python3-jsonschema
+python3${PYTHON_MINOR}-jsonschema
diff --git a/build/pkgs/jupyter_client/distros/opensuse.txt b/build/pkgs/jupyter_client/distros/opensuse.txt
index 0159b2d7b90..a1e21956a79 100644
--- a/build/pkgs/jupyter_client/distros/opensuse.txt
+++ b/build/pkgs/jupyter_client/distros/opensuse.txt
@@ -1 +1 @@
-python3-jupyter-client
+python3${PYTHON_MINOR}-jupyter-client
diff --git a/build/pkgs/jupyter_core/distros/opensuse.txt b/build/pkgs/jupyter_core/distros/opensuse.txt
index 2f316f2ee07..2c677674477 100644
--- a/build/pkgs/jupyter_core/distros/opensuse.txt
+++ b/build/pkgs/jupyter_core/distros/opensuse.txt
@@ -1 +1 @@
-python3-jupyter-core
+python3${PYTHON_MINOR}-jupyter-core
diff --git a/build/pkgs/jupyterlab_widgets/distros/opensuse.txt b/build/pkgs/jupyterlab_widgets/distros/opensuse.txt
index 651221f2ba2..04706eee600 100644
--- a/build/pkgs/jupyterlab_widgets/distros/opensuse.txt
+++ b/build/pkgs/jupyterlab_widgets/distros/opensuse.txt
@@ -1 +1 @@
-python-jupyterlab-widgets
+python3${PYTHON_MINOR}-jupyterlab-widgets
diff --git a/build/pkgs/markupsafe/distros/opensuse.txt b/build/pkgs/markupsafe/distros/opensuse.txt
index 483c7ee1e18..8c103c6b5e5 100644
--- a/build/pkgs/markupsafe/distros/opensuse.txt
+++ b/build/pkgs/markupsafe/distros/opensuse.txt
@@ -1 +1 @@
-python3-MarkupSafe
+python3${PYTHON_MINOR}-MarkupSafe
diff --git a/build/pkgs/matplotlib/distros/opensuse.txt b/build/pkgs/matplotlib/distros/opensuse.txt
index 13743297213..40f1130ec6f 100644
--- a/build/pkgs/matplotlib/distros/opensuse.txt
+++ b/build/pkgs/matplotlib/distros/opensuse.txt
@@ -1 +1 @@
-python3-matplotlib
+python3${PYTHON_MINOR}-matplotlib
diff --git a/build/pkgs/mpmath/distros/opensuse.txt b/build/pkgs/mpmath/distros/opensuse.txt
index fbc82a97e07..8b65d97862d 100644
--- a/build/pkgs/mpmath/distros/opensuse.txt
+++ b/build/pkgs/mpmath/distros/opensuse.txt
@@ -1 +1 @@
-python3-mpmath
+python3${PYTHON_MINOR}-mpmath
diff --git a/build/pkgs/networkx/distros/opensuse.txt b/build/pkgs/networkx/distros/opensuse.txt
index 67790667af2..7c421f08d48 100644
--- a/build/pkgs/networkx/distros/opensuse.txt
+++ b/build/pkgs/networkx/distros/opensuse.txt
@@ -1 +1 @@
-python3-networkx
+python3${PYTHON_MINOR}-networkx
diff --git a/build/pkgs/nibabel/distros/opensuse.txt b/build/pkgs/nibabel/distros/opensuse.txt
index 19df029d93f..1a7f1fd31f7 100644
--- a/build/pkgs/nibabel/distros/opensuse.txt
+++ b/build/pkgs/nibabel/distros/opensuse.txt
@@ -1 +1 @@
-python3-nibabel
+python3${PYTHON_MINOR}-nibabel
diff --git a/build/pkgs/numpy/distros/opensuse.txt b/build/pkgs/numpy/distros/opensuse.txt
index 79d5c5a1429..2e278515236 100644
--- a/build/pkgs/numpy/distros/opensuse.txt
+++ b/build/pkgs/numpy/distros/opensuse.txt
@@ -1 +1 @@
-python3-numpy
+python3${PYTHON_MINOR}-numpy
diff --git a/build/pkgs/packaging/distros/opensuse.txt b/build/pkgs/packaging/distros/opensuse.txt
index 8f1c0ffc29f..bec5186f923 100644
--- a/build/pkgs/packaging/distros/opensuse.txt
+++ b/build/pkgs/packaging/distros/opensuse.txt
@@ -1 +1 @@
-python3-packaging
+python3${PYTHON_MINOR}-packaging
diff --git a/build/pkgs/pandocfilters/distros/opensuse.txt b/build/pkgs/pandocfilters/distros/opensuse.txt
index d0d4c24e15e..843b3c1b32b 100644
--- a/build/pkgs/pandocfilters/distros/opensuse.txt
+++ b/build/pkgs/pandocfilters/distros/opensuse.txt
@@ -1 +1 @@
-python3-pandocfilters
+python3${PYTHON_MINOR}-pandocfilters
diff --git a/build/pkgs/pexpect/distros/opensuse.txt b/build/pkgs/pexpect/distros/opensuse.txt
index 8d745ee4a07..f8cc97d1599 100644
--- a/build/pkgs/pexpect/distros/opensuse.txt
+++ b/build/pkgs/pexpect/distros/opensuse.txt
@@ -1 +1 @@
-python3-pexpect
+python3${PYTHON_MINOR}-pexpect
diff --git a/build/pkgs/pickleshare/distros/opensuse.txt b/build/pkgs/pickleshare/distros/opensuse.txt
index a00907d167b..260701493fc 100644
--- a/build/pkgs/pickleshare/distros/opensuse.txt
+++ b/build/pkgs/pickleshare/distros/opensuse.txt
@@ -1 +1 @@
-python3-pickleshare
+python3${PYTHON_MINOR}-pickleshare
diff --git a/build/pkgs/pillow/distros/opensuse.txt b/build/pkgs/pillow/distros/opensuse.txt
index 88283bea6d9..8261b108af6 100644
--- a/build/pkgs/pillow/distros/opensuse.txt
+++ b/build/pkgs/pillow/distros/opensuse.txt
@@ -1 +1 @@
-python3-Pillow
+python3${PYTHON_MINOR}-Pillow
diff --git a/build/pkgs/pip/distros/opensuse.txt b/build/pkgs/pip/distros/opensuse.txt
index 39bd9fc5097..eb4aa7ea9f1 100644
--- a/build/pkgs/pip/distros/opensuse.txt
+++ b/build/pkgs/pip/distros/opensuse.txt
@@ -1 +1 @@
-python3-pip
+python3${PYTHON_MINOR}-pip
diff --git a/build/pkgs/pluggy/distros/opensuse.txt b/build/pkgs/pluggy/distros/opensuse.txt
index 43a3acf0462..42720b43944 100644
--- a/build/pkgs/pluggy/distros/opensuse.txt
+++ b/build/pkgs/pluggy/distros/opensuse.txt
@@ -1 +1 @@
-python3-pluggy
+python3${PYTHON_MINOR}-pluggy
diff --git a/build/pkgs/prometheus_client/distros/opensuse.txt b/build/pkgs/prometheus_client/distros/opensuse.txt
index 4d7723ec37e..c061661b6e6 100644
--- a/build/pkgs/prometheus_client/distros/opensuse.txt
+++ b/build/pkgs/prometheus_client/distros/opensuse.txt
@@ -1 +1 @@
-python3-prometheus_client
+python3${PYTHON_MINOR}-prometheus_client
diff --git a/build/pkgs/prompt_toolkit/distros/opensuse.txt b/build/pkgs/prompt_toolkit/distros/opensuse.txt
index 89b0ac83a9b..3c48b809bc1 100644
--- a/build/pkgs/prompt_toolkit/distros/opensuse.txt
+++ b/build/pkgs/prompt_toolkit/distros/opensuse.txt
@@ -1 +1 @@
-python-importlib_resources
+python3${PYTHON_MINOR}-importlib_resources
diff --git a/build/pkgs/ptyprocess/distros/opensuse.txt b/build/pkgs/ptyprocess/distros/opensuse.txt
index ad4f6db1ca7..846495a86e8 100644
--- a/build/pkgs/ptyprocess/distros/opensuse.txt
+++ b/build/pkgs/ptyprocess/distros/opensuse.txt
@@ -1 +1 @@
-python3-ptyprocess
+python3${PYTHON_MINOR}-ptyprocess
diff --git a/build/pkgs/py/distros/opensuse.txt b/build/pkgs/py/distros/opensuse.txt
index 81fefe60903..c03de61a449 100644
--- a/build/pkgs/py/distros/opensuse.txt
+++ b/build/pkgs/py/distros/opensuse.txt
@@ -1 +1 @@
-python3-py
+python3${PYTHON_MINOR}-py
diff --git a/build/pkgs/pybtex/distros/opensuse.txt b/build/pkgs/pybtex/distros/opensuse.txt
index bdd39a48fde..e482a1bfea0 100644
--- a/build/pkgs/pybtex/distros/opensuse.txt
+++ b/build/pkgs/pybtex/distros/opensuse.txt
@@ -1 +1 @@
-python3-pybtex
+python3${PYTHON_MINOR}-pybtex
diff --git a/build/pkgs/pycparser/distros/opensuse.txt b/build/pkgs/pycparser/distros/opensuse.txt
index 0ba4f8b19f5..503e7c176d1 100644
--- a/build/pkgs/pycparser/distros/opensuse.txt
+++ b/build/pkgs/pycparser/distros/opensuse.txt
@@ -1 +1 @@
-python3-pycparser
+python3${PYTHON_MINOR}-pycparser
diff --git a/build/pkgs/pygments/distros/opensuse.txt b/build/pkgs/pygments/distros/opensuse.txt
index 3ab37929b2c..ef63366ff27 100644
--- a/build/pkgs/pygments/distros/opensuse.txt
+++ b/build/pkgs/pygments/distros/opensuse.txt
@@ -1 +1 @@
-python3-pygments
+python3${PYTHON_MINOR}-pygments
diff --git a/build/pkgs/pyparsing/distros/opensuse.txt b/build/pkgs/pyparsing/distros/opensuse.txt
index 492a7ce0a69..2a91a003cf9 100644
--- a/build/pkgs/pyparsing/distros/opensuse.txt
+++ b/build/pkgs/pyparsing/distros/opensuse.txt
@@ -1 +1 @@
-python3-pyparsing
+python3${PYTHON_MINOR}-pyparsing
diff --git a/build/pkgs/python3/distros/opensuse.txt b/build/pkgs/python3/distros/opensuse.txt
index 07358a92e89..760ddd76f2c 100644
--- a/build/pkgs/python3/distros/opensuse.txt
+++ b/build/pkgs/python3/distros/opensuse.txt
@@ -1 +1 @@
-python3-devel
+python3${PYTHON_MINOR}-devel
diff --git a/build/pkgs/pytz/distros/opensuse.txt b/build/pkgs/pytz/distros/opensuse.txt
index 1b20e1dbb77..232b99a6d04 100644
--- a/build/pkgs/pytz/distros/opensuse.txt
+++ b/build/pkgs/pytz/distros/opensuse.txt
@@ -1 +1 @@
-python3-pytz
+python3${PYTHON_MINOR}-pytz
diff --git a/build/pkgs/pyx/distros/opensuse.txt b/build/pkgs/pyx/distros/opensuse.txt
index 03265558e86..f7dd2365b82 100644
--- a/build/pkgs/pyx/distros/opensuse.txt
+++ b/build/pkgs/pyx/distros/opensuse.txt
@@ -1 +1 @@
-python3-PyX
+python3${PYTHON_MINOR}-PyX
diff --git a/build/pkgs/pyzmq/distros/opensuse.txt b/build/pkgs/pyzmq/distros/opensuse.txt
index 265a272130e..fe243347c49 100644
--- a/build/pkgs/pyzmq/distros/opensuse.txt
+++ b/build/pkgs/pyzmq/distros/opensuse.txt
@@ -1 +1 @@
-python3-pyzmq
+python3${PYTHON_MINOR}-pyzmq
diff --git a/build/pkgs/requests/distros/opensuse.txt b/build/pkgs/requests/distros/opensuse.txt
index 43147b2be74..c1581ad8a95 100644
--- a/build/pkgs/requests/distros/opensuse.txt
+++ b/build/pkgs/requests/distros/opensuse.txt
@@ -1 +1 @@
-python3-requests
+python3${PYTHON_MINOR}-requests
diff --git a/build/pkgs/rpy2/distros/opensuse.txt b/build/pkgs/rpy2/distros/opensuse.txt
index 9748535a285..5b9c1542845 100644
--- a/build/pkgs/rpy2/distros/opensuse.txt
+++ b/build/pkgs/rpy2/distros/opensuse.txt
@@ -1 +1 @@
-python-rpy2
+python3${PYTHON_MINOR}-rpy2
diff --git a/build/pkgs/scipy/distros/opensuse.txt b/build/pkgs/scipy/distros/opensuse.txt
index 12b366666d6..d2bc2a30a85 100644
--- a/build/pkgs/scipy/distros/opensuse.txt
+++ b/build/pkgs/scipy/distros/opensuse.txt
@@ -1 +1 @@
-python3-scipy
+python3${PYTHON_MINOR}-scipy
diff --git a/build/pkgs/send2trash/distros/opensuse.txt b/build/pkgs/send2trash/distros/opensuse.txt
index 404e2bd3580..8d3c81fa23c 100644
--- a/build/pkgs/send2trash/distros/opensuse.txt
+++ b/build/pkgs/send2trash/distros/opensuse.txt
@@ -1 +1 @@
-python3-Send2Trash
+python3${PYTHON_MINOR}-Send2Trash
diff --git a/build/pkgs/setuptools/distros/opensuse.txt b/build/pkgs/setuptools/distros/opensuse.txt
index 1c0901c0374..b2d8de78f80 100644
--- a/build/pkgs/setuptools/distros/opensuse.txt
+++ b/build/pkgs/setuptools/distros/opensuse.txt
@@ -1 +1 @@
-python3-setuptools
+python3${PYTHON_MINOR}-setuptools
diff --git a/build/pkgs/setuptools_scm/distros/opensuse.txt b/build/pkgs/setuptools_scm/distros/opensuse.txt
index 2aa5ca12cba..cacb303c566 100644
--- a/build/pkgs/setuptools_scm/distros/opensuse.txt
+++ b/build/pkgs/setuptools_scm/distros/opensuse.txt
@@ -1 +1 @@
-python3-setuptools_scm
+python3${PYTHON_MINOR}-setuptools_scm
diff --git a/build/pkgs/simplegeneric/distros/opensuse.txt b/build/pkgs/simplegeneric/distros/opensuse.txt
index d788a7233a7..ddc1661a230 100644
--- a/build/pkgs/simplegeneric/distros/opensuse.txt
+++ b/build/pkgs/simplegeneric/distros/opensuse.txt
@@ -1 +1 @@
-python3-simplegeneric
+python3${PYTHON_MINOR}-simplegeneric
diff --git a/build/pkgs/six/distros/opensuse.txt b/build/pkgs/six/distros/opensuse.txt
index 68ff8595d0b..127cfc6a26a 100644
--- a/build/pkgs/six/distros/opensuse.txt
+++ b/build/pkgs/six/distros/opensuse.txt
@@ -1 +1 @@
-python3-six
+python3${PYTHON_MINOR}-six
diff --git a/build/pkgs/snowballstemmer/distros/opensuse.txt b/build/pkgs/snowballstemmer/distros/opensuse.txt
index 09b2636df60..a21cc876a24 100644
--- a/build/pkgs/snowballstemmer/distros/opensuse.txt
+++ b/build/pkgs/snowballstemmer/distros/opensuse.txt
@@ -1 +1 @@
-python3-snowballstemmer
+python3${PYTHON_MINOR}-snowballstemmer
diff --git a/build/pkgs/sphinx/distros/opensuse.txt b/build/pkgs/sphinx/distros/opensuse.txt
index bc54d0bd553..0aa0566b066 100644
--- a/build/pkgs/sphinx/distros/opensuse.txt
+++ b/build/pkgs/sphinx/distros/opensuse.txt
@@ -1 +1 @@
-python3-Sphinx
+python3${PYTHON_MINOR}-Sphinx
diff --git a/build/pkgs/sphinxcontrib_applehelp/distros/opensuse.txt b/build/pkgs/sphinxcontrib_applehelp/distros/opensuse.txt
index 3754baa21f5..9d71e79f307 100644
--- a/build/pkgs/sphinxcontrib_applehelp/distros/opensuse.txt
+++ b/build/pkgs/sphinxcontrib_applehelp/distros/opensuse.txt
@@ -1 +1 @@
-python-sphinxcontrib-applehelp
+python3${PYTHON_MINOR}-sphinxcontrib-applehelp
diff --git a/build/pkgs/sphinxcontrib_devhelp/distros/opensuse.txt b/build/pkgs/sphinxcontrib_devhelp/distros/opensuse.txt
index 0b1b3e44a6b..95012c2425d 100644
--- a/build/pkgs/sphinxcontrib_devhelp/distros/opensuse.txt
+++ b/build/pkgs/sphinxcontrib_devhelp/distros/opensuse.txt
@@ -1 +1 @@
-python-sphinxcontrib-devhelp
+python3${PYTHON_MINOR}-sphinxcontrib-devhelp
diff --git a/build/pkgs/sphinxcontrib_htmlhelp/distros/opensuse.txt b/build/pkgs/sphinxcontrib_htmlhelp/distros/opensuse.txt
index 81390fd522f..5859fe855bb 100644
--- a/build/pkgs/sphinxcontrib_htmlhelp/distros/opensuse.txt
+++ b/build/pkgs/sphinxcontrib_htmlhelp/distros/opensuse.txt
@@ -1 +1 @@
-python-sphinxcontrib-htmlhelp
+python3${PYTHON_MINOR}-sphinxcontrib-htmlhelp
diff --git a/build/pkgs/sphinxcontrib_jsmath/distros/opensuse.txt b/build/pkgs/sphinxcontrib_jsmath/distros/opensuse.txt
index 2b4927832ac..dbe478264db 100644
--- a/build/pkgs/sphinxcontrib_jsmath/distros/opensuse.txt
+++ b/build/pkgs/sphinxcontrib_jsmath/distros/opensuse.txt
@@ -1 +1 @@
-python-sphinxcontrib-jsmath
+python3${PYTHON_MINOR}-sphinxcontrib-jsmath
diff --git a/build/pkgs/sphinxcontrib_qthelp/distros/opensuse.txt b/build/pkgs/sphinxcontrib_qthelp/distros/opensuse.txt
index 2c11924a5df..9462502bae5 100644
--- a/build/pkgs/sphinxcontrib_qthelp/distros/opensuse.txt
+++ b/build/pkgs/sphinxcontrib_qthelp/distros/opensuse.txt
@@ -1 +1 @@
-python-sphinxcontrib-qthelp
+python3${PYTHON_MINOR}-sphinxcontrib-qthelp
diff --git a/build/pkgs/sphinxcontrib_serializinghtml/distros/opensuse.txt b/build/pkgs/sphinxcontrib_serializinghtml/distros/opensuse.txt
index 46d22be403f..7a647e3e36a 100644
--- a/build/pkgs/sphinxcontrib_serializinghtml/distros/opensuse.txt
+++ b/build/pkgs/sphinxcontrib_serializinghtml/distros/opensuse.txt
@@ -1 +1 @@
-python-sphinxcontrib-serializinghtml
+python3${PYTHON_MINOR}-sphinxcontrib-serializinghtml
diff --git a/build/pkgs/sphinxcontrib_websupport/distros/opensuse.txt b/build/pkgs/sphinxcontrib_websupport/distros/opensuse.txt
index a9a5a1a1727..d01c76bd534 100644
--- a/build/pkgs/sphinxcontrib_websupport/distros/opensuse.txt
+++ b/build/pkgs/sphinxcontrib_websupport/distros/opensuse.txt
@@ -1 +1 @@
-python-sphinxcontrib-websupport
+python3${PYTHON_MINOR}-sphinxcontrib-websupport
diff --git a/build/pkgs/sqlalchemy/distros/opensuse.txt b/build/pkgs/sqlalchemy/distros/opensuse.txt
index 023e06b7468..0a1757fd5b3 100644
--- a/build/pkgs/sqlalchemy/distros/opensuse.txt
+++ b/build/pkgs/sqlalchemy/distros/opensuse.txt
@@ -1 +1 @@
-python3-SQLAlchemy
+python3${PYTHON_MINOR}-SQLAlchemy
diff --git a/build/pkgs/sympy/distros/opensuse.txt b/build/pkgs/sympy/distros/opensuse.txt
index db423c87ba7..bea17da35b4 100644
--- a/build/pkgs/sympy/distros/opensuse.txt
+++ b/build/pkgs/sympy/distros/opensuse.txt
@@ -1 +1 @@
-python3-sympy
+python3${PYTHON_MINOR}-sympy
diff --git a/build/pkgs/texttable/distros/opensuse.txt b/build/pkgs/texttable/distros/opensuse.txt
index 8f8e7e29d7a..d4959328e94 100644
--- a/build/pkgs/texttable/distros/opensuse.txt
+++ b/build/pkgs/texttable/distros/opensuse.txt
@@ -1 +1 @@
-python3-texttable
+python3${PYTHON_MINOR}-texttable
diff --git a/build/pkgs/toml/distros/opensuse.txt b/build/pkgs/toml/distros/opensuse.txt
index 543e89d2a6f..fbc340aee15 100644
--- a/build/pkgs/toml/distros/opensuse.txt
+++ b/build/pkgs/toml/distros/opensuse.txt
@@ -1 +1 @@
-python3-toml
+python3${PYTHON_MINOR}-toml
diff --git a/build/pkgs/tornado/distros/opensuse.txt b/build/pkgs/tornado/distros/opensuse.txt
index 426685be95b..1f37b341221 100644
--- a/build/pkgs/tornado/distros/opensuse.txt
+++ b/build/pkgs/tornado/distros/opensuse.txt
@@ -1 +1 @@
-python3-tornado
+python3${PYTHON_MINOR}-tornado
diff --git a/build/pkgs/traitlets/distros/opensuse.txt b/build/pkgs/traitlets/distros/opensuse.txt
index 93cb8375e46..f0cc6730e1f 100644
--- a/build/pkgs/traitlets/distros/opensuse.txt
+++ b/build/pkgs/traitlets/distros/opensuse.txt
@@ -1 +1 @@
-python3-traitlets
+python3${PYTHON_MINOR}-traitlets
diff --git a/build/pkgs/typing_extensions/distros/opensuse.txt b/build/pkgs/typing_extensions/distros/opensuse.txt
index 92ad68dabc4..62a10cbbc72 100644
--- a/build/pkgs/typing_extensions/distros/opensuse.txt
+++ b/build/pkgs/typing_extensions/distros/opensuse.txt
@@ -1 +1 @@
-python-typing_extensions
+python3${PYTHON_MINOR}-typing_extensions
diff --git a/build/pkgs/tzlocal/distros/opensuse.txt b/build/pkgs/tzlocal/distros/opensuse.txt
index 95d2d705c05..2e4de5e9e49 100644
--- a/build/pkgs/tzlocal/distros/opensuse.txt
+++ b/build/pkgs/tzlocal/distros/opensuse.txt
@@ -1 +1 @@
-python3-tzlocal
+python3${PYTHON_MINOR}-tzlocal
diff --git a/build/pkgs/urllib3/distros/opensuse.txt b/build/pkgs/urllib3/distros/opensuse.txt
index af6e58664fb..7466e3c2bdd 100644
--- a/build/pkgs/urllib3/distros/opensuse.txt
+++ b/build/pkgs/urllib3/distros/opensuse.txt
@@ -1 +1 @@
-python-urllib3
+python3${PYTHON_MINOR}-urllib3
diff --git a/build/pkgs/vcversioner/distros/opensuse.txt b/build/pkgs/vcversioner/distros/opensuse.txt
index 3a9b9818aa4..a9b307f8509 100644
--- a/build/pkgs/vcversioner/distros/opensuse.txt
+++ b/build/pkgs/vcversioner/distros/opensuse.txt
@@ -1 +1 @@
-python3-vcversioner
+python3${PYTHON_MINOR}-vcversioner
diff --git a/build/pkgs/wcwidth/distros/opensuse.txt b/build/pkgs/wcwidth/distros/opensuse.txt
index 2974220c878..8fea03a6c67 100644
--- a/build/pkgs/wcwidth/distros/opensuse.txt
+++ b/build/pkgs/wcwidth/distros/opensuse.txt
@@ -1 +1 @@
-python3-wcwidth
+python3${PYTHON_MINOR}-wcwidth
diff --git a/build/pkgs/webencodings/distros/opensuse.txt b/build/pkgs/webencodings/distros/opensuse.txt
index ac30c2f3307..b8d9c4d299c 100644
--- a/build/pkgs/webencodings/distros/opensuse.txt
+++ b/build/pkgs/webencodings/distros/opensuse.txt
@@ -1 +1 @@
-python3-webencodings
+python3${PYTHON_MINOR}-webencodings
diff --git a/build/pkgs/wheel/distros/opensuse.txt b/build/pkgs/wheel/distros/opensuse.txt
index 3c066725a1d..3df335c1375 100644
--- a/build/pkgs/wheel/distros/opensuse.txt
+++ b/build/pkgs/wheel/distros/opensuse.txt
@@ -1 +1 @@
-python3-wheel
+python3${PYTHON_MINOR}-wheel

From c076df43eff6d282d81abc5d25688018cd256cc3 Mon Sep 17 00:00:00 2001
From: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
Date: Wed, 30 Aug 2023 10:15:56 -0700
Subject: [PATCH 224/247] build/bin/write-dockerfile.sh: Substitute
 ${PYTHON_MINOR}

---
 build/bin/write-dockerfile.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/bin/write-dockerfile.sh b/build/bin/write-dockerfile.sh
index 85b51245b29..6980f6b6e4b 100755
--- a/build/bin/write-dockerfile.sh
+++ b/build/bin/write-dockerfile.sh
@@ -16,7 +16,7 @@ export PATH="$SAGE_ROOT"/build/bin:$PATH
 SYSTEM_PACKAGES=$EXTRA_SYSTEM_PACKAGES
 CONFIGURE_ARGS="--enable-option-checking "
 for SPKG in $(sage-package list --has-file=spkg-configure.m4 $SAGE_PACKAGE_LIST_ARGS) $EXTRA_SAGE_PACKAGES; do
-    SYSTEM_PACKAGE=$(sage-get-system-packages $SYSTEM $SPKG)
+    SYSTEM_PACKAGE=$(sage-get-system-packages $SYSTEM $SPKG | sed 's/${PYTHON_MINOR}/'${PYTHON_MINOR}'/g')
     if [ -n "${SYSTEM_PACKAGE}" ]; then
 	# SYSTEM_PACKAGE can be empty if, for example, the environment
 	# variable ENABLE_SYSTEM_SITE_PACKAGES is empty.

From 409ac5ac2135e2a6d912b916f14981d186ae319c Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 30 Aug 2023 15:21:59 -0400
Subject: [PATCH 225/247] configure.ac: remove pyvenv.cfg when ./configure is
 run

This is necessary to trigger a rebuild of pyvenv.cfg, in case the
value of --enable-system-site-packages has changed.
---
 configure.ac | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/configure.ac b/configure.ac
index 26515d45839..701731ae191 100644
--- a/configure.ac
+++ b/configure.ac
@@ -609,6 +609,21 @@ AC_CONFIG_COMMANDS(links, [
     eval SAGE_VENV="$SAGE_VENV"dnl eval so as to evaluate the embedded ${SAGE_LOCAL}
 ])
 
+AC_CONFIG_COMMANDS([pyenv.cfg],[
+    dnl Erase the venv configuration so that it will be recreated,
+    dnl in case SAGE_VENV_FLAGS has changed. In particular we need
+    dnl to be able to toggle --enable-system-site-packages and have
+    dnl it actually take effect.
+    AC_MSG_NOTICE([Removing ${SAGE_VENV}/pyvenv.cfg in case SAGE_VENV_FLAGS have changed])
+    rm -f "${SAGE_VENV}/pyvenv.cfg"
+],[
+    dnl Set $SAGE_LOCAL which does not happen automatically in
+    dnl in AC_CONFIG_COMMANDS actions.
+    SAGE_LOCAL="$SAGE_LOCAL"
+    dnl Evaluate the ${SAGE_LOCAL} often embedded in SAGE_VENV
+    eval SAGE_VENV="$SAGE_VENV"
+])
+
 AC_OUTPUT()
 
 SAGE_SYSTEM_PACKAGE_NOTICE()

From a1d8273bb0907d38f8d5486c7b0feea128c93096 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 30 Aug 2023 15:42:29 -0400
Subject: [PATCH 226/247] Revert "configure.ac: remove pyvenv.cfg when
 ./configure is run"

This reverts commit 409ac5ac2135e2a6d912b916f14981d186ae319c.
---
 configure.ac | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/configure.ac b/configure.ac
index 701731ae191..26515d45839 100644
--- a/configure.ac
+++ b/configure.ac
@@ -609,21 +609,6 @@ AC_CONFIG_COMMANDS(links, [
     eval SAGE_VENV="$SAGE_VENV"dnl eval so as to evaluate the embedded ${SAGE_LOCAL}
 ])
 
-AC_CONFIG_COMMANDS([pyenv.cfg],[
-    dnl Erase the venv configuration so that it will be recreated,
-    dnl in case SAGE_VENV_FLAGS has changed. In particular we need
-    dnl to be able to toggle --enable-system-site-packages and have
-    dnl it actually take effect.
-    AC_MSG_NOTICE([Removing ${SAGE_VENV}/pyvenv.cfg in case SAGE_VENV_FLAGS have changed])
-    rm -f "${SAGE_VENV}/pyvenv.cfg"
-],[
-    dnl Set $SAGE_LOCAL which does not happen automatically in
-    dnl in AC_CONFIG_COMMANDS actions.
-    SAGE_LOCAL="$SAGE_LOCAL"
-    dnl Evaluate the ${SAGE_LOCAL} often embedded in SAGE_VENV
-    eval SAGE_VENV="$SAGE_VENV"
-])
-
 AC_OUTPUT()
 
 SAGE_SYSTEM_PACKAGE_NOTICE()

From ab4904bf0b806aa9014f0dc8386e74b79843ed35 Mon Sep 17 00:00:00 2001
From: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
Date: Wed, 30 Aug 2023 14:29:09 -0700
Subject: [PATCH 227/247] build/make/Makefile.in: Use a file separate from
 pyvenv.cfg as installation record

---
 build/make/Makefile.in | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/build/make/Makefile.in b/build/make/Makefile.in
index 7622c5f0f13..5c5a1a43d0c 100644
--- a/build/make/Makefile.in
+++ b/build/make/Makefile.in
@@ -227,6 +227,7 @@ SAGE_I_TARGETS = sagelib doc
 	python3_venv _clean-broken-gcc
 
 PYTHON_FOR_VENV = @PYTHON_FOR_VENV@
+SAGE_VENV_FLAGS = @SAGE_VENV_FLAGS@
 
 ifneq ($(PYTHON_FOR_VENV),)
 # Special rule for making the Python virtualenv from the system Python (Python
@@ -239,10 +240,11 @@ ifneq ($(PYTHON_FOR_VENV),)
 ifeq ($(PYTHON),python3)
 PYTHON = python3_venv
 endif
-inst_python3_venv = $(SAGE_VENV)/pyvenv.cfg
+inst_python3_venv = $(SAGE_VENV)/$(SPKG_INST_RELDIR)/python3_venv-$(subst /,-,$(PYTHON_FOR_VENV))$(findstring --system-site-packages,$(SAGE_VENV_FLAGS))
 
 $(inst_python3_venv):
-	$(PYTHON_FOR_VENV) $(SAGE_ROOT)/build/bin/sage-venv @SAGE_VENV_FLAGS@ "$(SAGE_VENV)"
+	$(PYTHON_FOR_VENV) $(SAGE_ROOT)/build/bin/sage-venv $(SAGE_VENV_FLAGS) "$(SAGE_VENV)"
+	touch $@
 endif
 
 # Build everything and start Sage.

From 0e0285cd34787d186d8d50e9437f6a10e0e21f41 Mon Sep 17 00:00:00 2001
From: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
Date: Wed, 30 Aug 2023 14:37:21 -0700
Subject: [PATCH 228/247] build/pkgs/setuptools_scm/distros: Add more

---
 build/pkgs/setuptools_scm/distros/arch.txt    | 1 +
 build/pkgs/setuptools_scm/distros/debian.txt  | 1 +
 build/pkgs/setuptools_scm/distros/fedora.txt  | 1 +
 build/pkgs/setuptools_scm/distros/freebsd.txt | 1 +
 4 files changed, 4 insertions(+)
 create mode 100644 build/pkgs/setuptools_scm/distros/arch.txt
 create mode 100644 build/pkgs/setuptools_scm/distros/debian.txt
 create mode 100644 build/pkgs/setuptools_scm/distros/fedora.txt
 create mode 100644 build/pkgs/setuptools_scm/distros/freebsd.txt

diff --git a/build/pkgs/setuptools_scm/distros/arch.txt b/build/pkgs/setuptools_scm/distros/arch.txt
new file mode 100644
index 00000000000..2b97444decf
--- /dev/null
+++ b/build/pkgs/setuptools_scm/distros/arch.txt
@@ -0,0 +1 @@
+python-setuptools-scm
diff --git a/build/pkgs/setuptools_scm/distros/debian.txt b/build/pkgs/setuptools_scm/distros/debian.txt
new file mode 100644
index 00000000000..bcfdd6ebcdd
--- /dev/null
+++ b/build/pkgs/setuptools_scm/distros/debian.txt
@@ -0,0 +1 @@
+setuptools-scm
diff --git a/build/pkgs/setuptools_scm/distros/fedora.txt b/build/pkgs/setuptools_scm/distros/fedora.txt
new file mode 100644
index 00000000000..720fd2897be
--- /dev/null
+++ b/build/pkgs/setuptools_scm/distros/fedora.txt
@@ -0,0 +1 @@
+python-setuptools_scm
diff --git a/build/pkgs/setuptools_scm/distros/freebsd.txt b/build/pkgs/setuptools_scm/distros/freebsd.txt
new file mode 100644
index 00000000000..ba714681e0a
--- /dev/null
+++ b/build/pkgs/setuptools_scm/distros/freebsd.txt
@@ -0,0 +1 @@
+devel/py-setuptools_scm

From 34b8808b8a9030069c66cd986f17b3c08eb2995c Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 30 Aug 2023 18:14:16 -0400
Subject: [PATCH 229/247] build/make/Makefile.in: ensure
 $(SAGE_VENV)/$(SPKG_INST_RELDIR) exists

We touch a file inside $(SAGE_VENV)/$(SPKG_INST_RELDIR) to create the
installation record "inst_python3_venv" but that directory must exist
first. We add the prerequisite and "mkdir -p" to create it when it
does not.
---
 build/make/Makefile.in | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/build/make/Makefile.in b/build/make/Makefile.in
index 5c5a1a43d0c..caf86fdeaf8 100644
--- a/build/make/Makefile.in
+++ b/build/make/Makefile.in
@@ -242,7 +242,9 @@ PYTHON = python3_venv
 endif
 inst_python3_venv = $(SAGE_VENV)/$(SPKG_INST_RELDIR)/python3_venv-$(subst /,-,$(PYTHON_FOR_VENV))$(findstring --system-site-packages,$(SAGE_VENV_FLAGS))
 
-$(inst_python3_venv):
+$(SAGE_VENV)/$(SPKG_INST_RELDIR):
+	mkdir -p $@
+$(inst_python3_venv): $(SAGE_VENV)/$(SPKG_INST_RELDIR)
 	$(PYTHON_FOR_VENV) $(SAGE_ROOT)/build/bin/sage-venv $(SAGE_VENV_FLAGS) "$(SAGE_VENV)"
 	touch $@
 endif

From faace2f036b1104851f3cae4107354bdd2493444 Mon Sep 17 00:00:00 2001
From: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
Date: Wed, 30 Aug 2023 16:55:43 -0700
Subject: [PATCH 230/247] build/pkgs/jupyter_core/dependencies: Add build dep
 hatchling

---
 build/pkgs/jupyter_core/dependencies | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/pkgs/jupyter_core/dependencies b/build/pkgs/jupyter_core/dependencies
index 6aeda10f20d..8fbd6477646 100644
--- a/build/pkgs/jupyter_core/dependencies
+++ b/build/pkgs/jupyter_core/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN) traitlets
+$(PYTHON) traitlets | $(PYTHON_TOOLCHAIN) hatchling
 
 ----------
 All lines of this file are ignored except the first.

From 33eb52ab0320925e44ce2e438daed006657ef224 Mon Sep 17 00:00:00 2001
From: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
Date: Wed, 30 Aug 2023 19:42:05 -0700
Subject: [PATCH 231/247] build/pkgs/{pip,setuptools_scm}: Update lower bounds

---
 build/pkgs/pip/install-requires.txt            | 3 ++-
 build/pkgs/setuptools_scm/install-requires.txt | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/build/pkgs/pip/install-requires.txt b/build/pkgs/pip/install-requires.txt
index 7af2e246633..5e76a10f694 100644
--- a/build/pkgs/pip/install-requires.txt
+++ b/build/pkgs/pip/install-requires.txt
@@ -1,2 +1,3 @@
-pip >=21.3
+pip >=22.1
 # for use of the "in-tree-build" feature, default since 21.3, by the Sage distribution
+# for use of --config-settings, 22.1
diff --git a/build/pkgs/setuptools_scm/install-requires.txt b/build/pkgs/setuptools_scm/install-requires.txt
index ee00ef62d52..34188327a0f 100644
--- a/build/pkgs/setuptools_scm/install-requires.txt
+++ b/build/pkgs/setuptools_scm/install-requires.txt
@@ -1 +1,2 @@
-setuptools_scm >=4.1.2
+# matplotlib-3.6.2 needs >= 7
+setuptools_scm >=7

From 3aa39bef405c1efb014789408095a578dba33df9 Mon Sep 17 00:00:00 2001
From: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
Date: Wed, 30 Aug 2023 20:01:12 -0700
Subject: [PATCH 232/247] build/pkgs/setuptools/install-requires.txt: Set upper
 bound

---
 build/pkgs/setuptools/install-requires.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/pkgs/setuptools/install-requires.txt b/build/pkgs/setuptools/install-requires.txt
index 0810ca37277..e0cf7c9b5dc 100644
--- a/build/pkgs/setuptools/install-requires.txt
+++ b/build/pkgs/setuptools/install-requires.txt
@@ -1 +1 @@
-setuptools >=49.6.0
+setuptools >=49.6.0, <64

From fec85fd7a0c902ce81b986e3efb793adcf2bb353 Mon Sep 17 00:00:00 2001
From: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
Date: Wed, 30 Aug 2023 20:25:56 -0700
Subject: [PATCH 233/247] build/pkgs/pybind11/install-requires.txt: Increase
 lower bound

---
 build/pkgs/pybind11/install-requires.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/pkgs/pybind11/install-requires.txt b/build/pkgs/pybind11/install-requires.txt
index 7f37917011f..6c44c4bd07e 100644
--- a/build/pkgs/pybind11/install-requires.txt
+++ b/build/pkgs/pybind11/install-requires.txt
@@ -1 +1 @@
-pybind11 >=2.5.0
+pybind11 >=2.6

From 3ea8061e6dd32509fb4398f221c6f474a20335d0 Mon Sep 17 00:00:00 2001
From: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
Date: Wed, 30 Aug 2023 22:48:23 -0700
Subject: [PATCH 234/247] build/pkgs/pygments/install-requires.txt: Increase
 lower bound

---
 build/pkgs/pygments/install-requires.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/pkgs/pygments/install-requires.txt b/build/pkgs/pygments/install-requires.txt
index 0d0dc97d523..337e5bbad8b 100644
--- a/build/pkgs/pygments/install-requires.txt
+++ b/build/pkgs/pygments/install-requires.txt
@@ -1 +1 @@
-pygments >=2.3.1
+pygments >=2.12

From 68095a8f70ef392308971a19c7909818c1b1f232 Mon Sep 17 00:00:00 2001
From: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
Date: Wed, 30 Aug 2023 23:48:47 -0700
Subject: [PATCH 235/247] build/pkgs/ipython/install-requires.txt: Lower the
 upper bound

---
 build/pkgs/ipython/install-requires.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/build/pkgs/ipython/install-requires.txt b/build/pkgs/ipython/install-requires.txt
index 4616117aa08..03d4a4f3413 100644
--- a/build/pkgs/ipython/install-requires.txt
+++ b/build/pkgs/ipython/install-requires.txt
@@ -1 +1,2 @@
-ipython >=7.13.0, <8.11.0
+ipython >=7.13.0, <8.9.0
+# ipython >= 8.9.0 requires prompt_toolkit too new for Sage

From af2488f63c0a18abe225feb685a4338aecee97f2 Mon Sep 17 00:00:00 2001
From: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
Date: Thu, 31 Aug 2023 00:00:06 -0700
Subject: [PATCH 236/247] build/pkgs/cppy/install-requires.txt: Set lower bound

---
 build/pkgs/cppy/install-requires.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/pkgs/cppy/install-requires.txt b/build/pkgs/cppy/install-requires.txt
index 9d2b4aaeee0..42667a30148 100644
--- a/build/pkgs/cppy/install-requires.txt
+++ b/build/pkgs/cppy/install-requires.txt
@@ -1 +1 @@
-cppy
+cppy >=1.2.0

From 0cb24cee01833ecb443ddfb84ff2c51f6c8feb86 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Thu, 31 Aug 2023 09:23:59 -0400
Subject: [PATCH 237/247] build/pkgs/babel/install-requires.txt: increase lower
 bound

Require at least babel-2.11.0 for the bugfix,

  * Use email.Message for pofile header parsing instead of the deprecated
    cgi.parse_header function. :gh:`876` - Aarni Koskela

This avoids deprecation warnings that cause some of our doctests to
fail; for example,

  sage: sage_getdoc(foo)
  DeprecationWarning: 'cgi' is deprecated and slated for removal in Python
  3.13
  'Construct a Foo.\n'

in src/doc/en/developer/coding_basics.rst.
---
 build/pkgs/babel/install-requires.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/pkgs/babel/install-requires.txt b/build/pkgs/babel/install-requires.txt
index 1d0d6191bb9..b4db5e907f3 100644
--- a/build/pkgs/babel/install-requires.txt
+++ b/build/pkgs/babel/install-requires.txt
@@ -1 +1 @@
-babel >=2.6.0
+babel >=2.11.0

From 54592ee643ef06b7d9cf187fea73dcbfae04c650 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Thu, 31 Aug 2023 09:33:46 -0400
Subject: [PATCH 238/247] build/pkgs/pythran/install-requires.txt: add lower
 bound

Require at least pythran-0.12.1 for the bugfix in upstream commit
cd68ac68, "Only use numpy.distutils conditionally." Earlier versions
of pythran can emit deprecation warnings that cause the test suite to
fail; for example,

  sage: cython("cdef class A:\n    cdef public int a")
  DeprecationWarning:
      `numpy.distutils` is deprecated since NumPy 1.23.0, as a result
      of the deprecation of `distutils` itself. It will be removed for
      Python >= 3.12. For older Python versions it will remain present.
      It is recommended to use `setuptools < 60.0` for those Python versions.
      For more details, see:
        https://numpy.org/devdocs/reference/distutils_status_migration.html
---
 build/pkgs/pythran/install-requires.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/pkgs/pythran/install-requires.txt b/build/pkgs/pythran/install-requires.txt
index 86d056b339f..f365e5f4971 100644
--- a/build/pkgs/pythran/install-requires.txt
+++ b/build/pkgs/pythran/install-requires.txt
@@ -1 +1 @@
-pythran
+pythran >=0.12.1

From df9e5ace20753c3f7ea4a01558eaa7dc2d1ce71a Mon Sep 17 00:00:00 2001
From: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
Date: Thu, 31 Aug 2023 11:26:49 -0700
Subject: [PATCH 239/247] build/pkgs/*/dependencies: Reduce $(PYTHON) to an
 order-only dependency

---
 build/pkgs/admcycles/dependencies                      | 2 +-
 build/pkgs/alabaster/dependencies                      | 2 +-
 build/pkgs/appdirs/dependencies                        | 2 +-
 build/pkgs/appnope/dependencies                        | 2 +-
 build/pkgs/argon2_cffi/dependencies                    | 2 +-
 build/pkgs/argon2_cffi_bindings/dependencies           | 2 +-
 build/pkgs/asttokens/dependencies                      | 2 +-
 build/pkgs/attrs/dependencies                          | 2 +-
 build/pkgs/auditwheel_or_delocate/dependencies         | 2 +-
 build/pkgs/awali/dependencies                          | 2 +-
 build/pkgs/babel/dependencies                          | 2 +-
 build/pkgs/backcall/dependencies                       | 2 +-
 build/pkgs/beautifulsoup4/dependencies                 | 2 +-
 build/pkgs/beniget/dependencies                        | 2 +-
 build/pkgs/bleach/dependencies                         | 2 +-
 build/pkgs/certifi/dependencies                        | 2 +-
 build/pkgs/cffi/dependencies                           | 2 +-
 build/pkgs/charset_normalizer/dependencies             | 2 +-
 build/pkgs/contourpy/dependencies                      | 2 +-
 build/pkgs/conway_polynomials/dependencies             | 2 +-
 build/pkgs/cppy/dependencies                           | 2 +-
 build/pkgs/cryptominisat/dependencies                  | 2 +-
 build/pkgs/cvxopt/dependencies                         | 2 +-
 build/pkgs/cvxpy/dependencies                          | 2 +-
 build/pkgs/cycler/dependencies                         | 2 +-
 build/pkgs/cylp/dependencies                           | 2 +-
 build/pkgs/cypari/dependencies                         | 2 +-
 build/pkgs/cysignals/dependencies                      | 2 +-
 build/pkgs/cython/dependencies                         | 2 +-
 build/pkgs/database_cubic_hecke/dependencies           | 2 +-
 build/pkgs/database_knotinfo/dependencies              | 2 +-
 build/pkgs/dateutil/dependencies                       | 2 +-
 build/pkgs/debugpy/dependencies                        | 2 +-
 build/pkgs/decorator/dependencies                      | 2 +-
 build/pkgs/defusedxml/dependencies                     | 2 +-
 build/pkgs/deprecation/dependencies                    | 2 +-
 build/pkgs/distlib/dependencies                        | 2 +-
 build/pkgs/docutils/dependencies                       | 2 +-
 build/pkgs/dot2tex/dependencies                        | 2 +-
 build/pkgs/ecos_python/dependencies                    | 2 +-
 build/pkgs/editables/dependencies                      | 2 +-
 build/pkgs/elliptic_curves/dependencies                | 2 +-
 build/pkgs/entrypoints/dependencies                    | 2 +-
 build/pkgs/executing/dependencies                      | 2 +-
 build/pkgs/fastjsonschema/dependencies                 | 2 +-
 build/pkgs/filelock/dependencies                       | 2 +-
 build/pkgs/flit_core/dependencies                      | 2 +-
 build/pkgs/fonttools/dependencies                      | 2 +-
 build/pkgs/fpylll/dependencies                         | 2 +-
 build/pkgs/furo/dependencies                           | 2 +-
 build/pkgs/gambit/dependencies                         | 2 +-
 build/pkgs/gap_jupyter/dependencies                    | 2 +-
 build/pkgs/gast/dependencies                           | 2 +-
 build/pkgs/gdb/dependencies                            | 2 +-
 build/pkgs/gitpython/dependencies                      | 2 +-
 build/pkgs/gmpy2/dependencies                          | 2 +-
 build/pkgs/hatch_fancy_pypi_readme/dependencies        | 2 +-
 build/pkgs/hatch_nodejs_version/dependencies           | 2 +-
 build/pkgs/hatch_vcs/dependencies                      | 2 +-
 build/pkgs/hatchling/dependencies                      | 2 +-
 build/pkgs/html5lib/dependencies                       | 2 +-
 build/pkgs/idna/dependencies                           | 2 +-
 build/pkgs/imagesize/dependencies                      | 2 +-
 build/pkgs/importlib_metadata/dependencies             | 2 +-
 build/pkgs/importlib_resources/dependencies            | 2 +-
 build/pkgs/ipykernel/dependencies                      | 2 +-
 build/pkgs/ipympl/dependencies                         | 2 +-
 build/pkgs/ipython/dependencies                        | 2 +-
 build/pkgs/ipython_genutils/dependencies               | 2 +-
 build/pkgs/ipywidgets/dependencies                     | 2 +-
 build/pkgs/jedi/dependencies                           | 2 +-
 build/pkgs/jinja2/dependencies                         | 2 +-
 build/pkgs/jsonschema/dependencies                     | 2 +-
 build/pkgs/jupymake/dependencies                       | 2 +-
 build/pkgs/jupyter_client/dependencies                 | 2 +-
 build/pkgs/jupyter_core/dependencies                   | 2 +-
 build/pkgs/jupyter_jsmol/dependencies                  | 2 +-
 build/pkgs/jupyter_packaging/dependencies              | 2 +-
 build/pkgs/jupyter_sphinx/dependencies                 | 2 +-
 build/pkgs/jupyterlab/dependencies                     | 2 +-
 build/pkgs/jupyterlab_pygments/dependencies            | 2 +-
 build/pkgs/jupyterlab_widgets/dependencies             | 2 +-
 build/pkgs/kiwisolver/dependencies                     | 2 +-
 build/pkgs/lrcalc_python/dependencies                  | 2 +-
 build/pkgs/markupsafe/dependencies                     | 2 +-
 build/pkgs/mathics/dependencies                        | 2 +-
 build/pkgs/mathics_scanner/dependencies                | 2 +-
 build/pkgs/matplotlib/dependencies                     | 2 +-
 build/pkgs/matplotlib_inline/dependencies              | 2 +-
 build/pkgs/memory_allocator/dependencies               | 2 +-
 build/pkgs/meson/dependencies                          | 2 +-
 build/pkgs/meson_python/dependencies                   | 2 +-
 build/pkgs/mistune/dependencies                        | 2 +-
 build/pkgs/mpmath/dependencies                         | 2 +-
 build/pkgs/nbclient/dependencies                       | 2 +-
 build/pkgs/nbconvert/dependencies                      | 2 +-
 build/pkgs/nbformat/dependencies                       | 2 +-
 build/pkgs/nest_asyncio/dependencies                   | 2 +-
 build/pkgs/networkx/dependencies                       | 2 +-
 build/pkgs/ninja_build/dependencies                    | 2 +-
 build/pkgs/nodeenv/dependencies                        | 2 +-
 build/pkgs/notebook/dependencies                       | 2 +-
 build/pkgs/notedown/dependencies                       | 2 +-
 build/pkgs/numpy/dependencies                          | 2 +-
 build/pkgs/ore_algebra/dependencies                    | 2 +-
 build/pkgs/osqp_python/dependencies                    | 2 +-
 build/pkgs/p_group_cohomology/dependencies             | 2 +-
 build/pkgs/packaging/dependencies                      | 2 +-
 build/pkgs/palettable/dependencies                     | 2 +-
 build/pkgs/pandoc_attributes/dependencies              | 2 +-
 build/pkgs/pandocfilters/dependencies                  | 2 +-
 build/pkgs/pari_jupyter/dependencies                   | 2 +-
 build/pkgs/parso/dependencies                          | 2 +-
 build/pkgs/pathspec/dependencies                       | 2 +-
 build/pkgs/pexpect/dependencies                        | 2 +-
 build/pkgs/phitigra/dependencies                       | 2 +-
 build/pkgs/pickleshare/dependencies                    | 2 +-
 build/pkgs/pillow/dependencies                         | 2 +-
 build/pkgs/pint/dependencies                           | 2 +-
 build/pkgs/pip/dependencies                            | 2 +-
 build/pkgs/pkgconfig/dependencies                      | 2 +-
 build/pkgs/platformdirs/dependencies                   | 2 +-
 build/pkgs/pluggy/dependencies                         | 2 +-
 build/pkgs/ply/dependencies                            | 2 +-
 build/pkgs/poetry_core/dependencies                    | 2 +-
 build/pkgs/pplpy/dependencies                          | 2 +-
 build/pkgs/primecountpy/dependencies                   | 2 +-
 build/pkgs/prometheus_client/dependencies              | 2 +-
 build/pkgs/prompt_toolkit/dependencies                 | 2 +-
 build/pkgs/ptyprocess/dependencies                     | 2 +-
 build/pkgs/pure_eval/dependencies                      | 2 +-
 build/pkgs/py/dependencies                             | 2 +-
 build/pkgs/pybind11/dependencies                       | 2 +-
 build/pkgs/pycosat/dependencies                        | 2 +-
 build/pkgs/pycparser/dependencies                      | 2 +-
 build/pkgs/pycryptosat/dependencies                    | 2 +-
 build/pkgs/pycygwin/dependencies                       | 2 +-
 build/pkgs/pygments/dependencies                       | 2 +-
 build/pkgs/pygraphviz/dependencies                     | 2 +-
 build/pkgs/pynormaliz/dependencies                     | 2 +-
 build/pkgs/pyparsing/dependencies                      | 2 +-
 build/pkgs/pyppeteer/dependencies                      | 2 +-
 build/pkgs/pyproject_metadata/dependencies             | 2 +-
 build/pkgs/pyrsistent/dependencies                     | 2 +-
 build/pkgs/pyscipopt/dependencies                      | 2 +-
 build/pkgs/pysingular/dependencies                     | 2 +-
 build/pkgs/pytest/dependencies                         | 2 +-
 build/pkgs/pytest_mock/dependencies                    | 2 +-
 build/pkgs/pytest_xdist/dependencies                   | 2 +-
 build/pkgs/python_build/dependencies                   | 2 +-
 build/pkgs/python_igraph/dependencies                  | 2 +-
 build/pkgs/pythran/dependencies                        | 2 +-
 build/pkgs/pytz/dependencies                           | 2 +-
 build/pkgs/pytz_deprecation_shim/dependencies          | 2 +-
 build/pkgs/pyzmq/dependencies                          | 2 +-
 build/pkgs/qdldl_python/dependencies                   | 2 +-
 build/pkgs/requests/dependencies                       | 2 +-
 build/pkgs/retrolab/dependencies                       | 2 +-
 build/pkgs/rpy2/dependencies                           | 2 +-
 build/pkgs/rst2ipynb/dependencies                      | 2 +-
 build/pkgs/sage_conf/dependencies                      | 2 +-
 build/pkgs/sage_docbuild/dependencies                  | 2 +-
 build/pkgs/sage_flatsurf/dependencies                  | 2 +-
 build/pkgs/sage_numerical_backends_coin/dependencies   | 2 +-
 build/pkgs/sage_numerical_backends_cplex/dependencies  | 2 +-
 build/pkgs/sage_numerical_backends_gurobi/dependencies | 2 +-
 build/pkgs/sage_setup/dependencies                     | 2 +-
 build/pkgs/sage_sws2rst/dependencies                   | 2 +-
 build/pkgs/sagelib/dependencies                        | 2 +-
 build/pkgs/sagemath_bliss/dependencies                 | 2 +-
 build/pkgs/sagemath_categories/dependencies            | 2 +-
 build/pkgs/sagemath_coxeter3/dependencies              | 2 +-
 build/pkgs/sagemath_environment/dependencies           | 2 +-
 build/pkgs/sagemath_mcqd/dependencies                  | 2 +-
 build/pkgs/sagemath_meataxe/dependencies               | 2 +-
 build/pkgs/sagemath_objects/dependencies               | 2 +-
 build/pkgs/sagemath_repl/dependencies                  | 2 +-
 build/pkgs/sagemath_sirocco/dependencies               | 2 +-
 build/pkgs/sagemath_tdlib/dependencies                 | 2 +-
 build/pkgs/sagenb_export/dependencies                  | 2 +-
 build/pkgs/sagetex/dependencies                        | 2 +-
 build/pkgs/scipy/dependencies                          | 2 +-
 build/pkgs/scs/dependencies                            | 2 +-
 build/pkgs/send2trash/dependencies                     | 2 +-
 build/pkgs/setuptools/dependencies                     | 2 +-
 build/pkgs/setuptools_scm/dependencies                 | 2 +-
 build/pkgs/setuptools_scm_git_archive/dependencies     | 2 +-
 build/pkgs/setuptools_wheel/dependencies               | 2 +-
 build/pkgs/simplegeneric/dependencies                  | 2 +-
 build/pkgs/singular_jupyter/dependencies               | 2 +-
 build/pkgs/six/dependencies                            | 2 +-
 build/pkgs/slabbe/dependencies                         | 2 +-
 build/pkgs/snappy/dependencies                         | 2 +-
 build/pkgs/snowballstemmer/dependencies                | 2 +-
 build/pkgs/soupsieve/dependencies                      | 2 +-
 build/pkgs/sphinx/dependencies                         | 2 +-
 build/pkgs/sphinx_basic_ng/dependencies                | 2 +-
 build/pkgs/sphinx_copybutton/dependencies              | 2 +-
 build/pkgs/sphinxcontrib_applehelp/dependencies        | 2 +-
 build/pkgs/sphinxcontrib_devhelp/dependencies          | 2 +-
 build/pkgs/sphinxcontrib_htmlhelp/dependencies         | 2 +-
 build/pkgs/sphinxcontrib_jsmath/dependencies           | 2 +-
 build/pkgs/sphinxcontrib_qthelp/dependencies           | 2 +-
 build/pkgs/sphinxcontrib_serializinghtml/dependencies  | 2 +-
 build/pkgs/sphinxcontrib_websupport/dependencies       | 2 +-
 build/pkgs/stack_data/dependencies                     | 2 +-
 build/pkgs/surface_dynamics/dependencies               | 2 +-
 build/pkgs/symengine_py/dependencies                   | 2 +-
 build/pkgs/sympy/dependencies                          | 2 +-
 build/pkgs/terminado/dependencies                      | 2 +-
 build/pkgs/texttable/dependencies                      | 2 +-
 build/pkgs/tinycss2/dependencies                       | 2 +-
 build/pkgs/toml/dependencies                           | 2 +-
 build/pkgs/tomli/dependencies                          | 2 +-
 build/pkgs/tomlkit/dependencies                        | 2 +-
 build/pkgs/tornado/dependencies                        | 2 +-
 build/pkgs/tox/dependencies                            | 2 +-
 build/pkgs/traitlets/dependencies                      | 2 +-
 build/pkgs/typing_extensions/dependencies              | 2 +-
 build/pkgs/tzdata/dependencies                         | 2 +-
 build/pkgs/tzlocal/dependencies                        | 2 +-
 build/pkgs/urllib3/dependencies                        | 2 +-
 build/pkgs/vcversioner/dependencies                    | 2 +-
 build/pkgs/virtualenv/dependencies                     | 2 +-
 build/pkgs/wcwidth/dependencies                        | 2 +-
 build/pkgs/webencodings/dependencies                   | 2 +-
 build/pkgs/wheel/dependencies                          | 2 +-
 build/pkgs/widgetsnbextension/dependencies             | 2 +-
 build/pkgs/zipp/dependencies                           | 2 +-
 229 files changed, 229 insertions(+), 229 deletions(-)

diff --git a/build/pkgs/admcycles/dependencies b/build/pkgs/admcycles/dependencies
index 0738c2d7777..47296a7bace 100644
--- a/build/pkgs/admcycles/dependencies
+++ b/build/pkgs/admcycles/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN)
+ | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/alabaster/dependencies b/build/pkgs/alabaster/dependencies
index 0738c2d7777..47296a7bace 100644
--- a/build/pkgs/alabaster/dependencies
+++ b/build/pkgs/alabaster/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN)
+ | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/appdirs/dependencies b/build/pkgs/appdirs/dependencies
index 0738c2d7777..47296a7bace 100644
--- a/build/pkgs/appdirs/dependencies
+++ b/build/pkgs/appdirs/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN)
+ | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/appnope/dependencies b/build/pkgs/appnope/dependencies
index 0738c2d7777..47296a7bace 100644
--- a/build/pkgs/appnope/dependencies
+++ b/build/pkgs/appnope/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN)
+ | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/argon2_cffi/dependencies b/build/pkgs/argon2_cffi/dependencies
index d1b259926f8..920046ab33d 100644
--- a/build/pkgs/argon2_cffi/dependencies
+++ b/build/pkgs/argon2_cffi/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) argon2_cffi_bindings | $(PYTHON_TOOLCHAIN) flit_core
+ argon2_cffi_bindings | $(PYTHON_TOOLCHAIN) flit_core $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/argon2_cffi_bindings/dependencies b/build/pkgs/argon2_cffi_bindings/dependencies
index 0d815c35f4b..4b9d24ccf44 100644
--- a/build/pkgs/argon2_cffi_bindings/dependencies
+++ b/build/pkgs/argon2_cffi_bindings/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN) cffi setuptools_scm
+ | $(PYTHON_TOOLCHAIN) cffi setuptools_scm $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/asttokens/dependencies b/build/pkgs/asttokens/dependencies
index 0738c2d7777..47296a7bace 100644
--- a/build/pkgs/asttokens/dependencies
+++ b/build/pkgs/asttokens/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN)
+ | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/attrs/dependencies b/build/pkgs/attrs/dependencies
index 4361e46ddaf..9be6b4aab7c 100644
--- a/build/pkgs/attrs/dependencies
+++ b/build/pkgs/attrs/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) vcversioner | $(PYTHON_TOOLCHAIN)
+ vcversioner | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/auditwheel_or_delocate/dependencies b/build/pkgs/auditwheel_or_delocate/dependencies
index 0738c2d7777..47296a7bace 100644
--- a/build/pkgs/auditwheel_or_delocate/dependencies
+++ b/build/pkgs/auditwheel_or_delocate/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN)
+ | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/awali/dependencies b/build/pkgs/awali/dependencies
index b125e2ded92..09b60167a34 100644
--- a/build/pkgs/awali/dependencies
+++ b/build/pkgs/awali/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) cmake cython nbconvert ncurses
+ cmake cython nbconvert ncurses | $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/babel/dependencies b/build/pkgs/babel/dependencies
index 41462907c20..802e470da86 100644
--- a/build/pkgs/babel/dependencies
+++ b/build/pkgs/babel/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN) pytz
+ | $(PYTHON_TOOLCHAIN) pytz $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/backcall/dependencies b/build/pkgs/backcall/dependencies
index 902a5feed13..4fedbe70cd1 100644
--- a/build/pkgs/backcall/dependencies
+++ b/build/pkgs/backcall/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN) flit_core tomli
+ | $(PYTHON_TOOLCHAIN) flit_core tomli $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/beautifulsoup4/dependencies b/build/pkgs/beautifulsoup4/dependencies
index 01af7f65566..c9982dd1882 100644
--- a/build/pkgs/beautifulsoup4/dependencies
+++ b/build/pkgs/beautifulsoup4/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) soupsieve | $(PYTHON_TOOLCHAIN)
+ soupsieve | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/beniget/dependencies b/build/pkgs/beniget/dependencies
index d792a85db72..96da9efd5ac 100644
--- a/build/pkgs/beniget/dependencies
+++ b/build/pkgs/beniget/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) gast | $(PYTHON_TOOLCHAIN)
+ gast | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/bleach/dependencies b/build/pkgs/bleach/dependencies
index 4a74f9bfd68..c7ac2e8b3e7 100644
--- a/build/pkgs/bleach/dependencies
+++ b/build/pkgs/bleach/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) packaging six webencodings | $(PYTHON_TOOLCHAIN)
+ packaging six webencodings | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/certifi/dependencies b/build/pkgs/certifi/dependencies
index 0738c2d7777..47296a7bace 100644
--- a/build/pkgs/certifi/dependencies
+++ b/build/pkgs/certifi/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN)
+ | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/cffi/dependencies b/build/pkgs/cffi/dependencies
index 9e4c266ad69..9af7c6ed3db 100644
--- a/build/pkgs/cffi/dependencies
+++ b/build/pkgs/cffi/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN) pycparser
+ | $(PYTHON_TOOLCHAIN) pycparser $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/charset_normalizer/dependencies b/build/pkgs/charset_normalizer/dependencies
index 0738c2d7777..47296a7bace 100644
--- a/build/pkgs/charset_normalizer/dependencies
+++ b/build/pkgs/charset_normalizer/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN)
+ | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/contourpy/dependencies b/build/pkgs/contourpy/dependencies
index 0740ab1d4a7..d12b50bf33c 100644
--- a/build/pkgs/contourpy/dependencies
+++ b/build/pkgs/contourpy/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) numpy | $(PYTHON_TOOLCHAIN) pybind11
+ numpy | $(PYTHON_TOOLCHAIN) pybind11 $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/conway_polynomials/dependencies b/build/pkgs/conway_polynomials/dependencies
index 1700e743d59..6b134137610 100644
--- a/build/pkgs/conway_polynomials/dependencies
+++ b/build/pkgs/conway_polynomials/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON)
+| $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/cppy/dependencies b/build/pkgs/cppy/dependencies
index 0738c2d7777..47296a7bace 100644
--- a/build/pkgs/cppy/dependencies
+++ b/build/pkgs/cppy/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN)
+ | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/cryptominisat/dependencies b/build/pkgs/cryptominisat/dependencies
index 15e88888b6d..e30473e40f6 100644
--- a/build/pkgs/cryptominisat/dependencies
+++ b/build/pkgs/cryptominisat/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) m4ri zlib libpng | cmake boost_cropped
+ m4ri zlib libpng | cmake boost_cropped $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/cvxopt/dependencies b/build/pkgs/cvxopt/dependencies
index d47ae01f215..33055fe8bf4 100644
--- a/build/pkgs/cvxopt/dependencies
+++ b/build/pkgs/cvxopt/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) numpy $(BLAS) gsl glpk suitesparse | $(PYTHON_TOOLCHAIN) pkgconfig
+ numpy $(BLAS) gsl glpk suitesparse | $(PYTHON_TOOLCHAIN) pkgconfig $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/cvxpy/dependencies b/build/pkgs/cvxpy/dependencies
index 540b44ff0f2..42cfab890cc 100644
--- a/build/pkgs/cvxpy/dependencies
+++ b/build/pkgs/cvxpy/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) numpy scipy glpk cvxopt osqp_python ecos_python scs | $(PYTHON_TOOLCHAIN)
+ numpy scipy glpk cvxopt osqp_python ecos_python scs | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/cycler/dependencies b/build/pkgs/cycler/dependencies
index 730af09b339..2218ed812dd 100644
--- a/build/pkgs/cycler/dependencies
+++ b/build/pkgs/cycler/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) six | $(PYTHON_TOOLCHAIN)
+ six | $(PYTHON_TOOLCHAIN) $(PYTHON)
 ----------
 All lines of this file are ignored except the first.
 
diff --git a/build/pkgs/cylp/dependencies b/build/pkgs/cylp/dependencies
index 3c541129eb9..d2c6405119d 100644
--- a/build/pkgs/cylp/dependencies
+++ b/build/pkgs/cylp/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) numpy scipy cbc | $(PYTHON_TOOLCHAIN) cython
+ numpy scipy cbc | $(PYTHON_TOOLCHAIN) cython $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/cypari/dependencies b/build/pkgs/cypari/dependencies
index 72b5af7ad81..69dfe7e7d8a 100644
--- a/build/pkgs/cypari/dependencies
+++ b/build/pkgs/cypari/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) cython pari cysignals | $(PYTHON_TOOLCHAIN)
+ cython pari cysignals | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/cysignals/dependencies b/build/pkgs/cysignals/dependencies
index d3225d480f1..cd45ae2076c 100644
--- a/build/pkgs/cysignals/dependencies
+++ b/build/pkgs/cysignals/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) cython pari | $(PYTHON_TOOLCHAIN)
+ cython pari | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/cython/dependencies b/build/pkgs/cython/dependencies
index 0738c2d7777..47296a7bace 100644
--- a/build/pkgs/cython/dependencies
+++ b/build/pkgs/cython/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN)
+ | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/database_cubic_hecke/dependencies b/build/pkgs/database_cubic_hecke/dependencies
index 0738c2d7777..47296a7bace 100644
--- a/build/pkgs/database_cubic_hecke/dependencies
+++ b/build/pkgs/database_cubic_hecke/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN)
+ | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/database_knotinfo/dependencies b/build/pkgs/database_knotinfo/dependencies
index 0738c2d7777..47296a7bace 100644
--- a/build/pkgs/database_knotinfo/dependencies
+++ b/build/pkgs/database_knotinfo/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN)
+ | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/dateutil/dependencies b/build/pkgs/dateutil/dependencies
index 7a972de985e..a90844872ae 100644
--- a/build/pkgs/dateutil/dependencies
+++ b/build/pkgs/dateutil/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) six | $(PYTHON_TOOLCHAIN)
+ six | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/debugpy/dependencies b/build/pkgs/debugpy/dependencies
index 0738c2d7777..47296a7bace 100644
--- a/build/pkgs/debugpy/dependencies
+++ b/build/pkgs/debugpy/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN)
+ | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/decorator/dependencies b/build/pkgs/decorator/dependencies
index 0738c2d7777..47296a7bace 100644
--- a/build/pkgs/decorator/dependencies
+++ b/build/pkgs/decorator/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN)
+ | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/defusedxml/dependencies b/build/pkgs/defusedxml/dependencies
index 0738c2d7777..47296a7bace 100644
--- a/build/pkgs/defusedxml/dependencies
+++ b/build/pkgs/defusedxml/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN)
+ | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/deprecation/dependencies b/build/pkgs/deprecation/dependencies
index 0738c2d7777..47296a7bace 100644
--- a/build/pkgs/deprecation/dependencies
+++ b/build/pkgs/deprecation/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN)
+ | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/distlib/dependencies b/build/pkgs/distlib/dependencies
index 0738c2d7777..47296a7bace 100644
--- a/build/pkgs/distlib/dependencies
+++ b/build/pkgs/distlib/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN)
+ | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/docutils/dependencies b/build/pkgs/docutils/dependencies
index 0738c2d7777..47296a7bace 100644
--- a/build/pkgs/docutils/dependencies
+++ b/build/pkgs/docutils/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN)
+ | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/dot2tex/dependencies b/build/pkgs/dot2tex/dependencies
index c1925d16b73..75d8c64edb5 100644
--- a/build/pkgs/dot2tex/dependencies
+++ b/build/pkgs/dot2tex/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN) pyparsing
+ | $(PYTHON_TOOLCHAIN) pyparsing $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/ecos_python/dependencies b/build/pkgs/ecos_python/dependencies
index ecd3af7675b..aaf3b261709 100644
--- a/build/pkgs/ecos_python/dependencies
+++ b/build/pkgs/ecos_python/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) numpy scipy | $(PYTHON_TOOLCHAIN)
+ numpy scipy | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/editables/dependencies b/build/pkgs/editables/dependencies
index 0738c2d7777..47296a7bace 100644
--- a/build/pkgs/editables/dependencies
+++ b/build/pkgs/editables/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN)
+ | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/elliptic_curves/dependencies b/build/pkgs/elliptic_curves/dependencies
index 6b134137610..3518086ab84 100644
--- a/build/pkgs/elliptic_curves/dependencies
+++ b/build/pkgs/elliptic_curves/dependencies
@@ -1,4 +1,4 @@
-| $(PYTHON)
+|  $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/entrypoints/dependencies b/build/pkgs/entrypoints/dependencies
index 902a5feed13..4fedbe70cd1 100644
--- a/build/pkgs/entrypoints/dependencies
+++ b/build/pkgs/entrypoints/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN) flit_core tomli
+ | $(PYTHON_TOOLCHAIN) flit_core tomli $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/executing/dependencies b/build/pkgs/executing/dependencies
index 0738c2d7777..47296a7bace 100644
--- a/build/pkgs/executing/dependencies
+++ b/build/pkgs/executing/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN)
+ | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/fastjsonschema/dependencies b/build/pkgs/fastjsonschema/dependencies
index 0738c2d7777..47296a7bace 100644
--- a/build/pkgs/fastjsonschema/dependencies
+++ b/build/pkgs/fastjsonschema/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN)
+ | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/filelock/dependencies b/build/pkgs/filelock/dependencies
index 0738c2d7777..47296a7bace 100644
--- a/build/pkgs/filelock/dependencies
+++ b/build/pkgs/filelock/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN)
+ | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/flit_core/dependencies b/build/pkgs/flit_core/dependencies
index 93c460228b4..644ad35f773 100644
--- a/build/pkgs/flit_core/dependencies
+++ b/build/pkgs/flit_core/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | pip
+ | pip $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/fonttools/dependencies b/build/pkgs/fonttools/dependencies
index 9c736669d9a..909380550a2 100644
--- a/build/pkgs/fonttools/dependencies
+++ b/build/pkgs/fonttools/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN) cython
+ | $(PYTHON_TOOLCHAIN) cython $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/fpylll/dependencies b/build/pkgs/fpylll/dependencies
index 4b4fb1b44fb..4837249bcfa 100644
--- a/build/pkgs/fpylll/dependencies
+++ b/build/pkgs/fpylll/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) cython cysignals numpy fplll
+ cython cysignals numpy fplll | $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/furo/dependencies b/build/pkgs/furo/dependencies
index fec067b2058..07434099dee 100644
--- a/build/pkgs/furo/dependencies
+++ b/build/pkgs/furo/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) beautifulsoup4 sphinx pygments sphinx_basic_ng | $(PYTHON_TOOLCHAIN)
+ beautifulsoup4 sphinx pygments sphinx_basic_ng | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/gambit/dependencies b/build/pkgs/gambit/dependencies
index 1f00cbf5321..e026bfaacf9 100644
--- a/build/pkgs/gambit/dependencies
+++ b/build/pkgs/gambit/dependencies
@@ -1,4 +1,4 @@
-cython | $(PYTHON_TOOLCHAIN)
+cython | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/gap_jupyter/dependencies b/build/pkgs/gap_jupyter/dependencies
index 41133c3ff0a..89f9b88dd92 100644
--- a/build/pkgs/gap_jupyter/dependencies
+++ b/build/pkgs/gap_jupyter/dependencies
@@ -1 +1 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN) ipython gap
+ | $(PYTHON_TOOLCHAIN) ipython gap $(PYTHON)
diff --git a/build/pkgs/gast/dependencies b/build/pkgs/gast/dependencies
index 0738c2d7777..47296a7bace 100644
--- a/build/pkgs/gast/dependencies
+++ b/build/pkgs/gast/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN)
+ | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/gdb/dependencies b/build/pkgs/gdb/dependencies
index bdf81f77180..cf6822bb92e 100644
--- a/build/pkgs/gdb/dependencies
+++ b/build/pkgs/gdb/dependencies
@@ -1,4 +1,4 @@
-mpfr zlib ncurses $(PYTHON) xz
+mpfr zlib ncurses  xz | $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/gitpython/dependencies b/build/pkgs/gitpython/dependencies
index 0738c2d7777..47296a7bace 100644
--- a/build/pkgs/gitpython/dependencies
+++ b/build/pkgs/gitpython/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN)
+ | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/gmpy2/dependencies b/build/pkgs/gmpy2/dependencies
index 98c6065dc87..b1f92b9241d 100644
--- a/build/pkgs/gmpy2/dependencies
+++ b/build/pkgs/gmpy2/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) $(MP_LIBRARY) mpfr mpc | $(PYTHON_TOOLCHAIN)
+ $(MP_LIBRARY) mpfr mpc | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/hatch_fancy_pypi_readme/dependencies b/build/pkgs/hatch_fancy_pypi_readme/dependencies
index 8cd44d06682..cfb7c484697 100644
--- a/build/pkgs/hatch_fancy_pypi_readme/dependencies
+++ b/build/pkgs/hatch_fancy_pypi_readme/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN) hatchling
+ | $(PYTHON_TOOLCHAIN) hatchling $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/hatch_nodejs_version/dependencies b/build/pkgs/hatch_nodejs_version/dependencies
index e9293f104ca..85e8893f785 100644
--- a/build/pkgs/hatch_nodejs_version/dependencies
+++ b/build/pkgs/hatch_nodejs_version/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) hatchling | $(PYTHON_TOOLCHAIN)
+ hatchling | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/hatch_vcs/dependencies b/build/pkgs/hatch_vcs/dependencies
index 8cd44d06682..cfb7c484697 100644
--- a/build/pkgs/hatch_vcs/dependencies
+++ b/build/pkgs/hatch_vcs/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN) hatchling
+ | $(PYTHON_TOOLCHAIN) hatchling $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/hatchling/dependencies b/build/pkgs/hatchling/dependencies
index 84b5ea48ccc..4c10ae56e2e 100644
--- a/build/pkgs/hatchling/dependencies
+++ b/build/pkgs/hatchling/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) pathspec tomli editables pluggy packaging | $(PYTHON_TOOLCHAIN)
+ pathspec tomli editables pluggy packaging | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/html5lib/dependencies b/build/pkgs/html5lib/dependencies
index 89200065387..7ebee8487db 100644
--- a/build/pkgs/html5lib/dependencies
+++ b/build/pkgs/html5lib/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) webencodings | $(PYTHON_TOOLCHAIN)
+ webencodings | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/idna/dependencies b/build/pkgs/idna/dependencies
index 0738c2d7777..47296a7bace 100644
--- a/build/pkgs/idna/dependencies
+++ b/build/pkgs/idna/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN)
+ | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/imagesize/dependencies b/build/pkgs/imagesize/dependencies
index 0738c2d7777..47296a7bace 100644
--- a/build/pkgs/imagesize/dependencies
+++ b/build/pkgs/imagesize/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN)
+ | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/importlib_metadata/dependencies b/build/pkgs/importlib_metadata/dependencies
index 77aa2a42f93..3c8d3aeb24e 100644
--- a/build/pkgs/importlib_metadata/dependencies
+++ b/build/pkgs/importlib_metadata/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) zipp typing_extensions | $(PYTHON_TOOLCHAIN) tomli
+ zipp typing_extensions | $(PYTHON_TOOLCHAIN) tomli $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/importlib_resources/dependencies b/build/pkgs/importlib_resources/dependencies
index 58927ab6f75..655283898b7 100644
--- a/build/pkgs/importlib_resources/dependencies
+++ b/build/pkgs/importlib_resources/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) zipp | $(PYTHON_TOOLCHAIN)
+ zipp | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/ipykernel/dependencies b/build/pkgs/ipykernel/dependencies
index 792c3e70634..7e153a0cb46 100644
--- a/build/pkgs/ipykernel/dependencies
+++ b/build/pkgs/ipykernel/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) ipython_genutils importlib_metadata matplotlib_inline ipython jupyter_client tornado appnope traitlets executing | $(PYTHON_TOOLCHAIN)
+ ipython_genutils importlib_metadata matplotlib_inline ipython jupyter_client tornado appnope traitlets executing | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/ipympl/dependencies b/build/pkgs/ipympl/dependencies
index 05d47407b15..90b85bcfdbc 100644
--- a/build/pkgs/ipympl/dependencies
+++ b/build/pkgs/ipympl/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) ipywidgets matplotlib ipykernel | $(PYTHON_TOOLCHAIN)  jupyter_packaging
+ ipywidgets matplotlib ipykernel | $(PYTHON_TOOLCHAIN)  jupyter_packaging $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/ipython/dependencies b/build/pkgs/ipython/dependencies
index 38dad7b80ee..48ad216441c 100644
--- a/build/pkgs/ipython/dependencies
+++ b/build/pkgs/ipython/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) jinja2 tornado pyzmq pickleshare simplegeneric traitlets decorator wcwidth prompt_toolkit pygments pexpect appnope backcall jedi stack_data | $(PYTHON_TOOLCHAIN)
+ jinja2 tornado pyzmq pickleshare simplegeneric traitlets decorator wcwidth prompt_toolkit pygments pexpect appnope backcall jedi stack_data | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/ipython_genutils/dependencies b/build/pkgs/ipython_genutils/dependencies
index 0738c2d7777..47296a7bace 100644
--- a/build/pkgs/ipython_genutils/dependencies
+++ b/build/pkgs/ipython_genutils/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN)
+ | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/ipywidgets/dependencies b/build/pkgs/ipywidgets/dependencies
index 64f5151c754..bcb4e030b7d 100644
--- a/build/pkgs/ipywidgets/dependencies
+++ b/build/pkgs/ipywidgets/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) widgetsnbextension jupyterlab_widgets | $(PYTHON_TOOLCHAIN) ipykernel ipython traitlets
+ widgetsnbextension jupyterlab_widgets | $(PYTHON_TOOLCHAIN) ipykernel ipython traitlets $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/jedi/dependencies b/build/pkgs/jedi/dependencies
index 60b5f820a37..0e2212bd149 100644
--- a/build/pkgs/jedi/dependencies
+++ b/build/pkgs/jedi/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) parso | $(PYTHON_TOOLCHAIN)
+ parso | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/jinja2/dependencies b/build/pkgs/jinja2/dependencies
index 6947978ec42..151ae9767d1 100644
--- a/build/pkgs/jinja2/dependencies
+++ b/build/pkgs/jinja2/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) markupsafe docutils | $(PYTHON_TOOLCHAIN)
+ markupsafe docutils | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/jsonschema/dependencies b/build/pkgs/jsonschema/dependencies
index 51698156cf0..d0211604157 100644
--- a/build/pkgs/jsonschema/dependencies
+++ b/build/pkgs/jsonschema/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) vcversioner attrs importlib_metadata pyrsistent | $(PYTHON_TOOLCHAIN) hatchling hatch_vcs hatch_fancy_pypi_readme
+ vcversioner attrs importlib_metadata pyrsistent | $(PYTHON_TOOLCHAIN) hatchling hatch_vcs hatch_fancy_pypi_readme $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/jupymake/dependencies b/build/pkgs/jupymake/dependencies
index c8ed956ad6a..aa714006aae 100644
--- a/build/pkgs/jupymake/dependencies
+++ b/build/pkgs/jupymake/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) polymake | $(PYTHON_TOOLCHAIN)
+ polymake | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/jupyter_client/dependencies b/build/pkgs/jupyter_client/dependencies
index 29d5d3b6bf3..dcc8c256fad 100644
--- a/build/pkgs/jupyter_client/dependencies
+++ b/build/pkgs/jupyter_client/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) jupyter_core | $(PYTHON_TOOLCHAIN) pyzmq dateutil nest_asyncio tornado traitlets entrypoints hatchling
+ jupyter_core | $(PYTHON_TOOLCHAIN) pyzmq dateutil nest_asyncio tornado traitlets entrypoints hatchling $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/jupyter_core/dependencies b/build/pkgs/jupyter_core/dependencies
index 8fbd6477646..a312196cbed 100644
--- a/build/pkgs/jupyter_core/dependencies
+++ b/build/pkgs/jupyter_core/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) traitlets | $(PYTHON_TOOLCHAIN) hatchling
+ traitlets | $(PYTHON_TOOLCHAIN) hatchling $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/jupyter_jsmol/dependencies b/build/pkgs/jupyter_jsmol/dependencies
index a6d87526311..104c23d159f 100644
--- a/build/pkgs/jupyter_jsmol/dependencies
+++ b/build/pkgs/jupyter_jsmol/dependencies
@@ -1,4 +1,4 @@
-ipywidgets jupyter_packaging $(PYTHON) | $(PYTHON_TOOLCHAIN)
+ipywidgets jupyter_packaging  | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/jupyter_packaging/dependencies b/build/pkgs/jupyter_packaging/dependencies
index 838afe13edf..11e420a0a7b 100644
--- a/build/pkgs/jupyter_packaging/dependencies
+++ b/build/pkgs/jupyter_packaging/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) packaging deprecation tomlkit | $(PYTHON_TOOLCHAIN) hatchling
+ packaging deprecation tomlkit | $(PYTHON_TOOLCHAIN) hatchling $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/jupyter_sphinx/dependencies b/build/pkgs/jupyter_sphinx/dependencies
index 785929f6ea8..37476f7a572 100644
--- a/build/pkgs/jupyter_sphinx/dependencies
+++ b/build/pkgs/jupyter_sphinx/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) sphinx ipywidgets ipython nbconvert nbformat | $(PYTHON_TOOLCHAIN)
+ sphinx ipywidgets ipython nbconvert nbformat | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/jupyterlab/dependencies b/build/pkgs/jupyterlab/dependencies
index 98ad2e94050..059006650e1 100644
--- a/build/pkgs/jupyterlab/dependencies
+++ b/build/pkgs/jupyterlab/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) vcversioner jupyter_core jupyter_client jinja2 tornado ipython packaging terminado traitlets nbconvert send2trash nbformat prometheus_client ipython_genutils argon2_cffi pyzmq idna requests jsonschema babel notebook | $(PYTHON_TOOLCHAIN)
+ vcversioner jupyter_core jupyter_client jinja2 tornado ipython packaging terminado traitlets nbconvert send2trash nbformat prometheus_client ipython_genutils argon2_cffi pyzmq idna requests jsonschema babel notebook | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/jupyterlab_pygments/dependencies b/build/pkgs/jupyterlab_pygments/dependencies
index a59532cdda1..fd3f15b7aa3 100644
--- a/build/pkgs/jupyterlab_pygments/dependencies
+++ b/build/pkgs/jupyterlab_pygments/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) pygments | $(PYTHON_TOOLCHAIN)
+ pygments | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/jupyterlab_widgets/dependencies b/build/pkgs/jupyterlab_widgets/dependencies
index 0738c2d7777..47296a7bace 100644
--- a/build/pkgs/jupyterlab_widgets/dependencies
+++ b/build/pkgs/jupyterlab_widgets/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN)
+ | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/kiwisolver/dependencies b/build/pkgs/kiwisolver/dependencies
index 5df13094620..1ba038a9b7a 100644
--- a/build/pkgs/kiwisolver/dependencies
+++ b/build/pkgs/kiwisolver/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) cppy | $(PYTHON_TOOLCHAIN)
+ cppy | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/lrcalc_python/dependencies b/build/pkgs/lrcalc_python/dependencies
index 27c96045586..d7e0cec0534 100644
--- a/build/pkgs/lrcalc_python/dependencies
+++ b/build/pkgs/lrcalc_python/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) lrcalc | $(PYTHON_TOOLCHAIN) cython
+ lrcalc | $(PYTHON_TOOLCHAIN) cython $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/markupsafe/dependencies b/build/pkgs/markupsafe/dependencies
index 0738c2d7777..47296a7bace 100644
--- a/build/pkgs/markupsafe/dependencies
+++ b/build/pkgs/markupsafe/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN)
+ | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/mathics/dependencies b/build/pkgs/mathics/dependencies
index ac723a5ac26..11d5626d8c7 100644
--- a/build/pkgs/mathics/dependencies
+++ b/build/pkgs/mathics/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN) pint palettable mathics_scanner
+ | $(PYTHON_TOOLCHAIN) pint palettable mathics_scanner $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/mathics_scanner/dependencies b/build/pkgs/mathics_scanner/dependencies
index 0738c2d7777..47296a7bace 100644
--- a/build/pkgs/mathics_scanner/dependencies
+++ b/build/pkgs/mathics_scanner/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN)
+ | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/matplotlib/dependencies b/build/pkgs/matplotlib/dependencies
index cfcf3edda7e..a2592fe7c6d 100644
--- a/build/pkgs/matplotlib/dependencies
+++ b/build/pkgs/matplotlib/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) numpy freetype pillow dateutil pyparsing tornado six cycler qhull fonttools contourpy | $(PYTHON_TOOLCHAIN) kiwisolver certifi setuptools_scm_git_archive
+ numpy freetype pillow dateutil pyparsing tornado six cycler qhull fonttools contourpy | $(PYTHON_TOOLCHAIN) kiwisolver certifi setuptools_scm_git_archive $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/matplotlib_inline/dependencies b/build/pkgs/matplotlib_inline/dependencies
index 1da34eeae60..a1a8daa948c 100644
--- a/build/pkgs/matplotlib_inline/dependencies
+++ b/build/pkgs/matplotlib_inline/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) traitlets | $(PYTHON_TOOLCHAIN)
+ traitlets | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/memory_allocator/dependencies b/build/pkgs/memory_allocator/dependencies
index 296a2bebad3..1db13c07e43 100644
--- a/build/pkgs/memory_allocator/dependencies
+++ b/build/pkgs/memory_allocator/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) cython | $(PYTHON_TOOLCHAIN)
+ cython | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/meson/dependencies b/build/pkgs/meson/dependencies
index 0738c2d7777..47296a7bace 100644
--- a/build/pkgs/meson/dependencies
+++ b/build/pkgs/meson/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN)
+ | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/meson_python/dependencies b/build/pkgs/meson_python/dependencies
index 160adbf36c9..01b5cb597b0 100644
--- a/build/pkgs/meson_python/dependencies
+++ b/build/pkgs/meson_python/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) meson pyproject_metadata tomli ninja_build patchelf | $(PYTHON_TOOLCHAIN)
+ meson pyproject_metadata tomli ninja_build patchelf | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/mistune/dependencies b/build/pkgs/mistune/dependencies
index 296a2bebad3..1db13c07e43 100644
--- a/build/pkgs/mistune/dependencies
+++ b/build/pkgs/mistune/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) cython | $(PYTHON_TOOLCHAIN)
+ cython | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/mpmath/dependencies b/build/pkgs/mpmath/dependencies
index 0738c2d7777..47296a7bace 100644
--- a/build/pkgs/mpmath/dependencies
+++ b/build/pkgs/mpmath/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN)
+ | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/nbclient/dependencies b/build/pkgs/nbclient/dependencies
index e21070fd3af..acec3fadace 100644
--- a/build/pkgs/nbclient/dependencies
+++ b/build/pkgs/nbclient/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) jupyter_client nbformat | $(PYTHON_TOOLCHAIN)
+ jupyter_client nbformat | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/nbconvert/dependencies b/build/pkgs/nbconvert/dependencies
index b423493e603..09dfbf42cb8 100644
--- a/build/pkgs/nbconvert/dependencies
+++ b/build/pkgs/nbconvert/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON)  mistune jinja2 pygments traitlets jupyter_core nbformat entrypoints bleach pandocfilters defusedxml jupyter_client jupyterlab_pygments nbclient beautifulsoup4 markupsafe | $(PYTHON_TOOLCHAIN)
+  mistune jinja2 pygments traitlets jupyter_core nbformat entrypoints bleach pandocfilters defusedxml jupyter_client jupyterlab_pygments nbclient beautifulsoup4 markupsafe | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/nbformat/dependencies b/build/pkgs/nbformat/dependencies
index 6c8921f1382..a6f9cc5f425 100644
--- a/build/pkgs/nbformat/dependencies
+++ b/build/pkgs/nbformat/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) jsonschema fastjsonschema jupyter_core traitlets | $(PYTHON_TOOLCHAIN) hatchling hatch_nodejs_version
+ jsonschema fastjsonschema jupyter_core traitlets | $(PYTHON_TOOLCHAIN) hatchling hatch_nodejs_version $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/nest_asyncio/dependencies b/build/pkgs/nest_asyncio/dependencies
index 0738c2d7777..47296a7bace 100644
--- a/build/pkgs/nest_asyncio/dependencies
+++ b/build/pkgs/nest_asyncio/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN)
+ | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/networkx/dependencies b/build/pkgs/networkx/dependencies
index 8eb6920e25d..fdba548c01a 100644
--- a/build/pkgs/networkx/dependencies
+++ b/build/pkgs/networkx/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) decorator | $(PYTHON_TOOLCHAIN) scipy
+ decorator | $(PYTHON_TOOLCHAIN) scipy $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/ninja_build/dependencies b/build/pkgs/ninja_build/dependencies
index 6b134137610..3518086ab84 100644
--- a/build/pkgs/ninja_build/dependencies
+++ b/build/pkgs/ninja_build/dependencies
@@ -1,4 +1,4 @@
-| $(PYTHON)
+|  $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/nodeenv/dependencies b/build/pkgs/nodeenv/dependencies
index 16df46f57ee..04eff0c842c 100644
--- a/build/pkgs/nodeenv/dependencies
+++ b/build/pkgs/nodeenv/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN) certifi
+ | $(PYTHON_TOOLCHAIN) certifi $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/notebook/dependencies b/build/pkgs/notebook/dependencies
index 9f5cb330ae2..9e6cbf4b36d 100644
--- a/build/pkgs/notebook/dependencies
+++ b/build/pkgs/notebook/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN) ipython jupyter_client ipykernel nbconvert nbformat jinja2 tornado terminado send2trash prometheus_client argon2_cffi
+ | $(PYTHON_TOOLCHAIN) ipython jupyter_client ipykernel nbconvert nbformat jinja2 tornado terminado send2trash prometheus_client argon2_cffi $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/notedown/dependencies b/build/pkgs/notedown/dependencies
index ea77eefc7f4..3dcb5b1900f 100644
--- a/build/pkgs/notedown/dependencies
+++ b/build/pkgs/notedown/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) $(PYTHON_TOOLCHAIN) | pip nbformat nbconvert six pandoc_attributes
+ $(PYTHON_TOOLCHAIN) | pip nbformat nbconvert six pandoc_attributes $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/numpy/dependencies b/build/pkgs/numpy/dependencies
index d3c0f0055e4..63faafe335a 100644
--- a/build/pkgs/numpy/dependencies
+++ b/build/pkgs/numpy/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) $(BLAS) gfortran | $(PYTHON_TOOLCHAIN) pkgconfig cython
+ $(BLAS) gfortran | $(PYTHON_TOOLCHAIN) pkgconfig cython $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/ore_algebra/dependencies b/build/pkgs/ore_algebra/dependencies
index 05ba0d8954b..126e8ceee06 100644
--- a/build/pkgs/ore_algebra/dependencies
+++ b/build/pkgs/ore_algebra/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN) $(SAGERUNTIME)
+ | $(PYTHON_TOOLCHAIN) $(SAGERUNTIME) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/osqp_python/dependencies b/build/pkgs/osqp_python/dependencies
index 4f344bba626..6cc50626d1d 100644
--- a/build/pkgs/osqp_python/dependencies
+++ b/build/pkgs/osqp_python/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) qdldl_python numpy scipy | $(PYTHON_TOOLCHAIN) cmake
+ qdldl_python numpy scipy | $(PYTHON_TOOLCHAIN) cmake $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/p_group_cohomology/dependencies b/build/pkgs/p_group_cohomology/dependencies
index a9d113183c5..57ea7e0dd94 100644
--- a/build/pkgs/p_group_cohomology/dependencies
+++ b/build/pkgs/p_group_cohomology/dependencies
@@ -1 +1 @@
-$(PYTHON) cython cysignals singular meataxe modular_resolution $(SAGE_SRC)/sage/matrix/matrix_gfpn_dense.pxd $(SAGE_SRC)/sage/structure/element.pxd $(SAGE_SRC)/sage/matrix/matrix_gfpn_dense.pxd $(SAGE_SRC)/sage/matrix/matrix0.pxd $(SAGE_SRC)/sage/libs/meataxe.pxd $(SAGE_SRC)/sage/rings/morphism.pxd | $(PYTHON_TOOLCHAIN) matplotlib gap xz $(SAGERUNTIME) ipywidgets
+ cython cysignals singular meataxe modular_resolution $(SAGE_SRC)/sage/matrix/matrix_gfpn_dense.pxd $(SAGE_SRC)/sage/structure/element.pxd $(SAGE_SRC)/sage/matrix/matrix_gfpn_dense.pxd $(SAGE_SRC)/sage/matrix/matrix0.pxd $(SAGE_SRC)/sage/libs/meataxe.pxd $(SAGE_SRC)/sage/rings/morphism.pxd | $(PYTHON_TOOLCHAIN) matplotlib gap xz $(SAGERUNTIME) ipywidgets $(PYTHON)
diff --git a/build/pkgs/packaging/dependencies b/build/pkgs/packaging/dependencies
index 2323f9df04a..17220ffcc37 100644
--- a/build/pkgs/packaging/dependencies
+++ b/build/pkgs/packaging/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | setuptools pip wheel pyparsing setuptools_wheel
+ | setuptools pip wheel pyparsing setuptools_wheel $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/palettable/dependencies b/build/pkgs/palettable/dependencies
index 0738c2d7777..47296a7bace 100644
--- a/build/pkgs/palettable/dependencies
+++ b/build/pkgs/palettable/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN)
+ | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/pandoc_attributes/dependencies b/build/pkgs/pandoc_attributes/dependencies
index 64f88253c78..cc9d4970706 100644
--- a/build/pkgs/pandoc_attributes/dependencies
+++ b/build/pkgs/pandoc_attributes/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) $(PYTHON_TOOLCHAIN) | pip pandocfilters
+ $(PYTHON_TOOLCHAIN) | pip pandocfilters $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/pandocfilters/dependencies b/build/pkgs/pandocfilters/dependencies
index 0738c2d7777..47296a7bace 100644
--- a/build/pkgs/pandocfilters/dependencies
+++ b/build/pkgs/pandocfilters/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN)
+ | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/pari_jupyter/dependencies b/build/pkgs/pari_jupyter/dependencies
index 44eaa153cc2..f7f0020c13b 100644
--- a/build/pkgs/pari_jupyter/dependencies
+++ b/build/pkgs/pari_jupyter/dependencies
@@ -1 +1 @@
-$(PYTHON) pari | $(PYTHON_TOOLCHAIN) cython notebook jupyter_core
+ pari | $(PYTHON_TOOLCHAIN) cython notebook jupyter_core $(PYTHON)
diff --git a/build/pkgs/parso/dependencies b/build/pkgs/parso/dependencies
index 0738c2d7777..47296a7bace 100644
--- a/build/pkgs/parso/dependencies
+++ b/build/pkgs/parso/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN)
+ | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/pathspec/dependencies b/build/pkgs/pathspec/dependencies
index 0738c2d7777..47296a7bace 100644
--- a/build/pkgs/pathspec/dependencies
+++ b/build/pkgs/pathspec/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN)
+ | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/pexpect/dependencies b/build/pkgs/pexpect/dependencies
index 4a942502496..d3f8eced66f 100644
--- a/build/pkgs/pexpect/dependencies
+++ b/build/pkgs/pexpect/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) ptyprocess | $(PYTHON_TOOLCHAIN)
+ ptyprocess | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/phitigra/dependencies b/build/pkgs/phitigra/dependencies
index 7aeb0c77c74..61dca76d6bc 100644
--- a/build/pkgs/phitigra/dependencies
+++ b/build/pkgs/phitigra/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) ipywidgets pillow numpy | $(PYTHON_TOOLCHAIN)
+ ipywidgets pillow numpy | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 These dependencies include the install-requires of ipycanvas.
 ----------
diff --git a/build/pkgs/pickleshare/dependencies b/build/pkgs/pickleshare/dependencies
index 0738c2d7777..47296a7bace 100644
--- a/build/pkgs/pickleshare/dependencies
+++ b/build/pkgs/pickleshare/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN)
+ | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/pillow/dependencies b/build/pkgs/pillow/dependencies
index 2ece64e58e8..f2500281136 100644
--- a/build/pkgs/pillow/dependencies
+++ b/build/pkgs/pillow/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) zlib freetype | $(PYTHON_TOOLCHAIN) pkgconf
+ zlib freetype | $(PYTHON_TOOLCHAIN) pkgconf $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/pint/dependencies b/build/pkgs/pint/dependencies
index 0738c2d7777..47296a7bace 100644
--- a/build/pkgs/pint/dependencies
+++ b/build/pkgs/pint/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN)
+ | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/pip/dependencies b/build/pkgs/pip/dependencies
index 618d627629a..dac3579f7e3 100644
--- a/build/pkgs/pip/dependencies
+++ b/build/pkgs/pip/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) setuptools wheel
+ setuptools wheel | $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/pkgconfig/dependencies b/build/pkgs/pkgconfig/dependencies
index 6dfe046e55e..b52668ccb01 100644
--- a/build/pkgs/pkgconfig/dependencies
+++ b/build/pkgs/pkgconfig/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN) pkgconf poetry_core
+ | $(PYTHON_TOOLCHAIN) pkgconf poetry_core $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/platformdirs/dependencies b/build/pkgs/platformdirs/dependencies
index 5b4aec583a4..952ebfb66cd 100644
--- a/build/pkgs/platformdirs/dependencies
+++ b/build/pkgs/platformdirs/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) setuptools_scm | $(PYTHON_TOOLCHAIN) hatchling hatch_vcs
+ setuptools_scm | $(PYTHON_TOOLCHAIN) hatchling hatch_vcs $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/pluggy/dependencies b/build/pkgs/pluggy/dependencies
index 0738c2d7777..47296a7bace 100644
--- a/build/pkgs/pluggy/dependencies
+++ b/build/pkgs/pluggy/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN)
+ | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/ply/dependencies b/build/pkgs/ply/dependencies
index 0738c2d7777..47296a7bace 100644
--- a/build/pkgs/ply/dependencies
+++ b/build/pkgs/ply/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN)
+ | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/poetry_core/dependencies b/build/pkgs/poetry_core/dependencies
index 0738c2d7777..47296a7bace 100644
--- a/build/pkgs/poetry_core/dependencies
+++ b/build/pkgs/poetry_core/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN)
+ | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/pplpy/dependencies b/build/pkgs/pplpy/dependencies
index 84d4fbab430..f61061ddefe 100644
--- a/build/pkgs/pplpy/dependencies
+++ b/build/pkgs/pplpy/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) $(MP_LIBRARY) gmpy2 cysignals mpfr mpc ppl | $(PYTHON_TOOLCHAIN) sphinx
+ $(MP_LIBRARY) gmpy2 cysignals mpfr mpc ppl | $(PYTHON_TOOLCHAIN) sphinx $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/primecountpy/dependencies b/build/pkgs/primecountpy/dependencies
index c141a1d7c2f..ce1374b2a0e 100644
--- a/build/pkgs/primecountpy/dependencies
+++ b/build/pkgs/primecountpy/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) primecount cysignals | $(PYTHON_TOOLCHAIN) cython
+ primecount cysignals | $(PYTHON_TOOLCHAIN) cython $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/prometheus_client/dependencies b/build/pkgs/prometheus_client/dependencies
index 0738c2d7777..47296a7bace 100644
--- a/build/pkgs/prometheus_client/dependencies
+++ b/build/pkgs/prometheus_client/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN)
+ | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/prompt_toolkit/dependencies b/build/pkgs/prompt_toolkit/dependencies
index 57465daf937..2bdb6af86bc 100644
--- a/build/pkgs/prompt_toolkit/dependencies
+++ b/build/pkgs/prompt_toolkit/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) six wcwidth | $(PYTHON_TOOLCHAIN)
+ six wcwidth | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/ptyprocess/dependencies b/build/pkgs/ptyprocess/dependencies
index 0738c2d7777..47296a7bace 100644
--- a/build/pkgs/ptyprocess/dependencies
+++ b/build/pkgs/ptyprocess/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN)
+ | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/pure_eval/dependencies b/build/pkgs/pure_eval/dependencies
index 0738c2d7777..47296a7bace 100644
--- a/build/pkgs/pure_eval/dependencies
+++ b/build/pkgs/pure_eval/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN)
+ | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/py/dependencies b/build/pkgs/py/dependencies
index 14a312e5dee..995ddecb8f4 100644
--- a/build/pkgs/py/dependencies
+++ b/build/pkgs/py/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN) setuptools_scm
+ | $(PYTHON_TOOLCHAIN) setuptools_scm $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/pybind11/dependencies b/build/pkgs/pybind11/dependencies
index da2b0925acd..ca33204bd52 100644
--- a/build/pkgs/pybind11/dependencies
+++ b/build/pkgs/pybind11/dependencies
@@ -1 +1 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN)
+ | $(PYTHON_TOOLCHAIN) $(PYTHON)
diff --git a/build/pkgs/pycosat/dependencies b/build/pkgs/pycosat/dependencies
index 0738c2d7777..47296a7bace 100644
--- a/build/pkgs/pycosat/dependencies
+++ b/build/pkgs/pycosat/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN)
+ | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/pycparser/dependencies b/build/pkgs/pycparser/dependencies
index 0738c2d7777..47296a7bace 100644
--- a/build/pkgs/pycparser/dependencies
+++ b/build/pkgs/pycparser/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN)
+ | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/pycryptosat/dependencies b/build/pkgs/pycryptosat/dependencies
index b897ff72eae..c51735427aa 100644
--- a/build/pkgs/pycryptosat/dependencies
+++ b/build/pkgs/pycryptosat/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) m4ri zlib libpng cryptominisat | cmake boost_cropped $(PYTHON_TOOLCHAIN)
+ m4ri zlib libpng cryptominisat | cmake boost_cropped $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/pycygwin/dependencies b/build/pkgs/pycygwin/dependencies
index 296a2bebad3..1db13c07e43 100644
--- a/build/pkgs/pycygwin/dependencies
+++ b/build/pkgs/pycygwin/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) cython | $(PYTHON_TOOLCHAIN)
+ cython | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/pygments/dependencies b/build/pkgs/pygments/dependencies
index 0738c2d7777..47296a7bace 100644
--- a/build/pkgs/pygments/dependencies
+++ b/build/pkgs/pygments/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN)
+ | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/pygraphviz/dependencies b/build/pkgs/pygraphviz/dependencies
index 232dc205925..a723707e09c 100644
--- a/build/pkgs/pygraphviz/dependencies
+++ b/build/pkgs/pygraphviz/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) libgraphviz | $(PYTHON_TOOLCHAIN)
+ libgraphviz | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/pynormaliz/dependencies b/build/pkgs/pynormaliz/dependencies
index 76200c19d23..1fca858579e 100644
--- a/build/pkgs/pynormaliz/dependencies
+++ b/build/pkgs/pynormaliz/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) normaliz | $(PYTHON_TOOLCHAIN)
+ normaliz | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/pyparsing/dependencies b/build/pkgs/pyparsing/dependencies
index 2471ffdf59d..22915b3da68 100644
--- a/build/pkgs/pyparsing/dependencies
+++ b/build/pkgs/pyparsing/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | pip wheel flit_core tomli
+ | pip wheel flit_core tomli $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/pyppeteer/dependencies b/build/pkgs/pyppeteer/dependencies
index 1c2d4afb8d4..7d9ec36f9c7 100644
--- a/build/pkgs/pyppeteer/dependencies
+++ b/build/pkgs/pyppeteer/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) appdirs importlib_metadata urllib3 certifi | $(PYTHON_TOOLCHAIN)
+ appdirs importlib_metadata urllib3 certifi | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/pyproject_metadata/dependencies b/build/pkgs/pyproject_metadata/dependencies
index 6d5368db738..3df264eee42 100644
--- a/build/pkgs/pyproject_metadata/dependencies
+++ b/build/pkgs/pyproject_metadata/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) packaging pyparsing | $(PYTHON_TOOLCHAIN)
+ packaging pyparsing | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/pyrsistent/dependencies b/build/pkgs/pyrsistent/dependencies
index 4361e46ddaf..9be6b4aab7c 100644
--- a/build/pkgs/pyrsistent/dependencies
+++ b/build/pkgs/pyrsistent/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) vcversioner | $(PYTHON_TOOLCHAIN)
+ vcversioner | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/pyscipopt/dependencies b/build/pkgs/pyscipopt/dependencies
index 66f72c29e1a..3c4a108db0f 100644
--- a/build/pkgs/pyscipopt/dependencies
+++ b/build/pkgs/pyscipopt/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) scip | $(PYTHON_TOOLCHAIN) cython
+ scip | $(PYTHON_TOOLCHAIN) cython $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/pysingular/dependencies b/build/pkgs/pysingular/dependencies
index bd58b826630..075bad15831 100644
--- a/build/pkgs/pysingular/dependencies
+++ b/build/pkgs/pysingular/dependencies
@@ -1 +1 @@
-$(PYTHON) singular | $(PYTHON_TOOLCHAIN)
+ singular | $(PYTHON_TOOLCHAIN) $(PYTHON)
diff --git a/build/pkgs/pytest/dependencies b/build/pkgs/pytest/dependencies
index 7e5a90a20bd..af3334a7daf 100644
--- a/build/pkgs/pytest/dependencies
+++ b/build/pkgs/pytest/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) pluggy packaging attrs py pyparsing importlib_metadata tomli | $(PYTHON_TOOLCHAIN)
+ pluggy packaging attrs py pyparsing importlib_metadata tomli | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/pytest_mock/dependencies b/build/pkgs/pytest_mock/dependencies
index 37ea60eb442..720c11ec214 100644
--- a/build/pkgs/pytest_mock/dependencies
+++ b/build/pkgs/pytest_mock/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) pytest packaging attrs pluggy tomli py pyparsing | $(PYTHON_TOOLCHAIN)
+ pytest packaging attrs pluggy tomli py pyparsing | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/pytest_xdist/dependencies b/build/pkgs/pytest_xdist/dependencies
index aa8c608f663..19d8b032667 100644
--- a/build/pkgs/pytest_xdist/dependencies
+++ b/build/pkgs/pytest_xdist/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) pytest | $(PYTHON_TOOLCHAIN)
+ pytest | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/python_build/dependencies b/build/pkgs/python_build/dependencies
index 769e08a8c26..b72a6d1c776 100644
--- a/build/pkgs/python_build/dependencies
+++ b/build/pkgs/python_build/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) pyparsing tomli packaging | $(PYTHON_TOOLCHAIN)
+ pyparsing tomli packaging | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/python_igraph/dependencies b/build/pkgs/python_igraph/dependencies
index 67ed15160f4..dde58706323 100644
--- a/build/pkgs/python_igraph/dependencies
+++ b/build/pkgs/python_igraph/dependencies
@@ -1,4 +1,4 @@
-igraph texttable $(PYTHON) | $(PYTHON_TOOLCHAIN)
+igraph texttable  | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/pythran/dependencies b/build/pkgs/pythran/dependencies
index 8a64589c0bc..3845adb7a2c 100644
--- a/build/pkgs/pythran/dependencies
+++ b/build/pkgs/pythran/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) beniget gast ply numpy | $(PYTHON_TOOLCHAIN)
+ beniget gast ply numpy | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/pytz/dependencies b/build/pkgs/pytz/dependencies
index 0738c2d7777..47296a7bace 100644
--- a/build/pkgs/pytz/dependencies
+++ b/build/pkgs/pytz/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN)
+ | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/pytz_deprecation_shim/dependencies b/build/pkgs/pytz_deprecation_shim/dependencies
index 232fe6c0554..2ea28ad2718 100644
--- a/build/pkgs/pytz_deprecation_shim/dependencies
+++ b/build/pkgs/pytz_deprecation_shim/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) tzdata | $(PYTHON_TOOLCHAIN)
+ tzdata | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/pyzmq/dependencies b/build/pkgs/pyzmq/dependencies
index c72b3d23340..5031d872d13 100644
--- a/build/pkgs/pyzmq/dependencies
+++ b/build/pkgs/pyzmq/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) cython zeromq | $(PYTHON_TOOLCHAIN)
+ cython zeromq | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/qdldl_python/dependencies b/build/pkgs/qdldl_python/dependencies
index 48c2586b9f4..757104fcba0 100644
--- a/build/pkgs/qdldl_python/dependencies
+++ b/build/pkgs/qdldl_python/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) pybind11 numpy scipy | $(PYTHON_TOOLCHAIN) cmake
+ pybind11 numpy scipy | $(PYTHON_TOOLCHAIN) cmake $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/requests/dependencies b/build/pkgs/requests/dependencies
index b896dbc3cac..668fe014f12 100644
--- a/build/pkgs/requests/dependencies
+++ b/build/pkgs/requests/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN) idna urllib3 certifi charset_normalizer
+ | $(PYTHON_TOOLCHAIN) idna urllib3 certifi charset_normalizer $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/retrolab/dependencies b/build/pkgs/retrolab/dependencies
index 531f28310be..58027d3558c 100644
--- a/build/pkgs/retrolab/dependencies
+++ b/build/pkgs/retrolab/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) jupyterlab | $(PYTHON_TOOLCHAIN)
+ jupyterlab | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/rpy2/dependencies b/build/pkgs/rpy2/dependencies
index b8937d88769..b88615716d4 100644
--- a/build/pkgs/rpy2/dependencies
+++ b/build/pkgs/rpy2/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) r cffi tzlocal pytz jinja2 | $(PYTHON_TOOLCHAIN) pycparser
+ r cffi tzlocal pytz jinja2 | $(PYTHON_TOOLCHAIN) pycparser $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/rst2ipynb/dependencies b/build/pkgs/rst2ipynb/dependencies
index 7fcda2181e1..d828daf957d 100644
--- a/build/pkgs/rst2ipynb/dependencies
+++ b/build/pkgs/rst2ipynb/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) pandoc | $(PYTHON_TOOLCHAIN) notedown
+ pandoc | $(PYTHON_TOOLCHAIN) notedown $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/sage_conf/dependencies b/build/pkgs/sage_conf/dependencies
index 0479fd1d280..f2bd00aaf0d 100644
--- a/build/pkgs/sage_conf/dependencies
+++ b/build/pkgs/sage_conf/dependencies
@@ -1 +1 @@
-$(PYTHON) $(SAGE_ROOT)/pkgs/sage-conf/_sage_conf/_conf.py $(SAGE_ROOT)/pkgs/sage-conf/setup.cfg $(SAGE_ROOT)/pkgs/sage-conf/bin/sage-env-config | $(PYTHON_TOOLCHAIN)
+ $(SAGE_ROOT)/pkgs/sage-conf/_sage_conf/_conf.py $(SAGE_ROOT)/pkgs/sage-conf/setup.cfg $(SAGE_ROOT)/pkgs/sage-conf/bin/sage-env-config | $(PYTHON_TOOLCHAIN) $(PYTHON)
diff --git a/build/pkgs/sage_docbuild/dependencies b/build/pkgs/sage_docbuild/dependencies
index 376ad09772a..c21e4b287e3 100644
--- a/build/pkgs/sage_docbuild/dependencies
+++ b/build/pkgs/sage_docbuild/dependencies
@@ -1 +1 @@
-$(PYTHON) sphinx $(SAGE_ROOT)/pkgs/sage-docbuild/sage_docbuild/*.py $(SAGE_ROOT)/pkgs/sage-docbuild/sage_docbuild/ext/*.py | $(PYTHON_TOOLCHAIN) sagelib
+ sphinx $(SAGE_ROOT)/pkgs/sage-docbuild/sage_docbuild/*.py $(SAGE_ROOT)/pkgs/sage-docbuild/sage_docbuild/ext/*.py | $(PYTHON_TOOLCHAIN) sagelib $(PYTHON)
diff --git a/build/pkgs/sage_flatsurf/dependencies b/build/pkgs/sage_flatsurf/dependencies
index 4c62fdd4fef..c706908baa7 100644
--- a/build/pkgs/sage_flatsurf/dependencies
+++ b/build/pkgs/sage_flatsurf/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN) surface_dynamics $(SAGERUNTIME)
+ | $(PYTHON_TOOLCHAIN) surface_dynamics $(SAGERUNTIME) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/sage_numerical_backends_coin/dependencies b/build/pkgs/sage_numerical_backends_coin/dependencies
index 4cbde1164f2..0448728cea5 100644
--- a/build/pkgs/sage_numerical_backends_coin/dependencies
+++ b/build/pkgs/sage_numerical_backends_coin/dependencies
@@ -1,4 +1,4 @@
-cbc cysignals $(SAGE_SRC)/sage/numerical/backends/generic_backend.pxd $(SAGE_SRC)/sage/cpython/string.pxd $(SAGE_SRC)/sage/cpython/string_impl.h | $(SAGERUNTIME) $(PYTHON_TOOLCHAIN) cython ipywidgets
+cbc cysignals $(SAGE_SRC)/sage/numerical/backends/generic_backend.pxd $(SAGE_SRC)/sage/cpython/string.pxd $(SAGE_SRC)/sage/cpython/string_impl.h | $(SAGERUNTIME) $(PYTHON_TOOLCHAIN) cython ipywidgets $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/sage_numerical_backends_cplex/dependencies b/build/pkgs/sage_numerical_backends_cplex/dependencies
index 0b35afa3540..840bdcabd34 100644
--- a/build/pkgs/sage_numerical_backends_cplex/dependencies
+++ b/build/pkgs/sage_numerical_backends_cplex/dependencies
@@ -1,4 +1,4 @@
-cysignals $(SAGE_SRC)/sage/numerical/backends/generic_backend.pxd $(SAGE_SRC)/sage/cpython/string.pxd $(SAGE_SRC)/sage/cpython/string_impl.h | $(SAGERUNTIME) $(PYTHON_TOOLCHAIN) cython ipywidgets
+cysignals $(SAGE_SRC)/sage/numerical/backends/generic_backend.pxd $(SAGE_SRC)/sage/cpython/string.pxd $(SAGE_SRC)/sage/cpython/string_impl.h | $(SAGERUNTIME) $(PYTHON_TOOLCHAIN) cython ipywidgets $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/sage_numerical_backends_gurobi/dependencies b/build/pkgs/sage_numerical_backends_gurobi/dependencies
index 0b35afa3540..840bdcabd34 100644
--- a/build/pkgs/sage_numerical_backends_gurobi/dependencies
+++ b/build/pkgs/sage_numerical_backends_gurobi/dependencies
@@ -1,4 +1,4 @@
-cysignals $(SAGE_SRC)/sage/numerical/backends/generic_backend.pxd $(SAGE_SRC)/sage/cpython/string.pxd $(SAGE_SRC)/sage/cpython/string_impl.h | $(SAGERUNTIME) $(PYTHON_TOOLCHAIN) cython ipywidgets
+cysignals $(SAGE_SRC)/sage/numerical/backends/generic_backend.pxd $(SAGE_SRC)/sage/cpython/string.pxd $(SAGE_SRC)/sage/cpython/string_impl.h | $(SAGERUNTIME) $(PYTHON_TOOLCHAIN) cython ipywidgets $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/sage_setup/dependencies b/build/pkgs/sage_setup/dependencies
index 8c2e218f49a..cae3faf9049 100644
--- a/build/pkgs/sage_setup/dependencies
+++ b/build/pkgs/sage_setup/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) cython pkgconfig jinja2 $(SAGE_ROOT)/pkgs/sage-setup/sage_setup/*.py $(SAGE_ROOT)/pkgs/sage-setup/sage_setup/autogen/interpreters/specs/*.py $(SAGE_ROOT)/pkgs/sage-setup/sage_setup/command/*.py | $(PYTHON_TOOLCHAIN)
+ cython pkgconfig jinja2 $(SAGE_ROOT)/pkgs/sage-setup/sage_setup/*.py $(SAGE_ROOT)/pkgs/sage-setup/sage_setup/autogen/interpreters/specs/*.py $(SAGE_ROOT)/pkgs/sage-setup/sage_setup/command/*.py | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/sage_sws2rst/dependencies b/build/pkgs/sage_sws2rst/dependencies
index 5ca5e27df75..f32c4fc594d 100644
--- a/build/pkgs/sage_sws2rst/dependencies
+++ b/build/pkgs/sage_sws2rst/dependencies
@@ -1 +1 @@
-$(PYTHON) beautifulsoup4 $(SAGE_ROOT)/pkgs/sage-sws2rst/*.py | $(PYTHON_TOOLCHAIN)
+ beautifulsoup4 $(SAGE_ROOT)/pkgs/sage-sws2rst/*.py | $(PYTHON_TOOLCHAIN) $(PYTHON)
diff --git a/build/pkgs/sagelib/dependencies b/build/pkgs/sagelib/dependencies
index 9b8c062d3c3..4d756744e65 100644
--- a/build/pkgs/sagelib/dependencies
+++ b/build/pkgs/sagelib/dependencies
@@ -1,4 +1,4 @@
-FORCE $(SCRIPTS) arb boost_cropped $(BLAS) brial cliquer cypari cysignals cython ecl eclib ecm flint libgd gap giac givaro glpk gmpy2 gsl iml importlib_metadata importlib_resources jinja2 jupyter_core lcalc lrcalc_python libbraiding libhomfly libpng linbox m4ri m4rie memory_allocator mpc mpfi mpfr $(MP_LIBRARY) ntl numpy pari pip pkgconfig planarity ppl pplpy primesieve primecount primecountpy pycygwin $(PYTHON) requests rw sage_conf singular symmetrica typing_extensions $(PCFILES) | $(PYTHON_TOOLCHAIN) sage_setup
+FORCE $(SCRIPTS) arb boost_cropped $(BLAS) brial cliquer cypari cysignals cython ecl eclib ecm flint libgd gap giac givaro glpk gmpy2 gsl iml importlib_metadata importlib_resources jinja2 jupyter_core lcalc lrcalc_python libbraiding libhomfly libpng linbox m4ri m4rie memory_allocator mpc mpfi mpfr $(MP_LIBRARY) ntl numpy pari pip pkgconfig planarity ppl pplpy primesieve primecount primecountpy pycygwin  requests rw sage_conf singular symmetrica typing_extensions $(PCFILES) | $(PYTHON_TOOLCHAIN) sage_setup $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/sagemath_bliss/dependencies b/build/pkgs/sagemath_bliss/dependencies
index 279e79ace91..a7915e316b9 100644
--- a/build/pkgs/sagemath_bliss/dependencies
+++ b/build/pkgs/sagemath_bliss/dependencies
@@ -1 +1 @@
-$(PYTHON) bliss cysignals | $(PYTHON_TOOLCHAIN) sage_setup sage_conf sagemath_environment cython pkgconfig
+ bliss cysignals | $(PYTHON_TOOLCHAIN) sage_setup sage_conf sagemath_environment cython pkgconfig $(PYTHON)
diff --git a/build/pkgs/sagemath_categories/dependencies b/build/pkgs/sagemath_categories/dependencies
index d8b6bdbd4a7..9fa43a64aae 100644
--- a/build/pkgs/sagemath_categories/dependencies
+++ b/build/pkgs/sagemath_categories/dependencies
@@ -1 +1 @@
-$(PYTHON) sagemath_objects | $(PYTHON_TOOLCHAIN) sagemath_environment sage_setup cython pkgconfig python_build
+ sagemath_objects | $(PYTHON_TOOLCHAIN) sagemath_environment sage_setup cython pkgconfig python_build $(PYTHON)
diff --git a/build/pkgs/sagemath_coxeter3/dependencies b/build/pkgs/sagemath_coxeter3/dependencies
index 615392ca427..ada45656089 100644
--- a/build/pkgs/sagemath_coxeter3/dependencies
+++ b/build/pkgs/sagemath_coxeter3/dependencies
@@ -1 +1 @@
-$(PYTHON) coxeter3 | $(PYTHON_TOOLCHAIN) sage_setup sagemath_environment cython pkgconfig
+ coxeter3 | $(PYTHON_TOOLCHAIN) sage_setup sagemath_environment cython pkgconfig $(PYTHON)
diff --git a/build/pkgs/sagemath_environment/dependencies b/build/pkgs/sagemath_environment/dependencies
index 605611e7a21..0f36ec317e6 100644
--- a/build/pkgs/sagemath_environment/dependencies
+++ b/build/pkgs/sagemath_environment/dependencies
@@ -1 +1 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN) python_build
+ | $(PYTHON_TOOLCHAIN) python_build $(PYTHON)
diff --git a/build/pkgs/sagemath_mcqd/dependencies b/build/pkgs/sagemath_mcqd/dependencies
index e383df7dafa..9896fdaccfc 100644
--- a/build/pkgs/sagemath_mcqd/dependencies
+++ b/build/pkgs/sagemath_mcqd/dependencies
@@ -1 +1 @@
-$(PYTHON) mcqd memory_allocator cysignals | $(PYTHON_TOOLCHAIN) sage_setup cython pkgconfig
+ mcqd memory_allocator cysignals | $(PYTHON_TOOLCHAIN) sage_setup cython pkgconfig $(PYTHON)
diff --git a/build/pkgs/sagemath_meataxe/dependencies b/build/pkgs/sagemath_meataxe/dependencies
index f100932802a..c333fcc61db 100644
--- a/build/pkgs/sagemath_meataxe/dependencies
+++ b/build/pkgs/sagemath_meataxe/dependencies
@@ -1 +1 @@
-$(PYTHON) meataxe | $(PYTHON_TOOLCHAIN) sage_setup sagemath_environment cython pkgconfig
+ meataxe | $(PYTHON_TOOLCHAIN) sage_setup sagemath_environment cython pkgconfig $(PYTHON)
diff --git a/build/pkgs/sagemath_objects/dependencies b/build/pkgs/sagemath_objects/dependencies
index 807b8b17215..ffc14bb6ba6 100644
--- a/build/pkgs/sagemath_objects/dependencies
+++ b/build/pkgs/sagemath_objects/dependencies
@@ -1,3 +1,3 @@
-FORCE $(PYTHON) cysignals gmpy2 | $(PYTHON_TOOLCHAIN) sagemath_environment sage_setup cython pkgconfig python_build
+FORCE  cysignals gmpy2 | $(PYTHON_TOOLCHAIN) sagemath_environment sage_setup cython pkgconfig python_build $(PYTHON)
 
 # FORCE: Always run the spkg-install script
diff --git a/build/pkgs/sagemath_repl/dependencies b/build/pkgs/sagemath_repl/dependencies
index ebc253dac5b..7d7ba20c5dd 100644
--- a/build/pkgs/sagemath_repl/dependencies
+++ b/build/pkgs/sagemath_repl/dependencies
@@ -1 +1 @@
-$(PYTHON) sagemath_objects sagemath_environment ipython ipywidgets | $(PYTHON_TOOLCHAIN) python_build
+ sagemath_objects sagemath_environment ipython ipywidgets | $(PYTHON_TOOLCHAIN) python_build $(PYTHON)
diff --git a/build/pkgs/sagemath_sirocco/dependencies b/build/pkgs/sagemath_sirocco/dependencies
index b923f34d7eb..4f47049ec4b 100644
--- a/build/pkgs/sagemath_sirocco/dependencies
+++ b/build/pkgs/sagemath_sirocco/dependencies
@@ -1 +1 @@
-$(PYTHON) sirocco cypari cysignals mpfr | $(PYTHON_TOOLCHAIN) sage_setup sagemath_environment cython pkgconfig
+ sirocco cypari cysignals mpfr | $(PYTHON_TOOLCHAIN) sage_setup sagemath_environment cython pkgconfig $(PYTHON)
diff --git a/build/pkgs/sagemath_tdlib/dependencies b/build/pkgs/sagemath_tdlib/dependencies
index 5c7ecd31f2f..b22ab6c52a7 100644
--- a/build/pkgs/sagemath_tdlib/dependencies
+++ b/build/pkgs/sagemath_tdlib/dependencies
@@ -1 +1 @@
-$(PYTHON) tdlib cysignals | $(PYTHON_TOOLCHAIN) sage_setup sagemath_environment cython pkgconfig
+ tdlib cysignals | $(PYTHON_TOOLCHAIN) sage_setup sagemath_environment cython pkgconfig $(PYTHON)
diff --git a/build/pkgs/sagenb_export/dependencies b/build/pkgs/sagenb_export/dependencies
index 26033350f88..f9a2f2adbb9 100644
--- a/build/pkgs/sagenb_export/dependencies
+++ b/build/pkgs/sagenb_export/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) notebook nbconvert ipython six | $(PYTHON_TOOLCHAIN)
+ notebook nbconvert ipython six | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/sagetex/dependencies b/build/pkgs/sagetex/dependencies
index 6090d5dc3ac..af9b5f370fb 100644
--- a/build/pkgs/sagetex/dependencies
+++ b/build/pkgs/sagetex/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) maxima scipy matplotlib pillow tachyon pyparsing
+ maxima scipy matplotlib pillow tachyon pyparsing | $(PYTHON)
 
 To build SageTeX, you just need Python and pyparsing, but to test (SAGE_CHECK=yes)
 SageTeX, you actually need to run Sage, produce plots,...
diff --git a/build/pkgs/scipy/dependencies b/build/pkgs/scipy/dependencies
index 5d42789eb10..82fa8e0c0d7 100644
--- a/build/pkgs/scipy/dependencies
+++ b/build/pkgs/scipy/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) $(BLAS) gfortran numpy pybind11 cython pythran | $(PYTHON_TOOLCHAIN) meson_python
+ $(BLAS) gfortran numpy pybind11 cython pythran | $(PYTHON_TOOLCHAIN) meson_python $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/scs/dependencies b/build/pkgs/scs/dependencies
index 56c3c7a111c..a736df74ec5 100644
--- a/build/pkgs/scs/dependencies
+++ b/build/pkgs/scs/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) numpy | $(PYTHON_TOOLCHAIN) cmake
+ numpy | $(PYTHON_TOOLCHAIN) cmake $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/send2trash/dependencies b/build/pkgs/send2trash/dependencies
index 0738c2d7777..47296a7bace 100644
--- a/build/pkgs/send2trash/dependencies
+++ b/build/pkgs/send2trash/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN)
+ | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/setuptools/dependencies b/build/pkgs/setuptools/dependencies
index 1700e743d59..d45a397db36 100644
--- a/build/pkgs/setuptools/dependencies
+++ b/build/pkgs/setuptools/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON)
+ | $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/setuptools_scm/dependencies b/build/pkgs/setuptools_scm/dependencies
index f3662a5c829..7dd3b6e8f6e 100644
--- a/build/pkgs/setuptools_scm/dependencies
+++ b/build/pkgs/setuptools_scm/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) typing_extensions | setuptools pip wheel tomli packaging
+ typing_extensions | setuptools pip wheel tomli packaging $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/setuptools_scm_git_archive/dependencies b/build/pkgs/setuptools_scm_git_archive/dependencies
index 0738c2d7777..47296a7bace 100644
--- a/build/pkgs/setuptools_scm_git_archive/dependencies
+++ b/build/pkgs/setuptools_scm_git_archive/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN)
+ | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/setuptools_wheel/dependencies b/build/pkgs/setuptools_wheel/dependencies
index 618d627629a..dac3579f7e3 100644
--- a/build/pkgs/setuptools_wheel/dependencies
+++ b/build/pkgs/setuptools_wheel/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) setuptools wheel
+ setuptools wheel | $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/simplegeneric/dependencies b/build/pkgs/simplegeneric/dependencies
index 703d0ec7ba3..1169eb4105f 100644
--- a/build/pkgs/simplegeneric/dependencies
+++ b/build/pkgs/simplegeneric/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN)
+ | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 # simplegeneric does not strictly require setuptools, but it does try
 # to use setuptools if it is available. However, there is a problem
diff --git a/build/pkgs/singular_jupyter/dependencies b/build/pkgs/singular_jupyter/dependencies
index 14dc06f7076..dc15abb82c7 100644
--- a/build/pkgs/singular_jupyter/dependencies
+++ b/build/pkgs/singular_jupyter/dependencies
@@ -1 +1 @@
-$(PYTHON) jupyter_client | $(PYTHON_TOOLCHAIN) pysingular ipython ipywidgets
+ jupyter_client | $(PYTHON_TOOLCHAIN) pysingular ipython ipywidgets $(PYTHON)
diff --git a/build/pkgs/six/dependencies b/build/pkgs/six/dependencies
index 0738c2d7777..47296a7bace 100644
--- a/build/pkgs/six/dependencies
+++ b/build/pkgs/six/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN)
+ | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/slabbe/dependencies b/build/pkgs/slabbe/dependencies
index 05ba0d8954b..126e8ceee06 100644
--- a/build/pkgs/slabbe/dependencies
+++ b/build/pkgs/slabbe/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN) $(SAGERUNTIME)
+ | $(PYTHON_TOOLCHAIN) $(SAGERUNTIME) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/snappy/dependencies b/build/pkgs/snappy/dependencies
index db96ccc42e0..ceaf757887e 100644
--- a/build/pkgs/snappy/dependencies
+++ b/build/pkgs/snappy/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) decorator ipython cypari | $(PYTHON_TOOLCHAIN) sagelib
+ decorator ipython cypari | $(PYTHON_TOOLCHAIN) sagelib $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/snowballstemmer/dependencies b/build/pkgs/snowballstemmer/dependencies
index 0738c2d7777..47296a7bace 100644
--- a/build/pkgs/snowballstemmer/dependencies
+++ b/build/pkgs/snowballstemmer/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN)
+ | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/soupsieve/dependencies b/build/pkgs/soupsieve/dependencies
index 8cd44d06682..cfb7c484697 100644
--- a/build/pkgs/soupsieve/dependencies
+++ b/build/pkgs/soupsieve/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN) hatchling
+ | $(PYTHON_TOOLCHAIN) hatchling $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/sphinx/dependencies b/build/pkgs/sphinx/dependencies
index 75c668d9c23..9b7505c9aec 100644
--- a/build/pkgs/sphinx/dependencies
+++ b/build/pkgs/sphinx/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN) docutils jinja2 pygments snowballstemmer imagesize babel alabaster requests sphinxcontrib_websupport sphinxcontrib_applehelp sphinxcontrib_devhelp sphinxcontrib_htmlhelp sphinxcontrib_jsmath sphinxcontrib_qthelp sphinxcontrib_serializinghtml packaging importlib_metadata
+ | $(PYTHON_TOOLCHAIN) docutils jinja2 pygments snowballstemmer imagesize babel alabaster requests sphinxcontrib_websupport sphinxcontrib_applehelp sphinxcontrib_devhelp sphinxcontrib_htmlhelp sphinxcontrib_jsmath sphinxcontrib_qthelp sphinxcontrib_serializinghtml packaging importlib_metadata $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/sphinx_basic_ng/dependencies b/build/pkgs/sphinx_basic_ng/dependencies
index 175a793ecbc..ac849c62bf6 100644
--- a/build/pkgs/sphinx_basic_ng/dependencies
+++ b/build/pkgs/sphinx_basic_ng/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) sphinx | $(PYTHON_TOOLCHAIN)
+ sphinx | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/sphinx_copybutton/dependencies b/build/pkgs/sphinx_copybutton/dependencies
index 175a793ecbc..ac849c62bf6 100644
--- a/build/pkgs/sphinx_copybutton/dependencies
+++ b/build/pkgs/sphinx_copybutton/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) sphinx | $(PYTHON_TOOLCHAIN)
+ sphinx | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/sphinxcontrib_applehelp/dependencies b/build/pkgs/sphinxcontrib_applehelp/dependencies
index 0738c2d7777..47296a7bace 100644
--- a/build/pkgs/sphinxcontrib_applehelp/dependencies
+++ b/build/pkgs/sphinxcontrib_applehelp/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN)
+ | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/sphinxcontrib_devhelp/dependencies b/build/pkgs/sphinxcontrib_devhelp/dependencies
index 0738c2d7777..47296a7bace 100644
--- a/build/pkgs/sphinxcontrib_devhelp/dependencies
+++ b/build/pkgs/sphinxcontrib_devhelp/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN)
+ | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/sphinxcontrib_htmlhelp/dependencies b/build/pkgs/sphinxcontrib_htmlhelp/dependencies
index 0738c2d7777..47296a7bace 100644
--- a/build/pkgs/sphinxcontrib_htmlhelp/dependencies
+++ b/build/pkgs/sphinxcontrib_htmlhelp/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN)
+ | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/sphinxcontrib_jsmath/dependencies b/build/pkgs/sphinxcontrib_jsmath/dependencies
index 0738c2d7777..47296a7bace 100644
--- a/build/pkgs/sphinxcontrib_jsmath/dependencies
+++ b/build/pkgs/sphinxcontrib_jsmath/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN)
+ | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/sphinxcontrib_qthelp/dependencies b/build/pkgs/sphinxcontrib_qthelp/dependencies
index 0738c2d7777..47296a7bace 100644
--- a/build/pkgs/sphinxcontrib_qthelp/dependencies
+++ b/build/pkgs/sphinxcontrib_qthelp/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN)
+ | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/sphinxcontrib_serializinghtml/dependencies b/build/pkgs/sphinxcontrib_serializinghtml/dependencies
index 0738c2d7777..47296a7bace 100644
--- a/build/pkgs/sphinxcontrib_serializinghtml/dependencies
+++ b/build/pkgs/sphinxcontrib_serializinghtml/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN)
+ | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/sphinxcontrib_websupport/dependencies b/build/pkgs/sphinxcontrib_websupport/dependencies
index dabbd0f750d..52be4a5ba53 100644
--- a/build/pkgs/sphinxcontrib_websupport/dependencies
+++ b/build/pkgs/sphinxcontrib_websupport/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) sphinxcontrib_serializinghtml | $(PYTHON_TOOLCHAIN)
+ sphinxcontrib_serializinghtml | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/stack_data/dependencies b/build/pkgs/stack_data/dependencies
index cf6aae43990..52b3edda4b5 100644
--- a/build/pkgs/stack_data/dependencies
+++ b/build/pkgs/stack_data/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) executing asttokens pure_eval | $(PYTHON_TOOLCHAIN)
+ executing asttokens pure_eval | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/surface_dynamics/dependencies b/build/pkgs/surface_dynamics/dependencies
index 936121d388d..d8bc8524dbb 100644
--- a/build/pkgs/surface_dynamics/dependencies
+++ b/build/pkgs/surface_dynamics/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) cysignals pplpy $(SAGE_SRC)/sage/rings/integer.pxd $(SAGE_SRC)/sage/ext/stdsage.pxd | $(PYTHON_TOOLCHAIN) $(SAGERUNTIME)
+ cysignals pplpy $(SAGE_SRC)/sage/rings/integer.pxd $(SAGE_SRC)/sage/ext/stdsage.pxd | $(PYTHON_TOOLCHAIN) $(SAGERUNTIME) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/symengine_py/dependencies b/build/pkgs/symengine_py/dependencies
index 0b94df79ab9..c48bcedf69c 100644
--- a/build/pkgs/symengine_py/dependencies
+++ b/build/pkgs/symengine_py/dependencies
@@ -1,4 +1,4 @@
-symengine $(PYTHON) | cmake cython $(PYTHON_TOOLCHAIN)
+symengine  | cmake cython $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/sympy/dependencies b/build/pkgs/sympy/dependencies
index 24e1585f16e..6480ac46289 100644
--- a/build/pkgs/sympy/dependencies
+++ b/build/pkgs/sympy/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) mpmath | $(PYTHON_TOOLCHAIN)
+ mpmath | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/terminado/dependencies b/build/pkgs/terminado/dependencies
index 54ec1c7c229..2138b7ccbe8 100644
--- a/build/pkgs/terminado/dependencies
+++ b/build/pkgs/terminado/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) ptyprocess tornado | $(PYTHON_TOOLCHAIN) hatchling
+ ptyprocess tornado | $(PYTHON_TOOLCHAIN) hatchling $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/texttable/dependencies b/build/pkgs/texttable/dependencies
index 0738c2d7777..47296a7bace 100644
--- a/build/pkgs/texttable/dependencies
+++ b/build/pkgs/texttable/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN)
+ | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/tinycss2/dependencies b/build/pkgs/tinycss2/dependencies
index 89200065387..7ebee8487db 100644
--- a/build/pkgs/tinycss2/dependencies
+++ b/build/pkgs/tinycss2/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) webencodings | $(PYTHON_TOOLCHAIN)
+ webencodings | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/toml/dependencies b/build/pkgs/toml/dependencies
index 0738c2d7777..47296a7bace 100644
--- a/build/pkgs/toml/dependencies
+++ b/build/pkgs/toml/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN)
+ | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/tomli/dependencies b/build/pkgs/tomli/dependencies
index 7cd1e28759d..992761d1f11 100644
--- a/build/pkgs/tomli/dependencies
+++ b/build/pkgs/tomli/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | pip flit_core
+ | pip flit_core $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/tomlkit/dependencies b/build/pkgs/tomlkit/dependencies
index 3eb5a92ef22..e67b4c08948 100644
--- a/build/pkgs/tomlkit/dependencies
+++ b/build/pkgs/tomlkit/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN) poetry_core
+ | $(PYTHON_TOOLCHAIN) poetry_core $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/tornado/dependencies b/build/pkgs/tornado/dependencies
index 212c6234efb..0d4701f9d71 100644
--- a/build/pkgs/tornado/dependencies
+++ b/build/pkgs/tornado/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) certifi | $(PYTHON_TOOLCHAIN)
+ certifi | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/tox/dependencies b/build/pkgs/tox/dependencies
index 5a00a282b7d..d910d42722f 100644
--- a/build/pkgs/tox/dependencies
+++ b/build/pkgs/tox/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) packaging six filelock pluggy py toml virtualenv importlib_metadata | $(PYTHON_TOOLCHAIN)
+ packaging six filelock pluggy py toml virtualenv importlib_metadata | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/traitlets/dependencies b/build/pkgs/traitlets/dependencies
index df88de8f64c..e835448bea5 100644
--- a/build/pkgs/traitlets/dependencies
+++ b/build/pkgs/traitlets/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN) ipython_genutils decorator six hatchling
+ | $(PYTHON_TOOLCHAIN) ipython_genutils decorator six hatchling $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/typing_extensions/dependencies b/build/pkgs/typing_extensions/dependencies
index f8bd1ee040d..e0e94942dba 100644
--- a/build/pkgs/typing_extensions/dependencies
+++ b/build/pkgs/typing_extensions/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | flit_core
+ | flit_core $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/tzdata/dependencies b/build/pkgs/tzdata/dependencies
index 0738c2d7777..47296a7bace 100644
--- a/build/pkgs/tzdata/dependencies
+++ b/build/pkgs/tzdata/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN)
+ | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/tzlocal/dependencies b/build/pkgs/tzlocal/dependencies
index 1d3b818d4ac..4e161b299ab 100644
--- a/build/pkgs/tzlocal/dependencies
+++ b/build/pkgs/tzlocal/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) pytz_deprecation_shim | $(PYTHON_TOOLCHAIN)
+ pytz_deprecation_shim | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/urllib3/dependencies b/build/pkgs/urllib3/dependencies
index 0738c2d7777..47296a7bace 100644
--- a/build/pkgs/urllib3/dependencies
+++ b/build/pkgs/urllib3/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN)
+ | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/vcversioner/dependencies b/build/pkgs/vcversioner/dependencies
index 0738c2d7777..47296a7bace 100644
--- a/build/pkgs/vcversioner/dependencies
+++ b/build/pkgs/vcversioner/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN)
+ | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/virtualenv/dependencies b/build/pkgs/virtualenv/dependencies
index a8b8def7051..021e0fc1bd7 100644
--- a/build/pkgs/virtualenv/dependencies
+++ b/build/pkgs/virtualenv/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) appdirs distlib filelock six importlib_metadata importlib_resources platformdirs | $(PYTHON_TOOLCHAIN)
+ appdirs distlib filelock six importlib_metadata importlib_resources platformdirs | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/wcwidth/dependencies b/build/pkgs/wcwidth/dependencies
index 0738c2d7777..47296a7bace 100644
--- a/build/pkgs/wcwidth/dependencies
+++ b/build/pkgs/wcwidth/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN)
+ | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/webencodings/dependencies b/build/pkgs/webencodings/dependencies
index 0738c2d7777..47296a7bace 100644
--- a/build/pkgs/webencodings/dependencies
+++ b/build/pkgs/webencodings/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN)
+ | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/wheel/dependencies b/build/pkgs/wheel/dependencies
index 98d3e59447b..a8e327be793 100644
--- a/build/pkgs/wheel/dependencies
+++ b/build/pkgs/wheel/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) setuptools
+ setuptools | $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/widgetsnbextension/dependencies b/build/pkgs/widgetsnbextension/dependencies
index f7ff1dca568..301cefdea49 100644
--- a/build/pkgs/widgetsnbextension/dependencies
+++ b/build/pkgs/widgetsnbextension/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) jupyter_packaging | $(PYTHON_TOOLCHAIN) jupyter_core
+ jupyter_packaging | $(PYTHON_TOOLCHAIN) jupyter_core $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/zipp/dependencies b/build/pkgs/zipp/dependencies
index 4361e46ddaf..9be6b4aab7c 100644
--- a/build/pkgs/zipp/dependencies
+++ b/build/pkgs/zipp/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) vcversioner | $(PYTHON_TOOLCHAIN)
+ vcversioner | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.

From a3246b0498be333fd620a531ac7742c8ddce372e Mon Sep 17 00:00:00 2001
From: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
Date: Thu, 31 Aug 2023 12:24:30 -0700
Subject: [PATCH 240/247] build/bin/sage-build-env-config.in: Set PYTHON_MINOR
 variable

---
 build/bin/sage-build-env-config.in   |  1 +
 build/make/Makefile.in               |  1 +
 build/pkgs/python3/spkg-configure.m4 | 14 +++++++-------
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/build/bin/sage-build-env-config.in b/build/bin/sage-build-env-config.in
index b2f59343d25..7d6cd113bf9 100644
--- a/build/bin/sage-build-env-config.in
+++ b/build/bin/sage-build-env-config.in
@@ -62,3 +62,4 @@ export CONFIGURED_SAGE_EDITABLE="@SAGE_EDITABLE@"
 export CONFIGURED_SAGE_WHEELS="@SAGE_WHEELS@"
 
 export ENABLE_SYSTEM_SITE_PACKAGES="@ENABLE_SYSTEM_SITE_PACKAGES@"
+export PYTHON_MINOR="@PYTHON_MINOR@"
diff --git a/build/make/Makefile.in b/build/make/Makefile.in
index caf86fdeaf8..9bf5a9a823c 100644
--- a/build/make/Makefile.in
+++ b/build/make/Makefile.in
@@ -227,6 +227,7 @@ SAGE_I_TARGETS = sagelib doc
 	python3_venv _clean-broken-gcc
 
 PYTHON_FOR_VENV = @PYTHON_FOR_VENV@
+PYTHON_MINOR = @PYTHON_MINOR@
 SAGE_VENV_FLAGS = @SAGE_VENV_FLAGS@
 
 ifneq ($(PYTHON_FOR_VENV),)
diff --git a/build/pkgs/python3/spkg-configure.m4 b/build/pkgs/python3/spkg-configure.m4
index 5a0aa955633..a6886c0e72c 100644
--- a/build/pkgs/python3/spkg-configure.m4
+++ b/build/pkgs/python3/spkg-configure.m4
@@ -130,17 +130,17 @@ To build Sage with a different system python, use ./configure --with-python=/pat
     ])
     AC_SUBST([PYTHON_FOR_VENV])
 
+    AS_IF([test -n "$PYTHON_FOR_VENV"],
+          [PYTHON_VERSION=$("$PYTHON_FOR_VENV" -c "import sysconfig; print(sysconfig.get_python_version())")],
+          [PYTHON_VERSION=$(echo $(cat build/pkgs/python3/package-version.txt))])
+    AC_SUBST([PYTHON_MINOR], [$(echo $PYTHON_VERSION | sed -E 's/[[0-9]]*\.([[0-9]]*).*/\1/')])
+    export PYTHON_MINOR  # for sage-get-system-packages
+
     AS_VAR_IF([SAGE_VENV], [auto], [SAGE_VENV=$SAGE_VENV_AUTO])
     AS_CASE([$SAGE_VENV],
         [no],  [SAGE_VENV='${SAGE_LOCAL}'],dnl Quoted so that it is resolved at build time by shell/Makefile
-        [yes], [AS_IF([test -n "$PYTHON_FOR_VENV"], [
-                   PYTHON_VERSION=$("$PYTHON_FOR_VENV" -c "import sysconfig; print(sysconfig.get_python_version())")
-                ], [
-                   PYTHON_VERSION=$(echo $(cat build/pkgs/python3/package-version.txt))
-                ])
-                SAGE_VENV='${SAGE_LOCAL}'/var/lib/sage/venv-python$PYTHON_VERSION]
+        [yes], [SAGE_VENV='${SAGE_LOCAL}'/var/lib/sage/venv-python$PYTHON_VERSION]
     )
-
     dnl These temporary directories are created by the check above
     dnl and need to be cleaned up to prevent the "rm -f conftest*"
     dnl (that a bunch of other checks do) from emitting warnings about

From 51172bd88636657b4461970ff35321298efd487f Mon Sep 17 00:00:00 2001
From: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
Date: Thu, 31 Aug 2023 12:45:43 -0700
Subject: [PATCH 241/247] build/make/Makefile.in: Re-create venv when
 PYTHON_MINOR, PYTHON_FOR_VENV, or SAGE_VENV_FLAGS change

---
 build/make/Makefile.in | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/build/make/Makefile.in b/build/make/Makefile.in
index 9bf5a9a823c..5ec2be00479 100644
--- a/build/make/Makefile.in
+++ b/build/make/Makefile.in
@@ -233,7 +233,7 @@ SAGE_VENV_FLAGS = @SAGE_VENV_FLAGS@
 ifneq ($(PYTHON_FOR_VENV),)
 # Special rule for making the Python virtualenv from the system Python (Python
 # 3 only).  $(PYTHON) is set in Makefile to python3_venv.
-# Thus $(inst_python3_venv) will be the dependency of every Python package.
+# Thus $(inst_python3_venv) will an (order-only) dependency of every Python package.
 #
 # TODO: If we reconfigure to build our own Python after having used the system
 # Python, files installed to create the virtualenv should be *removed*.  That
@@ -241,13 +241,15 @@ ifneq ($(PYTHON_FOR_VENV),)
 ifeq ($(PYTHON),python3)
 PYTHON = python3_venv
 endif
-inst_python3_venv = $(SAGE_VENV)/$(SPKG_INST_RELDIR)/python3_venv-$(subst /,-,$(PYTHON_FOR_VENV))$(findstring --system-site-packages,$(SAGE_VENV_FLAGS))
+inst_python3_venv = $(SAGE_VENV)/$(SPKG_INST_RELDIR)/python3_venv-3.$(PYTHON_MINOR)-$(subst /,-,$(PYTHON_FOR_VENV))$(findstring --system-site-packages,$(SAGE_VENV_FLAGS))
 
 $(SAGE_VENV)/$(SPKG_INST_RELDIR):
-	mkdir -p $@
-$(inst_python3_venv): $(SAGE_VENV)/$(SPKG_INST_RELDIR)
+	mkdir -p "$@"
+
+$(inst_python3_venv): | $(SAGE_VENV)/$(SPKG_INST_RELDIR)
 	$(PYTHON_FOR_VENV) $(SAGE_ROOT)/build/bin/sage-venv $(SAGE_VENV_FLAGS) "$(SAGE_VENV)"
-	touch $@
+	rm -f "$(SAGE_VENV)/$(SPKG_INST_RELDIR)"/python3_venv-*
+	touch "$@"
 endif
 
 # Build everything and start Sage.

From 8a36757ace5a14fcd01685986687df075cf2883d Mon Sep 17 00:00:00 2001
From: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
Date: Thu, 31 Aug 2023 12:55:18 -0700
Subject: [PATCH 242/247] .github/workflows/ci-linux.yml
 (standard-sitepackages): Only test platforms with usable system python

---
 .github/workflows/ci-linux.yml | 33 ++++++++++++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci-linux.yml b/.github/workflows/ci-linux.yml
index 8a2ea35cfba..6f598521a37 100644
--- a/.github/workflows/ci-linux.yml
+++ b/.github/workflows/ci-linux.yml
@@ -78,7 +78,38 @@ jobs:
       targets: build doc-html
       targets_optional: ptest
       tox_packages_factors: >-
-          ["standard-sitepackages"]
+        ["standard-sitepackages"]
+      # Only test systems with a usable system python (>= 3.9)
+      tox_system_factors: >-
+        ["ubuntu-jammy",
+         "ubuntu-kinetic",
+         "ubuntu-lunar",
+         "ubuntu-mantic",
+         "debian-bullseye",
+         "debian-bookworm",
+         "debian-trixie",
+         "debian-sid",
+         "linuxmint-21",
+         "linuxmint-21.1",
+         "linuxmint-21.2",
+         "fedora-33",
+         "fedora-34",
+         "fedora-35",
+         "fedora-36",
+         "fedora-37",
+         "fedora-38",
+         "fedora-39",
+         "centos-stream-8-python3.9",
+         "centos-stream-9-python3.9",
+         "almalinux-8-python3.9",
+         "gentoo-python3.10",
+         "gentoo-python3.11",
+         "archlinux-latest",
+         "opensuse-15.4-gcc_11-python3.10",
+         "opensuse-15.5-gcc_11-python3.11",
+         "opensuse-tumbleweed-python3.10",
+         "opensuse-tumbleweed",
+         "debian-bullseye-i386"]
       docker_push_repository: ghcr.io/${{ github.repository }}/
       max_parallel: 10
 

From bc7a92b0709ae6a1d3d542691ed7fdcd09197d0b Mon Sep 17 00:00:00 2001
From: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
Date: Thu, 31 Aug 2023 13:25:58 -0700
Subject: [PATCH 243/247] build/pkgs/{jinja2,packaging}: Increase lower bounds

---
 build/pkgs/jinja2/install-requires.txt    | 3 ++-
 build/pkgs/packaging/install-requires.txt | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/build/pkgs/jinja2/install-requires.txt b/build/pkgs/jinja2/install-requires.txt
index 99d8e6ecd6e..829d4c266d3 100644
--- a/build/pkgs/jinja2/install-requires.txt
+++ b/build/pkgs/jinja2/install-requires.txt
@@ -1 +1,2 @@
-jinja2 >=2.11.2
+jinja2 >=3.0
+# for sphinx
diff --git a/build/pkgs/packaging/install-requires.txt b/build/pkgs/packaging/install-requires.txt
index cb98c369e84..637d00eff2f 100644
--- a/build/pkgs/packaging/install-requires.txt
+++ b/build/pkgs/packaging/install-requires.txt
@@ -1,2 +1,3 @@
-packaging >=18.0
+packaging >=21.0
 # Trac #30975: packaging 20.5 is known to work but we have to silence "DeprecationWarning: Creating a LegacyVersion"
+# Sphinx needs >= 21

From 0ea6aa30c1c7dad8846f804a2e8106305505af83 Mon Sep 17 00:00:00 2001
From: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
Date: Fri, 25 Aug 2023 14:41:33 -0700
Subject: [PATCH 244/247] build/pkgs/jupyter_jsmol: Switch to wheel package

---
 build/pkgs/jupyter_jsmol/SPKG.rst             |  2 +-
 build/pkgs/jupyter_jsmol/checksums.ini        | 10 +++++-----
 build/pkgs/jupyter_jsmol/dependencies         |  2 +-
 build/pkgs/jupyter_jsmol/install-requires.txt |  2 +-
 build/pkgs/jupyter_jsmol/spkg-install.in      |  3 ---
 5 files changed, 8 insertions(+), 11 deletions(-)
 delete mode 100644 build/pkgs/jupyter_jsmol/spkg-install.in

diff --git a/build/pkgs/jupyter_jsmol/SPKG.rst b/build/pkgs/jupyter_jsmol/SPKG.rst
index e318a86c7b1..64458e86b2d 100644
--- a/build/pkgs/jupyter_jsmol/SPKG.rst
+++ b/build/pkgs/jupyter_jsmol/SPKG.rst
@@ -9,7 +9,7 @@ JSmol viewer widget for Jupyter
 License
 -------
 
-BSD
+MIT
 
 Upstream Contact
 ----------------
diff --git a/build/pkgs/jupyter_jsmol/checksums.ini b/build/pkgs/jupyter_jsmol/checksums.ini
index 0ac16d6e78c..9ac2c41a8e4 100644
--- a/build/pkgs/jupyter_jsmol/checksums.ini
+++ b/build/pkgs/jupyter_jsmol/checksums.ini
@@ -1,5 +1,5 @@
-tarball=jupyter_jsmol-VERSION.tar.gz
-sha1=6ba59de9d1df15b2a09a57f6bdf10f48f13af9ac
-md5=90e9490414e7fbecc6013b4b051b06d7
-cksum=917919116
-upstream_url=https://pypi.io/packages/source/j/jupyter-jsmol/jupyter_jsmol-VERSION.tar.gz
+tarball=jupyter_jsmol-VERSION-py2.py3-none-any.whl
+sha1=b00f1ca76aaa906c7c0a43e36baf608183f3d552
+md5=dd786877513296a36a08518ad64ace47
+cksum=2135042898
+upstream_url=https://pypi.io/packages/py2.py3/j/jupyter_jsmol/jupyter_jsmol-VERSION-py2.py3-none-any.whl
diff --git a/build/pkgs/jupyter_jsmol/dependencies b/build/pkgs/jupyter_jsmol/dependencies
index 104c23d159f..2c7683a6111 100644
--- a/build/pkgs/jupyter_jsmol/dependencies
+++ b/build/pkgs/jupyter_jsmol/dependencies
@@ -1,4 +1,4 @@
-ipywidgets jupyter_packaging  | $(PYTHON_TOOLCHAIN) $(PYTHON)
+ipywidgets | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/jupyter_jsmol/install-requires.txt b/build/pkgs/jupyter_jsmol/install-requires.txt
index 2df501ec9a8..9465bfb8e0c 100644
--- a/build/pkgs/jupyter_jsmol/install-requires.txt
+++ b/build/pkgs/jupyter_jsmol/install-requires.txt
@@ -1 +1 @@
-jupyter-jsmol >=2022.1.0
+jupyter-jsmol
diff --git a/build/pkgs/jupyter_jsmol/spkg-install.in b/build/pkgs/jupyter_jsmol/spkg-install.in
deleted file mode 100644
index 72d65dde8d5..00000000000
--- a/build/pkgs/jupyter_jsmol/spkg-install.in
+++ /dev/null
@@ -1,3 +0,0 @@
-cd src
-# Use --no-build-isolation because we have a different version of jupyter_packaging
-eval sdh_pip_install --no-build-isolation --config-settings "--global-option=--skip-npm" .

From a6081be6cf8725de9d2af9e876a255499d7b821b Mon Sep 17 00:00:00 2001
From: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
Date: Thu, 31 Aug 2023 15:30:47 -0700
Subject: [PATCH 245/247] 
 build/pkgs/{markupsafe,sphinxcontrib_serializinghtml}: Increase lower bounds

---
 build/pkgs/markupsafe/install-requires.txt                    | 2 +-
 build/pkgs/sphinxcontrib_serializinghtml/install-requires.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/pkgs/markupsafe/install-requires.txt b/build/pkgs/markupsafe/install-requires.txt
index 331f488e6a0..7d44bce10e1 100644
--- a/build/pkgs/markupsafe/install-requires.txt
+++ b/build/pkgs/markupsafe/install-requires.txt
@@ -1 +1 @@
-markupsafe >=1.1.0
+markupsafe >=2.0
diff --git a/build/pkgs/sphinxcontrib_serializinghtml/install-requires.txt b/build/pkgs/sphinxcontrib_serializinghtml/install-requires.txt
index 98fc0654928..584fc77c6b2 100644
--- a/build/pkgs/sphinxcontrib_serializinghtml/install-requires.txt
+++ b/build/pkgs/sphinxcontrib_serializinghtml/install-requires.txt
@@ -1 +1 @@
-sphinxcontrib_serializinghtml >=1.1.4
+sphinxcontrib_serializinghtml >=1.1.5

From 5b11b9b65393281891b431b116fad6f17cd00f0a Mon Sep 17 00:00:00 2001
From: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
Date: Thu, 31 Aug 2023 20:23:06 -0700
Subject: [PATCH 246/247] build/pkgs/sagelib/dependencies: Add pythran as an
 order-only dep

---
 build/pkgs/sagelib/dependencies | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/pkgs/sagelib/dependencies b/build/pkgs/sagelib/dependencies
index 9b8c062d3c3..04da0bd14ea 100644
--- a/build/pkgs/sagelib/dependencies
+++ b/build/pkgs/sagelib/dependencies
@@ -1,4 +1,4 @@
-FORCE $(SCRIPTS) arb boost_cropped $(BLAS) brial cliquer cypari cysignals cython ecl eclib ecm flint libgd gap giac givaro glpk gmpy2 gsl iml importlib_metadata importlib_resources jinja2 jupyter_core lcalc lrcalc_python libbraiding libhomfly libpng linbox m4ri m4rie memory_allocator mpc mpfi mpfr $(MP_LIBRARY) ntl numpy pari pip pkgconfig planarity ppl pplpy primesieve primecount primecountpy pycygwin $(PYTHON) requests rw sage_conf singular symmetrica typing_extensions $(PCFILES) | $(PYTHON_TOOLCHAIN) sage_setup
+FORCE $(SCRIPTS) arb boost_cropped $(BLAS) brial cliquer cypari cysignals cython ecl eclib ecm flint libgd gap giac givaro glpk gmpy2 gsl iml importlib_metadata importlib_resources jinja2 jupyter_core lcalc lrcalc_python libbraiding libhomfly libpng linbox m4ri m4rie memory_allocator mpc mpfi mpfr $(MP_LIBRARY) ntl numpy pari pip pkgconfig planarity ppl pplpy primesieve primecount primecountpy pycygwin $(PYTHON) requests rw sage_conf singular symmetrica typing_extensions $(PCFILES) | $(PYTHON_TOOLCHAIN) sage_setup pythran
 
 ----------
 All lines of this file are ignored except the first.

From 84bf9a3c488ccaa12a468afad4dcdd088995b2ce Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Fri, 1 Sep 2023 18:36:58 -0400
Subject: [PATCH 247/247] build/pkgs/python3/spkg-configure.m4: use "cut" for
 minor component

Use the "cut" utility to parse the python minor version component
instead of sed -E. Despite what the GNU sed manpage says, the "-E"
flag does not actually appear in any version of POSIX, while "cut"
does. The cut version is also a bit more readable.
---
 build/pkgs/python3/spkg-configure.m4 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/pkgs/python3/spkg-configure.m4 b/build/pkgs/python3/spkg-configure.m4
index a6886c0e72c..d57aa416e3a 100644
--- a/build/pkgs/python3/spkg-configure.m4
+++ b/build/pkgs/python3/spkg-configure.m4
@@ -133,7 +133,7 @@ To build Sage with a different system python, use ./configure --with-python=/pat
     AS_IF([test -n "$PYTHON_FOR_VENV"],
           [PYTHON_VERSION=$("$PYTHON_FOR_VENV" -c "import sysconfig; print(sysconfig.get_python_version())")],
           [PYTHON_VERSION=$(echo $(cat build/pkgs/python3/package-version.txt))])
-    AC_SUBST([PYTHON_MINOR], [$(echo $PYTHON_VERSION | sed -E 's/[[0-9]]*\.([[0-9]]*).*/\1/')])
+    AC_SUBST([PYTHON_MINOR], [$(echo $PYTHON_VERSION | cut -d. -f2)])
     export PYTHON_MINOR  # for sage-get-system-packages
 
     AS_VAR_IF([SAGE_VENV], [auto], [SAGE_VENV=$SAGE_VENV_AUTO])