Hmm, my lack of patience never works in my favor.
I emerged suspend2-sources which updated a hibernate script and perhaps something else... Now I boot to command line. This is exactly what was happening when I tried to upgrade from 3.4e to 3.4f. I unmerged suspend2-sources, but to no avail. Any idea how to get back to the desktop???