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

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

diff --cc bin/ebuild
Simple merge

diff --cc bin/ebuild-helpers/ecompress
Simple merge

diff --cc bin/ebuild-helpers/ecompressdir
index 3576443bb36b9dbcdb3d3bebc73aeae37063f969,7ed2627e33df755287f88575216eddb787ebc459..7361f2b90aae389d6c8b8630e47729013c827d02
--- 1/bin/ebuild-helpers/ecompressdir
--- 2/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-helpers/prepstrip
Simple merge

diff --cc bin/ebuild.sh
index 693ae948580f6a99796e3709e25f7520cbf3ae95,4daa076104a651b7f70a93967e8f0bd71bc352a0..fd87b9c49a6285b5af252f7f4df4eee001562961
--- 1/bin/ebuild.sh
--- 2/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 dc54f811fc4e66aeebdd52c22fb89af32348f171,7ad7c0d52116d4ae9121754d04d66fc9f7b54602..332fbe0a9cfeb19a5b47ba11e66a987aea6ec716
mode 100644,100755..100644
--- 1/bin/misc-functions.sh
--- 2/bin/misc-functions.sh
+++ b/bin/misc-functions.sh

diff --cc pym/_emerge/depgraph.py
Simple merge

diff --cc pym/portage/package/ebuild/config.py
Simple merge

diff --cc pym/portage/package/ebuild/doebuild.py
Simple merge

diff --cc pym/portage/package/ebuild/fetch.py
Simple merge