diff --git a/dev-python/hatchling/hatchling-1.21.1.ebuild b/dev-python/hatchling/hatchling-1.21.1-r1.ebuild
similarity index 91%
rename from dev-python/hatchling/hatchling-1.21.1.ebuild
rename to dev-python/hatchling/hatchling-1.21.1-r1.ebuild
index 9233bcc8808f6..6919c16fa12c3 100644
--- a/dev-python/hatchling/hatchling-1.21.1.ebuild
+++ b/dev-python/hatchling/hatchling-1.21.1-r1.ebuild
@@ -35,7 +35,12 @@ RDEPEND="
 	$(python_gen_cond_dep '
 		>=dev-python/tomli-1.2.2[${PYTHON_USEDEP}]
 	' 3.10)
-	dev-python/trove-classifiers[${PYTHON_USEDEP}]
+"
+# always depend on the newest version available, at least until upstream
+# stops treating unknown classifiers as a fatal error
+# https://github.com/pypa/hatch/issues/1368
+RDEPEND+="
+	>=dev-python/trove-classifiers-2024.3.25[${PYTHON_USEDEP}]
 "
 BDEPEND="
 	${RDEPEND}
diff --git a/dev-python/hatchling/hatchling-1.22.5.ebuild b/dev-python/hatchling/hatchling-1.22.5-r1.ebuild
similarity index 91%
rename from dev-python/hatchling/hatchling-1.22.5.ebuild
rename to dev-python/hatchling/hatchling-1.22.5-r1.ebuild
index 880c81d559bbf..92ad9f5f83920 100644
--- a/dev-python/hatchling/hatchling-1.22.5.ebuild
+++ b/dev-python/hatchling/hatchling-1.22.5-r1.ebuild
@@ -36,7 +36,12 @@ RDEPEND="
 	$(python_gen_cond_dep '
 		>=dev-python/tomli-1.2.2[${PYTHON_USEDEP}]
 	' 3.10)
-	dev-python/trove-classifiers[${PYTHON_USEDEP}]
+"
+# always depend on the newest version available, at least until upstream
+# stops treating unknown classifiers as a fatal error
+# https://github.com/pypa/hatch/issues/1368
+RDEPEND+="
+	>=dev-python/trove-classifiers-2024.3.25[${PYTHON_USEDEP}]
 "
 BDEPEND="
 	${RDEPEND}