Hi Guix,

I didn't notice that building html documentation for the updated 
matplotlib package failed halfway.  This patch fixes that, and 
rewrites the build procedure in a way that should make the package 
build fail on similar errors in the future.

Thomas