Brought forward changes from portage_2_0.

1 files changed, 77 insertions, 66 deletions

diff --git a/man/make.conf.5 b/man/make.conf.5
index 6566bb0..3c34861 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -20,7 +20,7 @@ make.defaults to make.globals to make.conf to the environment
 settings.  Clearing these variables requires a clear\-all as in:
 export USE="\-*"
 .SH "VARIABLES"
-.TP 
+.TP
 \fBACCEPT_KEYWORDS\fR = \fI[space delimited list of KEYWORDS]\fR
 Enable testing of ebuilds that have not yet been deemed 'stable'.  Users
 of the 'x86' architecture would set this to '~x86' while ppc users would
@@ -57,8 +57,8 @@ http://gcc.gnu.org/onlinedocs/gcc\-3.2/gcc/Invoking\-GCC.html
 http://gcc.gnu.org/onlinedocs/gcc\-3.3/gcc/Invoking\-GCC.html
 .br 
 http://gcc.gnu.org/onlinedocs/gcc\-2.95.3/gcc_2.html
-.TP 
-\fBCHOST\fR
+.TP
+.B CHOST
 This variable is passed by the \fIebuild scripts\fR to the \fIconfigure\fR
 step as \fI\-\-host=${CHOST}\fR.  This way you can force the build\-host.
 
@@ -69,55 +69,67 @@ http://gcc.gnu.org/onlinedocs/gcc\-3.2/gcc/Submodel\-Options.html
 http://gcc.gnu.org/onlinedocs/gcc\-3.3/gcc/Submodel\-Options.html
 .br 
 http://gcc.gnu.org/onlinedocs/gcc\-2.95.3/gcc_2.html
-.TP 
+.TP
 \fBCLEAN_DELAY\fR = \fIinteger\fR
 Determines how long the countdown delay will be after running `emerge clean`.
 .br 
 Defaults to 5 seconds.
-.TP 
+.TP
 \fBCONFIG_PROTECT\fR = \fI[space delimited list of dirs]\fR
 All directories that are defined here will have "config file protection"
 enabled for them.  For more information, please see `emerge \-\-help config`.
-.TP 
+.TP
 \fBCONFIG_PROTECT_MASK\fR = \fI[space delimited list of dirs]\fR
 All directories that are defined here will have "config file protection"
 disabled for them.  For more information, please see `emerge \-\-help config`.
-.TP 
+.TP
+.B CTARGET
+This variable is passed by the \fIebuild scripts\fR to the \fIconfigure\fR
+as \fI\-\-target=${CTARGET}\fR only if it is defined.
+.TP
 \fBDISTDIR\fR = \fI[path]\fR
 Defines the location of your local source file repository.
 .br 
 Defaults to ${PORTDIR}/distfiles.
-.TP 
+.TP
+.B EBEEP_IGNORE
+Defines whether or not to ignore audible beeps when displaying important
+informational messages.  This variable is unset by default.
+.TP
+.B EPAUSE_IGNORE
+Defines whether or not to ignore short pauses that occur when displaying
+important informational messages.  This variable is unset by default.
+.TP
 \fBFEATURES\fR = \fI"sandbox ccache autoaddcvs"\fR
 Defines actions portage takes by default.  These options should
 not be changed by anyone but developers and/or maintainers.  'sandbox' is an important
 part of \fBFEATURES\fR and should not be disabled by default.  This is 
 an incremental variable.
 .RS
-.TP 
+.TP
 .B autoaddcvs
 Causes portage to automatically try to add files to cvs that will have to be added 
 later.  Done at generation times and only works when \fIcvs\fR is also in 
 \fBFEATURES\fR.
-.TP 
+.TP
 .B buildpkg
 Binary packages will be created for all packages that are merged.
-.TP 
+.TP
 .B ccache
 Enable portage support for the ccache package.  If the ccache dir is not 
 present in the user's environment, then portage will default to 
 ${PORTAGE_TMPDIR}/ccache (with \fIuserpriv\fR) and to /root/.ccache otherwise.
-.TP 
+.TP
 .B collision\-protect
 A QA\-feature to ensure that a package doesn't overwrite files it doesn't own.
-.TP 
+.TP
 .B cvs
 A feature for developers that causes portage to enable all USE flags in SRC_URI
 when creating digests.
-.TP 
+.TP
 .B digest
 Autogenerate a digest for packages.
-.TP 
+.TP
 .B distcc
 Enable portage support for the distcc package.
 .TP 
@@ -133,7 +145,7 @@ when a problem arises (normally due to a crash or disconnect).
 Runs the script that will fix the dependencies in all binary packages.  This is 
 run whenever packages are moved around in the portage tree.  Please note that this 
 can take a lot of time.
-.TP 
+.TP
 .B getbinpkg
 Force emerges to always try to fetch files from the \fIPORTAGE_BINHOST\fR.  See 
 \fBmake.conf\fR(5) for more information.
