Update to support newer portage versions