Added Portage config files, several changes on mainline code