Update squashed-portage patch