diff --git a/llvm-core/flang/flang-21.0.0.9999.ebuild b/llvm-core/flang/flang-21.0.0.9999.ebuild
index e7da2ccc6b58b..9c3d3f4568bfe 100644
--- a/llvm-core/flang/flang-21.0.0.9999.ebuild
+++ b/llvm-core/flang/flang-21.0.0.9999.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=8
 
-inherit cmake llvm.org
+PYTHON_COMPAT=( python3_{11..13} )
+inherit cmake llvm.org python-any-r1
 
 DESCRIPTION="LLVM's Fortran frontend"
 HOMEPAGE="https://flang.llvm.org/"
@@ -26,7 +27,7 @@ PDEPEND="
 "
 BDEPEND="
 	test? (
-		dev-python/lit
+		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
 	)
 "
 
@@ -34,6 +35,14 @@ LLVM_COMPONENTS=( flang cmake )
 LLVM_TEST_COMPONENTS=( clang/test/Driver mlir/test/lib )
 llvm.org_set_globals
 
+python_check_deps() {
+	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
diff --git a/llvm-core/flang/flang-21.0.0_pre20250523.ebuild b/llvm-core/flang/flang-21.0.0_pre20250523.ebuild
index e7da2ccc6b58b..9c3d3f4568bfe 100644
--- a/llvm-core/flang/flang-21.0.0_pre20250523.ebuild
+++ b/llvm-core/flang/flang-21.0.0_pre20250523.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=8
 
-inherit cmake llvm.org
+PYTHON_COMPAT=( python3_{11..13} )
+inherit cmake llvm.org python-any-r1
 
 DESCRIPTION="LLVM's Fortran frontend"
 HOMEPAGE="https://flang.llvm.org/"
@@ -26,7 +27,7 @@ PDEPEND="
 "
 BDEPEND="
 	test? (
-		dev-python/lit
+		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
 	)
 "
 
@@ -34,6 +35,14 @@ LLVM_COMPONENTS=( flang cmake )
 LLVM_TEST_COMPONENTS=( clang/test/Driver mlir/test/lib )
 llvm.org_set_globals
 
+python_check_deps() {
+	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"