--- /usr/portage/eclass/cvs.eclass 2013-06-17 23:01:16.000000000 -0600 +++ cvs.eclass 2013-09-20 19:20:38.588524360 -0600 @@ -202,6 +202,7 @@ # called from cvs_src_unpack cvs_fetch() { + has "${EAPI:-0}" 0 1 2 && ! use prefix && EPREFIX= # Make these options local variables so that the global values are # not affected by modifications in this function. @@ -392,7 +393,7 @@ export CVS_RSH="${T}/cvs_sshwrapper" cat > "${CVS_RSH}"<> "${CVS_RSH}" echo "${CVS_ECLASS_STRICT_HOST_CHECKING}')" \ >> "${CVS_RSH}" - echo "os.execv('/usr/bin/ssh', newarglist)" \ + echo "os.execv('${EPREFIX}/usr/bin/ssh', newarglist)" \ >> "${CVS_RSH}" chmod a+x "${CVS_RSH}"