--- /usr/lib/portage/bin/ebuild.sh	2005-07-22 02:46:12.000000000 +0200
+++ ebuild.sh	2005-08-14 11:57:08.000000000 +0200
@@ -332,7 +332,15 @@
 		find "$@" -type d -printf "${D}/%p/.keep\n" | tr "\n" "\0" | $XARGS -0 -n100 touch || die "Failed to recursive create .keep files"
 	else
 		for x in "$@"; do
-			touch "${D}/${x}/.keep" || die "Failed to create .keep in ${D}/${x}"
+			if [ -f "${D}/${x}/.keep" ]; then
+				local i=1
+				while [ -f "${D}/${x}/.keep${i}" ]; do
+					i=$(($i + 1))
+				done
+				touch "${D}/${x}/.keep${i}" || die "Failed to create .keep${i} in ${D}/${x}"
+			else
+				touch "${D}/${x}/.keep" || die "Failed to create .keep in ${D}/${x}"
+			fi
 		done
 	fi
 }