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

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

diff --cc bin/repoman
Simple merge

diff --cc cnf/make.globals
index c6ba9f532c7d14037c2e25eefe423b637a545e4e,bcad5deb679b48a747ba9a5e42dbf2a410dd56a1..930b3d52e985990e134e563c42b14846c7709739
--- 1/cnf/make.globals
--- 2/cnf/make.globals
+++ b/cnf/make.globals
@@@ -131,10 -119,13 +131,13 @@@ PORTAGE_WORKDIR_MODE="0700
  PORTAGE_ELOG_CLASSES="log warn error"
  PORTAGE_ELOG_SYSTEM="save_summary echo"
  
 -PORTAGE_ELOG_MAILURI="root"
 +PORTAGE_ELOG_MAILURI="@rootuser@"
  PORTAGE_ELOG_MAILSUBJECT="[portage] ebuild log for \${PACKAGE} on \${HOST}"
 -PORTAGE_ELOG_MAILFROM="portage@localhost"
 +PORTAGE_ELOG_MAILFROM="@portageuser@@localhost"
  
+ # Signing command used by repoman
+ PORTAGE_GPG_SIGNING_COMMAND="gpg --sign --clearsign --yes --default-key \"\${PORTAGE_GPG_KEY}\" --homedir \"\${PORTAGE_GPG_DIR}\" \"\${FILE}\""
+ 
  #            *****************************
  #            **  DO NOT EDIT THIS FILE  **
  # ***************************************************

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

diff --cc pym/portage/const.py
index 7929c28c3da2b94821177872ed7a24bbe107c921,db3f8414be990491c480a7d5efa24d7a30ce47fd..7df2ecbd957dc67d5cd437d6745dbccd2908b3eb
--- 1/pym/portage/const.py
--- 2/pym/portage/const.py
+++ b/pym/portage/const.py
@@@ -1,23 -1,9 +1,23 @@@
  # portage: Constants
- # Copyright 1998-2010 Gentoo Foundation
+ # Copyright 1998-2011 Gentoo Foundation
  # Distributed under the terms of the GNU General Public License v2
  
 +# ===========================================================================
 +# autotool supplied constants.
 +# ===========================================================================
 +from portage.const_autotool import *
 +
  import os
  
 +# save the original prefix
 +BPREFIX = EPREFIX
 +# pick up EPREFIX from the environment if set
 +if "EPREFIX" in os.environ:
 +      if os.environ["EPREFIX"] != "":
 +              EPREFIX = os.path.normpath(os.environ["EPREFIX"])
 +      else:
 +              EPREFIX = os.environ["EPREFIX"]
 +
  # ===========================================================================
  # START OF CONSTANTS -- START OF CONSTANTS -- START OF CONSTANTS -- START OF
  # ===========================================================================
@@@ -132,10 -88,9 +132,10 @@@ EBUILD_PHASES            = ("pretend", 
  SUPPORTED_FEATURES       = frozenset([
                             "assume-digests", "binpkg-logs", "buildpkg", "buildsyspkg", "candy",
                             "ccache", "chflags", "collision-protect", "compress-build-logs",
-                            "digest", "distcc", "distlocks",
-                            "fakeroot", "fail-clean", "fixpackages", "getbinpkg",
+                            "digest", "distcc", "distlocks", "fakeroot",
+                            "fail-clean", "fixpackages", "force-mirror", "getbinpkg",
                             "installsources", "keeptemp", "keepwork", "fixlafiles", "lmirror",
 +                            "macossandbox", "macosprefixsandbox", "macosusersandbox",
                             "metadata-transfer", "mirror", "multilib-strict", "news",
                             "noauto", "noclean", "nodoc", "noinfo", "noman", "nostrip",
                             "notitles", "parallel-fetch", "parse-eapi-ebuild-head",

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

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

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