diff --git a/sci-physics/rivet/rivet-9999.ebuild b/sci-physics/rivet/rivet-9999.ebuild
index 2ee335a0f125..1e38689db0c5 100644
--- a/sci-physics/rivet/rivet-9999.ebuild
+++ b/sci-physics/rivet/rivet-9999.ebuild
@@ -40,8 +40,8 @@ RDEPEND="
 	highfive? (
 		sci-libs/highfive
 		sci-libs/hdf5[cxx]
+		sci-physics/yoda[eigen(-),highfive(-)]
 	)
-
 	sci-libs/gsl
 	zlib? ( virtual/zlib:= )
 	python? (
@@ -49,9 +49,9 @@ RDEPEND="
 		$(python_gen_cond_dep '
 			dev-python/matplotlib[${PYTHON_USEDEP}]
 		')
-		>=sci-physics/yoda-2.1[${PYTHON_SINGLE_USEDEP}]
+		sci-physics/yoda[${PYTHON_SINGLE_USEDEP}]
 	)
-	>=sci-physics/yoda-2.1:=[highfive(-)?]
+	>=sci-physics/yoda-2.1:=
 	!sci-physics/rivet:3
 "
 DEPEND="${RDEPEND}"