diff --git a/build/pkgs/pytest/distros/alpine.txt b/build/pkgs/pytest/distros/alpine.txt
new file mode 100644
index 00000000000..cc8f3f63e42
--- /dev/null
+++ b/build/pkgs/pytest/distros/alpine.txt
@@ -0,0 +1 @@
+py3-pytest
diff --git a/build/pkgs/pytest/distros/arch.txt b/build/pkgs/pytest/distros/arch.txt
new file mode 100644
index 00000000000..a40917b017b
--- /dev/null
+++ b/build/pkgs/pytest/distros/arch.txt
@@ -0,0 +1 @@
+python-pytest
diff --git a/build/pkgs/pytest/distros/debian.txt b/build/pkgs/pytest/distros/debian.txt
new file mode 100644
index 00000000000..e079f8a6038
--- /dev/null
+++ b/build/pkgs/pytest/distros/debian.txt
@@ -0,0 +1 @@
+pytest
diff --git a/build/pkgs/pytest/distros/fedora.txt b/build/pkgs/pytest/distros/fedora.txt
new file mode 100644
index 00000000000..e079f8a6038
--- /dev/null
+++ b/build/pkgs/pytest/distros/fedora.txt
@@ -0,0 +1 @@
+pytest
diff --git a/build/pkgs/pytest/distros/gentoo.txt b/build/pkgs/pytest/distros/gentoo.txt
new file mode 100644
index 00000000000..eb0e7be00b4
--- /dev/null
+++ b/build/pkgs/pytest/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/pytest
diff --git a/build/pkgs/pytest/distros/opensuse.txt b/build/pkgs/pytest/distros/opensuse.txt
new file mode 100644
index 00000000000..a40917b017b
--- /dev/null
+++ b/build/pkgs/pytest/distros/opensuse.txt
@@ -0,0 +1 @@
+python-pytest
diff --git a/build/pkgs/pytest/spkg-configure.m4 b/build/pkgs/pytest/spkg-configure.m4
new file mode 100644
index 00000000000..4d91d44fc27
--- /dev/null
+++ b/build/pkgs/pytest/spkg-configure.m4
@@ -0,0 +1 @@
+SAGE_SPKG_CONFIGURE([pytest], [SAGE_PYTHON_PACKAGE_CHECK([pytest])])
diff --git a/build/pkgs/setuptools_scm_git_archive/distros/alpine.txt b/build/pkgs/setuptools_scm_git_archive/distros/alpine.txt
deleted file mode 100644
index c08bc88e16c..00000000000
--- a/build/pkgs/setuptools_scm_git_archive/distros/alpine.txt
+++ /dev/null
@@ -1 +0,0 @@
-py3-setuptools-scm-git-archive
diff --git a/build/pkgs/setuptools_scm_git_archive/distros/arch.txt b/build/pkgs/setuptools_scm_git_archive/distros/arch.txt
deleted file mode 100644
index bc2a39f97a3..00000000000
--- a/build/pkgs/setuptools_scm_git_archive/distros/arch.txt
+++ /dev/null
@@ -1 +0,0 @@
-python-setuptools-scm-git-archive
diff --git a/build/pkgs/setuptools_scm_git_archive/distros/debian.txt b/build/pkgs/setuptools_scm_git_archive/distros/debian.txt
deleted file mode 100644
index 538474ff946..00000000000
--- a/build/pkgs/setuptools_scm_git_archive/distros/debian.txt
+++ /dev/null
@@ -1 +0,0 @@
-setuptools-scm-git-archive
diff --git a/build/pkgs/setuptools_scm_git_archive/distros/fedora.txt b/build/pkgs/setuptools_scm_git_archive/distros/fedora.txt
deleted file mode 100644
index ada37357769..00000000000
--- a/build/pkgs/setuptools_scm_git_archive/distros/fedora.txt
+++ /dev/null
@@ -1 +0,0 @@
-python-setuptools_scm_git_archive
diff --git a/build/pkgs/setuptools_scm_git_archive/distros/freebsd.txt b/build/pkgs/setuptools_scm_git_archive/distros/freebsd.txt
deleted file mode 100644
index 2ace76a2af0..00000000000
--- a/build/pkgs/setuptools_scm_git_archive/distros/freebsd.txt
+++ /dev/null
@@ -1 +0,0 @@
-devel/py-setuptools_scm_git_archive
diff --git a/build/pkgs/setuptools_scm_git_archive/distros/gentoo.txt b/build/pkgs/setuptools_scm_git_archive/distros/gentoo.txt
deleted file mode 100644
index fb7388e3dd7..00000000000
--- a/build/pkgs/setuptools_scm_git_archive/distros/gentoo.txt
+++ /dev/null
@@ -1 +0,0 @@
-dev-python/setuptools_scm_git_archive
diff --git a/build/pkgs/setuptools_scm_git_archive/spkg-configure.m4 b/build/pkgs/setuptools_scm_git_archive/spkg-configure.m4
deleted file mode 100644
index 0da3db40d22..00000000000
--- a/build/pkgs/setuptools_scm_git_archive/spkg-configure.m4
+++ /dev/null
@@ -1 +0,0 @@
-SAGE_SPKG_CONFIGURE([setuptools_scm_git_archive], [SAGE_PYTHON_PACKAGE_CHECK([setuptools_scm_git_archive])])
diff --git a/build/pkgs/tzdata/distros/alpine.txt b/build/pkgs/tzdata/distros/alpine.txt
new file mode 100644
index 00000000000..0acc1f14b5d
--- /dev/null
+++ b/build/pkgs/tzdata/distros/alpine.txt
@@ -0,0 +1 @@
+py3-pytzdata
diff --git a/build/pkgs/tzdata/distros/arch.txt b/build/pkgs/tzdata/distros/arch.txt
new file mode 100644
index 00000000000..268d4c9619e
--- /dev/null
+++ b/build/pkgs/tzdata/distros/arch.txt
@@ -0,0 +1 @@
+py3-tzdata
diff --git a/build/pkgs/tzdata/distros/debian.txt b/build/pkgs/tzdata/distros/debian.txt
new file mode 100644
index 00000000000..0883ff0705b
--- /dev/null
+++ b/build/pkgs/tzdata/distros/debian.txt
@@ -0,0 +1 @@
+tzdata
diff --git a/build/pkgs/tzdata/distros/fedora.txt b/build/pkgs/tzdata/distros/fedora.txt
new file mode 100644
index 00000000000..ee386299ec3
--- /dev/null
+++ b/build/pkgs/tzdata/distros/fedora.txt
@@ -0,0 +1 @@
+python-pytzdata
diff --git a/build/pkgs/tzdata/distros/freebsd.txt b/build/pkgs/tzdata/distros/freebsd.txt
new file mode 100644
index 00000000000..e4387e76f42
--- /dev/null
+++ b/build/pkgs/tzdata/distros/freebsd.txt
@@ -0,0 +1 @@
+devel/py-pytzdata
diff --git a/build/pkgs/tzdata/distros/gentoo.txt b/build/pkgs/tzdata/distros/gentoo.txt
new file mode 100644
index 00000000000..793ae4236e2
--- /dev/null
+++ b/build/pkgs/tzdata/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-python/tzdata
diff --git a/build/pkgs/tzdata/distros/opensuse.txt b/build/pkgs/tzdata/distros/opensuse.txt
new file mode 100644
index 00000000000..ee386299ec3
--- /dev/null
+++ b/build/pkgs/tzdata/distros/opensuse.txt
@@ -0,0 +1 @@
+python-pytzdata
diff --git a/build/pkgs/tzdata/spkg-configure.m4 b/build/pkgs/tzdata/spkg-configure.m4
new file mode 100644
index 00000000000..98211abb6e7
--- /dev/null
+++ b/build/pkgs/tzdata/spkg-configure.m4
@@ -0,0 +1 @@
+SAGE_SPKG_CONFIGURE([tzdata], [SAGE_PYTHON_PACKAGE_CHECK([tzdata])])
diff --git a/build/pkgs/vcversioner/distros/alpine.txt b/build/pkgs/vcversioner/distros/alpine.txt
new file mode 100644
index 00000000000..5f57f829536
--- /dev/null
+++ b/build/pkgs/vcversioner/distros/alpine.txt
@@ -0,0 +1 @@
+py3-vcversioner
diff --git a/build/pkgs/vcversioner/distros/arch.txt b/build/pkgs/vcversioner/distros/arch.txt
new file mode 100644
index 00000000000..886bb3fb18b
--- /dev/null
+++ b/build/pkgs/vcversioner/distros/arch.txt
@@ -0,0 +1 @@
+python-vcversioner
diff --git a/build/pkgs/vcversioner/distros/debian.txt b/build/pkgs/vcversioner/distros/debian.txt
new file mode 100644
index 00000000000..39a323addb3
--- /dev/null
+++ b/build/pkgs/vcversioner/distros/debian.txt
@@ -0,0 +1 @@
+vcversioner
diff --git a/build/pkgs/vcversioner/distros/freebsd.txt b/build/pkgs/vcversioner/distros/freebsd.txt
new file mode 100644
index 00000000000..34dcb4f6099
--- /dev/null
+++ b/build/pkgs/vcversioner/distros/freebsd.txt
@@ -0,0 +1 @@
+devel/py-vcversioner
diff --git a/build/pkgs/vcversioner/spkg-configure.m4 b/build/pkgs/vcversioner/spkg-configure.m4
new file mode 100644
index 00000000000..5b2003023ad
--- /dev/null
+++ b/build/pkgs/vcversioner/spkg-configure.m4
@@ -0,0 +1 @@
+SAGE_SPKG_CONFIGURE([vcversioner], [SAGE_PYTHON_PACKAGE_CHECK([vcversioner])])