various small fixes to get 6.2.beta2 to build.

Package-Manager: portage-2.2.8-r1
Remove duplicate file

Package-Manager: portage-2.2.8-r1