Sync better and and fix broken ebuilds.