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

Conflicts:
	pym/_emerge/emergelog.py

diff --cc bin/ebuild
Simple merge

diff --cc bin/etc-update
index 205438943f712e8751eaa836612017bba0869529,42518adc64d7b15dbb8b49c48f0d08c06052583e..09362952ccd131acbd47757abc7382de5d02925b
--- 1/bin/etc-update
--- 2/bin/etc-update
+++ b/bin/etc-update
@@@ -549,18 -548,14 +549,19 @@@ rm -rf "${TMP}" 2> /dev/nul
  mkdir "${TMP}" || die "failed to create temp dir" 1
  # make sure we have a secure directory to work in
  chmod 0700 "${TMP}" || die "failed to set perms on temp dir" 1
 -chown ${UID:-0}:${GID:-0} "${TMP}" || die "failed to set ownership on temp dir" 1
 +# GID need not to be available, and group 0 is not cool when not being
 +# root, hence just rely on mkdir to have created a dir which is owned by
 +# the user
 +if [[ -z ${UID} || ${UID} == 0 ]] ; then
 +      chown ${UID:-0}:${GID:-0} "${TMP}" || die "failed to set ownership on temp dir" 1
 +fi
  
  # I need the CONFIG_PROTECT value
 -#CONFIG_PROTECT=$(/usr/lib/portage/bin/portageq envvar CONFIG_PROTECT)
 -#CONFIG_PROTECT_MASK=$(/usr/lib/portage/bin/portageq envvar CONFIG_PROTECT_MASK)
 +#CONFIG_PROTECT=$(@PORTAGE_BASE@/bin/portageq envvar CONFIG_PROTECT)
 +#CONFIG_PROTECT_MASK=$(@PORTAGE_BASE@/bin/portageq envvar CONFIG_PROTECT_MASK)
  
  # load etc-config's configuration
+ CLEAR_TERM=$(get_config clear_term)
  EU_AUTOMERGE=$(get_config eu_automerge)
  rm_opts=$(get_config rm_opts)
  mv_opts=$(get_config mv_opts)

diff --cc bin/portageq
index 5f0e69853f453b22ab467b37270770397ae72bc6,fa713889ac59aed5b3417a4428535660e94fc831..800b444be9e937d5becc36082910dbf111bb831f
--- 1/bin/portageq
--- 2/bin/portageq
+++ b/bin/portageq
@@@ -21,16 -21,11 +21,15 @@@ except KeyboardInterrupt
        sys.exit(128 + signal.SIGINT)
  
  import os
- import subprocess
  import types
  
 +# for an explanation on this logic, see pym/_emerge/__init__.py
 +if os.environ.__contains__("PORTAGE_PYTHONPATH"):
 +      pym_path = os.environ["PORTAGE_PYTHONPATH"]
 +else:
 +      pym_path = os.path.join(os.path.dirname(
 +              os.path.dirname(os.path.realpath(__file__))), "pym")
  # Avoid sandbox violations after python upgrade.
 -pym_path = os.path.join(os.path.dirname(
 -      os.path.dirname(os.path.realpath(__file__))), "pym")
  if os.environ.get("SANDBOX_ON") == "1":
        sandbox_write = os.environ.get("SANDBOX_WRITE", "").split(":")
        if pym_path not in sandbox_write:

diff --cc man/emerge.1
Simple merge

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

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

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

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

diff --cc pym/_emerge/emergelog.py
index 046c99b9a4c556300c15a8c705886722a3bc196b,9cac3b222aa951647b06ab837072871b4190151b..20cec9fb8e9ad0396d631f5b9a500367900b4cc6
--- 1/pym/_emerge/emergelog.py
--- 2/pym/_emerge/emergelog.py
+++ b/pym/_emerge/emergelog.py
@@@ -12,10 -12,12 +12,13 @@@ from portage import _encoding
  from portage import _unicode_encode
  from portage.data import secpass
  from portage.output import xtermTitle
 +from portage.const import EPREFIX
  
 -_emerge_log_dir = '/var/log'
+ # We disable emergelog by default, since it's called from
+ # dblink.merge() and we don't want that to trigger log writes
+ # unless it's really called via emerge.
+ _disable = True
- _disable = False
 +_emerge_log_dir = EPREFIX + '/var/log'
  
  def emergelog(xterm_titles, mystr, short_msg=None):
  

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

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

diff --cc pym/portage/_sets/files.py
index f422ed9ccbb591d57179bc1af06a63827ff75833,f19ecf6ce37151cc75d9d84baacb556b2c5d69ed..7992b82d00e9e0887b15b446cfb3916fb1940753
--- 1/pym/portage/_sets/files.py
--- 2/pym/portage/_sets/files.py
+++ b/pym/portage/_sets/files.py
@@@ -1,6 -1,7 +1,6 @@@
- # Copyright 2007 Gentoo Foundation
+ # Copyright 2007-2011 Gentoo Foundation
  # Distributed under the terms of the GNU General Public License v2
  
 -import errno
  import re
  from itertools import chain
  

diff --cc pym/portage/dbapi/bintree.py
Simple merge

diff --cc pym/portage/dbapi/vartree.py
Simple merge

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

diff --cc pym/portage/package/ebuild/_config/MaskManager.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/util/__init__.py
Simple merge