Some clean up in baselayout. Some workarounds are no longer needed.

Package-Manager: portage-2.2.8-r2