patsy: cleaned to sync with the portage tree.