(PUP-3604) Rework handling of :ensure with a version

It's the same command, but we need to feed pkg_add a bit more information about the stem of package name when we're dealing with flavors.