--- trunk/mage/usr/lib/mage/smage2.functions.sh	2013/07/15 07:50:48	2140
+++ trunk/mage/usr/lib/mage/smage2.functions.sh	2013/08/15 08:56:57	2172
@@ -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
@@ -959,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}"
@@ -1033,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}"
@@ -1101,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
@@ -1298,3 +1312,8 @@
 		return 1
 	fi
 }
+
+mqalint()
+{
+	return 0
+}