FL-1765: update portage-utils, fix the git sync patch