--- trunk/extras/cargo/cargo-0.18.0-r1.smage2	2017/06/21 13:01:01	29518
+++ trunk/extras/cargo/cargo-0.18.0-r1.smage2	2018/01/24 09:23:17	30460
@@ -21,7 +21,8 @@
 
 if [[ ${BOOTSTRAP} = 0 ]]
 then
-	SDEPEND=">= dev-util/cargo-0.18"
+	SDEPEND="${SDEPEND}
+		>= dev-util/cargo-0.18"
 fi
 
 SRCFILE="${PVER}.tar.gz"
@@ -71,7 +72,9 @@
 	local myconf
 
 	# enforce rust-bin chost
-	myconf+=" --host=${ARCH}-unknown-linux-gnu --build=${ARCH}-unknown-linux-gnu"
+	local myARCH
+	[[ ${ARCH} = i*86 ]] && myARCH=i686
+	myconf+=" --host=${myARCH}-unknown-linux-gnu --build=${myARCH}-unknown-linux-gnu"
 
 	if [[ ${BOOTSTRAP} = 1 ]]
 	then
@@ -90,7 +93,10 @@
 src_install()
 {
 	cd ${SRCDIR}
-	make prepare-image-${ARCH}-unknown-linux-gnu IMGDIR_${ARCH}-unknown-linux-gnu=${BINDIR}/usr || die
+
+	local myARCH
+	[[ ${ARCH} = i*86 ]] && myARCH=i686
+	make prepare-image-${myARCH}-unknown-linux-gnu IMGDIR_${myARCH}-unknown-linux-gnu=${BINDIR}/usr || die
 
 	# remove unnecessary files
 	mdelete -r /usr/etc || die