Adopt a bunch of sage patches to cover various issues (mainly trac 13413 and 15312)

Package-Manager: portage-2.2.7