Better handling of tunning - cross fingers

Package-Manager: portage-2.2.0_alpha173