the 3.1.5 ebuild renamed tp 3.2.0 and w/ the patch commented out installed w/o error.
3.2.0 is in cvs