--- trunk/mage/usr/lib/mage/smage2.functions.sh	2014/01/06 12:49:32	2363
+++ trunk/mage/usr/lib/mage/smage2.functions.sh	2014/01/06 12:56:50	2365
@@ -695,68 +695,6 @@
 	fi
 }
 
-# fixes given dependencies to match a MAGE_TARGET
-# fix_mage_deps -target s/depend # <-- note -target !
-fix_mage_deps()
-{
-	local target="$1"
-	local depend="$2"
-	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
-
-	# run this only if target and depend is not empty
-	if [ -n "${target}" ] && [ -n "${depend}" ]
-	then
-		# fix DEPEND
-		while read sym dep
-		do
-			# ignore empty lines
-			[[ -z ${dep} ]] && continue
-
-			cat="$(dirname ${dep})"
-			# change if not virtual
-			if [[ ${cat} = virtual ]]
-			then
-				pname="$(basename ${dep})"
-			else
-				# fix pver to target-pver
-				# to get pname-target-pver
-
-				# doing it backwards !
-				pver="${dep##*-}"
-				# full pver
-				pname="$(basename ${dep/-${pver}/})${target}-${pver}"
-			fi
-
-			# do not add empty lines
-			if [ -z "${NDEPEND}" ]
-			then
-				NDEPEND="${sym} ${cat}/${pname}"
-			else
-				NDEPEND="${NDEPEND}
-	${sym} ${cat}/${pname}"
-			fi
-
-			unset cat pname pver
-		done << EOF
-${depend}
-EOF
-		# set NDEPEND to DEPEND
-		depend="${NDEPEND}"
-	fi
-
-	echo "${depend}"
-}
-
 # build_mage_script(): helper functions for regen_mage_tree()
 # generates an mage file with given information in smage file
 # needs at least:
@@ -790,7 +728,6 @@
 {
 	local magefile
 	local dest
-	local target
 	local split_pkg_base
 	local sym
 	local depname
@@ -798,17 +735,14 @@
 	# if MAGE_TREE_DEST not set use BUILDDIR
 	: ${MAGE_TREE_DEST=${BUILDDIR}/mage-tree}
 
-	# determinate which suffix this mage file should get, if any
-	[[ $1 = --target ]] && shift && target="-$1"
-
 	# mark package as splitpackage
 	[[ $1 = --split-pkg-base ]] && shift && split_pkg_base="$1"
 
 	# name of magefile
-	magefile="${PNAME}${target}-${PVER}-${PBUILD}.mage"
+	magefile="${PNAME}-${PVER}-${PBUILD}.mage"
 
 	# destination to magefile
-	dest="${MAGE_TREE_DEST}/${PCAT}/${PNAME}${target}/${magefile}"
+	dest="${MAGE_TREE_DEST}/${PCAT}/${PNAME}/${magefile}"
 
 	# show what we are doing
 	echo -e "${COLBLUE}===${COLGREEN} generating mage file:${COLDEFAULT}"
@@ -819,7 +753,7 @@
 	> ${dest}
 
 	# pgkname and state
-	echo "PKGNAME=\"${PNAME}${target}-${PVER}-\${ARCH}$(print_distrotag)-${PBUILD}\"" >> ${dest}
+	echo "PKGNAME=\"${PNAME}-${PVER}-\${ARCH}$(print_distrotag)-${PBUILD}\"" >> ${dest}
 	echo "STATE=\"${STATE}\"" >> ${dest}
 
 	# description and homepage
@@ -832,9 +766,6 @@
 	# special tags and vars
 	echo "PKGTYPE=\"${PKGTYPE}\""  >> ${dest}
 
-	# echo MAGE_TARGETS ## note -target is needed !
-	echo "MAGE_TARGETS=\"${target}\"" >> ${dest}
-
 	# split package base
 	echo "SPLIT_PACKAGE_BASE=\"${split_pkg_base}\"" >> ${dest}
 
@@ -863,8 +794,8 @@
 	fi
 
 	# deps and provides
-	echo "DEPEND=\"$(fix_mage_deps "${target}" "${DEPEND}")\"" >> ${dest}
-	echo "SDEPEND=\"$(fix_mage_deps "${target}" "${SDEPEND}")\"" >> ${dest}
+	echo "DEPEND=\"${DEPEND}\"" >> ${dest}
+	echo "SDEPEND=\"${SDEPEND}\"" >> ${dest}
 	echo "PROVIDE=\"${PROVIDE}\"" >> ${dest}
 
 	# add special functions
@@ -875,8 +806,6 @@
 		do
 			# add to mage (quotes needed !)
 			typeset -f "${i}" >> ${dest}
-			# unset to be safe (quotes needed !)
-			#unset "${i}" <-- later to get every target built
 		done
 	fi
 
@@ -894,20 +823,8 @@
 	# build them only if requested
 	if mqueryfeature regentree
 	then
-		# run it without targets
-		if [[ -n ${MAGE_TARGETS} ]]
-		then
-			# build for each target a mage file
-			# run it with several targets
-			echo
-			for subpackage in ${MAGE_TARGETS}
-			do
-				build_mage_script --target "${subpackage}"
-			done
-			echo
-
 		# run it for splitpackages
-		elif [[ -n ${SPLIT_PACKAGES} ]]
+		if [[ -n ${SPLIT_PACKAGES} ]]
 		then
 			local split_pkg_base="${PNAME}"
 			# save smage environment
@@ -947,16 +864,7 @@
 
 	# now unset all uneeded vars to be safe
 	# unset PKGNAME <-- don't do that; smage needs this var
-	# unset to be safe (quotes needed !)
-#	for i in ${SPECIAL_FUNCTIONS}
-#	do
-#		unset "${i}"
-#	done
 	unset SPECIAL_FUNCTIONS
-#	for i in ${SPECIAL_VARS}
-#	do
-#		unset "${i}"
-#	done
 	unset SPECIAL_VARS
 	unset STATE
 	unset DESCRIPTION
@@ -1206,7 +1114,6 @@
 	local pver
 	local pbuild
 	local parch
-	local target
 	local pkgname
 
 	# very basic getops
@@ -1218,7 +1125,6 @@
 			--pver|-v) shift; pver="$1" ;;
 			--pbuild|-b) shift; pbuild="$1" ;;
 			--parch|a) shift; parch="$1" ;;
-			--target|t) shift; target="$1" ;;
 		esac
 		shift
 	done
@@ -1234,11 +1140,8 @@
 	[ -z "${PKGDIR}" ] && die "generate_package_md5sum() \$PKGDIR not set."
 	[ -z "${PKGSUFFIX}" ] && die "generate_package_md5sum() \$PKGSUFFIX not set."
 
-	# fix target as it may be empty !
-	[ -n "${target}" ] && target="-${target}"
-
 	# build pkgname
-	pkgname="${pname}${target}-${pver}-${parch}$(print_distrotag)-${pbuild}"
+	pkgname="${pname}-${pver}-${parch}$(print_distrotag)-${pbuild}"
 
 	# build pkg-md5-sum only if requested
 	if mqueryfeature regentree
@@ -1256,7 +1159,7 @@
 		: ${MAGE_TREE_DEST=${BUILDDIR}/mage-tree}
 
 		# setup md5 dir
-		dest="${MAGE_TREE_DEST}/${pcat}/${pname}${target}/md5"
+		dest="${MAGE_TREE_DEST}/${pcat}/${pname}/md5"
 		install -d ${dest}
 
 		# gen md5sum