diff --git a/devel/py-enrich/Makefile b/devel/py-enrich/Makefile
index b844db70c5d..3db5fbb2c13 100644
--- a/devel/py-enrich/Makefile
+++ b/devel/py-enrich/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2021/02/20 17:34:17 sthen Exp $
+# $OpenBSD: Makefile,v 1.3 2021/10/27 19:58:40 sthen Exp $
 
 COMMENT =		extends Python Rich library functionality
 
@@ -20,8 +20,7 @@ FLAVOR =		python3
 
 MODPY_SETUPTOOLS =	Yes
 
-BUILD_DEPENDS =		devel/py-setuptools_scm_git_archive${MODPY_FLAVOR} \
-			textproc/py-toml${MODPY_FLAVOR}
+BUILD_DEPENDS =		devel/py-setuptools_scm_git_archive${MODPY_FLAVOR}
 
 RUN_DEPENDS =		devel/py-rich${MODPY_FLAVOR}
 
diff --git a/devel/py-importlib-metadata/Makefile b/devel/py-importlib-metadata/Makefile
index 1006c4588af..4f830d27f5d 100644
--- a/devel/py-importlib-metadata/Makefile
+++ b/devel/py-importlib-metadata/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2021/09/10 11:36:48 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.6 2021/10/27 19:58:40 sthen Exp $
 
 COMMENT =		library providing an API for accessing packages metadata
 
@@ -15,9 +15,7 @@ MAINTAINER =		Renaud Allard <renaud@allard.it>
 # Apache Software License
 PERMIT_PACKAGE =	Yes
 
-BUILD_DEPENDS =		textproc/py-toml${MODPY_FLAVOR} \
-			devel/py-setuptools_scm${MODPY_FLAVOR}
-
+BUILD_DEPENDS =		devel/py-setuptools_scm${MODPY_FLAVOR}
 RUN_DEPENDS =		devel/py-zipp${MODPY_FLAVOR}
 
 MODULES =		lang/python
diff --git a/devel/py-importlib_resources/Makefile b/devel/py-importlib_resources/Makefile
index e4af98638de..0ce93835b16 100644
--- a/devel/py-importlib_resources/Makefile
+++ b/devel/py-importlib_resources/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2021/03/05 20:48:47 sthen Exp $
+# $OpenBSD: Makefile,v 1.4 2021/10/27 19:58:41 sthen Exp $
 
 # remove when switching to Python 3.9
 COMMENT=		backport of the importlib.resources module
@@ -20,8 +20,7 @@ MODPY_PI=		Yes
 MODPY_SETUPTOOLS=	Yes
 
 BUILD_DEPENDS=		devel/py-setuptools_scm${MODPY_FLAVOR} \
-			devel/py-wheel${MODPY_FLAVOR} \
-			textproc/py-toml${MODPY_FLAVOR}
+			devel/py-wheel${MODPY_FLAVOR}
 
 FLAVORS=		python3
 FLAVOR=			python3
diff --git a/devel/py-setuptools-rust/Makefile b/devel/py-setuptools-rust/Makefile
index 6ac8ac8ca06..b196b0321bc 100644
--- a/devel/py-setuptools-rust/Makefile
+++ b/devel/py-setuptools-rust/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2021/09/01 15:59:56 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.3 2021/10/27 19:58:41 sthen Exp $
 
 COMMENT=		setuptools Rust extension plugin
 
@@ -22,8 +22,7 @@ MODPY_SETUPTOOLS=	Yes
 FLAVORS=		python3
 FLAVOR ?=		python3
 
-BUILD_DEPENDS=		devel/py-setuptools_scm${MODPY_FLAVOR} \
-			textproc/py-toml${MODPY_FLAVOR}
+BUILD_DEPENDS=		devel/py-setuptools_scm${MODPY_FLAVOR}
 
 RUN_DEPENDS=		devel/py-semantic-version${MODPY_FLAVOR} \
 			devel/py-wheel${MODPY_FLAVOR} \
diff --git a/devel/py-setuptools_scm/Makefile b/devel/py-setuptools_scm/Makefile
index 74c884621dc..01f436252ea 100644
--- a/devel/py-setuptools_scm/Makefile
+++ b/devel/py-setuptools_scm/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.19 2021/05/21 19:50:29 kmos Exp $
+# $OpenBSD: Makefile,v 1.20 2021/10/27 19:58:41 sthen Exp $
 
 COMMENT =		plugin to manage your versions by scm tags
 
@@ -6,7 +6,7 @@ MODPY_EGG_VERSION =	5.0.2
 DISTNAME =		setuptools_scm-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
 CATEGORIES =		devel
-REVISION =		0
+REVISION =		1
 
 # MIT
 PERMIT_PACKAGE =	Yes
@@ -22,8 +22,10 @@ TEST_DEPENDS =		${FULLPKGNAME}:${FULLPKGPATH} \
 			devel/py-pip${MODPY_FLAVOR}
 
 .if ${FLAVOR:Mpython3}
-# toml is an optional run dependency, used rarely
-TEST_DEPENDS +=		textproc/py-toml${MODPY_FLAVOR}
+# toml is an optional run dependency and only used for some ports, but
+# the failure mode from not having it (version number replaced with 0.0.0)
+# is not very obvious, so add it always
+RUN_DEPENDS +=		textproc/py-toml${MODPY_FLAVOR}
 .else
 NO_TEST=		Yes
 .endif
diff --git a/devel/py-tempora/Makefile b/devel/py-tempora/Makefile
index ecc78f51143..5457512458b 100644
--- a/devel/py-tempora/Makefile
+++ b/devel/py-tempora/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2021/10/27 08:44:11 sthen Exp $
+# $OpenBSD: Makefile,v 1.8 2021/10/27 19:58:41 sthen Exp $
 
 COMMENT =		objects and routines pertaining to date and time
 
@@ -23,8 +23,7 @@ MODPY_SETUPTOOLS =	Yes
 # unported deps
 NO_TEST =		Yes
 
-BUILD_DEPENDS =		devel/py-setuptools_scm${MODPY_FLAVOR}>=1.15.0 \
-			textproc/py-toml${MODPY_FLAVOR}
+BUILD_DEPENDS =		devel/py-setuptools_scm${MODPY_FLAVOR}>=1.15.0
 RUN_DEPENDS =		devel/py-jaraco-functools${MODPY_FLAVOR}>=1.2.0 \
 			devel/py-tz${MODPY_FLAVOR}