Updates for compatibility w/ upstream portage tree

This is in preparation for updating profiles and eclasses in portage-stable.