--- smage/trunk/include/alx-split.sminc	2012/07/18 08:32:10	3775
+++ smage/trunk/include/alx-split.sminc	2015/07/30 15:49:15	6979
@@ -20,28 +20,39 @@
 		usr/share/info
 		usr/share/locale
 		usr/share/man
-		usr/include
-		$(mlibdir)/*.so
-		usr/$(mlibdir)/*.so
-		$([[ $(mlibdir) != lib ]] && echo 'lib/*.so usr/lib/*.so')"
+		usr/include"
 
-# zap in normal packages
+# zap in dev packages
 ALX_DEV_ZAPMOST_OPTS=""
 
 # delete from dev packages
-ALX_DEV_RM_OPTS="$(mlibdir)/*.so.*
-		usr/$(mlibdir)/*.so.*
-		$([[ $(mlibdir) != lib ]] && echo 'lib/*.so.* usr/lib/*.so.*')"
+ALX_DEV_RM_OPTS=""
 
 # be backward compatible
-[[ ! -z ${ALX_ONLY_KEEP} ]] && ALX_PKG_KEEP="${ALX_ONLY_KEEP}"
-[[ ! -z ${ALX_DEV_ONLY_KEEP} ]] && ALX_DEV_PKG_KEEP="${ALX_DEV_ONLY_KEEP}"
+if [[ ! -z ${ALX_ONLY_KEEP} ]]
+then
+	ALX_PKG_KEEP="${ALX_ONLY_KEEP}"
+	echo -e "${COLYELLOW}Warning: 'ALX_ONLY_KEEP' is deprecated and gets removed in the future.${COLDEFAULT}"
+	echo -e "${COLYELLOW}         Please modify this smage2 script to use the 'ALX_PKG_KEEP' variable.${COLDEFAULT}"
+	unset ALX_ONLY_KEEP
+fi
+if [[ ! -z ${ALX_DEV_ONLY_KEEP} ]]
+then
+	ALX_DEV_PKG_KEEP="${ALX_DEV_ONLY_KEEP}"
+	echo -e "${COLYELLOW}Warning: 'ALX_DEV_ONLY_KEEP' is deprecated and gets removed in the future.${COLDEFAULT}"
+	echo -e "${COLYELLOW}         Please modify this smage2 script to use the 'ALX_DEV_PKG_KEEP' variable.${COLDEFAULT}"
+	unset ALX_DEV_ONLY_KEEP
+fi
 
 # alx keeps
 if [[ ! -z ${ALX_PKG_KEEP} ]]
 then
 	ALX_ZAPMOST_OPTS+=" ${ALX_PKG_KEEP}"
 	ALX_DEV_RM_OPTS+=" ${ALX_PKG_KEEP}"
+else
+	ALX_RM_OPTS+=" $(mlibdir)/*.so
+		usr/$(mlibdir)/*.so
+		$([[ $(mlibdir) != lib ]] && echo 'lib/*.so usr/lib/*.so')"
 fi
 
 # alx dev keeps
@@ -49,6 +60,10 @@
 then
 	ALX_DEV_ZAPMOST_OPTS+=" ${ALX_DEV_PKG_KEEP}"
 	ALX_RM_OPTS+=" ${ALX_DEV_PKG_KEEP}"
+else
+	ALX_DEV_RM_OPTS+=" $(mlibdir)/*.so.*
+		usr/$(mlibdir)/*.so.*
+		$([[ $(mlibdir) != lib ]] && echo 'lib/*.so.* usr/lib/*.so.*')"
 fi
 
 alx-split_generate_split_info()
@@ -57,6 +72,11 @@
 	{
 		DESCRIPTION=\"${DESCRIPTION}\"
 		DEPEND=\"${DEPEND}\"
+		if [[ ! -z \${ALX_DEPEND} ]]
+		then
+			DEPEND=\"\${DEPEND}
+				\${ALX_DEPEND}\"
+		fi
 		_PNAME=\"${PNAME}\"
 	}"
 }
@@ -65,12 +85,33 @@
 {
 	eval "split_info_${PNAME}-dev()
 	{
-		DESCRIPTION=\"Development files for ${PCATEGORIE}/${PNAME}-${PVER}-${PBUILD}.\"
-		DEPEND=\"== ${PCATEGORIE}/${PNAME}-${PVER}\"
+		DESCRIPTION=\"Development files for ${PCAT}/${PNAME}-${PVER}-${PBUILD}.\"
+		DEPEND=\"== ${PCAT}/${PNAME}-${PVER}\"
+		if [[ ! -z \${ALX_DEV_DEPEND} ]]
+		then
+			DEPEND=\"\${DEPEND}
+				\${ALX_DEV_DEPEND}\"
+		fi
 		_PNAME=\"${PNAME}\"
 	}"
 }
 
+# honor multilib builds
+if [[ ${MULTILIB_BUILD} = true ]]
+then
+	if [[ ! -z $(typeset -f src_install) ]]
+	then
+		# rename the old one
+		old_alx_src_install=old$(typeset -f src_install)
+		eval "${old_alx_src_install}"
+
+		alx_generic_src_install()
+		{
+			old_alx_src_install || die
+		}
+	fi
+fi
+
 alx-split_generate_src_install_dev()
 {
 	eval "alx-split_src_install_${PNAME}-dev()
@@ -102,12 +143,19 @@
 					*\**|*\\\**)
 						if [[ -e \${BINDIR}/\$(dirname \${i}) ]]
 						then
+							echo find \${BINDIR}/\$(dirname \${i}) -maxdepth 1 -name \"\$(basename \${i})\" | xargs --no-run-if-empty rm
 							find \${BINDIR}/\$(dirname \${i}) -maxdepth 1 -name \"\$(basename \${i})\" | xargs --no-run-if-empty rm
 						fi
 						;;
 					*)
 						if [[ -e \${BINDIR}/\${i} ]]
 						then
+							echo rm -r \${BINDIR}/\${i}
+							rm -r \${BINDIR}/\${i} || die
+						# busybox does not detect symlinks with -e if the reference does not exists
+						elif [[ -L \${BINDIR}/\${i} ]]
+						then
+							echo rm -r \${BINDIR}/\${i}
 							rm -r \${BINDIR}/\${i} || die
 						fi
 						;;
@@ -153,12 +201,19 @@
 					*\**|*\\\**)
 						if [[ -e \${BINDIR}/\$(dirname \${i}) ]]
 						then
+							echo find \${BINDIR}/\$(dirname \${i}) -maxdepth 1 -name \"\$(basename \${i})\" | xargs --no-run-if-empty rm
 							find \${BINDIR}/\$(dirname \${i}) -maxdepth 1 -name \"\$(basename \${i})\" | xargs --no-run-if-empty rm
 						fi
 						;;
 					*)
 						if [[ -e \${BINDIR}/\${i} ]]
 						then
+							echo rm -r \${BINDIR}/\${i}
+							rm -r \${BINDIR}/\${i} || die
+						# busybox does not detect symlinks with -e if the reference does not exists
+						elif [[ -L \${BINDIR}/\${i} ]]
+						then
+							echo rm -r \${BINDIR}/\${i}
 							rm -r \${BINDIR}/\${i} || die
 						fi
 						;;