Resync with portage and x11 overlays