--- trunk/core/mesa/mesa-7.4.1-r1.smage2	2009/05/10 09:28:32	1507
+++ trunk/core/mesa/mesa-7.4.1-r1.smage2	2009/05/10 15:19:37	1508
@@ -10,8 +10,6 @@
 DESCRIPTION="Mesa3D OpenGL graphics library."
 HOMEPAGE="http://mesa3d.sourceforge.net/"
 
-sminclude xorg mtools multilib
-
 DEPEND=">= dev-libs/expat-2
 	>= x11-libs/libX11-1
 	>= x11-libs/libXext-1
@@ -43,6 +41,10 @@
 SRCFILE="MesaLib-${PVER/_/-}.tar.gz"
 SRCDIR="${BUILDDIR}/Mesa-${PVER/_/-}"
 
+# must be set before the include of multilib!
+EMUL_LINUX_32=true
+sminclude xorg mtools multilib
+
 SRC_URI=(
 	sourceforge://mesa3d/${SRCFILE}
 	mirror://${PNAME}/${SRCFILE}
@@ -52,8 +54,6 @@
 
 UP2DATE="updatecmd_sourceforge mesa3d MesaLib"
 
-EMUL_LINUX_32=true
-
 src_prepare()
 {
 	munpack ${SRCFILE} || die
@@ -80,13 +80,13 @@
 		--enable-glw \
 		|| die
 
-		# only build software renderer on multilib arches
-		if [[ ${ARCH} = x86_64 ]]
-		then
-			only-m32 "echo 'DRI_DIRS =' >> configs/autoconf" || die
-		fi
+	# only build software renderer on multilib arches
+	if [[ ${ARCH} = x86_64 ]]
+	then
+		only-m32 "echo 'DRI_DIRS =' >> configs/autoconf" || die
+	fi
 
-	mmake -j1 || die
+	mmake || die
 }
 
 src_install()