diff --git a/dev-python/setuptools/setuptools-70.1.1.ebuild b/dev-python/setuptools/setuptools-70.1.1-r1.ebuild
similarity index 94%
rename from dev-python/setuptools/setuptools-70.1.1.ebuild
rename to dev-python/setuptools/setuptools-70.1.1-r1.ebuild
index 795508feb7a76..78ec6f84b7531 100644
--- a/dev-python/setuptools/setuptools-70.1.1.ebuild
+++ b/dev-python/setuptools/setuptools-70.1.1-r1.ebuild
@@ -63,8 +63,13 @@ BDEPEND="
 "
 # setuptools-scm is here because installing plugins apparently breaks stuff at
 # runtime, so let's pull it early. See bug #663324.
+#
+# trove-classifiers are optionally used in validation, if they are
+# installed.  Since we really oughtn't block them, let's always enforce
+# the newest version for the time being to avoid errors.
 PDEPEND="
 	dev-python/setuptools-scm[${PYTHON_USEDEP}]
+	>=dev-python/trove-classifiers-2024.7.2[${PYTHON_USEDEP}]
 "
 
 src_prepare() {
diff --git a/dev-python/setuptools/setuptools-70.2.0.ebuild b/dev-python/setuptools/setuptools-70.2.0-r1.ebuild
similarity index 94%
rename from dev-python/setuptools/setuptools-70.2.0.ebuild
rename to dev-python/setuptools/setuptools-70.2.0-r1.ebuild
index 6bcb4530cd44d..ee5ce0b32cdb5 100644
--- a/dev-python/setuptools/setuptools-70.2.0.ebuild
+++ b/dev-python/setuptools/setuptools-70.2.0-r1.ebuild
@@ -63,8 +63,14 @@ BDEPEND="
 "
 # setuptools-scm is here because installing plugins apparently breaks stuff at
 # runtime, so let's pull it early. See bug #663324.
+#
+# trove-classifiers are optionally used in validation, if they are
+# installed.  Since we really oughtn't block them, let's always enforce
+# the newest version for the time being to avoid errors.
+# https://github.com/pypa/setuptools/issues/4459
 PDEPEND="
 	dev-python/setuptools-scm[${PYTHON_USEDEP}]
+	>=dev-python/trove-classifiers-2024.7.2[${PYTHON_USEDEP}]
 "
 
 src_prepare() {