Remove git_cvs from the non-hybrid gcc2 image.

It depends on gcc4-only package cvsps. Thanks to Ingo for suggestion on
how to do this.
Syntax fix.

Sorry!