Mainly a note for self, maybe someone will beat me to it. The upgrade path is blocked until libxml2-2.7.7 is imported.
I think I just beat you to it.
overlays seems to b0rk, it won't let me commit
ok, it did commit, although it hangs, probably on mail or something