i didn't fully review the entire change, but this seems to work fine with pkgbase across two full builds, and nothing in the changes seems obviously wrong or problematic.