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

Conflicts:
	bin/ebuild-helpers/dosym

diff --cc bin/ebuild
index 58c2d839f2017612afcbb5f91c0dc67e72ad651e,db7e5e3857c4663be3034cc77b8ef0d8a1211216..e91149efa971150fd6e6d6668dd41a5a7c35db4d
--- 1/bin/ebuild
--- 2/bin/ebuild
+++ b/bin/ebuild
@@@ -57,19 -57,13 +57,15 @@@ opts, pargs = parser.parse_args(args=sy
  if len(pargs) < 2:
        parser.error("missing required args")
  
- if "merge" in pargs:
-       print("Disabling noauto in features... merge disables it. (qmerge doesn't)")
-       os.environ["FEATURES"] = os.environ.get("FEATURES", "") + " -noauto"
- 
  os.environ["PORTAGE_CALLER"]="ebuild"
 -try:
 -      import portage
 -except ImportError:
 -      from os import path as osp
 -      sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym"))
 -      import portage
 +# for an explanation on this logic, see pym/_emerge/__init__.py
 +from os import environ as ose
 +from os import path as osp
 +if ose.__contains__("PORTAGE_PYTHONPATH"):
 +    sys.path.insert(0, ose["PORTAGE_PYTHONPATH"])
 +else:
 +    sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.                    realpath(__file__))), "pym"))
 +import portage
  
  portage.dep._internal_warnings = True
  from portage import os

diff --cc bin/ebuild-helpers/dosym
index bd4044f632ca9a37a0bfccbecc38995e20ed4abf,7dd4c6d5146cea25f02e2f2a3748577edaf3c56a..16e0df0596e2c22fb07e5b8dabd1c9794014f8de
--- 1/bin/ebuild-helpers/dosym
--- 2/bin/ebuild-helpers/dosym
+++ b/bin/ebuild-helpers/dosym
@@@ -9,13 -9,16 +9,18 @@@ if [[ $# -ne 2 ]] ; the
        exit 1
  fi
  
- target="${1}"
- linkname="${2}"
- [[ ${target:0:1} == "/" ]] && target="${EPREFIX}${target}"
- destdir=${linkname%/*}
+ if [[ ${2} == */ ]] || \
 -      [[ -d ${D}${2} && ! -L ${D}${2} ]] ; then
++      [[ -d ${ED}${2} && ! -L ${ED}${2} ]] ; then
+       # implicit basename not allowed by PMS (bug #379899)
+       eqawarn "QA Notice: dosym target omits basename: '${2}'"
+ fi
+ 
+ destdir=${2%/*}
 -[[ ! -d ${D}${destdir} ]] && dodir "${destdir}"
 +[[ ! -d ${ED}${destdir} ]] && dodir "${destdir}"
  
- ln -snf "${target}" "${ED}/${linkname}"
 -ln -snf "$1" "${D}$2"
++target="${1}"
++[[ ${target:0:1} == "/" ]] && target="${EPREFIX}${target}"
++ln -snf "${target}" "${ED}/${2}"
  ret=$?
  [[ $ret -ne 0 ]] && helpers_die "${0##*/} failed"
  exit $ret

diff --cc bin/isolated-functions.sh
Simple merge

diff --cc pym/portage/output.py
Simple merge

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

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

diff --cc pym/portage/util/__init__.py
Simple merge

diff --cc pym/portage/util/_pty.py
Simple merge