xbps: merge another patch with a bugfix for virtual packages.