mom5: depend on oasis3-mct, not oasis3-mct@access-esm1.5, with version access-esm1.6

Author: dougiesquire

packages/mom5/package.py

@@ -61,17 +61,15 @@ class Mom5(CMakePackage, MakefilePackage):
         # Depend on virtual package "mpi".
         depends_on("mpi")
 
-    with when("@access-om2,legacy-access-om2-bgc"):
-        depends_on("datetime-fortran")
+    with when("@access-om2,legacy-access-om2-bgc,access-esm1.6"):
         depends_on("oasis3-mct+deterministic", when="+deterministic")
         depends_on("oasis3-mct~deterministic", when="~deterministic")
+
+    with when("@access-om2,legacy-access-om2-bgc"):
+        depends_on("datetime-fortran")
         depends_on("libaccessom2+deterministic", when="+deterministic")
         depends_on("libaccessom2~deterministic", when="~deterministic")
 
-    with when("@access-esm1.6"):
-        depends_on("oasis3-mct@access-esm1.5+deterministic", when="+deterministic")
-        depends_on("oasis3-mct@access-esm1.5~deterministic", when="~deterministic")
-
     # NOTE: Spack will also match "access-om2-legacy-bgc" here, that's why
     #       it has been renamed to "legacy-access-om2-bgc".
     with when("@access-om2,access-esm1.6"):