--- trunk/mage/usr/lib/mage/smage2.functions.sh	2012/02/06 10:22:30	1684
+++ trunk/mage/usr/lib/mage/smage2.functions.sh	2013/07/15 07:50:48	2140
@@ -343,6 +343,8 @@
 		DEST=$2
 	fi
 
+	echo -e "${COLBLUE}>>>${COLGREEN} Unpacking ${SOURCEDIR}/${PNAME}/${SRCFILE}${COLDEFAULT}"
+
 	[[ ! -d ${DEST} ]] && install -d ${DEST}
 
 	case "${SRCFILE##*.}" in
@@ -392,7 +394,7 @@
 			tar --no-same-owner -xvJf ${SOURCEDIR}/${PNAME}/${SRCFILE} -C ${DEST} || die ".txz unpack failed."
 			;;
 		rar)
-			unrar x ${SOURCEDIR}/${PNAME}/${SRCFILE} ${DEST}  || die ".rar unpack failed."
+			unrar x ${SOURCEDIR}/${PNAME}/${SRCFILE} ${DEST} || die ".rar unpack failed."
 			;;
 		zip|xpi|jar)
 			unzip ${SOURCEDIR}/${PNAME}/${SRCFILE} -d ${DEST} || die ".zip unpack failed."
@@ -571,6 +573,82 @@
 	fi
 }
 
+march()
+{
+	local retval
+
+	if [[ ! -z ${ARCH} ]]
+	then
+		echo "${ARCH}"
+		retval=0
+	else
+		retval=1
+	fi
+
+	return "${retval}"
+}
+
+marchsrcfile()
+{
+	local retval
+	local var="$1"
+
+	[[ -z ${var} ]] && var="SRCFILE"
+
+	if [[ ! -z $(eval echo \$${var}_${ARCH/i*86/x86}) ]]
+	then
+		eval echo \$${var}_${ARCH/i*86/x86} | tr ';' '\n'
+		retval=0
+	else
+		retval=1
+	fi
+
+	return "${retval}"
+}
+
+marchsrcdir()
+{
+	local retval
+	if [[ ! -z $(eval echo \$SRCDIR_${ARCH/i*86/x86}) ]]
+	then
+		eval echo \$SRCDIR_${ARCH/i*86/x86} | tr ';' '\n'
+		retval=0
+	else
+		retval=1
+	fi
+
+	return "${retval}"
+}
+
+marchdepend()
+{
+	local retval
+
+	if [[ ! -z $(eval echo \$DEPEND_${ARCH/i*86/x86}) ]]
+	then
+		echo "\$(eval echo \\\$DEPEND_\${ARCH/i*86/x86} | tr ';' '\n')"
+		retval=0
+	else
+		retval=1
+	fi
+
+	return "${retval}"
+}
+
+marchsdepend()
+{
+	local retval
+	if [[ ! -z $(eval echo \$SDEPEND_${ARCH/i*86/x86}) ]]
+	then
+		echo "\$(eval echo \\\$SDEPEND_\${ARCH/i*86/x86} | tr ';' '\n')"
+		retval=0
+	else
+		retval=1
+	fi
+
+	return "${retval}"
+}
+
 setup_distcc_environment()
 {
 	if [ -x /usr/bin/distcc ]
@@ -604,6 +682,12 @@
 	local NDEPEND
 	local sym dep cat pver pname
 
+	# first of all remove all tabs and duplicate lines
+	if [ -n "${depend}" ]
+	then
+		depend=$(echo "${depend}" | sed 's:\t::g' | sort -u)
+	fi
+
 	# deps and provides are special
 	# they must be fixed to match the target
 
@@ -876,7 +960,6 @@
 	export SAVED_HOMEPAGE="${HOMEPAGE}"
 	export SAVED_SPECIAL_VARS="${SPECIAL_VARS}"
 	export SAVED_STATE="${STATE}"
-	export SAVED_PKGTYPE="${PKGTYPE}"
 	export SAVED_INHERITS="${INHERITS}"
 	export SAVED_DEPEND="${DEPEND}"
 	export SAVED_SDEPEND="${SDEPEND}"
@@ -951,7 +1034,6 @@
 	export HOMEPAGE="${SAVED_HOMEPAGE}"
 	export SPECIAL_VARS="${SAVED_SPECIAL_VARS}"
 	export STATE="${SAVED_STATE}"
-	export PKGTYPE="${SAVED_PKGTYPE}"
 	export INHERITS="${SAVED_INHERITS}"
 	export DEPEND="${SAVED_DEPEND}"
 	export SDEPEND="${SAVED_SDEPEND}"