I stopped trying to use emerge, and only use qubes update. Nowhere near as thorough, but it doesn’t mess things up.