Merge several trivial differences from the upstream 9999 ebuild