--- smage/trunk/include/multilib.sminc	2013/12/16 10:20:07	5217
+++ smage/trunk/include/multilib.sminc	2017/12/21 09:38:37	11529
@@ -42,10 +42,10 @@
 	# the var ist decided with our common eval+echo magic
 	if [[ -z ${SDEPEND} ]]
 	then
-		SDEPEND="\$(eval echo \\\$EMUL_LINUX_32_SDEPEND_\${ARCH/i*86/x86} | tr ';' '\n')"
+		SDEPEND="$(marchsdepend EMUL_LINUX_32_SDEPEND)"
 	else
 		SDEPEND="${SDEPEND}
-			\$(eval echo \\\$EMUL_LINUX_32_SDEPEND_\${ARCH/i*86/x86} | tr ';' '\n')"
+			$(marchsdepend EMUL_LINUX_32_SDEPEND)"
 	fi
 fi
 
@@ -113,6 +113,10 @@
 	fi
 
 	# run any given command
+	if [[ ${MULTILIB_VERBOSE} = true ]]
+	then
+		echo -e "${COLGREEN}Executing:${COLDEFAULT} '$@'"
+	fi
 	eval $@ || die
 
 	unset ABI CC CXX ABI_LIBDIR
@@ -162,6 +166,10 @@
 	fi
 
 	# run any given command
+	if [[ ${MULTILIB_VERBOSE} = true ]]
+	then
+		echo -e "${COLGREEN}Executing:${COLDEFAULT} '$@'"
+	fi
 	eval $@ || die
 
 	unset ABI CC CXX ABI_LIBDIR
@@ -229,27 +237,27 @@
 
 mabi-cc()
 {
-	echo "\"gcc -\${ABI}\""
+	echo "gcc -\${ABI}"
 }
 
 mabi-cxx()
 {
-	echo "\"g++ -\${ABI}\""
+	echo "g++ -\${ABI}"
 }
 
 mabi-cflags()
 {
-	echo "\"\${CFLAGS}\""
+	echo "\${CFLAGS}"
 }
 
 mabi-cxxflags()
 {
-	echo "\"\${CXXFLAGS}\""
+	echo "\${CXXFLAGS}"
 }
 
 mabi-ldflags()
 {
-	echo "\"\${LDFLAGS}\""
+	echo "\${LDFLAGS}"
 }
 
 ##
@@ -261,7 +269,7 @@
 	# rename the old one
 	old_mconfigure=old$(typeset -f mconfigure)
 	eval "${old_mconfigure}"
-fi
+
 mconfigure()
 {
 	local abi
@@ -276,38 +284,14 @@
 		abi-${abi} oldmconfigure $@ || die
 	done
 }
-
-if [[ ! -z $(typeset -f cmake_configure) ]]
-then
-	# rename the old one
-	old_cmake_configure=old$(typeset -f cmake_configure)
-	eval "${old_cmake_configure}"
 fi
-cmake_configure()
-{
-	local abi
-	local abis_to_run="${MULTILIB_ABIS}"
-
-	# respect MULTILIB_ONLY_ABI variable
-	[[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"
-
-	local saved_SRCDIR="${SRCDIR}"
-	for abi in ${abis_to_run}
-	do
-		SRCDIR="${saved_SRCDIR}-${abi}"
-		cd ${SRCDIR}/${SRCSUBDIR}
-		abi-${abi} oldcmake_configure $@ || die
-	done
-	# restore SRCDIR
-	SRCDIR="${saved_SRCDIR}"
-}
 
 if [[ ! -z $(typeset -f munpack) ]]
 then
 	# rename the old one
 	old_munpack=old$(typeset -f munpack)
 	eval "${old_munpack}"
-fi
+
 munpack()
 {
 	local abi
@@ -323,13 +307,14 @@
 		mv ${SRCDIR} ${SRCDIR}-${abi} || die
 	done
 }
+fi
 
 if [[ ! -z $(typeset -f mmake) ]]
 then
 	# rename the old one
 	old_mmake=old$(typeset -f mmake)
 	eval "${old_mmake}"
-fi
+
 mmake()
 {
 	local abi
@@ -345,13 +330,14 @@
 		abi-${abi} oldmmake $@ || die
 	done
 }
+fi
 
 if [[ ! -z $(typeset -f minstall) ]]
 then
 	# rename the old one
 	old_minstall=old$(typeset -f minstall)
 	eval "${old_minstall}"
-fi
+
 minstall()
 {
 	local abi
@@ -367,6 +353,7 @@
 		abi-${abi} oldminstall $@ || die
 	done
 }
+fi
 
 minstall_destdir()
 {
@@ -389,7 +376,7 @@
 	# rename the old one
 	old_mpatch=old$(typeset -f mpatch)
 	eval "${old_mpatch}"
-fi
+
 mpatch()
 {
 	local abi
@@ -405,13 +392,14 @@
 		oldmpatch $@ || die
 	done
 }
+fi
 
 if [[ ! -z $(typeset -f mlibtoolize) ]]
 then
 	# rename the old one
 	old_mlibtoolize=old$(typeset -f mlibtoolize)
 	eval "${old_mlibtoolize}"
-fi
+
 mlibtoolize()
 {
 	local abi
@@ -427,13 +415,14 @@
 		oldmlibtoolize $@ || die
 	done
 }
+fi
 
 if [[ ! -z $(typeset -f mautoreconf) ]]
 then
 	# rename the old one
 	old_mautoreconf=old$(typeset -f mautoreconf)
 	eval "${old_mautoreconf}"
-fi
+
 mautoreconf()
 {
 	local abi
@@ -449,13 +438,14 @@
 		oldmautoreconf $@ || die
 	done
 }
+fi
 
 if [[ ! -z $(typeset -f minstalldocs) ]]
 then
 	# rename the old one
 	old_minstalldocs=old$(typeset -f minstalldocs)
 	eval "${old_minstalldocs}"
-fi
+
 minstalldocs()
 {
 	local abi
@@ -472,43 +462,4 @@
 		oldminstalldocs $@ || die
 	done
 }
-
-##
-# multilib mbuild wrappers
-##
-multilib_src_prepare()
-{
-	munpack ${SRCFILE} || die
-}
-
-multilib_src_compile()
-{
-	mconfigure || die
-	mmake || die
-}
-
-multilib_src_check()
-{
-	mmake -j1 -k check || die
-}
-
-multilib_src_install()
-{
-	mmake DESTDIR=${BINDIR} install || die
-
-	local i
-	for abi in ${MULTILIB_ABIS}
-	do
-		cd ${SRCDIR}-${abi}/${SRCSUBDIR}
-		for i in ABOUT-NLS AUTHORS BUGS CHANGES ChangeLog COPYING \
-			FAQ LICENSE NEWS README TODO
-		do
-			if [ -f ${SRCDIR}-${abi}/${i} ]
-			then
-				minstalldocs ${i} || die
-			fi
-		done
-	done
-}
-
-export_inherits multilib src_prepare src_compile src_check src_install
+fi