@@ -143,40 +155,35 @@ Check the signatures of Manifests and make sure they are correct.
 .TP 
 .B keeptemp
 Do not delete the ${T} directory after the merge process.
-.TP 
+.TP
 .B keepwork
 Do not delete the ${WORKDIR} directory after the merge process.
-.TP 
-.B maketest
-Run package\-specific tests during each merge to help make sure 
-the package compiled properly.  See \fItest\fR in \fBebuild\fR(1) 
-and \fIsrc_test()\fR in \fBebuild\fR(5).
-.TP 
+.TP
 .B mirror
 This will cause \fBFETCHCOMMAND\fR to always be run even if 
 the file already exists in \fBDISTDIR\fR.
-.TP 
+.TP
 .B noauto
 When utilizing \fBebuild\fR(1), only run the function requested.
-.TP 
+.TP
 .B noclean
 Do not delete the the source and temporary files after the merge process.
-.TP 
+.TP
 .B nodoc
 Do not install doc files (/usr/share/doc).
-.TP 
+.TP
 .B noinfo
 Do not install info pages.
-.TP 
+.TP
 .B noman
 Do not install manpages.
-.TP 
+.TP
 .B nostrip
 Prevents the stripping of binaries that are merged to the live filesystem.
-.TP 
+.TP
 .B notitles
 Disables xterm titlebar updates (which contains status info).
-.TP 
+.TP
 .B sandbox
 Enable sandbox\-ing when running \fBemerge\fR(1) and \fBebuild(1)\fR.
 .TP 
@@ -190,49 +197,53 @@ live filesystem, automatically search for and set permissions on setuid
 and setgid files.  Files that are setuid have the group and other read 
 bits removed while files that are setgid have the other read bit removed.  
 See also \fIsuidctl\fR below.
-.TP 
+.TP
 .B sign
 When commiting work to cvs with \fBrepoman\fR(1), sign the Manifest with 
 a GPG key.  Read about the \fIPORTAGE_GPG_KEY\fR variable in \fBmake.conf\fR(5).
-.TP 
+.TP
 .B strict
 Have portage react strongly to conditions that have the potential to be 
 dangerous (like missing or incorrect Manifests).
-.TP 
+.TP
 .B suidctl
 Before merging packages to the live filesystem, automatically strip setuid 
 bits from any file that is not listed in \fI/etc/portage/suidctl.conf\fR.
-.TP 
+.TP
+.B test
+Run package\-specific tests during each merge to help make sure 
+the package compiled properly.  See \fItest\fR in \fBebuild\fR(1) 
+and \fIsrc_test()\fR in \fBebuild\fR(5).
+.TP
 .B userpriv
 Allow portage to drop root privledges and compile packages as 
 portage:portage without a sandbox (unless \fIusersandbox\fR is also used).
-.TP 
+.TP
 .B usersandbox
 Enable the sandbox in the compile phase, when running without root privs (\fIuserpriv\fR).
 .RE
-.TP 
+.TP
 \fBFETCHCOMMAND\fR
 This variable contains the command used for fetching package\-sources from
 the internet.
-.TP 
+.TP
 \fBGENTOO_MIRRORS\fR = \fI[URLs]\fR
 Insert your space\-seperated list of local mirrors here.  These
 locations are used to download files before the ones listed in
 the \fIebuild scripts\fR. Merging 'mirrorselect' can help.
-.TP 
-\fBHTTP_PROXY FTP_PROXY\fR = \fI[host:port]\fR
+.TP
+\fBhttp_proxy ftp_proxy\fR = \fI[host:port]\fR
 These vars are used if the sources must be downloaded from the
 internet by \fBwget\fR(1).  They are only required if you use a
-proxy server for internet access.  Either define \fIPROXY\fR or
-\fIPROXY_FTP\fR and \fIPROXY_HTTP\fR.
-.TP 
+proxy server for internet access.
+.TP
 \fBMAKEOPTS\fR
 Use this variable if you want to use parallel make.  For example, if you
 have a dual\-processor system, set this variable to "\-j2" or "\-j3" for 
 enhanced build performance with many packages. Suggested settings are
 between \fICPUs+1\fR and \fI2*CPUs+1\fR.
 For more information, see \fBmake\fR(1).
-.TP 
+.TP
 \fBNOCOLOR\fR = \fI["true" | "false"]\fR
 Defines if color should be disabled by default.
 .br 
@@ -242,11 +253,11 @@ Defaults to false.
 Defines the location where created .tbz2 binary packages will be stored.
 .br 
 Defaults to ${PORTDIR}/packages.
-.TP 
+.TP
 .B PORT_LOGDIR
 This variable defines the directory in which per\-ebuild logs are kept.
 Logs are created only when this is set and writable.
-.TP 
+.TP
 \fBPORTAGE_BINHOST\fR = \fI"ftp://login:pass@grp.mirror.site/pub/grp/i686/athlon\-xp"\fR
 This is the host from which portage will grab prebuilt\-binary packages.  
 The list is a single entry specifying the full address of the directory 
