I've just checked out the marcuscom tree and have merged it. When compiling Gnome 2.12 (no previous gnome-setup) I did notice evolution 2.4.0 does not pull in evolution-data-server as a dependency, and does not compile. When I manually installed libedataserver evolution merged as expected. Probably simple to reproduce and solve.