adapting to standard order of definitions, dropped some default-equivalent function definitions, re-added test build functions as tests wouldn't otherwise be run
Merge /usr/local/portage/andis_overlay