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

diff --cc cnf/dispatch-conf.conf
index f1efe4056ea1f6cc4a25653e7a03b8843f82fa24,b51b61ae17d8584e1ab07d20840623f8e0140af4..008395132c500c3a6e2ce5c623de1327ca216624
--- 1/cnf/dispatch-conf.conf
--- 2/cnf/dispatch-conf.conf
+++ b/cnf/dispatch-conf.conf
@@@ -3,9 -3,17 +3,17 @@@
  #
  
  # Directory to archive replaced configs
 -archive-dir=/etc/config-archive
 +archive-dir="@PORTAGE_EPREFIX@/etc/config-archive"
  
  # Use rcs for storing files in the archive directory?
+ # WARNING: When configured to use rcs, read and execute permissions of
+ # archived files may be inherited from the first check in of a working
+ # file, as documented in the ci(1) man page. This means that even if
+ # the permissions of the working file have since changed, the older
+ # permissions of the first check in may be inherited. As mentioned in
+ # the ci(1) man page, users can control access to RCS files by setting
+ # the permissions of the directory containing the files (see
+ # archive-dir above).
  # (yes or no)
  use-rcs=no
  

diff --cc cnf/make.conf
Simple merge

diff --cc cnf/make.globals
index 16253d75fe32cfb69ae84c701b8793a5a7d20510,542d6aaf611fa54efc7c6c0ff576279eabb4b88d..c6ba9f532c7d14037c2e25eefe423b637a545e4e
--- 1/cnf/make.globals
--- 2/cnf/make.globals
+++ b/cnf/make.globals
@@@ -16,9 -16,11 +16,11 @@@
  CFLAGS=""
  CXXFLAGS=""
  LDFLAGS=""
+ FFLAGS=""
+ FCFLAGS=""
  
  # Default rsync mirror
 -SYNC="rsync://rsync.gentoo.org/gentoo-portage"
 +SYNC="rsync://rsync.prefix.freens.org/gentoo-portage-prefix"
  
  # Default distfiles mirrors. This rotation has multiple hosts and is reliable.
  # Approved by the mirror-admin team.

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

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

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

diff --cc pym/portage/package/ebuild/doebuild.py
index bbabf0376264516ec4a6d429769db83c3ee8cecb,6fc7489aa7317a38de17091f976b1b8a3bc6a0a6..3b63e7743b87de72ed11ae6234faab4da5154a3c
--- 1/pym/portage/package/ebuild/doebuild.py
--- 2/pym/portage/package/ebuild/doebuild.py
+++ b/pym/portage/package/ebuild/doebuild.py
@@@ -34,10 -34,10 +34,11 @@@ from portage import auxdbkeys, bsd_chfl
        unmerge, _encodings, _parse_eapi_ebuild_head, _os_merge, \
        _shell_quote, _unicode_decode, _unicode_encode
  from portage.const import EBUILD_SH_ENV_FILE, EBUILD_SH_ENV_DIR, \
 -      EBUILD_SH_BINARY, INVALID_ENV_FILE, MISC_SH_BINARY
 +      EBUILD_SH_BINARY, INVALID_ENV_FILE, MISC_SH_BINARY, \
 +      EPREFIX, EPREFIX_LSTRIP, MACOSSANDBOX_PROFILE
  from portage.data import portage_gid, portage_uid, secpass, \
        uid, userpriv_groups
+ from portage.dbapi.porttree import _parse_uri_map
  from portage.dbapi.virtual import fakedbapi
  from portage.dep import Atom, paren_enclose, use_reduce
  from portage.eapi import eapi_exports_KV, eapi_exports_merge_type, \