Index: bin/ebuild.sh
===================================================================
--- bin/ebuild.sh	(revision 2640)
+++ bin/ebuild.sh	(working copy)
@@ -1061,6 +1060,20 @@
 	export PWORKDIR="$WORKDIR"
 	src_install
 	#|| abort_install "fail"
+	
+	if [[ "${NO_MULTILIB_WRAPPER}" != "*" ]] ; then
+		MULTILIB_WRAPPER_MASK="${MULTILIB_WRAPPER_MASK:-/usr/bin/*-config}"
+		for configscript in "${D}"${MULTILIB_WRAPPER_MASK} ; do
+			# we need -f && ! -L as it would install \*-config otherwise, causing
+			# an rm /usr/bin/*-config when unmerging
+			if [[ -f ${configscript} ]] && ! [[ -L ${configscript} ]] && \
+				[[ "${NO_MULTILIB_WRAPPER/$(basename "${configscript}")}" == "${NO_MULTILIB_WRAPPER}" ]] ; then
+				generate-config-wrapper "${configscript}" \
+					|| die "generating multilib config wrapper file for ${configscript} failed"
+			fi
+		done
+	fi
+	
 	prepall
 	cd "${D}"