57,58d56
< 		CC="mpicc" && CXX="mpiCC"
< 		CC="mpicc" && CXX="mpiCC"
59a58
> 			CC="mpicc" && CXX="mpiCC"
60a60,61
> 		elif has_version 'sys-cluster/mpich2'; then
> 			CC="mpicc" && CXX="mpicxx"
61a63
> 			CC="mpicc" && CXX="mpiCC"