--- mesa-6.3.2.ebuild	2005-09-10 14:43:30.000000000 +0900
+++ mesa-6.3.2.ebuild	2005-09-10 14:45:01.000000000 +0900
@@ -20,7 +20,7 @@ 
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="motif"
+IUSE="motif dri"
 
 RDEPEND="dev-libs/expat
 	x11-libs/libX11
@@ -45,16 +45,20 @@ 
 # Think about: ggi, svga, fbcon, no-X configs
 
 pkg_setup() {
+	CONFIG="linux"
+
+	if use dri; then
+		CONFIG="${CONFIG}-dri"
+	fi
+
 	if use x86; then
-		CONFIG="linux-dri-x86"
+		CONFIG="${CONFIG}-x86"
 	# amd64 people need to look at this file to deal with lib64 issues, unless
 	# they're fine with hardcoded lib64.
 	elif use amd64; then
-		CONFIG="linux-dri-x86-64"
+		CONFIG="${CONFIG}-x86-64"
 	elif use ppc; then
-		CONFIG="linux-dri-ppc"
-	else
-		CONFIG="linux-dri"
+		CONFIG="${CONFIG}-ppc"
 	fi
 }
 
@@ -124,10 +128,12 @@ 
 	##
 	# Install the actual drivers --- 'make install' doesn't install them
 	# anywhere.
-	dodir /usr/$(get_libdir)/xorg/modules/dri
-	exeinto /usr/$(get_libdir)/xorg/modules/dri
-	einfo "Installing drivers to ${EXEDESTTREE}."
-	find ${S}/lib* -name '*_dri.so' | xargs doexe
+	if use dri; then
+		dodir /usr/$(get_libdir)/xorg/modules/dri
+		exeinto /usr/$(get_libdir)/xorg/modules/dri
+		einfo "Installing drivers to ${EXEDESTTREE}."
+		find ${S}/lib* -name '*_dri.so' | xargs doexe
+	fi
 
 	fix_opengl_symlinks
 	dynamic_libgl_install