Tentative fix for Issue #310 and #311

Package-Manager: portage-2.2.8-r1