--- trunk/mage/usr/lib/mage/smage2.functions.sh	2012/01/13 22:26:20	1651
+++ trunk/mage/usr/lib/mage/smage2.functions.sh	2013/02/01 09:46:47	2041
@@ -7,7 +7,8 @@
 smagesource()
 {
 	local file="$1"
-	local mystate
+	local localstate
+	local distfilestate
 	local mytag
 
 	source ${file}
@@ -29,23 +30,22 @@
 		fi
 	fi
 
-	[[ -n ${STATE} ]] && mystate="${STATE}"
+	[[ -n ${STATE} ]] && localstate="${STATE}"
 	[[ -n ${DISTROTAG} ]] && mytag="${DISTROTAG}"
 
-	# do not overide if local state was broken or disabled!
-	case ${STATE} in
-		broken) return ;;
-		disabled) return ;;
-	esac
-
 	if [ -f ${SMAGESCRIPTSDIR}/distribution ]
 	then
 		source ${SMAGESCRIPTSDIR}/distribution
-		[[ -n ${STATE} ]] && mystate="${STATE}"
+		[[ -n ${STATE} ]] && distfilestate="${STATE}"
 		[[ -n ${DISTROTAG} ]] && mytag="${DISTROTAG}"
 	fi
-	# now switch state and export it
-	STATE="${mystate}"
+	# now switch state and export it but do not overide any local states
+	if [[ ! -z ${localstate} ]]
+	then
+		STATE="${localstate}"
+	else
+		STATE="${distfilestate}"
+	fi
 
 	if mqueryfeature "pkgdistrotag"
 	then
@@ -59,7 +59,7 @@
 			echo -e "${COLRED}Requested 'pkgdistrotag' but no \$DISTROTAG found!${COLDEFAULT}"
 			echo -e "${COLRED}Disabled the feature for pkgbuild sanity!${COLDEFAULT}"
 		else
-			# now switch state and export it
+			# now switch state and export it but do not overide any local states
 			export DISTROTAG="${mytag}"
 		fi
 	else
@@ -281,8 +281,9 @@
 			fi
 		fi
 
-		# always enable shared by default
-		if [[ ! -z $(./configure --help | grep -- '--.*able-shared') ]]
+		# always enable shared by default but not for waf configure
+		if [[ ! -z $(./configure --help | grep -- '--.*able-shared') ]] &&
+			[[ -z $(./configure --version | grep waf) ]]
 		then
 			myopts+=" --enable-shared"
 		fi
@@ -342,6 +343,8 @@
 		DEST=$2
 	fi
 
+	echo -e "${COLBLUE}>>>${COLGREEN} Unpacking ${SOURCEDIR}/${PNAME}/${SRCFILE}${COLDEFAULT}"
+
 	[[ ! -d ${DEST} ]] && install -d ${DEST}
 
 	case "${SRCFILE##*.}" in
@@ -391,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."
@@ -570,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 ]
@@ -875,7 +954,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}"
@@ -950,7 +1028,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}"
@@ -1183,7 +1260,7 @@
 	[[ ! -d ${SRCPKGDIR} ]] && install -d ${SRCPKGDIR}
 	mv ${BUILDDIR}/${PNAME}-${PVER}-${PBUILD}.tar.bz2 ${SRCPKGDIR}/${PNAME}-${PVER}-${PBUILD}.${SRCPKGSUFFIX}
 
-	echo -e "${COLGREEN}Source package ${COLBLUE}${PNAME}-${PVER}-${PBUILD}.${SRCPKGSUFFIX} ${COLGREEN}successfully builded.${COLDEFAULT}"
+	echo -e "${COLGREEN}Source package ${COLBLUE}${PNAME}-${PVER}-${PBUILD}.${SRCPKGSUFFIX} ${COLGREEN}successfully builded.${COLDEFAULT}\n"
 }
 
 step_by_step()