--- xorg-x11-6.8.1.904.ebuild.old	2005-02-04 16:10:31.095278304 +0100
+++ xorg-x11-6.8.1.904.ebuild	2005-02-04 16:29:52.688689264 +0100
@@ -46,7 +46,7 @@
 
 # IUSE="gatos" disabled because gatos is broken on ~4.4 now (31 Jan 2004)
 IUSE="3dfx 3dnow bitmap-fonts cjk debug dlloader dmx doc font-server hardened
-	insecure-drivers ipv6 minimal mmx nls opengl pam sdk sse static
+	insecure-drivers ipv6 minimal mmx nls nvidia opengl pam sdk sse static
 	truetype-fonts type1-fonts uclibc xprint xv"
 # IUSE_INPUT_DEVICES="synaptics wacom"
 
@@ -676,9 +676,16 @@
 		# Do we want the glx extension? This will turn off XF86DRI if it's off.
 		# DRI can't build if glx isn't built, so keep this below DRI define.
 		# Do this before hppa so they can turn DRI off
+		# nvidia users neither need dri nor mesa, but beware that
+		# glxgears and glxinfo won't be built, as well
 		use_build opengl BuildGlxExt
-		use_build opengl BuildGLXLibrary
-		use_build opengl BuildXF86DRI
+		if use opengl && ! use nvidia; then
+			echo "#define BuildGLXLibrary YES" >> ${HOSTCONF}
+			echo "#define BuildXF86DRI YES" >> ${HOSTCONF}
+		else
+			echo "#define BuildGLXLibrary NO" >> ${HOSTCONF}
+			echo "#define BuildXF86DRI NO" >> ${HOSTCONF}
+		fi
 		# Needs GL headers
 		use_build opengl BuildGLULibrary