--- toolchain.eclass	1 Jun 2015 16:05:43 -0000	1.675
+++ toolchain.eclass	6 Jul 2015 15:33:24 -0000
@@ -418,14 +418,16 @@
 	export HTB_GCC_VER=${HTB_GCC_VER:-${GCC_RELEASE_VER}}
 	export SPECS_GCC_VER=${SPECS_GCC_VER:-${GCC_RELEASE_VER}}
 
+	local myA=()
+
 	if [[ -n ${GCC_A_FAKEIT} ]] ; then
-		unpack ${GCC_A_FAKEIT}
+		myA+=( ${GCC_A_FAKEIT} )
 	elif [[ -n ${PRERELEASE} ]] ; then
-		unpack gcc-${PRERELEASE}.tar.bz2
+		myA+=( gcc-${PRERELEASE}.tar.bz2 )
 	elif [[ -n ${SNAPSHOT} ]] ; then
-		unpack gcc-${SNAPSHOT}.tar.bz2
+		myA+=( gcc-${SNAPSHOT}.tar.bz2 )
 	elif [[ ${PV} != *9999* ]] ; then
-		unpack gcc-${GCC_RELEASE_VER}.tar.bz2
+		myA+=( gcc-${GCC_RELEASE_VER}.tar.bz2 )
 		# We want branch updates to be against a release tarball
 		if [[ -n ${BRANCH_UPDATE} ]] ; then
 			pushd "${S}" > /dev/null
@@ -436,7 +438,7 @@
 
 	if [[ -n ${D_VER} ]] && use d ; then
 		pushd "${S}"/gcc > /dev/null
-		unpack gdc-${D_VER}-src.tar.bz2
+		myA+=( gdc-${D_VER}-src.tar.bz2 )
 		cd ..
 		ebegin "Adding support for the D language"
 		./gcc/d/setup-gcc.sh >& "${T}"/dgcc.log
@@ -450,23 +452,25 @@
 	fi
 
 	[[ -n ${PATCH_VER} ]] && \
-		unpack gcc-${PATCH_GCC_VER}-patches-${PATCH_VER}.tar.bz2
+		myA+=( gcc-${PATCH_GCC_VER}-patches-${PATCH_VER}.tar.bz2 )
 
 	[[ -n ${UCLIBC_VER} ]] && \
-		unpack gcc-${UCLIBC_GCC_VER}-uclibc-patches-${UCLIBC_VER}.tar.bz2
+		myA+=( gcc-${UCLIBC_GCC_VER}-uclibc-patches-${UCLIBC_VER}.tar.bz2 )
 
 	if want_pie ; then
 		if [[ -n ${PIE_CORE} ]] ; then
-			unpack ${PIE_CORE}
+			myA+=( ${PIE_CORE} )
 		else
-			unpack gcc-${PIE_GCC_VER}-piepatches-v${PIE_VER}.tar.bz2
+			myA+=( gcc-${PIE_GCC_VER}-piepatches-v${PIE_VER}.tar.bz2 )
 		fi
 		[[ -n ${SPECS_VER} ]] && \
-			unpack gcc-${SPECS_GCC_VER}-specs-${SPECS_VER}.tar.bz2
+			myA+=( gcc-${SPECS_GCC_VER}-specs-${SPECS_VER}.tar.bz2 )
 	fi
 
-	use_if_iuse boundschecking && unpack "bounds-checking-gcc-${HTB_GCC_VER}-${HTB_VER}.patch.bz2"
+	use_if_iuse boundschecking && myA+=( "bounds-checking-gcc-${HTB_GCC_VER}-${HTB_VER}.patch.bz2" )
+
+	unpack "${myA[@]}"
 
 	popd > /dev/null
 }