Update with recent changes for xbps>=0.27