diff --git a/eclass/bazel.eclass b/eclass/bazel.eclass
index 9e09255fd66fb..8ae405c6941c1 100644
--- a/eclass/bazel.eclass
+++ b/eclass/bazel.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: bazel.eclass
@@ -17,7 +17,7 @@ case "${EAPI:-0}" in
 	0|1|2|3|4|5|6)
 		die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}"
 		;;
-	7)
+	7|8)
 		;;
 	*)
 		die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"
@@ -28,7 +28,9 @@ if [[ ! ${_BAZEL_ECLASS} ]]; then
 
 inherit multiprocessing toolchain-funcs
 
-BDEPEND=">=dev-util/bazel-0.20"
+if [[ ${CATEGORY}/${PN} != "dev-util/bazel" ]]; then
+	BDEPEND=">=dev-util/bazel-0.20"
+fi
 
 # @FUNCTION: bazel_get_flags
 # @DESCRIPTION: