Updates for portage 2.2.1