--- trunk/mage/usr/lib/mage/smage2.functions.sh	2012/02/16 11:58:12	1689
+++ trunk/mage/usr/lib/mage/smage2.functions.sh	2014/01/06 12:47:23	2362
@@ -318,9 +318,9 @@
 			sysconfdir=${BINDIR}/etc \
 			libdir=${BINDIR}/usr/$(mlibdir) \
 			"$@" install || die "minstall failed"
-        else
-                die "no Makefile found"
-        fi
+	else
+		die "no Makefile found"
+	fi
 }
 
 mmake()
@@ -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."
@@ -589,9 +591,13 @@
 marchsrcfile()
 {
 	local retval
-	if [[ ! -z $(eval echo \$SRCFILE_${ARCH/i*86/x86}) ]]
+	local var="$1"
+
+	[[ -z ${var} ]] && var="SRCFILE"
+
+	if [[ ! -z $(eval echo \$${var}_${ARCH/i*86/x86}) ]]
 	then
-		eval echo \$SRCFILE_${ARCH/i*86/x86} | tr ';' '\n'
+		eval echo \$${var}_${ARCH/i*86/x86} | tr ';' '\n'
 		retval=0
 	else
 		retval=1
@@ -603,9 +609,13 @@
 marchsrcdir()
 {
 	local retval
-	if [[ ! -z $(eval echo \$SRCDIR_${ARCH/i*86/x86}) ]]
+	local var="$1"
+
+	[[ -z ${var} ]] && var="SRCDIR"
+
+	if [[ ! -z $(eval echo \$${var}_${ARCH/i*86/x86}) ]]
 	then
-		eval echo \$SRCDIR_${ARCH/i*86/x86} | tr ';' '\n'
+		eval echo \$${var}_${ARCH/i*86/x86} | tr ';' '\n'
 		retval=0
 	else
 		retval=1
@@ -617,10 +627,13 @@
 marchdepend()
 {
 	local retval
+	local var="$1"
+
+	[[ -z ${var} ]] && var="DEPEND"
 
-	if [[ ! -z $(eval echo \$DEPEND_${ARCH/i*86/x86}) ]]
+	if [[ ! -z $(eval echo \$${var}_${ARCH/i*86/x86}) ]]
 	then
-		echo "\$(eval echo \\\$DEPEND_\${ARCH/i*86/x86} | tr ';' '\n')"
+		echo "\$(eval echo \\\$${var}_\${ARCH/i*86/x86} | tr ';' '\n')"
 		retval=0
 	else
 		retval=1
@@ -632,9 +645,13 @@
 marchsdepend()
 {
 	local retval
-	if [[ ! -z $(eval echo \$SDEPEND_${ARCH/i*86/x86}) ]]
+	local var="$1"
+
+	[[ -z ${var} ]] && var="SDEPEND"
+
+	if [[ ! -z $(eval echo \$${var}_${ARCH/i*86/x86}) ]]
 	then
-		echo "\$(eval echo \\\$SDEPEND_\${ARCH/i*86/x86} | tr ';' '\n')"
+		echo "\$(eval echo \\\$${var}_\${ARCH/i*86/x86} | tr ';' '\n')"
 		retval=0
 	else
 		retval=1
@@ -658,10 +675,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
@@ -676,6 +704,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
 
@@ -947,8 +981,8 @@
 	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_PKGTYPE="${PKGTYPE}"
 	export SAVED_INHERITS="${INHERITS}"
 	export SAVED_DEPEND="${DEPEND}"
 	export SAVED_SDEPEND="${SDEPEND}"
@@ -1022,8 +1056,8 @@
 	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 PKGTYPE="${SAVED_PKGTYPE}"
 	export INHERITS="${SAVED_INHERITS}"
 	export DEPEND="${SAVED_DEPEND}"
 	export SDEPEND="${SAVED_SDEPEND}"
@@ -1091,6 +1125,7 @@
 	unset SAVED_DESCRIPTION
 	unset SAVED_HOMEPAGE
 	unset SAVED_SPECIAL_VARS
+	unset SAVED_SPECIAL_FUNCTIONS
 	unset SAVED_STATE
 	unset SAVED_PKGTYPE
 	unset SAVED_INHERITS
@@ -1288,3 +1323,8 @@
 		return 1
 	fi
 }
+
+mqalint()
+{
+	return 0
+}