ebuild: fetch: Flatten conditionals in _get_fetch_resume_size

[portage.git] / man / make.conf.5

diff --git a/man/make.conf.5 b/man/make.conf.5
index 461172c9b1da681d32853fbda19019611b3007c3..80f642f129947522ac89bc3826a936026fc3547f 100644 (file)
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -1,4 +1,4 @@
-.TH "MAKE.CONF" "5" "Aug 2013" "Portage VERSION" "Portage"
+.TH "MAKE.CONF" "5" "Jan 2014" "Portage VERSION" "Portage"
 .SH "NAME"
 make.conf \- custom settings for Portage
 .SH "SYNOPSIS"
@@ -12,7 +12,8 @@ simple shell\-like expansion of the form \fIvar="${var}"\fR, the source
 keyword and variable substitution, but not some of the more advanced BASH
 features like arrays and special parameter expansions. For more details, see
 the Simple lexical analysis documentation:
-\fLhttp://docs.python.org/3/library/shlex.html\fR.
+\fLhttp://docs.python.org/3/library/shlex.html\fR. Note that if you source
+files, they need to be in the same shlex syntax for portage to read them.
 .br
 Portage will check the currently\-defined environment variables
 first for any settings.  If no environment settings are found,
@@ -276,6 +277,10 @@ like "File not recognized: File truncated"), try recompiling the application
 with ccache disabled before reporting a bug. Unless you are doing development
 work, do not enable ccache.
 .TP
+.B cgroup
+Use Linux control group to control processes spawned by ebuilds. This allows
+emerge to safely kill all subprocesses when ebuild phase exits.
+.TP
 .B clean\-logs
 Enable automatic execution of the command specified by the
 PORT_LOGDIR_CLEAN variable. The default PORT_LOGDIR_CLEAN setting will
@@ -385,6 +390,10 @@ would otherwise be useless with prefix configurations. This brings
 compatibility with the prefix branch of portage, which also supports EPREFIX
 for all EAPIs (for obvious reasons).
 .TP
+.B ipc\-sandbox
+Isolate the ebuild phase functions from host IPC namespace. Supported
+only on Linux. Requires network namespace support in kernel.
+.TP
 .B lmirror
 When \fImirror\fR is enabled in \fBFEATURES\fR, fetch files even
 when \fImirror\fR is also in the \fBebuild\fR(5) \fBRESTRICT\fR variable.
@@ -401,7 +410,7 @@ This feature is enabled by default.
 Automatically perform a metadata transfer when `emerge \-\-sync` is run.
 In versions of portage >=2.1.5, this feature is disabled by
 default. When metadata\-transfer is disabled, metadata cache from the
-${PORTDIR}/metadata/md5\-cache/ directory will be used directly
+${repository_location}/metadata/md5\-cache/ directory will be used directly
 (if available).
 .TP
 .B mirror
@@ -598,11 +607,11 @@ Enable the sandbox in the compile phase, when running without root privs
 (\fIuserpriv\fR).
 .TP
 .B usersync
-Drop privileges to the owner of \fBPORTDIR\fR for \fBemerge(1) --sync\fR
+Drop privileges to the owner of ${repository_location} for \fBemerge(1) --sync\fR
 operations. Note that this feature assumes that all subdirectories of
-\fBPORTDIR\fR have the same ownership as \fBPORTDIR\fR itself. It is the
-user's responsibility to ensure correct ownership, since otherwise portage
-would have to waste time validating ownership for each and every sync
+${repository_location} have the same ownership as ${repository_location} itself.
+It is the user's responsibility to ensure correct ownership, since otherwise
+Portage would have to waste time validating ownership for each and every sync
 operation.
 .TP
 .B webrsync-gpg
@@ -898,8 +907,7 @@ Defines the location of the temporary build directories.
 .br
 Defaults to /var/tmp.
 
-This should not be set to point anywhere under the directory tree
-specified by \fBPORTDIR\fR (/usr/portage by default).
+This should not be set to point anywhere under location of any repository.
 .TP
 \fBPORTAGE_USERNAME\fR = \fI[user]\fR
 Defines the username to use when executing in userpriv/etc... modes (i.e.
@@ -917,8 +925,8 @@ when \fBxattr\fR is in \fBFEATURES\fR.
 Defaults to "security.*" (security labels are special, see bug #461868).
 .TP
 \fBPORTDIR\fR = \fI[path]\fR
-Defines the location of the Portage tree. This is the repository for all
-profile information as well as all ebuilds. If you change this, you must update
+Defines the location of main repository. This variable is deprecated in favor of
+settings in \fBrepos.conf\fR. If you change this, you must update
 your /etc/portage/make.profile symlink accordingly.
 .br
 Defaults to /usr/portage.
@@ -934,8 +942,8 @@ put other data (such as overlays) in your \fBPORTDIR\fB.  Portage will walk
 directory structures and may arbitrarily add invalid categories as packages.
 .TP
 \fBPORTDIR_OVERLAY\fR = \fI"[path] [different\-path] [etc...]"\fR
-Defines the directories in which user made ebuilds may be stored and not
-overwriten when `emerge \-\-sync` is run.  This is a space delimited list of
+Defines the locations of other repositories. This variable is deprecated in
+favor of settings in \fBrepos.conf\fR. This variable is a space\-delimited list of
 directories.
 .br
 Defaults to no value.
@@ -985,7 +993,7 @@ Defaults to /.
 \fBRPMDIR\fR = \fI[path]\fR
 Defines the location where created RPM packages will be stored.
 .br
-Defaults to ${PORTDIR}/rpm.
+Defaults to /usr/portage/rpm.
 .TP
 \fBSYNC\fR = \fI[RSYNC]\fR
 Insert your preferred rsync mirror here.  This rsync server