[PATCH pkgs/ediff] Adapt ediff dependencies to new vc