--- p7zip-4.42.ebuild.orig	2006-06-03 20:10:49.000000000 +0200
+++ p7zip-4.42.ebuild	2006-06-03 20:23:05.000000000 +0200
@@ -19,9 +19,8 @@
 	unpack ${A}
 	cd "${S}"
 	use static && epatch "${FILESDIR}"/p7zip-4.16_x86_static.patch
-	# be aware that CXX is now gcc in pattern due to upstream  (radek@20060318)
 	sed -i \
-		-e "/^CXX=/s:gcc:$(tc-getCXX):" \
+		-e "/^CXX=/s:g++:$(tc-getCXX):" \
 		-e "/^CC=/s:gcc:$(tc-getCC):" \
 		-e "s:OPTFLAGS=-O:OPTFLAGS=${CXXFLAGS}:" \
 		makefile* || die "changing makefiles"