Corrected minor Gentoo-specific regressions.

Specifically, emerge_world() now (largely!) behaves as expected.