From: Simon Stelling <blubb@gentoo.org>
Date: Tue, 18 Jul 2006 17:09:23 +0000 (-0000)
Subject: make .keep files package-dependant to fix bug 102436
X-Git-Tag: v2.1.1~207
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=5e7ae8c3ca1eaae5dc80a3376b54d6cc4b45d16a;p=portage.git

make .keep files package-dependant to fix bug 102436

svn path=/main/trunk/; revision=3917
---

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 73fe3a4fd..f657dddce 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -332,10 +332,10 @@ keepdir() {
 	local x
 	if [ "$1" == "-R" ] || [ "$1" == "-r" ]; then
 		shift
-		find "$@" -type d -printf "${D}/%p/.keep\n" | tr "\n" "\0" | $XARGS -0 -n100 touch || die "Failed to recursive create .keep files"
+		find "$@" -type d -printf "${D}/%p/.keep_${CATEGORY}_${PN}-${SLOT}\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}"
+			touch "${D}/${x}/.keep_${CATEGORY}_${PN}-${SLOT}" || die "Failed to create .keep in ${D}/${x}"
 		done
 	fi
 }