From: Fabian Groffen <grobian@gentoo.org>
Date: Tue, 21 Dec 2010 19:45:49 +0000 (+0100)
Subject: Merge remote branch 'overlays-gentoo-org/master' into prefix
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=16e590bdb7e960ca84f3eb7ed5a2ca275ddd1b65;p=portage.git

Merge remote branch 'overlays-gentoo-org/master' into prefix

Conflicts:
	bin/ebuild-helpers/ecompressdir
	bin/ebuild.sh
---

16e590bdb7e960ca84f3eb7ed5a2ca275ddd1b65
diff --cc bin/ebuild-helpers/ecompressdir
index 3576443bb,7ed2627e3..7361f2b90
--- a/bin/ebuild-helpers/ecompressdir
+++ b/bin/ebuild-helpers/ecompressdir
@@@ -13,17 -13,20 +13,20 @@@ case $1 i
  	--ignore)
  		shift
  		for skip in "$@" ; do
 -			[[ -d ${D}${skip} || -f ${D}${skip} ]] \
 +			[[ -d ${ED}${skip} || -f ${ED}${skip} ]] \
- 				&& touch "${D}${skip}.ecompress.skip"
+ 				&& >> "${D}${skip}.ecompress.skip"
  		done
  		exit 0
  		;;
  	--queue)
  		shift
  		set -- "${@/%/.ecompress.dir}"
 -		set -- "${@/#/${D}}"
 +		set -- "${@/#/${ED}}"
- 		touch "$@"
- 		ret=$?
+ 		ret=0
+ 		for x in "$@" ; do
+ 			>> "$x"
+ 			((ret|=$?))
+ 		done
  		[[ $ret -ne 0 ]] && helpers_die "${0##*/} failed"
  		exit $ret
  		;;
diff --cc bin/ebuild.sh
index 693ae9485,4daa07610..fd87b9c49
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@@ -331,13 -325,16 +331,16 @@@ keepdir() 
  	local x
  	if [ "$1" == "-R" ] || [ "$1" == "-r" ]; then
  		shift
 -		find "$@" -type d -printf "${D}%p/.keep_${CATEGORY}_${PN}-${SLOT}\n" \
 +		find "$@" -type d -printf "${ED}%p/.keep_${CATEGORY}_${PN}-${SLOT}\n" \
- 			| tr "\n" "\0" | ${XARGS} -0 -n100 touch || \
- 			die "Failed to recursively create .keep files"
+ 			| tr "\n" "\0" | \
+ 			while read -r -d $'\0' ; do
+ 				>> "$REPLY" || \
+ 					die "Failed to recursively create .keep files"
+ 			done
  	else
  		for x in "$@"; do
- 			touch "${ED}${x}/.keep_${CATEGORY}_${PN}-${SLOT}" || \
- 				die "Failed to create .keep in ${ED}${x}"
 -			>> "${D}${x}/.keep_${CATEGORY}_${PN}-${SLOT}" || \
++			>> "${ED}${x}/.keep_${CATEGORY}_${PN}-${SLOT}" || \
+ 				die "Failed to create .keep in ${D}${x}"
  		done
  	fi
  }
@@@ -1156,8 -1157,9 +1165,9 @@@ dyn_install() 
  	export _E_DOCDESTTREE_=""
  
  	ebuild_phase src_install
- 	touch "${PORTAGE_BUILDDIR}/.installed"
+ 	>> "$PORTAGE_BUILDDIR/.installed" || \
+ 		die "Failed to create $PORTAGE_BUILDDIR/.installed"
 -	vecho ">>> Completed installing ${PF} into ${D}"
 +	vecho ">>> Completed installing ${PF} into ${ED}"
  	vecho
  	ebuild_phase post_src_install
  
diff --cc bin/misc-functions.sh
index dc54f811f,7ad7c0d52..332fbe0a9
mode 100644,100755..100644
--- a/bin/misc-functions.sh
+++ b/bin/misc-functions.sh