Use eopts for portage merge; fix buildrepo nextbuild to properly detect in-progrss builds (regression)