Resync with portage