app-portage/gentoolkit: Sync with tree.