Fix some issues and use repoman

Package-Manager: portage-2.2.10