--- /usr/portage/x11-base/xorg-x11/xorg-x11-6.8.99.3.ebuild	2005-04-20 08:06:07.000000000 +0200
+++ xorg-x11-6.8.99.3.ebuild	2005-04-20 20:57:04.486223096 +0200
@@ -963,11 +963,11 @@
 		FAST=1 ${S}/config/util/makeg.sh World WORLDOPTS="" \
 			|| die "debug make World failed"
 	else
-		FAST=1 emake World WORLDOPTS="" || die "make World failed"
+		FAST=1 emake MAKE="gmake" World WORLDOPTS="" || die "make World failed"
 	fi
 
 	if use nls; then
-		emake -C ${S}/nls || die "nls build failed"
+		emake MAKE="gmake" -C ${S}/nls || die "nls build failed"
 	fi
 }
 
@@ -982,29 +982,29 @@
 	# gcc3 related fix.  Do this during install, so that our
 	# whole build will not be compiled without mmx instructions.
 	if [ "$(gcc-version)" != "2.95" ] && use x86; then
-		make install DESTDIR=${D} \
-		|| make CDEBUGFLAGS="${CDEBUGFLAGS} -mno-mmx" \
+		gmake install DESTDIR=${D} MAKE="gmake" \
+		|| gmake CDEBUGFLAGS="${CDEBUGFLAGS} -mno-mmx" \
 			CXXDEBUGFLAGS="${CXXDEBUGFLAGS} -mno-mmx" \
-			install DESTDIR=${D} || die "install failed"
+			install DESTDIR=${D} MAKE="gmake" || die "install failed"
 	else
-		make install DESTDIR=${D} || die "install failed"
+		gmake install DESTDIR=${D} MAKE="gmake" || die "install failed"
 	fi
 
 	if use sdk; then
 		einfo "Installing X.org X11 SDK..."
-		make install.sdk DESTDIR=${D} || die "sdk install failed"
+		gmake install.sdk DESTDIR=${D} MAKE="gmake" || die "sdk install failed"
 	fi
 
 	if ! use minimal; then
 		einfo "Installing man pages..."
-		make install.man DESTDIR=${D} || die "man page install failed"
+		gmake install.man DESTDIR=${D} MAKE="gmake"|| die "man page install failed"
 		einfo "Compressing man pages..."
 		prepman /usr
 	fi
 
 	if use nls; then
 		cd ${S}/nls
-		make DESTDIR=${D} install || die "nls install failed"
+		gmake DESTDIR=${D} install MAKE="gmake" || die "nls install failed"
 	fi
 	dodoc ${S}/RELNOTES
 }