Sync with upstream advancecomp pkgbuild changes.