--- lapack-atlas-3.9.23-r3.ebuild	2010-07-02 01:07:12.047791548 -0600
+++ lapack-atlas-3.9.23-r4.ebuild	2010-07-02 00:55:01.684533837 -0600
@@ -37,13 +37,13 @@
 
 FORTRAN="g77 gfortran ifc"
 
-S="${WORKDIR}/ATLAS"
-S_LAPACK="${WORKDIR}/${L_PN}-lite-${L_PV}"
-BLD_DIR="${S}/gentoo-build"
-RPATH="/usr/$(get_libdir)/${L_PN}/${MY_PN}"
-S_LAPACK="${WORKDIR}"/${L_PN}-lite-${L_PV}
-
 src_prepare() {
+	S="${WORKDIR}/ATLAS"
+	S_LAPACK="${WORKDIR}/${L_PN}-lite-${L_PV}"
+	BLD_DIR="${S}/gentoo-build"
+	RPATH="/usr/$(get_libdir)/${L_PN}/${MY_PN}"
+	S_LAPACK="${WORKDIR}"/${L_PN}-lite-${L_PV}
+
 	epatch "${DISTDIR}"/${MY_PN}-${PATCH_V}-shared-libs.2.patch.bz2
 	epatch "${FILESDIR}"/${MY_PN}-asm-gentoo.patch
 	epatch "${FILESDIR}"/${PN}-${PATCH_V}-lam.patch
@@ -79,8 +79,14 @@
 
 	cd "${BLD_DIR}"
 	local archselect=
-	if use amd64 || use ppc64; then
-		archselect="-b 64"
+	if use amd64 || use ppc64 || use sparc ; then
+		if [ ${ABI} = amd64 ] || [ ${ABI} = ppc64 ] || [ ${ABI} = sparc64 ] ; then
+			archselect="-b 64"
+		elif [ ${ABI} = x86 ] || [ ${ABI} = ppc ] || [ ${ABI} = sparc32 ] ; then
+			archselect="-b 32"
+		else
+			archselect="-b 32"
+		fi
 	elif use alpha; then
 		archselect=""
 	else