sync with upstream

Package-Manager: portage-2.2.0
Manifest-Sign-Key: BF20DC51