minor simplification for portage-2 profile support
clean up imports for ebuild tests