@@ -254,34 +265,34 @@ serving the tbz2's for your system.  This is only used when running with
 the get binary pkg options are given to \fBemerge\fR.  Review \fBemerge\fR(1) 
 for more information.  Note that it should point to the 'All' directory on 
 the host that creates the binary packages and not to the root of the \fBPKGDIR\fR.
-.TP 
+.TP
 \fBPORTAGE_NICENESS\fR = \fI[number]\fR
 The value of this variable will be added to the current nice level that 
 emerge is running at.  In other words, this will not set the nice level, 
 it will increment it.  For more information about nice levels and what 
 are acceptable ranges, see \fBnice\fR(1).
-.TP 
+.TP
 \fBPORTAGE_TMPDIR\fR = \fI[path]\fR
 Defines the location of the temporary build directories.
 .br 
 Defaults to /var/tmp.
-.TP 
+.TP
 \fBPORTDIR\fR = \fI[path]\fR
 Defines the location of your Portage tree.
 .br 
 Defaults to /usr/portage. 
-.TP 
+.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 
 directories.
 .br 
 Defaults to no value.
-.TP 
+.TP
 \fBRESUMECOMMAND\fR
 This variable contains the command used for resuming package\-sources that
 have been partially downloaded by the \fBFETCHCOMMAND\fR.
-.TP 
+.TP
 \fBROOT\fR = \fI[path]\fR
 Use \fBROOT\fR to specify the target root filesystem to be used for
 merging packages or ebuilds.  Typically, you should set this setting
@@ -289,42 +300,42 @@ in the environment rather than in \fI/etc/make.conf\fR itself.  It's
 typically used for creating new build images.
 .br 
 Defaults to /.
-.TP 
+.TP
 \fBRSYNC_EXCLUDEFROM\fR = \fI"/etc/portage/rsync_excludes"\fR
 This is a file that portage will pass to rsync when it updates the portage tree.  
 Specific chucks of the tree may be excluded from the sync process.  This may cause 
 dependency failures if you are not careful.  The file format is pattern per line, 
 blanks and ';' or '#' lines are comments.  See \fBrsync\fR(1) for more details.
-.TP 
+.TP
 \fBRSYNC_RETRIES\fR = \fI[NUMBER]\fR
 The number of times rsync should retry on failed connections before
 giving up.
 .br 
 Defaults to 3.
-.TP 
+.TP
 \fBRSYNC_TIMEOUT\fR = \fI[SECONDS]\fR
 The number of seconds rsync should remain idle before it determines the
 connection has timed out. Dialup users may need to set this value at or
 above 300 seconds.
 .br 
 Defaults to 180 seconds.
-.TP 
+.TP
 \fBRPMDIR\fR = \fI[path]\fR
 Defines the location where created RPM packages will be stored.
 .br 
 Defaults to ${PORTDIR}/rpm.
-.TP 
+.TP
 \fBSYNC\fR = \fI[RSYNC]\fR
 Insert your preferred rsync mirror here.  This rsync server
 is used to sync the local portage tree when `emerge \-\-sync` is run.
 .br 
 Defaults to rsync://rsync.gentoo.org/gentoo\-portage
-.TP 
+.TP
 \fBUSE\fR = \fI[space delimited list of USE items]\fR
 This variable contains options that control the build behavior of several
 packages.  More information in \fBebuild\fR(5).  Possible USE values
 can be found in \fI/usr/portage/profiles/use.desc\fR.
-.TP 
+.TP
 \fBUSE_ORDER\fR = \fI"env:pkg:conf:auto:defaults"\fR
 Determines precedence for incrementing the setting of the USE variable.
 The above setting will cause the environment (env) to override per package (pkg)
@@ -346,21 +357,21 @@ Please report bugs via http://bugs.gentoo.org/
 .BR portage (5),
 .BR ebuild (1),
 .BR ebuild (5)
-.TP 
+.TP
 The \fI/usr/sbin/ebuild.sh\fR script. 
-.TP 
+.TP
 The helper apps in \fI/usr/lib/portage/bin\fR.
 .SH "FILES"
-.TP 
+.TP
 \fB/etc/make.conf\fR 
 Contains variables for the build\-process and overwrites those in make.defaults.
-.TP 
+.TP
 \fB/etc/make.globals\fR 
 Contains the default variables for the build\-process, you should edit \fI/etc/make.conf\fR instead.
-.TP 
+.TP
 \fB/usr/portage/profiles/use.desc\fR
 Contains a list of all global USE flags.
-.TP 
+.TP
 \fB/usr/portage/profiles/use.local.desc\fR
 Contains a list of all local USE variables.
 .SH "AUTHORS"
@@ -370,4 +381,4 @@ Nicholas Jones <carpaski@gentoo.org>
 .br 
 Mike Frysinger <vapier@gentoo.org>
 .SH "CVS HEADER"
-$Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/man/make.conf.5,v 1.45 2004/11/14 05:45:57 genone Exp $
+$Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/man/make.conf.5,v 1.46 2005/02/26 07:21:14 jstubbs Exp $