--- trunk/mage/usr/lib/mage/smage2.functions.sh	2013/02/01 09:45:47	2040
+++ trunk/mage/usr/lib/mage/smage2.functions.sh	2013/08/15 08:56:57	2172
@@ -394,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."
@@ -664,10 +664,21 @@
 	fi
 }
 
+setup_icecc_environment()
+{
+	if [ -x /usr/bin/icecc ]
+	then
+		echo -e "${COLBLUE}---${COLGREEN} Using IceCC for compilation ...${COLDEFAULT}"
+		export PATH=/usr/$(mlibdir)/icecc/bin:${PATH} || die "icecc: could not export new $PATH"
+	fi
+}
+
 setup_ccache_environment()
 {
 	if [ -x /usr/bin/ccache ]
 	then
+		mqueryfeature "icecc" && export CCACHE_PREFIX=icecc
+
 		echo -e "${COLBLUE}---${COLGREEN} Using CCache for compilation ...${COLDEFAULT}"
 		export PATH=/usr/$(mlibdir)/ccache/bin:${PATH} || die "ccache: could not export new $PATH"
 	fi
@@ -682,6 +693,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
 
@@ -953,6 +970,7 @@
 	export SAVED_DESCRIPTION="${DESCRIPTION}"
 	export SAVED_HOMEPAGE="${HOMEPAGE}"
 	export SAVED_SPECIAL_VARS="${SPECIAL_VARS}"
+	export SAVED_SPECIAL_FUNCTIONS="${SPECIAL_FUNCTIONS}"
 	export SAVED_STATE="${STATE}"
 	export SAVED_INHERITS="${INHERITS}"
 	export SAVED_DEPEND="${DEPEND}"
@@ -1027,6 +1045,7 @@
 	export DESCRIPTION="${SAVED_DESCRIPTION}"
 	export HOMEPAGE="${SAVED_HOMEPAGE}"
 	export SPECIAL_VARS="${SAVED_SPECIAL_VARS}"
+	export SPECIAL_FUNCTIONS="${SAVED_SPECIAL_FUNCTIONS}"
 	export STATE="${SAVED_STATE}"
 	export INHERITS="${SAVED_INHERITS}"
 	export DEPEND="${SAVED_DEPEND}"
@@ -1095,6 +1114,7 @@
 	unset SAVED_DESCRIPTION
 	unset SAVED_HOMEPAGE
 	unset SAVED_SPECIAL_VARS
+	unset SAVED_SPECIAL_FUNCTIONS
 	unset SAVED_STATE
 	unset SAVED_PKGTYPE
 	unset SAVED_INHERITS
@@ -1292,3 +1312,8 @@
 		return 1
 	fi
 }
+
+mqalint()
+{
+	return 0
+}