--- /usr/portage/dev-vcs/git/git-1.7.6.ebuild	2011-06-27 21:56:45.000000000 +0200
+++ git-1.7.6.ebuild	2011-06-29 10:14:50.419964551 +0200
@@ -312,6 +312,9 @@ src_install() {
 
 	# Depending on the tarball and manual rebuild of the documentation, the
 	# manpages may exist in either OR both of these directories.
+	if ! use cvs; then
+		find man? -name "*git*cvs*" | xargs rm
+	fi
 	find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
 	find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
 
@@ -403,6 +406,12 @@ src_install() {
 	newconfd "${FILESDIR}"/git-daemon.confd git-daemon
 
 	fixlocalpod
+
+	# burn CVS with fire, see #373439
+	if ! use cvs; then
+		rm -rf "${ED}"/usr/bin/git-cvsserver \
+			"${ED}"/usr/libexec/git-core/git-cvs* || die
+	fi
 }
 
 src_test() {