From: Fabian Groffen <grobian@gentoo.org>
Date: Sat, 22 Jan 2011 14:19:02 +0000 (+0100)
Subject: Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f0aac6b7704d1acae6a4dc45e774979dba915e7b;p=portage.git

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

f0aac6b7704d1acae6a4dc45e774979dba915e7b
diff --cc cnf/dispatch-conf.conf
index f1efe4056,b51b61ae1..008395132
--- a/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.globals
index 16253d75f,542d6aaf6..c6ba9f532
--- a/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/portage/package/ebuild/doebuild.py
index bbabf0376,6fc7489aa..3b63e7743
--- a/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, \