sync with sage patches

Package-Manager: portage-2.2.8-r1