[gentoo-commits] proj/portage:master commit in: man/

[gentoo-commits] proj/portage:master commit in: man/

[Brian Dolbec]

commit:     c62a55bcf83805b9278d976772998bc9dd18a75a
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 20 02:17:12 2015 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Sun Sep 20 02:24:52 2015 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=c62a55bc

man: repoman commit: Replace reference to "cvs" with "VCS"

 man/repoman.1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/man/repoman.1 b/man/repoman.1
index abd998b..59d8ca4 100644
--- a/man/repoman.1
+++ b/man/repoman.1
@@ -138,7 +138,7 @@ option if you would like to replace existing distfiles digests.
 Check Manifests for missing or incorrect digests
 .TP
 .B commit
-Scan directory tree for QA issues; if OK, commit via cvs
+Scan directory tree for QA issues; if OK, commit via VCS
 .SH QA KEYWORDS
 .TP
 .B CVS/Entries.IO_error

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     747b2d2079281adc60206c52b8bbf475fd982969
Author:     Allen-Kristjan Päll <akpall+gentoo <AT> fst <DOT> ee>
AuthorDate: Tue Aug 20 06:09:52 2024 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Tue Aug 20 16:29:16 2024 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=747b2d20

man/emerge.1: Fixed a typo

Signed-off-by: Allen-Kristjan Päll <akpall+gentoo <AT> fst.ee>
Closes: https://github.com/gentoo/portage/pull/1373
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 man/emerge.1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/man/emerge.1 b/man/emerge.1
index e30f5f813e..c629c68262 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -30,7 +30,7 @@ distribution.
 .SH "EBUILDS, TBZ2S, SETS AND ATOMS"
 \fBemerge\fR primarily installs packages.  You can specify
 packages to install in five possible ways: an \fIatom\fR,
-a \fIset\fR, an installed \fIfile\fR, an \fIebuild\fR, a
+a \fIset\fR, an installed \fIfile\fR, an \fIebuild\fR,
 a \fItbz2\fR file, or a \fIgpkg\fR file.
 .LP
 .TP

[gentoo-commits] proj/portage:master commit in: man/

[Mike Gilbert]

commit:     76615b8c97ef9cd24fd282e1ec2d62998220c992
Author:     Lucio Sauer <watermanpaint <AT> posteo <DOT> net>
AuthorDate: Fri Aug  9 00:14:00 2024 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Aug 15 17:27:04 2024 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=76615b8c

ebuild.5: update QA variables affected by QA_PREBUILT

Signed-off-by: Lucio Sauer <watermanpaint <AT> posteo.net>
Closes: https://github.com/gentoo/portage/pull/1367
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 man/ebuild.5 | 44 ++++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index 36d65eb18f..b83ea46e17 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -862,28 +862,6 @@ This should contain a list of file paths, relative to the image directory, of
 desktop files which should not be validated. The paths may contain regular
 expressions with escape\-quoted special characters.
 .TP
-.B QA_DT_NEEDED
-This should contain a list of file paths, relative to the image directory, of
-shared libraries that lack NEEDED entries. The paths may contain regular
-expressions with escape\-quoted special characters.
-.TP
-.B QA_EXECSTACK
-This should contain a list of file paths, relative to the image directory, of
-objects that require executable stack in order to run.
-The paths may contain fnmatch patterns.
-
-This variable is intended to be used on objects that truly need executable
-stack (i.e. not those marked to need it which in fact do not).
-.TP
-.B QA_FLAGS_IGNORED
-This should contain a list of file paths, relative to the image directory, of
-files that do not contain .GCC.command.line sections or contain .hash sections.
-The paths may contain regular expressions with escape\-quoted special
-characters.
-
-This variable is intended to be used on files of binary packages which ignore
-CFLAGS, CXXFLAGS, FFLAGS, FCFLAGS, and LDFLAGS variables.
-.TP
 .B QA_MULTILIB_PATHS
 This should contain a list of file paths, relative to the image directory, of
 files that should be ignored for the multilib\-strict checks.
@@ -906,6 +884,28 @@ the QA_* variables that support regular expressions instead
 of fnmatch patterns. The translation mechanism simply replaces
 "*" with ".*".
 .TP
+.B QA_DT_NEEDED
+This should contain a list of file paths, relative to the image directory, of
+shared libraries that lack NEEDED entries. The paths may contain regular
+expressions with escape\-quoted special characters.
+.TP
+.B QA_EXECSTACK
+This should contain a list of file paths, relative to the image directory, of
+objects that require executable stack in order to run.
+The paths may contain fnmatch patterns.
+
+This variable is intended to be used on objects that truly need executable
+stack (i.e. not those marked to need it which in fact do not).
+.TP
+.B QA_FLAGS_IGNORED
+This should contain a list of file paths, relative to the image directory, of
+files that do not contain .GCC.command.line sections or contain .hash sections.
+The paths may contain regular expressions with escape\-quoted special
+characters.
+
+This variable is intended to be used on files of binary packages which ignore
+CFLAGS, CXXFLAGS, FFLAGS, FCFLAGS, and LDFLAGS variables.
+.TP
 .B QA_PRESTRIPPED
 This should contain a list of file paths, relative to the image directory, of
 files that contain pre-stripped binaries. The paths may contain regular

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     f3ae6bb0bd495b6b16d7e617515f4504ae2e1839
Author:     Waldo Lemmer <waldolemmer1 <AT> gmail <DOT> com>
AuthorDate: Sun May 26 14:30:32 2024 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun May 26 19:09:06 2024 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=f3ae6bb0

emerge.1: Fix /var/log/emerge.log description

/var/log/emerge.log doesn't "[contain] a log of all emerge output". This
commit changes this description to better reflect what emerge.log
contains:

 - Packages that were built

 - emerge's invocation (i.e. its command-line arguments)

Signed-off-by: Waldo Lemmer <waldolemmer1 <AT> gmail.com>
Closes: https://github.com/gentoo/portage/pull/1331
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 man/emerge.1 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/man/emerge.1 b/man/emerge.1
index dd9cde5722..5c36dc1f0d 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -1,4 +1,4 @@
-.TH "EMERGE" "1" "Jan 2024" "Portage @VERSION@" "Portage"
+.TH "EMERGE" "1" "May 2024" "Portage @VERSION@" "Portage"
 .SH "NAME"
 emerge \- Command\-line interface to the Portage system
 .SH "SYNOPSIS"
@@ -1520,8 +1520,8 @@ Contains the default variables for the build process.  \fBDo not edit
 this file\fR.
 .TP
 .B /var/log/emerge.log
-Contains a log of all emerge output. This file is always appended to, so if you
-want to clean it, you need to do so manually.
+Contains a log of merged packages and invocations of \fBemerge\fR.  This file
+is always appended to, so if you want to clean it, you need to do so manually.
 .TP
 .B /var/log/emerge-fetch.log
 Contains a log of all the fetches in the previous emerge invocation.

[gentoo-commits] proj/portage:master commit in: man/

[Sam James]

commit:     8a98670a4a108814aaecbe3192b93505e8b38d50
Author:     Bryan Gardiner <bog <AT> khumba <DOT> net>
AuthorDate: Sat May 11 03:18:57 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon May 13 05:43:48 2024 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=8a98670a

ebuild.5: Escape carats which are special to groff

Raw carats are converted to circumflex characters which are not
searchable, so they need to be escaped.  See groff_char(7).

Signed-off-by: Bryan Gardiner <bog <AT> khumba.net>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 man/ebuild.5 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index a32ba4828c..36d65eb18f 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -734,7 +734,7 @@ If flag1 enabled then flag2 enabled	flag1? ( flag2 )
 If flag1 disabled then flag2 enabled	!flag1? ( flag2 )
 If flag1 disabled then flag2 disabled	!flag1? ( !flag2 )
 Must enable any one or more (inclusive or)	|| ( flag1 flag2 flag3 )
-Must enable exactly one but not more (exclusive or)	^^ ( flag1 flag2 flag3 )
+Must enable exactly one but not more (exclusive or)	\(ha\(ha ( flag1 flag2 flag3 )
 May enable at most one (EAPI 5 or later)	?? ( flag1 flag2 flag3 )
 .TE
 .TP

[gentoo-commits] proj/portage:master commit in: man/

[Sam James]

commit:     221fa725deb03a65308864d812d3f8eddec6c930
Author:     Alexey Gladkov <legion <AT> kernel <DOT> org>
AuthorDate: Sat Apr 27 13:29:47 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Apr 28 00:04:10 2024 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=221fa725

zipfile: Add an example to portage(5)

Signed-off-by: Alexey Gladkov <legion <AT> kernel.org>
Closes: https://github.com/gentoo/portage/pull/1264
Signed-off-by: Sam James <sam <AT> gentoo.org>

 man/portage.5 | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/man/portage.5 b/man/portage.5
index d8990bf416..1f717c4cb8 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -1140,7 +1140,7 @@ expire while it is in use by a running process.
 .B sync\-type
 Specifies type of synchronization performed by `emerge \-\-sync`.
 .br
-Valid non\-empty values: cvs, git, mercurial, rsync, svn, webrsync
+Valid non\-empty values: cvs, git, mercurial, rsync, zipfile, svn, webrsync
 (emerge\-webrsync)
 .br
 This attribute can be set to empty value to disable synchronization of given
@@ -1165,6 +1165,8 @@ cvs: [cvs://]:access_method:[username@]hostname[:port]:/path
 git: (git|git+ssh|http|https)://[username@]hostname[:port]/path
 .br
 rsync: (rsync|ssh)://[username@]hostname[:port]/(module|path)
+.br
+zipfile: (http|https)://hostname[:port]/path/to/zipfile.zip
 .TP
 Examples:
 .RS
@@ -1327,6 +1329,13 @@ location = /var/lib/layman/voip
 sync\-type = laymanator
 sync\-uri = git://anongit.gentoo.org/proj/voip.git
 auto\-sync = yes
+
+# Overlay with latest ebuild repository snapshot.
+[snapshot]
+location = /var/db/repos/snapshot
+sync\-type = zipfile
+sync\-uri = https://github.com/gentoo/gentoo/archive/refs/heads/master.zip
+auto\-sync = yes
 .fi
 .RE
 .TP

[gentoo-commits] proj/portage:master commit in: man/

[Sam James]

commit:     3bc61292f9d44f8fd4d8655ab10e2064c70c912f
Author:     Gábor Oszkár Dénes <gaboroszkar <AT> protonmail <DOT> com>
AuthorDate: Thu Feb 29 20:56:00 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Mar 28 04:26:12 2024 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=3bc61292

man: Document autoenabled options by --getbinpkgonly

Signed-off-by: Gábor Oszkár Dénes <gaboroszkar <AT> protonmail.com>
Closes: https://github.com/gentoo/portage/pull/1291
Signed-off-by: Sam James <sam <AT> gentoo.org>

 man/emerge.1 | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/man/emerge.1 b/man/emerge.1
index 43dc3f26b1..dd9cde5722 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -447,15 +447,17 @@ Tells emerge to ignore binary packages for which the corresponding
 ebuild dependencies have changed since the packages were built.
 In order to help avoid issues with resolving inconsistent dependencies,
 this option is automatically enabled unless the \fB\-\-usepkgonly\fR
-option is enabled. Behavior with respect to changed build\-time
+(or \fB\-\-getbinpkgonly\fR) option is enabled.
+Behavior with respect to changed build\-time
 dependencies is controlled by the \fB\-\-with\-bdeps\fR option.
 .TP
 .BR "\-\-binpkg\-respect\-use [ y | n ]"
 Tells emerge to ignore binary packages if their USE flags
 don't match the current configuration. In order to help avoid issues
 with resolving inconsistent USE flag settings, this option is
-automatically enabled unless the \fB\-\-usepkgonly\fR option
-is enabled. If \fB\-\-binpkg\-respect\-use\fR is given explicitly,
+automatically enabled unless the \fB\-\-usepkgonly\fR
+(or \fB\-\-getbinpkgonly\fR) option is enabled.
+If \fB\-\-binpkg\-respect\-use\fR is given explicitly,
 then it implies \fB\-\-autounmask\-use=n\fR, because these options
 naturally oppose each other.
 .TP

[gentoo-commits] proj/portage:master commit in: man/

[John Helmert III]

commit:     f7e0e0aba8fcb8d73e5d7f866d8023a8fb90930e
Author:     John Helmert III <ajak <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 18 05:29:27 2023 +0000
Commit:     John Helmert III <ajak <AT> gentoo <DOT> org>
CommitDate: Mon Dec 18 05:29:27 2023 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=f7e0e0ab

man/make.conf.5: fix note about gpkg extension (it's .gpkg.tar)

Signed-off-by: John Helmert III <ajak <AT> gentoo.org>

 man/make.conf.5 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/man/make.conf.5 b/man/make.conf.5
index 7e564c089f..f527166da3 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -118,7 +118,7 @@ values are \fIxpak\fI or \fIgpkg\fI.  If \fBBINPKG_FORMAT\fR is set to \fIxpak\f
 packages will have the file extension .tbz2 for any compression type for historical
 reasons.  If \fBBINPKG_FORMAT\fR is set to \fIxpak\fR, and FEATURES="binpkg-multi-instance"
 is set, packages will have the file extension .xpak.  If \fBBINPKG_FORMAT\fR is set
-to \fIgpkg\fR, packages will have the file extension .gpkg.
+to \fIgpkg\fR, packages will have the file extension .gpkg.tar.
 .TP
 \fBBINPKG_COMPRESS\fR = \fI"compression"\fR
 This variable is used to determine the compression used for \fIbinary

[gentoo-commits] proj/portage:master commit in: man/

[Sam James]

commit:     dfc192ba206c334a388bebb7e8b046bed98c0101
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 11 05:56:45 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Nov 11 07:24:02 2023 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=dfc192ba

man: fix typos

Thanks to codespell.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 man/color.map.5   |  6 +++---
 man/ebuild.5      |  8 ++++----
 man/emerge.1      | 10 +++++-----
 man/emirrordist.1 |  2 +-
 man/make.conf.5   |  6 +++---
 man/portage.5     | 14 +++++++-------
 6 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/man/color.map.5 b/man/color.map.5
index eccb0c5a97..80446175d4 100644
--- a/man/color.map.5
+++ b/man/color.map.5
@@ -17,16 +17,16 @@ pattern]\fR
 .SH "VARIABLES"
 .TP
 \fBNORMAL\fR = \fI"normal"\fR
-Defines color used for some words occuring in other contexts than those below.
+Defines color used for some words occurring in other contexts than those below.
 .TP
 \fBBAD\fR = \fI"red"\fR
-Defines color used for some words occuring in bad context.
+Defines color used for some words occurring in bad context.
 .TP
 \fBBRACKET\fR = \fI"blue"\fR
 Defines color used for brackets.
 .TP
 \fBGOOD\fR = \fI"green"\fR
-Defines color used for some words occuring in good context.
+Defines color used for some words occurring in good context.
 .TP
 \fBHILITE\fR = \fI"teal"\fR
 Defines color used for highlighted words.

diff --git a/man/ebuild.5 b/man/ebuild.5
index cce5451755..aad189bb00 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -408,7 +408,7 @@ Contains the path to the directory in which package-specific auxiliary
 files are located.  Do not modify this variable.
 .TP
 .B EBUILD_PHASE
-Contains the abreviated name of the phase function that is
+Contains the abbreviated name of the phase function that is
 currently executing, such as "setup", "unpack", "compile", or
 "preinst".
 .TP
@@ -476,7 +476,7 @@ source	source\-build which is scheduled for merge
 .TP
 .B PROVIDES_EXCLUDE\fR = \fI[space delimited list of fnmatch patterns]\fR
 Sonames and file paths matched by these fnmatch patterns will be
-excluded during genertion of \fBPROVIDES\fR metadata (see
+excluded during generation of \fBPROVIDES\fR metadata (see
 \fBportage\fR(5)). Patterns are delimited by whitespace, and it is
 possible to create patterns containing quoted whitespace.
 .TP
@@ -553,7 +553,7 @@ Defines the ebuild API version to which this package conforms. If not
 defined then it defaults to "0". If portage does not recognize the
 EAPI value then it will mask the package and refuse to perform any
 operations with it since this means that a newer version of portage
-needs to be installed first. For maximum backward compatiblity, a
+needs to be installed first. For maximum backward compatibility, a
 package should conform to the lowest possible EAPI. Note that anyone
 who uses the \fBebuild\fR(1) command with this package will be
 required to have a version of portage that recognizes the EAPI to
@@ -961,7 +961,7 @@ end the function with a call to \fBdie\fR.
 .TP
 .B pkg_setup
 This function can be used if the package needs specific setup actions or
-checks to be preformed before anything else.
+checks to be performed before anything else.
 .br
 Initial working directory: $PORTAGE_TMPDIR
 .TP

diff --git a/man/emerge.1 b/man/emerge.1
index 667138ff3a..e18bc9e257 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -457,7 +457,7 @@ with resolving inconsistent USE flag settings, this option is
 automatically enabled unless the \fB\-\-usepkgonly\fR option
 is enabled. If \fB\-\-binpkg\-respect\-use\fR is given explicitly,
 then it implies \fB\-\-autounmask\-use=n\fR, because these options
-naturally oppose eachother.
+naturally oppose each other.
 .TP
 .BR "\-\-buildpkg [ y | n ]" ", " \-b
 Tells emerge to build binary packages for all ebuilds processed in
@@ -654,7 +654,7 @@ that can pull unbuilt ebuilds into the dependency graph, since unbuilt
 ebuilds do not have any soname dependency metadata, making it impossible
 to determine whether an unresolved soname dependency can be satisfied.
 Therefore, \fB\-\-usepkgonly\fR (or \fB\-\-getbinpkgonly\fR) must be
-used in order to enable soname depedency resolution when installing
+used in order to enable soname dependency resolution when installing
 packages.
 .TP
 .BR "\-\-ignore\-world [ y | n ]"
@@ -678,7 +678,7 @@ this option.
 Assume that packages may have implicit dependencies on packages which
 belong to the @system set. This option is enabled by default. One of the
 effects of disabling this option is to allow the \-\-jobs option to
-spawn jobs without accounting for the possiblity of implicit dependencies
+spawn jobs without accounting for the possibility of implicit dependencies
 on packages that belong to the @system set.
 .TP
 .BR \-j\ [JOBS] ", "  \-\-jobs[=JOBS]
@@ -931,7 +931,7 @@ mode whenever a new slot is installed. This option is enabled by
 default.
 
 NOTE: If you want to skip all rebuilds involving slot\-operator
-dependecies (including those that involve sub\-slot changes alone),
+dependencies (including those that involve sub\-slot changes alone),
 then \fI\-\-ignore\-built\-slot\-operator\-deps=y\fR is the option
 that you are looking for, since \fI\-\-rebuild\-if\-new\-slot\fR
 does not affect rebuilds triggered by sub\-slot changes alone.
@@ -1328,7 +1328,7 @@ permanent, you can put them in /etc/portage/package.use instead.
 If \fBemerge \-\-update @system\fR or \fBemerge \-\-update @world\fR
 fails with an error message, it may be that an ebuild uses some
 newer feature not present in this version of \fBemerge\fR.  You
-can use \fBemerge \-\-update sys-apps/portage\fR to upgrade to the lastest
+can use \fBemerge \-\-update sys-apps/portage\fR to upgrade to the latest
 version, which should support any necessary new features.
 .SH "MASKED PACKAGES"
 \fINOTE: Please use caution when using development packages.  Problems

diff --git a/man/emirrordist.1 b/man/emirrordist.1
index 37a56a8bb9..51b04c4885 100644
--- a/man/emirrordist.1
+++ b/man/emirrordist.1
@@ -21,7 +21,7 @@ Perform a trial run with no changes made (typically combined
 with \fI\-v\fR or \fI\-vv\fR).
 .TP
 \fB\-v\fR, \fB\-\-verbose\fR
-Display extra information on stderr (multiple occurences
+Display extra information on stderr (multiple occurrences
 increase verbosity).
 .TP
 \fB\-\-ignore\-default\-opts\fR

diff --git a/man/make.conf.5 b/man/make.conf.5
index 045882a17a..7e564c089f 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -332,7 +332,7 @@ should not be disabled by default.
 .RS
 .TP
 .B assume\-digests
-When commiting work to cvs with \fBrepoman\fR(1), assume that all existing
+When committing work to cvs with \fBrepoman\fR(1), assume that all existing
 SRC_URI digests are correct.  This feature also affects digest generation via
 \fBebuild\fR(1) and \fBemerge\fR(1) (emerge generates digests only when the
 \fIdigest\fR feature is enabled). Existing digests for files that do not exist
@@ -421,7 +421,7 @@ Enable a special progress indicator when \fBemerge\fR(1) is calculating
 dependencies.
 .TP
 .B case\-insensitive\-fs
-Use case\-insensitive file name comparisions when merging and unmerging
+Use case\-insensitive file name comparisons when merging and unmerging
 files. Most users should not enable this feature, since most filesystems
 are case\-sensitive. You should only enable this feature if you are
 using portage to install files to a case\-insensitive filesystem.
@@ -711,7 +711,7 @@ bits removed while files that are setgid have the other read bit removed.
 See also \fIsuidctl\fR below.
 .TP
 .B sign
-When commiting work to cvs with \fBrepoman\fR(1), sign the Manifest with
+When committing 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

diff --git a/man/portage.5 b/man/portage.5
index dae4d47206..d8990bf416 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -919,7 +919,7 @@ only.
 .BR repos.conf
 Specifies \fIsite\-specific\fR repository configuration information.
 .br
-Configuration specified in \fBrepos.conf\fR can be overriden by
+Configuration specified in \fBrepos.conf\fR can be overridden by
 \fBPORTAGE_REPOSITORIES\fR environmental variable, which has the same
 format as \fBrepos.conf\fR.
 
@@ -1106,12 +1106,12 @@ Extra options to give to mercurial when updating repository (hg pull).
 Enable read\-copy\-update (RCU) behavior for sync operations. The current
 latest immutable version of a repository will be referenced by a symlink
 found where the repository would normally be located (see the \fBlocation\fR
-setting). Repository consumers should resolve the cannonical path of this
+setting). Repository consumers should resolve the canonical path of this
 symlink before attempt to access the repository, and all operations should
 be read\-only, since the repository is considered immutable. Updates occur
 by atomic replacement of the symlink, which causes new consumers to use the
 new immutable version, while any earlier consumers continue to use the
-cannonical path that was resolved earlier. This option requires
+canonical path that was resolved earlier. This option requires
 sync\-allow\-hardlinks and sync\-rcu\-store\-dir options to be enabled, and
 currently also requires that sync\-type is set to rsync. This option is
 disabled by default, since the symlink usage would require special handling
@@ -1321,7 +1321,7 @@ sync\-uri = :pserver:anonymous@anoncvs.gentoo.org:/var/cvsroot
 sync\-cvs\-repo = gentoo\-x86
 auto\-sync = yes
 
-# Overlay 'voip' syncronized with layman's plug-in sync module
+# Overlay 'voip' synchronized with layman's plug-in sync module
 [voip]
 location = /var/lib/layman/voip
 sync\-type = laymanator
@@ -1646,7 +1646,7 @@ A list of all the packages which will be displayed when you run `emerge info`.
 A list of all the variables which will be displayed when you run `emerge info`.
 .TP
 .BR license_groups
-This contains groups of licenses that may be specifed in the
+This contains groups of licenses that may be specified in the
 \fBACCEPT_LICENSE\fR variable (see \fBmake.conf\fR(5)). Refer
 to GLEP 23 for further information:
 \fIhttps://www.gentoo.org/glep/glep-0023.html\fR.
@@ -1856,7 +1856,7 @@ all objects that the package installed onto your system.
 Contains information about the sonames that a package provides, which is
 automatically generated from the files that it installs. The sonames
 may have been filtered by the \fBPROVIDES_EXCLUDE\fR \fBebuild\fR(5)
-variable. A multilib category, followed by a colon, always preceeds a
+variable. A multilib category, followed by a colon, always precedes a
 list of one or more sonames.
 
 .I Example:
@@ -1870,7 +1870,7 @@ automatically generated from the files that it installs. The sonames
 may have been filtered by the \fBREQUIRES_EXCLUDE\fR \fBebuild\fR(5)
 variable. Any sonames that a package provides are automatically excluded
 from \fBREQUIRES\fR. A multilib category, followed by a colon, always
-preceeds a list of one or more sonames.
+precedes a list of one or more sonames.
 
 .I Example:
 .nf

[gentoo-commits] proj/portage:master commit in: man/

[Mike Gilbert]

commit:     b2f543f9b3815ac8e7d7f53ab387ce51f4b8311e
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Mon Oct  9 20:46:31 2023 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Oct  9 20:46:31 2023 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=b2f543f9

man/make.conf.5: note locations with trust issues

Bug: https://bugs.gentoo.org/915330
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 man/make.conf.5 | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/man/make.conf.5 b/man/make.conf.5
index 25893c4243..045882a17a 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -214,7 +214,9 @@ unless you know what you are doing.
 \fBCCACHE_DIR\fR = \fI[path]\fR
 Defines the location of the ccache working directory.  See the \fBccache\fR(1)
 man page for more information.
-.br
+
+Only trusted users should be granted write access to this location.
+
 Defaults to /var/tmp/ccache
 .TP
 \fBCCACHE_SIZE\fR = \fI"size"\fR
@@ -282,6 +284,8 @@ they will be automatically fetched on demand for a given build. If you would
 like to selectively prune obsolete files from this directory, see
 \fBeclean\fR(1) from the gentoolkit package.
 
+Only trusted users should be granted write access to this location.
+
 Use the \fBPORTAGE_RO_DISTDIRS\fR variable to specify one or
 more read-only directories containing distfiles.
 .br
@@ -956,7 +960,9 @@ to its category. However, for backward compatibility with the layout
 used by older versions of portage, if the \fI${PKGDIR}/All\fR directory
 exists then all packages will be stored inside of it and symlinks to
 the packages will be created in the category subdirectories.
-.br
+
+Only trusted users should be granted write access to this location.
+
 Defaults to /var/cache/binpkgs.
 .TP
 .B PORT_LOGDIR
@@ -1205,7 +1211,9 @@ Defaults to 30.
 .TP
 \fBPORTAGE_TMPDIR\fR = \fI[path]\fR
 Defines the location of the temporary build directories.
-.br
+
+Only trusted users should be granted write access to ${PORTAGE_TMPDIR}/portage.
+
 Defaults to /var/tmp.
 
 This should not be set to point anywhere under location of any repository.

[gentoo-commits] proj/portage:master commit in: man/

[Sam James]

commit:     79a7fea7d32c924d290569c0d9efbc377eb87749
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Oct  6 01:30:04 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Oct  6 01:30:04 2023 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=79a7fea7

make.conf(5): update MAKEOPTS guidance

We recommend min(RAM/2GB, threads) nowadays because C++ projects may need
up to 2GB per job.

Bug: https://bugs.gentoo.org/821529
Signed-off-by: Sam James <sam <AT> gentoo.org>

 man/make.conf.5 | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/man/make.conf.5 b/man/make.conf.5
index 8f6c444ba1..762de83c4a 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -928,9 +928,10 @@ enabled for these flags may be closed as INVALID.
 .B MAKEOPTS
 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. In order to avoid
-excess load, the \fB\-\-load\-average\fR option is recommended.
+enhanced build performance with many packages. It is suggested that the jobs
+value used be the minimum of: available RAM divided by 2GB, or the number of
+threads on the system. In order to avoid excess load, the
+\fB\-\-load\-average\fR option is recommended.
 For more information, see \fBmake\fR(1). Also see \fBemerge\fR(1) for
 information about analogous \fB\-\-jobs\fR and \fB\-\-load\-average\fR options.
 Defaults to the number of processors if left unset.

[gentoo-commits] proj/portage:master commit in: man/

[Sam James]

commit:     102c79b20729ed95b8759c612eee0f4404decc8d
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 16 05:50:05 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Sep 16 05:50:05 2023 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=102c79b2

man: ebuild(5): fix has_version argument

It takes a dependency specification, not just a package name and version.

(e.g. it accepts USE flags, like app-misc/foo[x]).

Signed-off-by: Sam James <sam <AT> gentoo.org>

 man/ebuild.5 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index 9dd14d8afb..cce5451755 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -1177,10 +1177,10 @@ has a default value of ' ', or a space.  It is a \fBbash\fR(1) setting.
 Like \fBhas\fR, but also echoes \fIitem\fR when \fBhas\fR returns true.  Banned
 in \fBEAPI 8\fR.
 .TP
-.B has_version\fR \fI[\-b]\fR \fI[\-d]\fR \fI[\-r]\fR \fI[\-\-host\-root]\fR \fI<category/package\-version>
-Check to see if \fIcategory/package\-version\fR is installed.  The
+.B has_version\fR \fI[\-b]\fR \fI[\-d]\fR \fI[\-r]\fR \fI[\-\-host\-root]\fR \fI<dependency specification>
+Check to see if \fI<dependency specification>\fR is installed.  The
 parameter accepts all values that are acceptable in the \fBDEPEND\fR
-variable.  The function returns 0 if \fIcategory/package\-version\fR
+variable.  The function returns 0 if \fI<dependency specification>\fR
 is installed, 1 otherwise. The package is searched for in \fBROOT\fR
 by default.
 

[gentoo-commits] proj/portage:master commit in: man/

[Sam James]

commit:     3b1e0733abf2fdc634a64f4e118b987aec33c6fc
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 15 17:41:16 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Sep 16 05:47:57 2023 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=3b1e0733

man: use groff escape sequence for tilde characters

groff replaces normal tilde (~) with a weird "modifier" on output.
Use the escape sequence from groff_char(7) to avoid this.

Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
Closes: https://github.com/gentoo/portage/pull/1094
Signed-off-by: Sam James <sam <AT> gentoo.org>

 man/ebuild.5    | 18 +++++++++---------
 man/emerge.1    |  6 +++---
 man/make.conf.5 |  6 +++---
 man/portage.5   | 10 +++++-----
 4 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index d4187a8a47..9dd14d8afb 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -62,20 +62,20 @@ operators:
 	\fI<\fRmedia\-libs/libgd\-1.6
 .fi
 .TP
-.B Extended Atom Prefixes [!~] and Postfixes [*]
+.B Extended Atom Prefixes [!\(ti] and Postfixes [*]
 Now to get even fancier, we provide the ability to define blocking packages and
 version range matching.  Also note that these extended prefixes/postfixes may
 be combined in any way with the atom classes defined above.
 .RS
 .TP
-.I ~
+.I \(ti
 means match any revision of the base version specified.  So in the
 example below, we would match versions '1.0.2a', '1.0.2a\-r1', '1.0.2a\-r2',
 etc...
 
 \fBExample\fR:
 .nf
-	\fI~\fRnet\-libs/libnet\-1.0.2a
+	\fI\(ti\fRnet\-libs/libnet\-1.0.2a
 .fi
 .TP
 .I !
@@ -120,7 +120,7 @@ Beginning with \fBEAPI 1\fR, any atom can be constrained to match a specific
 \fBExamples\fR:
 .nf
 	x11\-libs/qt:3
-	\fI~\fRx11\-libs/qt-3.3.8:3
+	\fI\(ti\fRx11\-libs/qt-3.3.8:3
 	\fI>=\fRx11\-libs/qt-3.3.8:3
 	\fI=\fRx11\-libs/qt-3.3*:3
 .fi
@@ -572,7 +572,7 @@ file name, should be separated by whitespace.
 Should contain a list of URIs for the sources main sites and other further
 package dependent information.
 .TP
-.B KEYWORDS\fR = \fI[\-~][x86,ppc,sparc,mips,alpha,arm,hppa,...]
+.B KEYWORDS\fR = \fI[\-\(ti][x86,ppc,sparc,mips,alpha,arm,hppa,...]
 .P
 
 KEYWORDS works in conjunction with ACCEPT_KEYWORDS (see \fBmake.conf\fR(5))
@@ -590,9 +590,9 @@ Any ebuild that then has
 "amd64" in KEYWORDS will be unmasked by default.
 
 On an "unstable"
-amd64 system, ACCEPT_KEYWORDS will be set to "amd64 ~amd64", with the
+amd64 system, ACCEPT_KEYWORDS will be set to "amd64 \(tiamd64", with the
 tilde denoting "unstable." Then, if an ebuild has \fIeither\fR
-"amd64" or "~amd64" in KEYWORDS, it will be keyword unmasked by default on
+"amd64" or "\(tiamd64" in KEYWORDS, it will be keyword unmasked by default on
 that system. Similarly, if an ebuild is known to not be compatible
 with a particular architecture, the "\-" prefix ( i.e. "\-amd64") setting
 can be specified to mask it only on that arch.
@@ -612,7 +612,7 @@ This would be done by specifying "\-ppc", for example. This will ensure that
 it is explicitly keyword\-masked for that architecture.
 .IP \(bu
 When submitting an ebuild to Gentoo Linux, it is the project policy to only
-have "~arch" set in KEYWORDS
+have "\(tiarch" set in KEYWORDS
 for the architecture for which it has been successfully tested, and no more.
 As the ebuild receives more testing, Gentoo arch teams will gradually expand
 the KEYWORDS settings to "bump" the package to unstable, and possibly stable.
@@ -1605,7 +1605,7 @@ SRC_URI="ftp://alpha.gnu.org/pub/gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL\-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="\(tiamd64"
 
 BDEPEND="nls? ( sys-devel/gettext )"
 

diff --git a/man/emerge.1 b/man/emerge.1
index c9f4e45421..ed3cf929fe 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -1290,10 +1290,10 @@ Symbol	Mask Type
 
 #	package.mask
 *	missing keyword
-~	unstable keyword
+\(ti	unstable keyword
 .TE
 
-\fBNOTE:\fR The unstable keyword symbol (~) will not be shown in cases
+\fBNOTE:\fR The unstable keyword symbol (\(ti) will not be shown in cases
 in which the corresponding unstable keywords have been accepted
 globally via \fBACCEPT_KEYWORDS\fR.
 .TP
@@ -1370,7 +1370,7 @@ The \fBKEYWORDS\fR variable in an \fBebuild\fR file is also used for masking
 a package still in testing.  There are architecture\-specific keywords for
 each package that let \fBportage\fR know which systems are compatible with
 the package.  Packages which compile on an architecture, but have not been
-proven to be "stable", are masked with a tilde (\fB~\fR) in front of the
+proven to be "stable", are masked with a tilde (\fB\(ti\fR) in front of the
 architecture name.  \fBemerge\fR examines the \fBACCEPT_KEYWORDS\fR environment
 variable to allow or disallow the emerging of a package masked by
 \fBKEYWORDS\fR.  To inform \fBemerge\fR that it should build these 'testing'

diff --git a/man/make.conf.5 b/man/make.conf.5
index 2a28d2b6f7..8f6c444ba1 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -51,9 +51,9 @@ Defaults to the value of $CHOST.
 .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
-set this to '~ppc'.  This is an incremental variable.  Only define a
-~arch.
+of the 'x86' architecture would set this to '\(tix86' while ppc users would
+set this to '\(tippc'.  This is an incremental variable.  Only define a
+\(tiarch.
 .br
 Defaults to the value of $ARCH.
 .TP

diff --git a/man/portage.5 b/man/portage.5
index 1c0ce22bdb..91c3ffdb45 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -607,7 +607,7 @@ Files in this directory, including make.conf, repos.conf, sets.conf,
 and any file with a name that begins with "package." can also be directories.
 
 If it is a directory, then all the files in that directory, excluding files
-that begin with '.' or end with '~', will be sorted in lexical order by file
+that begin with '.' or end with '\(ti', will be sorted in lexical order by file
 name and summed together as if they were a single file.
 
 .I Example:
@@ -761,9 +761,9 @@ modifies effective KEYWORDS (rather than ACCEPT_KEYWORDS).
 
 .I Example:
 # always use unstable libgd
-media\-libs/libgd ~x86
+media\-libs/libgd \(tix86
 # only use stable mplayer
-media\-video/mplayer \-~x86
+media\-video/mplayer \-\(tix86
 # always use unstable netcat
 net-analyzer/netcat
 .fi
@@ -775,7 +775,7 @@ three special tokens:
 
 .nf
 \fB*\fR  package is visible if it is stable on any architecture
-\fB~*\fR package is visible if it is in testing on any architecture
+\fB\(ti*\fR package is visible if it is in testing on any architecture
 \fB**\fR package is always visible (KEYWORDS are ignored completely)
 .fi
 
@@ -1683,7 +1683,7 @@ given package should vary depending on which profile the user has selected.
 # add stable keyword to libgd
 media\-libs/libgd x86
 # remove stable keyword from mplayer and add unstable keyword
-media\-video/mplayer \-x86 ~x86
+media\-video/mplayer \-x86 \(tix86
 # remove all keywords from netcat
 net-analyzer/netcat -*
 .fi

[gentoo-commits] proj/portage:master commit in: man/

[Sam James]

commit:     6db114e2efd6ef05dbb285698f4b104f305ff113
Author:     Christian Becke <christianbecke <AT> web <DOT> de>
AuthorDate: Wed Aug  2 10:47:51 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Aug  8 04:50:17 2023 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=6db114e2

portage(5): fix description of volatile attribute

The description of the 'volatile' keyword in the 'repos.conf' section in the portage(5)
man page seems to be inconsistent.

I think the first two sentences correctly describe the behaviour of 'volatile' and
agree with the comments in portage/repository/config.py:
"Specifies whether a repository is volatile.  Volatile repositories are assumed to
contain changes made outside of Portage.  This prohibits optimizations from occurring
by assuming the integrity of the repository and its caches may be  violated."

The remainder of the paragraph inverts the meaning of 'volatile' and does not
agree with the code in portage/repository/config.py:
"Disabling this option allows local changes to be made to the repository for
e.g. development safely.  For git-synced repositories, Portage will not perform
destructive operations.  Per default, repositories are considered volatile if
their directory is owned by either 'root' or 'portage' and if it is under
/var/db/repos. Otherwise, the repository is considered non volatile."

Bug: https://bugs.gentoo.org/911594
Signed-off-by: Christian Becke <christianbecke <AT> web.de>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 man/portage.5 | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/man/portage.5 b/man/portage.5
index 4bae67720..1c0ce22bd 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -1265,11 +1265,11 @@ sync\-openpgp\-key\-path setting. Defaults to no, false.
 Specifies whether a repository is volatile.  Volatile repositories
 are assumed to contain changes made outside of Portage.  This prohibits
 optimizations from occurring by assuming the integrity of the repository
-and its caches may be violated.  Disabling this option allows local changes to
-be made to the repository for e.g. development safely.  For git-synced
-repositories, Portage will not perform destructive operations.
-Per default, repositories are considered volatile if their directory is owned
-by either 'root' or 'portage' and if it is under /var/db/repos. Otherwise,
+and its caches may be violated.  Enabling this option allows local changes to
+be made to the repository for e.g. development safely.  When enabled, Portage
+will not perform destructive operations for git-synced repositories.  Per
+default, repositories are considered volatile if their directory is not owned
+by either 'root' or 'portage' or if it is not under /var/db/repos.  Otherwise,
 the repository is considered non volatile.
 .TP
 

[gentoo-commits] proj/portage:master commit in: man/

[Sam James]

commit:     3eb9a842af0ffe2e73678f8815196633952fb1b6
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 29 01:04:10 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Apr  7 09:52:29 2023 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=3eb9a842

portage.5: document restrict-allowed, properties-allowed

Note that Portage doesn't really do anything with these
right now AFAICT but it may in future (not planned though) decide
to ignore non-acceptable tokens, etc.

Bug: https://bugs.gentoo.org/861659
Closes: https://github.com/gentoo/portage/pull/874
Signed-off-by: Sam James <sam <AT> gentoo.org>

 man/portage.5 | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/man/portage.5 b/man/portage.5
index 1c28efa49..a1358e376 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -1,4 +1,4 @@
-.TH "PORTAGE" "5" "Nov 2022" "Portage VERSION" "Portage"
+.TH "PORTAGE" "5" "Apr 2023" "Portage VERSION" "Portage"
 .SH NAME
 portage \- the heart of Gentoo
 .SH "DESCRIPTION"
@@ -1470,6 +1470,14 @@ listed toward the left of the list.
 .BR repo\-name " = <value of profiles/repo_name>"
 The name of this repository (overrides profiles/repo_name if it exists).
 .TP
+.BR properties\-allowed
+List of PROPERTIES tokens which are allowed for ebuilds within
+the repo.  If unset, any tokens is allowed.
+.TP
+.BR restrict\-allowed
+List of RESTRICT tokens which are allowed for ebuilds within
+the repo.  If unset, any tokens is allowed.
+.TP
 .BR sign\-commits " = [true|" false "]"
 Boolean value whether we should sign commits in this repo.
 .TP

[gentoo-commits] proj/portage:master commit in: man/

[Ulrich Müller]

commit:     95839090ab5796d4e64f87db91703f41c61ffd9d
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Apr  5 18:40:53 2023 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Apr  7 06:28:04 2023 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=95839090

ebuild.5: Drop list of tokens for RESTRICT and PROPERTIES

These would either be incomplete for RESTRICT or become very long.
In any case, tokens are listed below.

Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 man/ebuild.5 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index e52779d2e..e871846e4 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -1,4 +1,4 @@
-.TH "EBUILD" "5" "July 2022" "Portage VERSION" "Portage"
+.TH "EBUILD" "5" "Apr 2023" "Portage VERSION" "Portage"
 
 .SH "NAME"
 ebuild \- the internal format, variables, and functions in an ebuild script
@@ -738,7 +738,7 @@ Must enable exactly one but not more (exclusive or)	^^ ( flag1 flag2 flag3 )
 May enable at most one (EAPI 5 or later)	?? ( flag1 flag2 flag3 )
 .TE
 .TP
-.B RESTRICT\fR = \fI[strip,mirror,fetch,userpriv]
+.B RESTRICT
 This should be a space delimited list of portage features to restrict.
 You may use conditional syntax to vary restrictions as seen above in DEPEND.
 .PD 0
@@ -792,7 +792,7 @@ Disables userpriv for specific packages.
 .RE
 .PD 1
 .TP
-.B PROPERTIES\fR = \fI[interactive,live]
+.B PROPERTIES
 A space delimited list of properties, with conditional syntax support.
 .PD 0
 .RS

[gentoo-commits] proj/portage:master commit in: man/

[Ulrich Müller]

commit:     9056dde470bd1cc054c75ab2536227579631610c
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Apr  5 18:43:34 2023 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Apr  7 06:28:05 2023 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=9056dde4

ebuild.5: Document PROPERTIES=test_network

Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 man/ebuild.5 | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/man/ebuild.5 b/man/ebuild.5
index e871846e4..66c8518b3 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -803,6 +803,11 @@ One or more ebuild phases will produce a prompt that requires user interaction.
 .I live
 The package uses live source code that may vary each time that the package
 is installed.
+.TP
+.I test_network
+The package manager may run tests that require an internet connection, even if
+the ebuild has
+.IR RESTRICT=test .
 .RE
 .PD 1
 .TP

[gentoo-commits] proj/portage:master commit in: man/

[Sam James]

commit:     95be4f4e72a28df07de10d0864b2e4800f1a22cd
Author:     Oskari Pirhonen <xxc3ncoredxx <AT> gmail <DOT> com>
AuthorDate: Sun Feb 26 21:19:19 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Feb 26 21:55:24 2023 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=95be4f4e

ebuild(5): add QA_CONFIG_IMPL_DECL_SKIP

Signed-off-by: Oskari Pirhonen <xxc3ncoredxx <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 man/ebuild.5 | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/man/ebuild.5 b/man/ebuild.5
index decef8399..029917878 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -916,6 +916,11 @@ If set, then portage verifies that all pkg-config .pc files have a Version field
 with the value of QA_PKGCONFIG_VERSION. For example, set
 \fIQA_PKGCONFIG_VERSION=${PV}\fR if your package is expected to install all
 pkg-config .pc files with a Version field containing PV.
+.TP
+.B QA_CONFIG_IMPL_DECL_SKIP
+This should contain a list of function names to ignore when checking for
+\fI-Wimplicit-function-declaration\fR in configure logs. This should only be
+used for false positives.
 
 .SH "PORTAGE DECLARATIONS"
 .TP

[gentoo-commits] proj/portage:master commit in: man/

[Sam James]

commit:     8e97aab2aee65880e6e3728fa57c7bc99b0ecd8e
Author:     Oskari Pirhonen <xxc3ncoredxx <AT> gmail <DOT> com>
AuthorDate: Sun Feb 26 21:42:12 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Feb 26 21:55:24 2023 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=8e97aab2

ebuild(5): alphabetize QA_* vars

Signed-off-by: Oskari Pirhonen <xxc3ncoredxx <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 man/ebuild.5 | 98 ++++++++++++++++++++++++++++++------------------------------
 1 file changed, 49 insertions(+), 49 deletions(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index 029917878..e52779d2e 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -829,23 +829,30 @@ binary objects that cannot be altered.
 
 Note that objects that violate these rules may fail on some architectures.
 .TP
-.B QA_PREBUILT
-This should contain a list of file paths, relative to the image
-directory, of files that are pre\-built binaries. Paths
-listed here will be appended to each of the QA_* variables
-listed below. The paths may contain fnmatch\-like patterns
-which will be internally translated to regular expressions for
-the QA_* variables that support regular expressions instead
-of fnmatch patterns. The translation mechanism simply replaces
-"*" with ".*".
+.B QA_AM_MAINTAINER_MODE
+This should contain a list of lines containing automake missing \-\-run
+commands. The lines may contain regular expressions with escape\-quoted
+special characters.
 .TP
-.B QA_TEXTRELS
-This variable can be set to a list of file paths, relative to the image
-directory, of files that contain text relocations that cannot be eliminated.
-The paths may contain fnmatch patterns.
-
-This variable is intended to be used on closed\-source binary objects that
-cannot be altered.
+.B QA_CONFIG_IMPL_DECL_SKIP
+This should contain a list of function names to ignore when checking for
+\fI-Wimplicit-function-declaration\fR in configure logs. This should only be
+used for false positives.
+.TP
+.B QA_CONFIGURE_OPTIONS
+This should contain a list of configure options which trigger warnings about
+unrecognized options. The options may contain regular expressions with
+escape\-quoted special characters.
+.TP
+.B QA_DESKTOP_FILE
+This should contain a list of file paths, relative to the image directory, of
+desktop files which should not be validated. The paths may contain regular
+expressions with escape\-quoted special characters.
+.TP
+.B QA_DT_NEEDED
+This should contain a list of file paths, relative to the image directory, of
+shared libraries that lack NEEDED entries. The paths may contain regular
+expressions with escape\-quoted special characters.
 .TP
 .B QA_EXECSTACK
 This should contain a list of file paths, relative to the image directory, of
@@ -855,11 +862,6 @@ The paths may contain fnmatch patterns.
 This variable is intended to be used on objects that truly need executable
 stack (i.e. not those marked to need it which in fact do not).
 .TP
-.B QA_WX_LOAD
-This should contain a list of file paths, relative to the image directory, of
-files that contain writable and executable segments.  These are rare.
-The paths may contain fnmatch patterns.
-.TP
 .B QA_FLAGS_IGNORED
 This should contain a list of file paths, relative to the image directory, of
 files that do not contain .GCC.command.line sections or contain .hash sections.
@@ -875,6 +877,22 @@ files that should be ignored for the multilib\-strict checks.
 The paths may contain regular expressions with escape\-quoted special
 characters.
 .TP
+.B QA_PKGCONFIG_VERSION
+If set, then portage verifies that all pkg-config .pc files have a Version field
+with the value of QA_PKGCONFIG_VERSION. For example, set
+\fIQA_PKGCONFIG_VERSION=${PV}\fR if your package is expected to install all
+pkg-config .pc files with a Version field containing PV.
+.TP
+.B QA_PREBUILT
+This should contain a list of file paths, relative to the image
+directory, of files that are pre\-built binaries. Paths
+listed here will be appended to each of the QA_* variables
+listed below. The paths may contain fnmatch\-like patterns
+which will be internally translated to regular expressions for
+the QA_* variables that support regular expressions instead
+of fnmatch patterns. The translation mechanism simply replaces
+"*" with ".*".
+.TP
 .B QA_PRESTRIPPED
 This should contain a list of file paths, relative to the image directory, of
 files that contain pre-stripped binaries. The paths may contain regular
@@ -891,36 +909,18 @@ shared libraries that have SONAMEs but should not have a corresponding SONAME
 symlink in the same directory. The paths may contain regular expressions
 with escape\-quoted special characters.
 .TP
-.B QA_AM_MAINTAINER_MODE
-This should contain a list of lines containing automake missing \-\-run
-commands. The lines may contain regular expressions with escape\-quoted
-special characters.
-.TP
-.B QA_CONFIGURE_OPTIONS
-This should contain a list of configure options which trigger warnings about
-unrecognized options. The options may contain regular expressions with
-escape\-quoted special characters.
-.TP
-.B QA_DT_NEEDED
-This should contain a list of file paths, relative to the image directory, of
-shared libraries that lack NEEDED entries. The paths may contain regular
-expressions with escape\-quoted special characters.
+.B QA_TEXTRELS
+This variable can be set to a list of file paths, relative to the image
+directory, of files that contain text relocations that cannot be eliminated.
+The paths may contain fnmatch patterns.
+
+This variable is intended to be used on closed\-source binary objects that
+cannot be altered.
 .TP
-.B QA_DESKTOP_FILE
+.B QA_WX_LOAD
 This should contain a list of file paths, relative to the image directory, of
-desktop files which should not be validated. The paths may contain regular
-expressions with escape\-quoted special characters.
-.TP
-.B QA_PKGCONFIG_VERSION
-If set, then portage verifies that all pkg-config .pc files have a Version field
-with the value of QA_PKGCONFIG_VERSION. For example, set
-\fIQA_PKGCONFIG_VERSION=${PV}\fR if your package is expected to install all
-pkg-config .pc files with a Version field containing PV.
-.TP
-.B QA_CONFIG_IMPL_DECL_SKIP
-This should contain a list of function names to ignore when checking for
-\fI-Wimplicit-function-declaration\fR in configure logs. This should only be
-used for false positives.
+files that contain writable and executable segments.  These are rare.
+The paths may contain fnmatch patterns.
 
 .SH "PORTAGE DECLARATIONS"
 .TP

[gentoo-commits] proj/portage:master commit in: man/

[Sam James]

commit:     389ad205d6960404218eff55c5f3bd870a0342e0
Author:     Diego Viola <diego.viola <AT> gmail <DOT> com>
AuthorDate: Sun Feb 12 18:18:09 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Feb 15 05:45:10 2023 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=389ad205

man/portage.5: fix typo

Signed-off-by: Diego Viola <diego.viola <AT> gmail.com>
Closes: https://github.com/gentoo/portage/pull/986
Signed-off-by: Sam James <sam <AT> gentoo.org>

 man/portage.5 | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/man/portage.5 b/man/portage.5
index f722bfb1a..1c28efa49 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -447,7 +447,7 @@ to be removed by \fBemerge\fR(1) \fB\-\-depclean\fR actions (see the
 # you take care of the kernel
 sys-kernel/development-sources-2.6.7
 
-# you installed your own special copy of QT
+# you installed your own special copy of Qt
 x11-libs/qt-3.3.0
 
 # you have modular X but packages want monolithic
@@ -472,7 +472,7 @@ a '\-'.
 .nf
 # force docs for GTK 2.x
 =x11\-libs/gtk+\-2* doc
-# unforce mysql support for QT
+# unforce mysql support for Qt
 x11\-libs/qt \-mysql
 .fi
 .TP
@@ -494,7 +494,7 @@ a '\-'.
 .nf
 # mask docs for GTK 2.x
 =x11\-libs/gtk+\-2* doc
-# unmask mysql support for QT
+# unmask mysql support for Qt
 x11\-libs/qt \-mysql
 .fi
 .TP
@@ -875,7 +875,7 @@ KEYWORDS.
 Per\-package USE flags.  Useful for tracking local USE flags or for
 enabling USE flags for certain packages only.  Perhaps you develop GTK
 and thus you want documentation for it, but you don't want
-documentation for QT.  Easy as pie my friend!
+documentation for Qt.  Easy as pie my friend!
 
 .I Format:
 .nf
@@ -891,7 +891,7 @@ assignments or defaults, you need to explicitly specify '\-*'.
 .nf
 # turn on docs for GTK 2.x
 =x11\-libs/gtk+\-2* doc
-# disable mysql support for QT
+# disable mysql support for Qt
 x11\-libs/qt \-mysql
 # set preferred video card for all packages
 */* VIDEO_CARDS: \-* radeon

[gentoo-commits] proj/portage:master commit in: man/

[Sam James]

commit:     704554770bb49bdfc24e9245404e2f0da938e3d7
Author:     Jernej Jakob <jernej.jakob+gentoo <AT> gmail <DOT> com>
AuthorDate: Tue Jun  7 14:13:20 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jan 14 16:41:48 2023 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=70455477

man/portage.5: document portage skips files that begin with '.' or end '~'

Closes: https://bugs.gentoo.org/834038
Signed-off-by: Jernej Jakob <jernej.jakob+gentoo <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 man/portage.5 | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/man/portage.5 b/man/portage.5
index a19e14647..c2c92faaa 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -604,10 +604,11 @@ virtual/aspell\-dict   app\-dicts/aspell\-en
 .TP
 .BR /etc/portage/
 Files in this directory, including make.conf, repos.conf, sets.conf,
-and any file with a name that begins with "package.", can be
-more than just a flat file.  If it is a directory, then all the files in that
-directory will be sorted in lexical order by file name and summed together
-as if it were a single file.
+and any file with a name that begins with "package." can also be directories.
+
+If it is a directory, then all the files in that directory, excluding files
+that begin with '.' or end with '~', will be sorted in lexical order by file
+name and summed together as if they were a single file.
 
 .I Example:
 .nf

[gentoo-commits] proj/portage:master commit in: man/

[Sam James]

commit:     0fff3fad5d82fb446dde744a42a866a2c1e7988c
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 21 01:26:44 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Dec 21 01:28:03 2022 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=0fff3fad

man/portage.5: expand on volatile configuration option

Suggested-by: Florian Schmaus <flow <AT> gentoo.org>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 man/portage.5 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/man/portage.5 b/man/portage.5
index c5100940b..a19e14647 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -1266,6 +1266,9 @@ optimizations from occurring by assuming the integrity of the repository
 and its caches may be violated.  Disabling this option allows local changes to
 be made to the repository for e.g. development safely.  For git-synced
 repositories, Portage will not perform destructive operations.
+Per default, repositories are considered volatile if their directory is owned
+by either 'root' or 'portage' and if it is under /var/db/repos. Otherwise,
+the repository is considered non volatile.
 .TP
 
 .RE

[gentoo-commits] proj/portage:master commit in: man/

[Sam James]

commit:     da2bb93c0e21f5778335e3cbe12b283fc3adb47b
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Oct  4 12:34:25 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Oct 10 19:49:15 2022 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=da2bb93c

man: make.conf.5: cleanup whitespace

Signed-off-by: Sam James <sam <AT> gentoo.org>

 man/make.conf.5 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/man/make.conf.5 b/man/make.conf.5
index 0c56e9c78..11bcbe238 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -376,11 +376,11 @@ This feature is enabled by default.
 .B binpkg-request-signature
 Binary packages are requested to be signed by trusted GPG signature.
 Portage will reject to process any binary package without a valid GPG
-signature. The verify command is defined in 
+signature. The verify command is defined in
 \fBBINPKG_GPG_VERIFY_COMMAND\fR variable.
 .TP
 .B binpkg-signing
-Binary packages will be signed by given GPG command. The signing command 
+Binary packages will be signed by given GPG command. The signing command
 is defined in \fBBINPKG_GPG_SIGNING_COMMAND\fR variable.
 .TP
 .B buildpkg

[gentoo-commits] proj/portage:master commit in: man/

[Sam James]

commit:     d64da802090024682b17f4aa10ce7bfd602a1df4
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Oct  4 12:33:32 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Oct 10 19:49:15 2022 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=d64da802

man: xpak.5: mention gpkg

Signed-off-by: Sam James <sam <AT> gentoo.org>
Closes: https://github.com/gentoo/portage/pull/920
Signed-off-by: Sam James <sam <AT> gentoo.org>

 man/xpak.5 | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/man/xpak.5 b/man/xpak.5
index 536810db5..36c8891ec 100644
--- a/man/xpak.5
+++ b/man/xpak.5
@@ -1,10 +1,11 @@
-.TH XPAK 5 "Oct 2011" "Portage VERSION" "Portage"
+.TH XPAK 5 "Oct 2022" "Portage VERSION" "Portage"
 .SH NAME
 xpak \- The XPAK Data Format used with Portage binary packages
 .SH DESCRIPTION
-Every Gentoo binary package has a xpak attached to it which contains build
-time information like the USE flags it was built with, the ebuild it was
-built from, the environmental variables, CFLAGS, CXXFLAGS, etc...
+Gentoo binary packages built in the \fIxpak\fR format have an xpak attached to
+it which contains build time information like the USE flags it was built with,
+the ebuild it was built from, the environmental variables, CFLAGS, CXXFLAGS, etc.
+Note that the \fIgpkg\fR format is different and described in GLEP 78.
 .SH NOTES
 .SS Data Types
 The following conventions cover all occurrences in this documentation

[gentoo-commits] proj/portage:master commit in: man/

[Sam James]

commit:     b66c1fe449fda61e88a615ac2623cfc15f1c9147
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Oct  4 12:25:34 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Oct 10 19:49:14 2022 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=b66c1fe4

man: make.conf.5: mention BINPKG_FORMAT, gpkg

Signed-off-by: Sam James <sam <AT> gentoo.org>

 man/make.conf.5 | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/man/make.conf.5 b/man/make.conf.5
index a527a3f74..0c56e9c78 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -112,6 +112,10 @@ ACCEPT_RESTRICT="*"
 ACCEPT_RESTRICT="* -bindist"
 .fi
 .TP
+.B BINPKG_FORMAT
+This variable sets the format used for tar binary packages. Possible
+values are \fIxpak\fI or \fIgpkg\fI.
+.TP
 \fBBINPKG_COMPRESS\fR = \fI"compression"\fR
 This variable is used to determine the compression used for \fIbinary
 packages\fR. Supported settings and compression algorithms are: bzip2, gzip,
@@ -928,7 +932,7 @@ Defines if color should be disabled by default.
 Defaults to false.
 .TP
 \fBPKGDIR\fR = \fI[path]\fR
-Defines the location where created .tbz2 binary packages will be
+Defines the location where created .tbz2 or .gpkg binary packages will be
 stored when the \fBemerge\fR(1) \fB\-\-buildpkg\fR option is enabled.
 By default, a given package is stored in a subdirectory corresponding
 to its category. However, for backward compatibility with the layout
@@ -947,7 +951,7 @@ See \fIPORTAGE_LOGDIR_CLEAN\fR below. Deprecated.
 \fBPORTAGE_BINHOST\fR = \fI[space delimited URI list]\fR
 This is a list of hosts from which portage will grab prebuilt\-binary packages.
 Each entry in the list must specify the full address of a directory
-serving tbz2's for your system (this directory must contain a 'Packages' index
+serving tbz2/gpkgs for your system (this directory must contain a 'Packages' index
 file). This is only used when running with
 the get binary pkg options are given to \fBemerge\fR.  Review \fBemerge\fR(1)
 for more information. The \fBPORTAGE_BINHOST\fR variable is deprecated in
@@ -965,7 +969,8 @@ setting as the base URI.
 .TP
 .B PORTAGE_BINPKG_FORMAT
 This variable sets default format used for binary packages. Possible values
-are tar and rpm or both.
+are tar and rpm or both. It is very uncommon to set this and is likely
+not what you want. You probably want \fBBINPKG_FORMAT\fR instead.
 .TP
 .B PORTAGE_BINPKG_TAR_OPTS
 This variable contains options to be passed to the tar command for creation

[gentoo-commits] proj/portage:master commit in: man/

[Sam James]

commit:     44c41c039af26607809ca1991d0538e9716eaa19
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Oct  4 12:31:04 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Oct 10 19:49:14 2022 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=44c41c03

man: emerge.1: mention gpkg

Signed-off-by: Sam James <sam <AT> gentoo.org>

 man/emerge.1 | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/man/emerge.1 b/man/emerge.1
index 4eaf073e2..f70ae9f23 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -4,8 +4,8 @@ emerge \- Command\-line interface to the Portage system
 .SH "SYNOPSIS"
 .TP
 .BR emerge
-[\fIoptions\fR] [\fIaction\fR] [\fIebuild\fR | \fItbz2file\fR | \fIfile\fR |
-\fI@set\fR | \fIatom\fR] ...
+[\fIoptions\fR] [\fIaction\fR] [\fIebuild\fR | \fItbz2 file\fR | \fIgpkg file\fR |
+\fIfile\fR | \fI@set\fR | \fIatom\fR] ...
 .TP
 .BR emerge
 \fB\-\-sync\fR [\fIrepo\fR | \fIalias\fR] ...
@@ -30,8 +30,8 @@ distribution.
 .SH "EBUILDS, TBZ2S, SETS AND ATOMS"
 \fBemerge\fR primarily installs packages.  You can specify
 packages to install in five possible ways: an \fIatom\fR,
-a \fIset\fR, an installed \fIfile\fR, an \fIebuild\fR, or
-a \fItbz2file\fR.
+a \fIset\fR, an installed \fIfile\fR, an \fIebuild\fR, a
+a \fItbz2\fR file, or a \fIgpkg\fR file.
 .LP
 .TP
 .BR ebuild
@@ -47,11 +47,17 @@ The \fIebuild\fR may also be an actual filename, such as
 \fBWARNING:\fR The implementation of \fBemerge /path/to/ebuild\fR is broken and
 so this syntax shouldn't be used.
 .TP
-.BR tbz2file
-A \fItbz2file\fR must be a valid .tbz2 created with \fBebuild
+.BR "tbz2 file"
+A \fItbz2\fR file must be a valid .tbz2 created with \fBebuild
 <package>\-<version>.ebuild package\fR or \fBemerge \-\-buildpkg
 [category/]<package>\fR or \fBquickpkg [category/]<package>\fR.
 .TP
+.BR "gpkg file"
+A \fIgpkg\fR file must be a valid .gpkg created with \fBebuild
+<package>\-<version>.ebuild package\fR or \fBemerge \-\-buildpkg
+[category/]<package>\fR or \fBquickpkg [category/]<package>\fR
+with \fBBINPKG_FORMAT="gpkg"\fR.
+.TP
 .BR file
 A \fIfile\fR must be a file or directory that has been installed by one or
 more packages. If an absolute path is not used, then it must begin with
@@ -99,9 +105,9 @@ specific \fBSLOT\fR by appending a colon and a \fBSLOT\fR. Example:
 If no action is specified, the action is to merge in the specified
 packages, satisfying any dependencies that they may have.  The
 arguments can be \fIatoms\fR, \fIsets\fR, installed \fIfiles\fR,
-\fIebuilds\fR, or \fItbz2s\fR.
+\fIebuilds\fR, \fItbz2s\fR, or \fIgpkgs\fR.
 \fBNote that you need to use the \-\-usepkg
-option if you want to install a tbz2\fR.  The packages are added
+option if you want to install a tbz2 or a gpkg.\fR  The packages are added
 to the \fBworld\fR file at the end, so that they are considered for
 later updating.
 .TP
@@ -457,10 +463,10 @@ naturally oppose eachother.
 Tells emerge to build binary packages for all ebuilds processed in
 addition to actually merging the packages.  Useful for maintainers
 or if you administrate multiple Gentoo Linux systems (build once,
-emerge tbz2s everywhere) as well as disaster recovery. The package
+emerge tbz2s or gpkgs everywhere) as well as disaster recovery. The package
 will be created in the \fBPKGDIR\fR directory (see \fBmake.conf\fR(5)).
 An alternative for already\-merged
-packages is to use \fBquickpkg\fR(1) which creates a tbz2 from the
+packages is to use \fBquickpkg\fR(1) which creates a tbz2 or gpkg from the
 live filesystem.
 .TP
 .BR \-\-buildpkg\-exclude " ATOMS"

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     b7c3656f8c356b20675abf90df37b24ab8b8eeb5
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 10 12:57:23 2022 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Fri Aug 12 16:05:47 2022 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=b7c3656f

man/emerge.1: add clarification to -k and -K

Both -k and -K imply --with-bdeps=n.  While this is already noted
under the documentation for --with-bdeps, a brief reminder under
the documentation for -k and -K is useful.  A user interested in
binary packages might look under -k and -K first and miss the
default behavior with respect to build time dependencies.

Bug: https://bugs.gentoo.org/863422
Closes: https://github.com/gentoo/portage/pull/886
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 man/emerge.1 | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/man/emerge.1 b/man/emerge.1
index 5ba88f3bc..4eaf073e2 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -1056,13 +1056,16 @@ Tells emerge to use binary packages (from $PKGDIR) if they are available, thus
 possibly avoiding some time\-consuming compiles.  This option is useful for CD
 installs; you can export PKGDIR=/mnt/cdrom/packages and then use this option to
 have emerge "pull" binary packages from the CD in order to satisfy
-dependencies.
+dependencies.  Note this option implies \fB\-\-with\-bdeps=n\fR.  To include
+build time dependencies, \fB\-\-with\-bdeps=y\fR must be specified explicitly.
 .TP
 .BR "\-\-usepkgonly [ y | n ]" ", " \-K
 Tells emerge to only use binary packages (from $PKGDIR).  All the binary
 packages must be available at the time of dependency calculation or emerge
 will simply abort.  Portage does not use ebuild repositories when calculating
-dependency information so all masking information is ignored.
+dependency information so all masking information is ignored.  Like \fB\-k\fR
+above, this option implies \fB\-\-with\-bdeps=n\fR.  To include build time
+dependencies, \fB\-\-with\-bdeps=y\fR must be specified explicitly.
 .TP
 .BR "\-\-usepkg\-exclude\-live [ y | n ]"
 Tells emerge to not install from binary packages for live ebuilds.

[gentoo-commits] proj/portage:master commit in: man/

[Sam James]

commit:     15382caac82eea9b8cdd2992a3685fdba5834aa0
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 20 03:41:43 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jul 20 03:41:43 2022 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=15382caa

portage.5: improve package.mask example/guidance

Make it match the format we recommend in devmanual.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 man/portage.5 | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/man/portage.5 b/man/portage.5
index b03314456..0c1a60827 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -1680,10 +1680,12 @@ package has been masked and WHO is doing the masking.
 
 .I Example:
 .nf
-# masked for security reasons
+# Larry The Cow <larry@example.com> (2 Jan 2022)
+# Masked for security reasons, bug #123456
 <sys\-libs/zlib\-1.1.4
-# <caleb@gentoo.org> (10 Sep 2003)
-# new kde betas
+
+# Larry The Cow <larry@example.com> (1 jan 2022)
+# New KDE betas
 =kde\-base/kde\-3.2.0_beta1
 =kde\-base/kdeaccessibility\-3.2.0_beta1
 .fi

[gentoo-commits] proj/portage:master commit in: man/

[Sam James]

commit:     87d3ee0ff6b553e99670138ede51551d78e02fbf
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 20 03:39:16 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jul 20 03:39:16 2022 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=87d3ee0f

portage.5: fix typo

Signed-off-by: Sam James <sam <AT> gentoo.org>

 man/portage.5 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/man/portage.5 b/man/portage.5
index f42564664..b03314456 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -415,7 +415,7 @@ to be enabled.
 .nf
 # By setting INSTALL_MASK in bashrc/nostandardconf.conf, we can avoid installing
 # the standard configuration and enable another package to install it.
-net-misc/dhcp nostardardconf.conf
+net-misc/dhcp nostandardconf.conf
 .fi
 .TP
 .BR package.provided

[gentoo-commits] proj/portage:master commit in: man/

[Sam James]

commit:     135a1640916719ba8de5ad5f4fc00435ee96dea8
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 20 03:34:43 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jul 20 03:38:17 2022 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=135a1640

ebuild.1: sort phase order references; mention explicit phase names

Signed-off-by: Sam James <sam <AT> gentoo.org>

 man/ebuild.1 | 35 +++++++++++++++++++++--------------
 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git a/man/ebuild.1 b/man/ebuild.1
index 5893c3df6..113d04092 100644
--- a/man/ebuild.1
+++ b/man/ebuild.1
@@ -35,7 +35,8 @@ Shows a condensed form of this man page along with a lot of package
 specific information.
 .TP
 .BR setup
-Runs all package-specific setup actions and exotic system checks.
+Runs all package-specific setup actions (by running the \fIpkg_setup()\fR
+function specified in the ebuild file) and exotic system checks.
 .TP
 .BR clean
 Cleans the temporary build directory that Portage has created for
@@ -116,13 +117,10 @@ current working directory will be set to ${S}.  When src_compile()
 completes, the sources should be fully compiled.
 .TP
 .BR test
-Runs package-specific test cases to verify that everything was built
+Runs package-specific test cases by running the \fIsrc_test()\fR function
+specified in the ebuild file to verify that everything was built
 properly.
 .TP
-.BR preinst
-Runs package-specific actions that need to be done before the package
-is installed into the live filesystem.
-.TP
 .BR install
 Installs the package to the temporary \fIinstall directory\fR by running
 the \fIsrc_install()\fR function.  When completed, the
@@ -130,13 +128,19 @@ the \fIsrc_install()\fR function.  When completed, the
 will contain all the files that should either be merged to the local
 filesystem or included in a binary package.
 .TP
+.BR preinst
+Runs package-specific actions (by running the \fIpkg_preinst()\fR
+function specified in the ebuild file) that need to be done before the package
+is installed into the live filesystem.
+.TP
 .BR instprep
 Performs the additional post-install/pre-merge preparations inside
 the temporary \fIinstall directory\fR.  This is intended to be called
 \fBafter\fR building binary package but before executing \fBpreinst\fR.
 .TP
 .BR postinst
-Runs package-specific actions that need to be done after the package
+Runs package-specific actions (by running the \fIpkg_postinst()\fR
+function specified in the ebuild file) that need to be done after the package
 is installed into the live filesystem.  Usually helpful messages are
 shown here.
 .TP
@@ -167,22 +171,25 @@ then unmerge the old one.  In fact, this is the recommended package
 upgrade method.
 .TP
 .BR prerm
-Runs package-specific actions that need to be executed before the package is
-removed from the filesystem.  See also \fIunmerge\fR.
+Runs package-specific actions (by running the \fIpkg_prerm()\fR
+function specified in the ebuild file) that need to be executed before the
+package is removed from the filesystem.  See also \fIunmerge\fR.
 .TP
 .BR postrm
-Runs package-specific actions that need to be executed after the package is
-removed from the filesystem.  See also \fIunmerge\fR.
+Runs package-specific actions (by running the \fIpkg_postrm()\fR
+function specified in the ebuild file) that need to be executed after the
+package is removed from the filesystem.  See also \fIunmerge\fR.
 .TP
 .BR config
-Runs package-specific actions that need to be executed after the emerge
+Runs package-specific actions (by running the \fIpkg_config()\fR
+function specified in the ebuild file) that need to be executed after the emerge
 process has completed.  This usually entails setup of configuration files
 or other similar setups that the user may wish to run.
 .TP
 .BR package
 This command is a lot like the \fImerge\fR command, except that after
-fetching, unpacking, compiling and installing, a .tbz2 binary package
-tarball is created and stored in \fBPKGDIR\fR (see \fBmake.conf\fR(5)).
+fetching, unpacking, compiling and installing, a .gpkg.tar or .tbz2 binary
+package tarball is created and stored in \fBPKGDIR\fR (see \fBmake.conf\fR(5)).
 .TP
 .BR rpm
 Builds a RedHat RPM package from the files in the temporary

[gentoo-commits] proj/portage:master commit in: man/

[Sam James]

commit:     e9bd35b240b1c5845ea981f3ea0dcc7db44fb2b3
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 20 02:07:04 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jul 20 02:09:40 2022 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=e9bd35b2

ebuild.5: note that doexe behaviour is undefined if exeinto not yet called

Signed-off-by: Sam James <sam <AT> gentoo.org>

 man/ebuild.5 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index 4a96276e8..186a3ac3f 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -1529,7 +1529,8 @@ The default is \fI\-m0755\fR.
 .TP
 .B doexe\fR \fI<executable> [list of more executables]
 Installs executables into the path controlled by \fBexeinto\fR.  This function
-uses \fBinstall\fR(1).  Creates all necessary dirs.
+uses \fBinstall\fR(1).  Creates all necessary dirs.  Behavior is undefined if
+\fBexeinto\fR has not yet been called.
 .TP
 .B docinto\fR \fI[path]
 Sets the subdir used by \fBdodoc\fR and \fBdohtml\fR

[gentoo-commits] proj/portage:master commit in: man/

[Sam James]

commit:     498c785f1398ceb7304d45ff31d7b4a7f5700eaa
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 20 02:00:40 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jul 20 02:09:39 2022 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=498c785f

ebuild.5: style tweaks to examples

Signed-off-by: Sam James <sam <AT> gentoo.org>

 man/ebuild.5 | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index 1e38e18af..ae1e1ce27 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -22,9 +22,9 @@ category/packagename is a \fI"catpkg"\fR. You will find this shorthand\-name
 used frequently in Gentoo. Here are some base atoms, a.k.a \fI"catpkgs"\fR:
 
 .nf
+.I 	net\-misc/dhcp
 .I 	sys\-apps/sed
 .I 	sys\-libs/zlib
-.I 	net\-misc/dhcp
 .fi
 .TP
 .B Atom Versions
@@ -131,9 +131,9 @@ delimited by a \fI/\fR character.
 
 \fBExamples\fR:
 .nf
+	dev\-lang/perl:0/5.12
 	dev\-libs/icu:0/0
 	dev\-libs/icu:0/49
-	dev\-lang/perl:0/5.12
 	dev\-libs/glib:2/2.30
 .fi
 .TP
@@ -150,9 +150,9 @@ a different matching package in a different slot.
 
 \fBExamples\fR:
 .nf
-	dev\-libs/icu:*
 	dev\-lang/perl:*
-	dev-libs/glib:*
+	dev\-libs/glib:*
+	dev\-libs/icu:*
 .fi
 .TP
 .I =
@@ -164,9 +164,9 @@ time the package was installed is available.
 
 \fBExamples\fR:
 .nf
-	dev\-libs/icu:=
+	dev\-libs/glib:=
 	dev\-lang/perl:=
-	dev-libs/glib:=
+	dev\-libs/icu:=
 .fi
 .TP
 .I slot=
@@ -175,9 +175,9 @@ otherwise behaves identically to the plain equals slot operator.
 
 \fBExamples\fR:
 .nf
-	dev\-libs/icu:0=
 	dev\-lang/perl:0=
-	dev-libs/glib:2=
+	dev\-libs/glib:2=
+	dev\-libs/icu:0=
 .fi
 .PP
 To implement the equals slot operator, the package manager
@@ -193,10 +193,10 @@ the regular slot).
 
 \fBExamples\fR:
 .nf
+	dev\-lang/perl:0/5.12=
+	dev\-libs/glib:2/2.30=
 	dev\-libs/icu:0/0=
 	dev\-libs/icu:0/49=
-	dev\-lang/perl:0/5.12=
-	dev-libs/glib:2/2.30=
 .fi
 .RE
 .TP
@@ -1579,7 +1579,7 @@ first parameter is \- (a hyphen).
 
 EAPI=8
 
-inherit some_eclass another_eclass
+inherit another-eclass some-eclass
 
 DESCRIPTION="Super\-useful stream editor (sed)"
 HOMEPAGE="https://www.gnu.org/software/sed/"

[gentoo-commits] proj/portage:master commit in: man/

[Sam James]

commit:     0eadc50aab2fd5e064127defe1058e4abce156f3
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 20 02:05:05 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jul 20 02:09:39 2022 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=0eadc50a

ebuild.5: mention Bash version depends on EAPI

Signed-off-by: Sam James <sam <AT> gentoo.org>

 man/ebuild.5 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index ae1e1ce27..4a96276e8 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -9,7 +9,8 @@ This script contains variables and commands that specify how to download,
 unpack, patch, compile, install and merge a particular software package from
 its original sources.  In addition to all of this, the ebuild script can also
 contain pre/post install/remove commands, as required.  All ebuild scripts are
-written in bash.
+written in bash.  The minimum version of Bash for an ebuild depends on the
+EAPI version.
 
 .SS "Dependencies"
 A \fIdepend atom\fR is simply a dependency that is used by portage when

[gentoo-commits] proj/portage:master commit in: man/

[Sam James]

commit:     54d778fb16653f5f57f1892bacf0b36baa4ea462
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 19 00:17:56 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jul 19 00:17:56 2022 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=54d778fb

ebuild.5: fix typo

Signed-off-by: Sam James <sam <AT> gentoo.org>

 man/ebuild.5 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index 226b998e8..1e38e18af 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -1281,7 +1281,7 @@ Beginning with \fBEAPI 7\fR, \fBeconf\fR adds
 \fIwith\-sysroot\fR to the arguments if the string
 \fIwith\-sysroot\fR occurs in the output of \fIconfigure \-\-help\fR.
 Beginning with \fBEAPI 8\fR, \fBeconf\fR adds
-\fIdatarootdir\fR to the arguments if the srting
+\fIdatarootdir\fR to the arguments if the string
 \fIdatarootdir\fR occurs in the output of \fIconfigure \-\-help\fR.  Additionally,
 in \fBEAPI 8\fR, \fBeconf\fR adds \fIdisable\-static\fR to the arguments
 if the string \fIdisable\-static\fR or \fIenable\-static\fR occurs in the output

[gentoo-commits] proj/portage:master commit in: man/

[Sam James]

commit:     8218c39e5d6472a368b53e9e4f27ea5ef7eecd84
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 18 20:20:42 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jul 18 20:20:42 2022 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=8218c39e

ebuild.5: update examples a bit

Signed-off-by: Sam James <sam <AT> gentoo.org>

 man/ebuild.5 | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index 18547122e..91660660a 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -257,7 +257,7 @@ multiple Atoms and be nested to an infinite depth.
 To include the jpeg library when the user has jpeg in \fBUSE\fR, simply use the
 following syntax:
 
-jpeg? ( media\-libs/jpeg )
+jpeg? ( media\-libs/libjpeg-turbo )
 .TP
 .B !usevar? ( Atom )
 If you want to include a package only if the user does not have a certain
@@ -271,11 +271,11 @@ support for a feature and have it enabled by default.
 .B usevar? ( Atom if true ) !usevar? ( Atom if false )
 For functionality like the tertiary operator found in C you must use
 two statements, one normal and one inverted.  If a package uses
-GTK2 or GTK1, but not both, then you can handle that like this:
+GTK3 or GTK2, but not both, then you can handle that like this:
 
-gtk2? ( =x11\-libs/gtk+\-2* ) !gtk2? ( =x11\-libs/gtk+\-1* )
+gtk3? ( =x11\-libs/gtk+\-3* ) !gtk3? ( =x11\-libs/gtk+\-2* )
 
-That way the default is the superior GTK2 library.
+That way the default is the superior GTK3 library.
 .TP
 .B || ( Atom Atom ... )
 When a package can work with a few different packages but a virtual is not
@@ -1574,11 +1574,10 @@ first parameter is \- (a hyphen).
 .SH "EXAMPLES"
 .DS
 .nf
-# Copyright 1999\-2013 Gentoo Foundation
+# Copyright 1999\-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
 
-EAPI="5"
+EAPI=8
 
 inherit some_eclass another_eclass
 
@@ -1588,11 +1587,9 @@ SRC_URI="ftp://alpha.gnu.org/pub/gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL\-2"
 SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
+KEYWORDS="~amd64"
 
-RDEPEND=""
-DEPEND="nls? ( sys-devel/gettext )"
+BDEPEND="nls? ( sys-devel/gettext )"
 
 src_configure() {
 	econf \\

[gentoo-commits] proj/portage:master commit in: man/

[Sam James]

commit:     333f0a12627c33f5bf5be4b68b5af4ce093d32f6
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 18 20:11:17 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jul 18 20:14:34 2022 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=333f0a12

ebuild.5: drop --disable-dependency-tracking in "example" econf

As discussed in #gentoo-qa, it's easier for now to drop this for
consistency rather than add all the extra args (which would be wrong
by itself without rephrasing all the text below to say e.g. "in EAPI ...,
econf doesn't add ...").

So, go for the easiest fix for now so that things make sense, and
we can revisit later.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 man/ebuild.5 | 1 -
 1 file changed, 1 deletion(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index 9c663213b..18547122e 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -1257,7 +1257,6 @@ ${\fIECONF_SOURCE\fR:-.}/configure \\
 	\-\-mandir="${EPREFIX}"/usr/share/man \\
 	\-\-sysconfdir="${EPREFIX}"/etc \\
 	${CTARGET:+\-\-target=${CTARGET}} \\
-	\-\-disable\-dependency\-tracking \\
 	\fI${EXTRA_ECONF}\fR \\
 	\fIconfigure options\fR || die "econf failed"
 .fi

[gentoo-commits] proj/portage:master commit in: man/

[Sam James]

commit:     18156a381dfaa4b4afc8c3c3f83ff30ca50d4008
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 18 19:48:39 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jul 18 20:14:33 2022 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=18156a38

ebuild.5: update econf for EAPI 6/7/8

Signed-off-by: Sam James <sam <AT> gentoo.org>

 man/ebuild.5 | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/man/ebuild.5 b/man/ebuild.5
index 55a9380d5..9c663213b 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -1275,6 +1275,18 @@ Beginning with \fBEAPI 5\fR, \fBeconf\fR adds
 \fIdisable\-silent\-rules\fR to the arguments if the
 string \fIdisable\-silent\-rules\fR occurs in the output
 of \fIconfigure \-\-help\fR.
+Beginning with \fBEAPI 6\fR, \fBeconf\fR adds
+\fIdocdir\fR and \fIhtmldir\fR if the corresponding string occurs
+in the output of \fIconfigure \-\-help\fR.
+Beginning with \fBEAPI 7\fR, \fBeconf\fR adds
+\fIwith\-sysroot\fR to the arguments if the string
+\fIwith\-sysroot\fR occurs in the output of \fIconfigure \-\-help\fR.
+Beginning with \fBEAPI 8\fR, \fBeconf\fR adds
+\fIdatarootdir\fR to the arguments if the srting
+\fIdatarootdir\fR occurs in the output of \fIconfigure \-\-help\fR.  Additionally,
+in \fBEAPI 8\fR, \fBeconf\fR adds \fIdisable\-static\fR to the arguments
+if the string \fIdisable\-static\fR or \fIenable\-static\fR occurs in the output
+of \fIconfigure \-\-help\fR.
 .TP
 .B emake\fR \fI[make options]
 This must be used in place of `make` in ebuilds.  Performs `${MAKE:-make}

[gentoo-commits] proj/portage:master commit in: man/

[Sam James]

commit:     16591cd0ca834fca0ec81819610ad891408cea11
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 18 19:33:13 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jul 18 19:37:43 2022 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=16591cd0

ebuild.5: einstall was banned in EAPI 6

Closes: https://github.com/gentoo/portage/pull/858
Signed-off-by: Sam James <sam <AT> gentoo.org>

 man/ebuild.5 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index 6c49055ea..55a9380d5 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -1314,7 +1314,8 @@ make \\
 .fi
 Please do \fBnot\fR use this in place of 'emake install DESTDIR=${D}'.
 That is the preferred way of installing make\-based packages.  Also, do
-not utilize the \fIEXTRA_EINSTALL\fR variable since it is for users.
+not utilize the \fIEXTRA_EINSTALL\fR variable since it is for users.  Banned
+since \fBEAPI 6\fR.
 
 .TP
 .B docompress\fR \fI[\-x] <path> [list of more paths]

[gentoo-commits] proj/portage:master commit in: man/

[Sam James]

commit:     a98e6e5fd481d4233433451d6535609060308bad
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 18 19:14:18 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jul 18 19:37:42 2022 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=a98e6e5f

ebuild.5: update for dolib, libopts being banned in EAPI 7

Signed-off-by: Sam James <sam <AT> gentoo.org>

 man/ebuild.5 | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index 8402d667b..ef1de107b 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -1421,11 +1421,13 @@ necessary dirs.
 .B dolib.so\fR \fI<library>\fR \fI[list of more libraries]
 .PD 1
 Installs a library or a list of libraries into \fIDESTTREE\fR/lib.
-Creates all necessary dirs.
+Creates all necessary dirs.  dolib is banned in \fBEAPI 7\fR: use the more
+specific \fBdolib.a\fR or \fBdolib.so\fR instead.
 .TP
 .B libopts\fR \fI[options for install(1)]
 Can be used to define options for the install function used in
-the \fBdolib\fR functions.  The default is \fI\-m0644\fR.
+the \fBdolib\fR functions.  The default is \fI\-m0644\fR.  \fBlibopts\fR
+is banned in \fBEAPI 7\fR.
 .TP
 .B doman\fR \fI[\-i18n=<locale>]\fR \fI<man\-page> [list of more man\-pages]
 Installs manual\-pages into /usr/share/man/man[0\-9n] depending on the

[gentoo-commits] proj/portage:master commit in: man/

[Sam James]

commit:     eea2e2f446187cff2f3a733185a6009574d5338e
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 18 19:19:56 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jul 18 19:37:43 2022 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=eea2e2f4

ebuild.5: hasv is banned in EAPI 8

Signed-off-by: Sam James <sam <AT> gentoo.org>

 man/ebuild.5 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index b4022bdd3..939d43f9b 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -1157,7 +1157,8 @@ The \fIitem list\fR is delimited by the \fIIFS\fR variable.  This variable
 has a default value of ' ', or a space.  It is a \fBbash\fR(1) setting.
 .TP
 .B hasv\fR \fI<item>\fR \fI<item list>
-Like \fBhas\fR, but also echoes \fIitem\fR when \fBhas\fR returns true.
+Like \fBhas\fR, but also echoes \fIitem\fR when \fBhas\fR returns true.  Banned
+in \fBEAPI 8\fR.
 .TP
 .B has_version\fR \fI[\-b]\fR \fI[\-d]\fR \fI[\-r]\fR \fI[\-\-host\-root]\fR \fI<category/package\-version>
 Check to see if \fIcategory/package\-version\fR is installed.  The

[gentoo-commits] proj/portage:master commit in: man/

[Sam James]

commit:     e87ce6cb2d1c0893d6b5faee64af69ca9ea16de1
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 18 19:21:57 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jul 18 19:37:43 2022 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=e87ce6cb

ebuild.5: mention dosym -r for EAPI 8

Signed-off-by: Sam James <sam <AT> gentoo.org>

 man/ebuild.5 | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index 939d43f9b..6c49055ea 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -1450,9 +1450,10 @@ file name.
 Beginning with \fBEAPI 4\fR, the \fBdohard\fR helper no longer exists. Ebuilds
 should call \fBln\fR(1) directly.
 .TP
-.B dosym\fR \fI<filename> <linkname>
+.B dosym\fR \fI[\-r] \fI<filename> <linkname>
 .PD 1
-Performs the ln command to create a symlink.
+Performs the ln command to create a symlink.  Setting \-r creates a relative
+symlink.  The \-r option is available beginning with \fBEAPI 8\fR.
 .TP
 .B doheader\fR \fI[\-r] <file> [list of more files]
 Installs the given header files into /usr/include/, by default

[gentoo-commits] proj/portage:master commit in: man/

[Sam James]

commit:     4455feee439bff65fcc8bce6af864840df2a3b96
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 18 19:19:00 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jul 18 19:37:43 2022 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=4455feee

ebuild.5: dohtml is banned in EAPI 7

Signed-off-by: Sam James <sam <AT> gentoo.org>

 man/ebuild.5 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/man/ebuild.5 b/man/ebuild.5
index ef1de107b..b4022bdd3 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -1468,6 +1468,7 @@ Setting \fI\-a\fR limits what types of files will be included,
 \fI\-A\fR appends to the default list, setting \fI\-x\fR sets which dirs to
 exclude (CVS excluded by default), \fI\-p\fR sets a document prefix,
 \fI\-r\fR sets recursive.
+\fBdohtml\fR is banned in \fBEAPI 7\fR: use \fBdodoc\fR and \fBdocinto\fR instead.
 .TP
 .B doinfo\fR \fI<info\-file> [list of more info\-files]
 Installs info\-pages into \fIDESTDIR\fR/info.  Files are automatically

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     5d2af567772bb12b073f1671daea6263055cbdc2
Author:     Matthew Smith <matthew <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 24 18:32:00 2022 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Apr 24 21:45:56 2022 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=5d2af567

man/make.conf.5: Document default MAKEOPTS behaviour

After commits 5a1e6c9 and 6c054da, if MAKEOPTS is left unset, it will
default to the number of processors.

Closes: https://github.com/gentoo/portage/pull/826
Signed-off-by: Matthew Smith <matthew <AT> gentoo.org>
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 man/make.conf.5 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/man/make.conf.5 b/man/make.conf.5
index 8afde4a00..fc4a018c5 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -923,6 +923,7 @@ between \fICPUs+1\fR and \fI2*CPUs+1\fR. In order to avoid
 excess load, the \fB\-\-load\-average\fR option is recommended.
 For more information, see \fBmake\fR(1). Also see \fBemerge\fR(1) for
 information about analogous \fB\-\-jobs\fR and \fB\-\-load\-average\fR options.
+Defaults to the number of processors if left unset.
 .TP
 \fBNOCOLOR\fR = \fI["true" | "false"]\fR
 Defines if color should be disabled by default.

[gentoo-commits] proj/portage:master commit in: man/

[Sam James]

commit:     4af629dddcd30efeb76416e2f8f17c5944c16ca7
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 16 23:42:50 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Aug 15 20:58:47 2021 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=4af629dd

man/emerge.1: Fix typo in --with-bdeps description

Closes: https://github.com/gentoo/portage/pull/730
Signed-off-by: Sam James <sam <AT> gentoo.org>

 man/emerge.1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/man/emerge.1 b/man/emerge.1
index f0988cd4a..8f8c2ebda 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -1095,7 +1095,7 @@ The default is set to "y" (on).
 In dependency calculations, pull in build time dependencies
 that are not strictly required. This option is automatically enabled for
 installation actions, meaning they will be installed, and defaults to
-\(aqy\(aq for the \fB\-\-depclean\fR action, meaning they will not be
+"y" for the \fB\-\-depclean\fR action, meaning they will not be
 removed. In order to prevent the \fB\-\-with\-bdeps\fR option from being
 automatically enabled for installation actions, specify
 \fB\-\-with\-bdeps\-auto=n\fR in either the command line or

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     ee944c4fd76af4f7dffb756e9ed0303cb9606112
Author:     Thymo van Beers <thymovanbeers <AT> gmail <DOT> com>
AuthorDate: Mon Jun 28 21:56:47 2021 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Jul  4 22:59:21 2021 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=ee944c4f

man/make.conf.5: remove mention of zlib USE flag

Both sys-devel/binutils and sys-devel/gdb are built with system zlib by
default for some time now. This commit removes the mention of USE=zlib to avoid
confusion.

Signed-off-by: Thymo van Beers <thymovanbeers <AT> gmail.com>
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 man/make.conf.5 | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/man/make.conf.5 b/man/make.conf.5
index 1c72109ad..db742fdb5 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -378,8 +378,7 @@ redundant on\-the\-fly compression.  The resulting file will be called
 .TP
 .B compressdebug
 Compress the debug sections in the split debug files with zlib to save
-space.  Make sure you have built both binutils and gdb with USE=zlib
-support for this to work.  See \fBsplitdebug\fR for general split debug
+space.  See \fBsplitdebug\fR for general split debug
 information (upon which this feature depends).
 .TP
 .B config\-protect\-if\-modified

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     1f3bfcb357c3f262730175f4d59c11e1ed4f8dc3
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Fri Apr  9 18:26:49 2021 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon May 24 06:44:57 2021 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=1f3bfcb3

make.conf.5: Suggest PORTAGE_LOG_FILTER_FILE_CMD supervisor for cat fallback (bug 781854)

If PORTAGE_LOG_FILTER_FILE_CMD fails after exec, then output
will be lost. Therefore, suggest to use bash as a supervisor,
with fallback to cat.

Bug: https://bugs.gentoo.org/781854
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 man/make.conf.5 | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/man/make.conf.5 b/man/make.conf.5
index badaea18e..1c72109ad 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -998,7 +998,18 @@ will set idle io priority. For more information about ionice, see
 .B PORTAGE_LOG_FILTER_FILE_CMD
 This variable specifies a command that filters build log output to a
 log file. In order to filter ANSI escape codes from build logs,
-\fBansifilter\fR(1) is a convenient setting for this variable.
+\fBansifilter\fR(1) is a convenient setting for this variable. Generally,
+PORTAGE_LOG_FILTER_FILE_CMD should include a supervisor that falls back
+to cat if the real filter command fails after exec. For example, a
+supervisor is needed for ansifilter, in case it fails after exec due to
+a problem resolving libstdc++ during a gcc upgrade.
+.br
+.I Example:
+.nf
+# Use bash as a supervisor, for fallback to cat if ansifilter fails
+# after exec due to a problem resolving libstdc++ during a gcc upgrade.
+PORTAGE_LOG_FILTER_FILE_CMD="bash -c \\"ansifilter; exec cat\\""
+.fi
 .TP
 .B PORTAGE_LOGDIR
 This variable defines the directory in which per\-ebuild logs are kept.

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     f737795e9da830d543a424ab7e74b2151e58fca8
Author:     Nekun <nekokun <AT> firemail <DOT> cc>
AuthorDate: Sun Apr 11 01:23:26 2021 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Apr 25 03:38:31 2021 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=f737795e

man/portage.5: Add userpatch documentation

Bug: https://bugs.gentoo.org/698244
Signed-off-by: Nekun <nekokun <AT> firemail.cc>
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 man/portage.5 | 33 ++++++++++++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/man/portage.5 b/man/portage.5
index 247ec5ab0..50f20454c 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -1,4 +1,4 @@
-.TH "PORTAGE" "5" "Mar 2021" "Portage VERSION" "Portage"
+.TH "PORTAGE" "5" "Apr 2021" "Portage VERSION" "Portage"
 .SH NAME
 portage \- the heart of Gentoo
 .SH "DESCRIPTION"
@@ -78,6 +78,9 @@ site-specific overrides of \fB/etc/portage/make.profile/\fR
 .BR /etc/portage/sets/
 user\-defined package sets
 .TP
+.BR /etc/portage/patches/
+user\-provided patches to packages
+.TP
 .BR /var/db/repos/gentoo/
 .nf
 sets.conf
@@ -1375,6 +1378,34 @@ Also see \fB/var/lib/portage/world_sets\fR and the \fBemerge\fR(1)
 \fB\-\-list\-sets\fR option.
 .RE
 .TP
+.BR /etc/portage/patches/
+.RS
+In this directory patches to the package source tree can be created.
+For each package, patches are taken from these subdirectories in the
+following order:
+.nr step 1 1
+.IP \n[step]. 3
+/etc/portage/patches/${CATEGORY}/${P}\-${PR}[:${SLOT}]
+.IP \n+[step].
+/etc/portage/patches/${CATEGORY}/${P}[:${SLOT}]
+.IP \n+[step].
+/etc/portage/patches/${CATEGORY}/${PN}[:${SLOT}]
+.RE 2
+
+Patches from more-specific directories overrides patches from less-specific,
+i.e. if patches with the same name coexist in different directories matches
+same package, only patch from directory matches the first matching pattern
+will be applied. Patches for each package are applied in the POSIX
+lexicographic order. Patch file name must end in ".patch" or, for
+\fBEAPI\fR >= \fB6\fR, in ".diff".
+
+If package ebuild uses \fBEAPI\fR <= \fB5\fR, it must explicitly invoke
+\fBepatch_user\fR or inherit \fBepatch.eclass\fR(5) and rely on default
+\fBsrc_prepare\fR for apply patches. Otherwise, patches are silently
+ignored. If package ebuild uses \fBEAPI\fR >= \fB6\fR, applying user
+patches is mandatory.
+.RE
+.TP
 .BR /var/db/repos/gentoo/
 .RS
 .TP

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     eb650736537728f40cee65c8a3d523d7dcfde804
Author:     Nekun <nekokun <AT> firemail <DOT> cc>
AuthorDate: Sun Apr 11 01:23:27 2021 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Apr 25 03:38:34 2021 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=eb650736

ebuild.5: Add eapply documentation

Bug: https://bugs.gentoo.org/698244
Signed-off-by: Nekun <nekokun <AT> firemail.cc>
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 man/ebuild.5 | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index 1afa59eef..a113c1502 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -1,4 +1,4 @@
-.TH "EBUILD" "5" "Jul 2019" "Portage VERSION" "Portage"
+.TH "EBUILD" "5" "Apr 2021" "Portage VERSION" "Portage"
 
 .SH "NAME"
 ebuild \- the internal format, variables, and functions in an ebuild script
@@ -799,6 +799,11 @@ Beginning with \fBEAPI 4\fR, an array or space\-delimited list of documentation
 files for the default src_install function to install using dodoc. If
 undefined, a reasonable default list is used. See the documentation for
 src_install below.
+.TP
+.B PATCHES
+Beginning with \fBEAPI 6\fR, an array of patches for applying in the default
+\fIsrc_prepare\fR function using \fIeapply\fR.
+
 
 .SS "QA Control Variables:"
 .TP
@@ -1210,6 +1215,21 @@ message\fR is displayed.
 This function uncompresses and/or untars a list of sources into the current
 directory. The function will append \fIsource\fR to the \fBDISTDIR\fR variable.
 
+.SS "Prepare:"
+.TP
+.B eapply\fR \fI[patch options]\fR \fI<files|directories>
+Applies patches to the \fB${WORKDIR}\fR with specified options. Default patch level is \fI\-p1\fR. If a directory specified, all patches from it with
+\fI.patch\fR or \fI.diff\fR suffix are applied.
+This function is available beginning with \fBEAPI 6\fR, replacing old
+\fBepatch.eclass\fR(5) functions.
+.TP
+.B eapply_user
+Applies user\-provided patches to the \fB${WORKDIR}\fR from Portage config
+directory tree. For directory syntax and applying rules, see
+\fI/etc/portage/patches/\fR section in \fBportage\fR(5). This function is
+available beginning with \fBEAPI 6\fR, replacing old \fBepatch.eclass\fR(5)
+functions.
+
 .SS "Compile:"
 .TP
 .B econf\fR \fI[configure options]

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     8851a437c7edc7ae01ba04dbff42b27e1f36b37b
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Apr  5 19:27:39 2021 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Apr  5 20:41:40 2021 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=8851a437

man/emerge.1: fix typos

Fixes: 3253686e9438 ("emerge: make --binpkg-respect-use=y imply --autounmask-use=n")
Bug: https://bugs.gentoo.org/773469
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 man/emerge.1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/man/emerge.1 b/man/emerge.1
index 33416d986..f0988cd4a 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -418,7 +418,7 @@ Allow autounmask package.license changes.
 .BR "\-\-autounmask\-use < y | n >"
 Allow autounmask package.use changes. This option is enabled by default
 (any of \fB\-\-autounmask=n\fR, \fB\-\-autounmask\-use=n\fR,
-or \fB\-\-binpkg-\-respect\-use=y\fR  disables
+or \fB\-\-binpkg\-respect\-use=y\fR  disables
 it). The \fBEMERGE_DEFAULT_OPTS\fR variable may be used to
 disable this option by default in \fBmake.conf\fR(5).
 .TP

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     18a7fac56795fd1ae27ac6e8eb1d2591787c5694
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Mar  5 21:25:49 2021 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sat Mar  6 08:41:03 2021 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=18a7fac5

man/make.conf.5: fix typos

Closes: https://github.com/gentoo/portage/pull/681
Signed-off-by: Sam James <sam <AT> gentoo.org>
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 man/make.conf.5 | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/man/make.conf.5 b/man/make.conf.5
index e78751c16..8d551c95e 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -849,7 +849,7 @@ Defaults to false.
 Defines the location where created .tbz2 binary packages will be
 stored when the \fBemerge\fR(1) \fB\-\-buildpkg\fR option is enabled.
 By default, a given package is stored in a subdirectory corresponding
-to it's category. However, for backward compatibility with the layout
+to its category. However, for backward compatibility with the layout
 used by older versions of portage, if the \fI${PKGDIR}/All\fR directory
 exists then all packages will be stored inside of it and symlinks to
 the packages will be created in the category subdirectories.
@@ -878,7 +878,7 @@ build packages for clients.  It defines the URI header field for the package
 index file which is located at ${PKGDIR}/Packages. Clients that have
 \fBPORTAGE_BINHOST\fR properly configured will be able to fetch the index and
 use the URI header field as a base URI for fetching binary packages. If the URI
-header field is not defined then the client will use it's ${PORTAGE_BINHOST}
+header field is not defined then the client will use its ${PORTAGE_BINHOST}
 setting as the base URI.
 .TP
 .B PORTAGE_BINPKG_FORMAT
@@ -989,7 +989,7 @@ Defaults to 0.
 .TP
 \fBPORTAGE_IONICE_COMMAND\fR = \fI[ionice command string]\fR
 This variable should contain a command for portage to call in order
-to adjust the io priority of portage and it's subprocesses. The command
+to adjust the io priority of portage and its subprocesses. The command
 string should contain a \\${PID} place-holder that will be substituted
 with an integer pid. For example, a value of "ionice \-c 3 \-p \\${PID}"
 will set idle io priority. For more information about ionice, see
@@ -1006,7 +1006,7 @@ Logs are created only when this is set. They are stored as
 ${CATEGORY}:${PF}:YYYYMMDD\-HHMMSS.log in the directory specified. If the
 directory does not exist, it will be created automatically and group
 permissions will be applied to it.  If the directory already exists, portage
-will not modify it's permissions.
+will not modify its permissions.
 .TP
 .B PORTAGE_LOGDIR_CLEAN
 This variable should contain a command for portage to call in order

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     d55e6f8f02fdc65986871a93809ead528b0e54fa
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 27 07:55:29 2021 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sat Feb 27 07:56:10 2021 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=d55e6f8f

man/emirrordist.1: fix --content-db description

Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 man/emirrordist.1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/man/emirrordist.1 b/man/emirrordist.1
index 7ad10dfd0..d66a1849d 100644
--- a/man/emirrordist.1
+++ b/man/emirrordist.1
@@ -68,7 +68,7 @@ reporting purposes. Overwritten with each run.
 .TP
 \fB\-\-content\-db\fR=\fIFILE\fR
 Database file used to pair content digests with distfiles names
-(required fo content\-hash layout).
+(required for content\-hash layout).
 .TP
 \fB\-\-delete\fR
 Enable deletion of unused distfiles.

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     bd362352dc83db6185528c794bb890d81b49cd4d
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 22 12:27:54 2021 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Feb 22 12:30:58 2021 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=bd362352

man/make.conf.5: mention eclean-pkg for binpkg-multi-instance

Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 man/make.conf.5 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/man/make.conf.5 b/man/make.conf.5
index 548a10b9b..76e0ac155 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -313,8 +313,8 @@ per\-package PATH attribute in the 'Packages' index directs them to
 download the file from the correct URI, and they automatically use
 BUILD_TIME metadata to select the latest builds.
 
-There is currently no automated way to prune old builds from PKGDIR,
-although it is possible to remove packages manually, and then run
+The \fBeclean\-pkg\fR command can be used to prune old builds from PKGDIR.
+It is also possible to remove packages manually, and then run
 \(aqemaint \-\-fix binhost' to update the ${PKGDIR}/Packages index.
 .TP
 .B buildpkg

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     70e50f5ac0880e0a55baa2d3b567381743403e7e
Author:     Daniel M. Weeks <dan <AT> danweeks <DOT> net>
AuthorDate: Mon Feb  1 17:22:38 2021 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Feb  1 18:08:05 2021 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=70e50f5a

man/make.conf.5: FETCHCOMMAND DIGESTS placeholder uses colons

Closes: https://github.com/gentoo/portage/pull/668
Fixes: f04dae7728b5 ("Make digests available to fetch command")
Signed-off-by: Daniel M. Weeks <dan <AT> danweeks.net>
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 man/make.conf.5 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/man/make.conf.5 b/man/make.conf.5
index 10f72d5c0..548a10b9b 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -1,4 +1,4 @@
-.TH "MAKE.CONF" "5" "Jan 2021" "Portage VERSION" "Portage"
+.TH "MAKE.CONF" "5" "Feb 2021" "Portage VERSION" "Portage"
 .SH "NAME"
 make.conf \- custom settings for Portage
 .SH "SYNOPSIS"
@@ -755,7 +755,7 @@ ___
 l l l.
 Placeholder	Meaning	Example
 
-\\${DIGESTS}	Space separated list of file digests	blake2b <hexdigest> sha512 <hexdigest>
+\\${DIGESTS}	Space separated list of file digests	blake2b:<hexdigest> sha512:<hexdigest>
 .TE
 .RE
 .TP

[gentoo-commits] proj/portage:master commit in: man/

[Ulrich Müller]

commit:     9436de9277593b668008c3906c8aca53f544b2ba
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 18 18:18:13 2021 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Jan 18 18:18:13 2021 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=9436de92

man/make.conf.5: Fix typo in markup

Fixes: bcf12c6f26cf ("Add a note that PORTDIR is a repository ...")
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 man/make.conf.5 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/man/make.conf.5 b/man/make.conf.5
index f6eae6f60..10f72d5c0 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -1104,7 +1104,7 @@ the emerge \-\-sync command. The default value of
 \fBPORTAGE_RSYNC_OPTS\fR will protect the default locations of
 \fBDISTDIR\fR and \fBPKGDIR\fR, but users are warned that any other locations
 inside \fBPORTDIR\fR are not necessarily safe for data storage.  You should not
-put other data (such as overlays) in your \fBPORTDIR\fB.  Portage will walk
+put other data (such as overlays) in your \fBPORTDIR\fR.  Portage will walk
 directory structures and may arbitrarily add invalid categories as packages.
 .TP
 \fBPORTDIR_OVERLAY\fR = \fI"[path] [different\-path] [etc...]"\fR

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     e108f1ccb4a7d38d27154943d7240fe8d2ff4a7d
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Tue Sep  8 01:16:40 2020 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Tue Sep  8 01:17:16 2020 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=e108f1cc

man/portage.5: Fix man2html rendering in repos.conf section

Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 man/portage.5 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/man/portage.5 b/man/portage.5
index db6e9ba76..4cffb194a 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -1,4 +1,4 @@
-.TH "PORTAGE" "5" "Jul 2020" "Portage VERSION" "Portage"
+.TH "PORTAGE" "5" "Sep 2020" "Portage VERSION" "Portage"
 .SH NAME
 portage \- the heart of Gentoo
 .SH "DESCRIPTION"
@@ -875,8 +875,8 @@ format as \fBrepos.conf\fR.
 \- attributes are specified in "${attribute} = ${value}" format
 .fi
 
-.I Attributes supported in DEFAULT section:
 .RS
+.I Attributes supported in DEFAULT section:
 .RS
 .TP
 .B main\-repo

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     f1f9062578936d68040490a8122ccf84c087030a
Author:     Michael Everitt <gentoo <AT> veremit <DOT> xyz>
AuthorDate: Sun Sep  6 00:05:59 2020 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Sep  7 23:40:32 2020 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=f1f90625

man/{portage,make.conf}.5: Files in subdirs are parsed in lexical order

Most files in packages.*, make.conf/*, *.postsync.d/* are parsed not just in
ascending alphabetical order, but actually in lexographical (lexical) order,
which means alpha-numerically + symbols.

Closes: https://github.com/gentoo/portage/pull/616
Signed-off-by: Michael Everitt <gentoo <AT> veremit.xyz>
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 man/make.conf.5 |  4 ++--
 man/portage.5   | 15 +++++++--------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/man/make.conf.5 b/man/make.conf.5
index eb812150f..1b997ad37 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -15,8 +15,8 @@ the Simple lexical analysis documentation:
 \fIhttps://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.
 If make.conf is a directory, then all the files in that directory will
-be sorted in ascending alphabetical order by file name and summed
-together as if it were a single file.
+be sorted in lexical order by file name and summed together as if it were
+a single file.
 .br
 Portage will check the currently\-defined environment variables
 first for any settings.  If no environment settings are found,

diff --git a/man/portage.5 b/man/portage.5
index 7472972cc..db6e9ba76 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -229,8 +229,8 @@ will be preferred.
 Any file in this directory, directories of other profiles or top-level
 "profiles" directory that begins with "package." or "use." can be more than
 just a flat file.  If it is a directory, then all the files in that directory
-will be sorted in ascending alphabetical order by file name and summed together
-as if it were a single file. Note that this behavior is only supported since
+will be sorted in lexical order by file name and summed together as if
+it were a single file. Note that this behavior is only supported since
 portage-2.1.6.7, and it is not included in PMS at this time.
 
 .I Example:
@@ -602,8 +602,8 @@ virtual/aspell\-dict   app\-dicts/aspell\-en
 Files in this directory including make.conf, repos.conf, and any file
 with a name that begins with "package." can be
 more than just a flat file.  If it is a directory, then all the files in that
-directory will be sorted in ascending alphabetical order by file name and summed
-together as if it were a single file.
+directory will be sorted in lexical order by file name and summed together
+as if it were a single file.
 
 .I Example:
 .nf
@@ -843,15 +843,14 @@ x11\-libs/qt \-mysql
 .TP
 .BR postsync.d/
 This directory is for user supplied postsync hooks to be run once after all
-repositories have been synced.  Each script is called in alphabetic order
+repositories have been synced.  Each script is called in lexical order
 without any arguments.
 .fi
 .TP
 .BR repo.postsync.d/
 This directory is for user supplied postsync hooks to be run once after each
-repository has been synced.  Each script is called in alphabetic order
-with three arguments.
-
+repository has been synced.  Each script is called in lexical order
+with the following three arguments:
 .I args:
         repository name, sync-uri, location
 .fi

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     b851d7f8f3c451d4dd4863580e75461c511b44d0
Author:     Michael Everitt <gentoo <AT> veremit <DOT> xyz>
AuthorDate: Sun Sep  6 00:05:04 2020 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Sep  6 01:13:48 2020 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=b851d7f8

man/portage.5: Tidy up some long (>80 char) lines

Closes: https://github.com/gentoo/portage/pull/615
Signed-off-by: Michael Everitt <gentoo <AT> veremit.xyz>
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 man/portage.5 | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/man/portage.5 b/man/portage.5
index a7e64cd5f..7472972cc 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -214,8 +214,8 @@ More reading:
 .TP
 \fB/etc/portage/make.profile/\fR or \fB/etc/make.profile/\fR
 This is usually just a symlink to the correct profile in
-\fB/var/db/repos/gentoo/profiles/\fR.  Since it is part of the ebuild repository, it
-may easily be updated/regenerated by running `emerge \-\-sync`.  It defines
+\fB/var/db/repos/gentoo/profiles/\fR.  Since it is part of the ebuild repository,
+it may easily be updated/regenerated by running `emerge \-\-sync`.  It defines
 what a profile is (usually arch specific stuff).  If you need a custom
 profile, then you should make your own \fBmake.profile\fR
 directory and populate it.  However, if you just wish to override some
@@ -644,8 +644,8 @@ The global custom settings for Portage. See \fBmake.conf\fR(5).
 .BR mirrors
 Whenever portage encounters a mirror:// style URI it will look up the actual
 hosts here.  If the mirror set is not found here, it will check the global
-mirrors file at /var/db/repos/gentoo/profiles/thirdpartymirrors.  You may also set a
-special mirror type called "local".  This list of mirrors will be checked
+mirrors file at /var/db/repos/gentoo/profiles/thirdpartymirrors.  You may also
+set a special mirror type called "local".  This list of mirrors will be checked
 before GENTOO_MIRRORS and will be used even if the package has
 RESTRICT="mirror" or RESTRICT="fetch".
 
@@ -864,8 +864,9 @@ only.
 .BR repos.conf
 Specifies \fIsite\-specific\fR repository configuration information.
 .br
-Configuration specified in \fBrepos.conf\fR can be overriden by \fBPORTAGE_REPOSITORIES\fR
-environmental variable, which has the same format as \fBrepos.conf\fR.
+Configuration specified in \fBrepos.conf\fR can be overriden by
+\fBPORTAGE_REPOSITORIES\fR environmental variable, which has the same
+format as \fBrepos.conf\fR.
 
 .I Format:
 .nf
@@ -918,8 +919,8 @@ since operations performed by these tools are inherently
 .TP
 .B auto\-sync = yes|no|true|false
 This setting determines if the repo will be synced during "\fBemerge \-\-sync\fR" or
-"\fBemaint sync \-\-auto\fR" runs.  This allows for repositories to be synced only when
-desired via "\fBemaint sync \-\-repo foo\fR".
+"\fBemaint sync \-\-auto\fR" runs.  This allows for repositories to be synced
+only when desired via "\fBemaint sync \-\-repo foo\fR".
 .br
 If unset, the repo will be treated as set
 yes, true.
@@ -1001,7 +1002,8 @@ Extra options to give to git when cloning repository (git clone).
 .TP
 .B sync\-git\-env
 Set environment variables for git when cloning or pulling the repository.
-These will be overridden by setting them again in sync-git-clone-env and sync-git-pull-env.
+These will be overridden by setting them again in sync\-git\-clone\-env and
+sync\-git\-pull\-env.
 See also example for sync-git-clone-env.
 .TP
 .B sync\-git\-pull\-env
@@ -1390,7 +1392,8 @@ and the newer/faster "md5-dict" format.  Default is to detect dirs.
 The EAPI to use for profiles when unspecified. This attribute is
 supported only if profile-default-eapi is included in profile-formats.
 .TP
-.BR profile\-formats " = [pms] [portage-1] [portage-2] [profile-bashrcs] [profile-set] [profile-default-eapi] [build-id]"
+.BR profile\-formats " = [pms] [portage-1] [portage-2] [profile-bashrcs] \
+[profile-set] [profile-default-eapi] [build-id]"
 Control functionality available to profiles in this repo such as which files
 may be dirs, or the syntax available in parent files.  Use "portage-2" if you're
 unsure.  The default is "portage-1-compat" mode which is meant to be compatible

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     0b391cd238dd5db84268d3002a56154a10e9e32a
Author:     Florian Schmaus <flo <AT> geekplace <DOT> eu>
AuthorDate: Tue Jul  7 09:31:36 2020 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Tue Jul  7 20:12:59 2020 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=0b391cd2

man/ebuild.5: Fix $P and $PN example

Both variables do *not* include the package's category. So $PN,
instead of

x11-base/xorg-server

returns

xorg-server

Same goes for $P.

This commit fixes the error which was introduced by
84b9b5c2a ("man/ebuild.5: Improvements to the ebuild(5) man page").

Bug: https://bugs.gentoo.org/731246
Closes: https://github.com/gentoo/portage/pull/567
Signed-off-by: Florian Schmaus <flo <AT> geekplace.eu>
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 man/ebuild.5 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index e955907f7..1afa59eef 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -342,7 +342,7 @@ This variable must NEVER be modified.
 
 \fBExample\fR:
 .nf
-	x11\-base/xorg\-server\-1.20.5\-r2 \-\-> '\fIx11\-base/xorg\-server\-1.20.5\fR'
+	x11\-base/xorg\-server\-1.20.5\-r2 \-\-> '\fIxorg\-server\-1.20.5\fR'
 .fi
 .TP
 .B PN
@@ -350,7 +350,7 @@ Contains the name of the script without the version number.
 
 \fBExample\fR:
 .nf
-	x11\-base/xorg\-server\-1.20.5\-r2 \-\-> '\fIx11\-base/xorg\-server\fR'
+	x11\-base/xorg\-server\-1.20.5\-r2 \-\-> '\fIxorg\-server\fR'
 .fi
 .TP
 .B PV

[gentoo-commits] proj/portage:master commit in: man/

[Mike Frysinger]

commit:     c36e8dfaf808f68586e7519232e072490ccc51db
Author:     Mike Frysinger <vapier <AT> chromium <DOT> org>
AuthorDate: Tue Jun 30 19:15:16 2020 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Tue Jun 30 19:15:16 2020 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=c36e8dfa

man: fix syntax for page refs

Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>

 man/egencache.1 | 4 ++--
 man/emerge.1    | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/man/egencache.1 b/man/egencache.1
index 27cd69e63..98b230a14 100644
--- a/man/egencache.1
+++ b/man/egencache.1
@@ -13,7 +13,7 @@ itself, for distribution.
 .BR "\-\-update [ATOM] ... "
 Update the \fImetadata/md5\-cache/\fR directory (generate metadata as
 necessary).
-If no package atoms are specified then all will be updated. See ebuild(5)
+If no package atoms are specified then all will be updated. See \fBebuild\fR(5)
 for the details on package atom syntax.
 .TP
 .BR "\-\-update\-changelogs"
@@ -151,7 +151,7 @@ exists in the repository. It can also be explicitly enabled via the
 cache\-formats setting in \fImetadata/layout.conf\fR (refer to \fBportage\fR(5)
 for example usage). If the 'pms' cache format is enabled and the 'md5-dict'
 format is not enabled, then it is necessary to enable
-\fBmetadata-transfer\fR in \fBFEATURES\fR (see \fBmake.conf(5)\fR).
+\fBmetadata-transfer\fR in \fBFEATURES\fR (see \fBmake.conf\fR(5)).
 This causes intermediate cache (in a different format that includes
 eclass state) to be generated inside the directory which is configurable
 via the \fB\-\-cache\-dir\fR option.

diff --git a/man/emerge.1 b/man/emerge.1
index 28b7f79f5..a8be677d6 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -56,8 +56,8 @@ A \fItbz2file\fR must be a valid .tbz2 created with \fBebuild
 A \fIfile\fR must be a file or directory that has been installed by one or
 more packages. If an absolute path is not used, then it must begin with
 either "./" or "../". For directories that are owned by multiple packages, all
-owning packages will be selected. See the portageq(1) owners command if you
-would like to query the owners of one or more files or directories.
+owning packages will be selected. See the \fBportageq\fR(1) owners command if
+you would like to query the owners of one or more files or directories.
 .TP
 .BR set
 A \fIset\fR is a convenient shorthand for a large group of
@@ -1100,7 +1100,7 @@ This also applies to options that enable the \fB\-\-usepkg\fR option
 implicitly, such as \fB\-\-getbinpkg\fR.
 
 This setting can be added to
-\fBEMERGE_DEFAULT_OPTS\fR (see make.conf(5)) and later overridden via the
+\fBEMERGE_DEFAULT_OPTS\fR (see \fBmake.conf\fR(5)) and later overridden via the
 command line.
 .TP
 .BR "\-\-with\-bdeps\-auto < y | n >"
@@ -1109,7 +1109,7 @@ This option is used to enable or disable the program logic that causes
 actions. This option is enabled by default. Use
 \fB\-\-with\-bdeps\-auto=n\fR to prevent \fB\-\-with\-bdeps\fR from
 being automatically enabled for installation actions. This setting can
-be added to \fBEMERGE_DEFAULT_OPTS\fR (see make.conf(5)) and later
+be added to \fBEMERGE_DEFAULT_OPTS\fR (see \fBmake.conf\fR(5)) and later
 overridden via the command line.
 
 \fBNOTE:\fR The program logic that causes \fB\-\-with\-bdeps\fR to be

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     778492b753b27753992d99ded118a37589649dd9
Author:     Chris Mayo <aklhfex <AT> gmail <DOT> com>
AuthorDate: Sat Mar 14 18:38:50 2020 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sat Mar 14 19:00:54 2020 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=778492b7

man/emerge.1: fix logrotate directory containing elog-save-summary

Signed-off-by: Chris Mayo <aklhfex <AT> gmail.com>
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 man/emerge.1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/man/emerge.1 b/man/emerge.1
index 2261a771b..28b7f79f5 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -1491,7 +1491,7 @@ Contains a log of all the fetches in the previous emerge invocation.
 .TP
 .B
 /var/log/portage/elog/summary.log
-Contains the emerge summaries. Installs \fI/etc/logrotate/elog-save-summary\fR.
+Contains the emerge summaries. Installs \fI/etc/logrotate.d/elog-save-summary\fR.
 .SH "SEE ALSO"
 .BR "emerge \-\-help",
 .BR quickpkg (1),

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     364c70a2d8f77640731c9dc4bef9f3bacbeab7a9
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 26 21:03:38 2019 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Wed Nov 27 03:19:00 2019 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=364c70a2

man/emerge.1: fix \fB typo

$ groff -man man/emerge.1 >/dev/null
man/emerge.1:117: warning: can't find font `b'

Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 man/emerge.1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/man/emerge.1 b/man/emerge.1
index dd6cdfd6e..8d3e74074 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -114,7 +114,7 @@ how many are found. See
 Cleans up the system by examining the installed packages and removing older
 packages.  This is accomplished by looking at each installed package and
 separating the installed versions by \fBslot\fR.  Clean will \fBremove all but
-the most recently installed version in each \fbslot\fR.  Clean should not
+the most recently installed version in each slot\fR.  Clean should not
 remove unslotted packages. Note: Most recently installed means most
 \fBrecent\fR, not highest version.
 .TP

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     81687462dcc5636c097acb618bf9076c4d4e6e56
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 21 19:26:18 2019 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Thu Nov 21 20:10:51 2019 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=81687462

man/make.conf.5: fix \fI typo

$ groff -man man/make.conf.5 >/dev/null
man/make.conf.5:15: warning: can't find font `L'

Reported-by: Ulrich Müller <ulm <AT> gentoo.org>
Fixes: b5365341dad1 ("refresh many URIs in the code base")
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 man/make.conf.5 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/man/make.conf.5 b/man/make.conf.5
index 71165bc53..44d518dbb 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -12,7 +12,7 @@ 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:
-\fLhttps://docs.python.org/3/library/shlex.html\fR. Note that if you source
+\fIhttps://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.
 If make.conf is a directory, then all the files in that directory will
 be sorted in ascending alphabetical order by file name and summed

[gentoo-commits] proj/portage:master commit in: man/

[Michał Górny]

commit:     63c0ac0dd06c0912ea37ac1e886da97f19492692
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 12 06:44:55 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Oct 12 07:26:29 2019 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=63c0ac0d

man/emirrordist.1: document new options

Reviewed-by: Zac Medico <zmedico <AT> gentoo.org>
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 man/emirrordist.1 | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/man/emirrordist.1 b/man/emirrordist.1
index cdd66cbdb..45108ef8c 100644
--- a/man/emirrordist.1
+++ b/man/emirrordist.1
@@ -119,6 +119,16 @@ Directory for individual fetch logs.
 Specifies a file containing a list of files to whitelist, one per line,
 # prefixed lines ignored. Use this option multiple times in order to
 specify multiple whitelists.
+.TP
+\fB\-\-symlinks\fR
+Use symbolic links to link distfiles to the primary layout from other
+specified layouts. If not specified, hard links are used instead.
+.TP
+\fB\-\-layout\-conf\fR=\fIFILE\fR
+Specifies alternate mirror \fIlayout.conf\fR file to use in order
+to select the desired distfile layout. If not specified,
+\fIlayout.conf\fR in \fB\-\-distfiles\fR directory will be used
+if present, otherwise flat layout will be assumed.
 .SH "REPORTING BUGS"
 Please report bugs via https://bugs.gentoo.org/
 .SH "THANKS"

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     84b9b5c2aea408b9e490b352885891bb3875714d
Author:     Daniel Robbins <drobbins <AT> funtoo <DOT> org>
AuthorDate: Sun Sep 29 21:50:18 2019 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Sep 29 21:50:18 2019 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=84b9b5c2

man/ebuild.5: Improvements to the ebuild(5) man page

The following patch contains several formatting improvements,
as well as extended information about KEYWORDS that is easier
to understand. The original description started describing Gentoo
policy on KEYWORDS without actually explaining what they are and how
they work.

I have also added missing documentation for the ARCH variable as this
was sort of shoe-horned in to the KEYWORDS documentation, and tried
to make it clearer what is a technical requirement of Portage the
software and what are Gentoo-specific arch team requirements.

Bug: https://bugs.gentoo.org/695870
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 man/ebuild.5 | 160 +++++++++++++++++++++++++++++++++++++++++++----------------
 1 file changed, 116 insertions(+), 44 deletions(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index b002f3889..e955907f7 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -17,9 +17,10 @@ calculating relationships between packages.  Please note that if the atom has
 not already been emerged, then the latest version available is matched.
 .TP
 .B Atom Bases
-The base atom is just a full category/packagename.
+The base atom is just a full category/packagename. Another name for a full
+category/packagename is a \fI"catpkg"\fR. You will find this shorthand\-name
+used frequently in Gentoo. Here are some base atoms, a.k.a \fI"catpkgs"\fR:
 
-Examples:
 .nf
 .I 	sys\-apps/sed
 .I 	sys\-libs/zlib
@@ -31,7 +32,7 @@ It is nice to be more specific and say that only certain versions of atoms are
 acceptable.  Note that versions must be combined with a prefix (see below).
 Hence you may add a version number as a postfix to the base.
 
-Examples:
+\fBExamples\fR:
 .nf
 	sys\-apps/sed\fI\-4.0.5\fR
 	sys\-libs/zlib\fI\-1.1.4\-r1\fR
@@ -51,7 +52,7 @@ Sometimes you want to be able to depend on general versions rather than
 specifying exact versions all the time.  Hence we provide standard boolean
 operators:
 
-Examples:
+\fBExamples\fR:
 .nf
 	\fI>\fRmedia\-libs/libgd\-1.6
 	\fI>=\fRmedia\-libs/libgd\-1.6
@@ -71,7 +72,7 @@ means match any revision of the base version specified.  So in the
 example below, we would match versions '1.0.2a', '1.0.2a\-r1', '1.0.2a\-r2',
 etc...
 
-Example:
+\fBExample\fR:
 .nf
 	\fI~\fRnet\-libs/libnet\-1.0.2a
 .fi
@@ -79,7 +80,7 @@ Example:
 .I !
 means block packages from being installed at the same time.
 
-Example:
+\fBExample\fR:
 .nf
 	\fI!\fRapp\-text/dos2unix
 .fi
@@ -90,7 +91,7 @@ and explicitly disallow them from being temporarily installed
 simultaneously during a series of upgrades. This syntax is supported
 beginning with \fBEAPI 2\fR.
 
-Example:
+\fBExample\fR:
 .nf
 	\fI!!\fR<sys\-apps/portage\-2.1.4_rc1
 .fi
@@ -103,7 +104,7 @@ that comes before the '*' must be a valid version in the absence of the '*'.
 For example, '2' is a valid version and '2.' is not. Therefore, '2*' is
 allowed and '2.*' is not.
 
-Examples:
+\fBExamples\fR:
 .nf
 	=dev\-libs/glib\-2\fI*\fR
 	\fI!\fR=net\-fs/samba\-2\fI*\fR
@@ -115,7 +116,7 @@ Beginning with \fBEAPI 1\fR, any atom can be constrained to match a specific
 \fBSLOT\fR. This is accomplished by appending a colon followed by a
 \fBSLOT\fR:
 
-Examples:
+\fBExamples\fR:
 .nf
 	x11\-libs/qt:3
 	\fI~\fRx11\-libs/qt-3.3.8:3
@@ -128,7 +129,7 @@ Beginning with \fBEAPI 5\fR, a slot dependency may contain an
 optional sub\-slot part that follows the regular slot and is
 delimited by a \fI/\fR character.
 
-Examples:
+\fBExamples\fR:
 .nf
 	dev\-libs/icu:0/0
 	dev\-libs/icu:0/49
@@ -147,7 +148,7 @@ for runtime dependencies, indicates that the package will not
 break if the matched package is uninstalled and replaced by
 a different matching package in a different slot.
 
-Examples:
+\fBExamples\fR:
 .nf
 	dev\-libs/icu:*
 	dev\-lang/perl:*
@@ -161,7 +162,7 @@ break unless a matching package with slot and sub\-slot equal
 to the slot and sub\-slot of the best installed version at the
 time the package was installed is available.
 
-Examples:
+\fBExamples\fR:
 .nf
 	dev\-libs/icu:=
 	dev\-lang/perl:=
@@ -172,7 +173,7 @@ Examples:
 Indicates that only a specific slot value is acceptable, and
 otherwise behaves identically to the plain equals slot operator.
 
-Examples:
+\fBExamples\fR:
 .nf
 	dev\-libs/icu:0=
 	dev\-lang/perl:0=
@@ -190,7 +191,7 @@ dependencies. The sub\-slot part must not be omitted here
 is considered to have an implicit sub\-slot which is equal to
 the regular slot).
 
-Examples:
+\fBExamples\fR:
 .nf
 	dev\-libs/icu:0/0=
 	dev\-libs/icu:0/49=
@@ -238,7 +239,7 @@ immediately following a flag with either \fI(+)\fR or \fI(\-)\fR. Use
 \fI(+)\fR to behave as if a missing flag is present and enabled, or
 \fI(\-)\fR to behave as if it is present and disabled:
 
-Examples:
+\fBExamples\fR:
 .nf
 	media\-video/ffmpeg[threads(+)]
 	media\-video/ffmpeg[-threads(\-)]
@@ -280,7 +281,7 @@ That way the default is the superior GTK2 library.
 When a package can work with a few different packages but a virtual is not
 appropriate, this syntax can easily be used.
 
-Example:
+\fBExample\fR:
 .nf
 || (
 	app\-games/unreal\-tournament
@@ -295,7 +296,7 @@ use either.  Adding a virtual is inappropriate due to the small scope of it.
 Another good example is when a package can be built with multiple video
 interfaces, but it can only ever have just one.
 
-Example:
+\fBExample\fR:
 .nf
 || (
 	sdl? ( media\-libs/libsdl )
@@ -314,58 +315,85 @@ the user does not specify any of the previous choices.
 Note that if any of the packages listed are already merged, the package manager
 will use that to consider the dependency satisfied.
 
-.SH "VARIABLES"
-.TP
-.B Usage Notes
-\- Variables defined in \fBmake.conf\fR(5) are available for use in
+.SS Variable Usage Notes
+.RS
+.IP \(bu 2
+Variables defined in \fBmake.conf\fR(5) are available for use in
 ebuilds (except Portage\-specific variables, which might be not supported by
 other package managers).
-.br
-\- When assigning values to variables in ebuilds, you \fIcannot have a
+.IP \(bu
+When assigning values to variables in ebuilds, you \fIcannot have a
 space\fR between the variable name and the equal sign.
-.br
-\- Variable values should only contain characters that are members of the
+.IP \(bu
+Variable values should only contain characters that are members of the
 \fBascii\fR(7) character set. This requirement is mandated by \fBGLEP 31\fR.
+.RE
+
+.SS "Variables Used In Ebuilds"
+.TP
+.B ARCH
+This variable contains the official Gentoo\-specific acronym for the current
+architecture of the running system. For an authoritative list please
+review /var/db/repos/gentoo/profiles/arch.list.
 .TP
 .B P
 This variable contains the package name without the ebuild revision.
 This variable must NEVER be modified.
 
-xfree\-4.2.1\-r2.ebuild \-\-> $P=='xfree\-4.2.1'
+\fBExample\fR:
+.nf
+	x11\-base/xorg\-server\-1.20.5\-r2 \-\-> '\fIx11\-base/xorg\-server\-1.20.5\fR'
+.fi
 .TP
 .B PN
 Contains the name of the script without the version number.
 
-xfree\-4.2.1\-r2.ebuild \-\-> $PN=='xfree'
+\fBExample\fR:
+.nf
+	x11\-base/xorg\-server\-1.20.5\-r2 \-\-> '\fIx11\-base/xorg\-server\fR'
+.fi
 .TP
 .B PV
 Contains the version number without the revision.
 
-xfree\-4.2.1\-r2.ebuild \-\-> $PV=='4.2.1'
+\fBExample\fR:
+.nf
+	x11\-base/xorg\-server\-1.20.5\-r2 \-\-> '\fI1.20.5\fR'
+.fi
 .TP
 .B PR
 Contains the revision number or 'r0' if no revision number exists.
 
-xfree\-4.2.1\-r2.ebuild \-\-> $PR=='r2'
+\fBExample\fR:
+.nf
+	x11\-base/xorg\-server\-1.20.5\-r2 \-\-> '\fIr2\fR'
+.fi
 .TP
 .B PVR
 Contains the version number with the revision (if non-zero).
 
+\fBExample\fR:
 .nf
-xfree\-4.2.1.ebuild \-\-> $PVR=='4.2.1'
-xfree\-4.2.1\-r2.ebuild \-\-> $PVR=='4.2.1\-r2'
+	x11\-base/xorg\-server\-1.20.5 \-\-> '\fI1.20.5\fR'
+	x11\-base/xorg\-server\-1.20.5\-r2 \-\-> '\fI1.20.5\-r2\fR'
 .fi
 .TP
 .B PF
 Contains the full package name \fBPN\fR\-\fBPVR\fR
 
+\fBExamples\fR:
 .nf
-xfree\-4.2.1.ebuild \-\-> $PF=='xfree\-4.2.1'
-xfree\-4.2.1\-r2.ebuild \-\-> $PF=='xfree\-4.2.1\-r2'
+	x11\-base/xorg\-server\-1.20.5 \-\-> '\fIxorg\-server\-1.20.5\fR'
+	x11\-base/xorg\-server\-1.20.5\-r2 \-\-> '\fIxorg\-server\-1.20.5\-r2\fR'
 .fi
 .TP
 .B CATEGORY
 Contains the package category name.
+
+\fBExample\fR:
+.nf
+	x11\-base/xorg\-server\-1.20.5\-r2 \-\-> '\fIx11\-base\fR'
+.fi
 .TP
 .B A
 Contains all source files required for the package.  This variable must
@@ -543,17 +571,61 @@ file name, should be separated by whitespace.
 Should contain a list of URIs for the sources main sites and other further
 package dependent information.
 .TP
-.B KEYWORDS\fR = \fI[\-~][x86,ppc,sparc,mips,alpha,arm,hppa]
-Should contain appropriate list of arches that the ebuild is know to
-work/not work.  By default if you do not know if an ebuild runs under
-a particular arch simply omit that KEYWORD.  If the ebuild will not
-work on that arch include it as \-ppc for example.  If the ebuild is
-being submitted for inclusion, it must have ~arch set for architectures
-where it has been PROVEN TO WORK.  (Packages KEYWORDed this way may be
-unmasked for testing by setting ACCEPT_KEYWORDS="~arch" on the command
-line, or in \fBmake.conf\fR(5)) For an authoritative list please review
-/var/db/repos/gentoo/profiles/arch.list. Please keep this list in
-alphabetical order.
+.B KEYWORDS\fR = \fI[\-~][x86,ppc,sparc,mips,alpha,arm,hppa,...]
+.P
+
+KEYWORDS works in conjunction with ACCEPT_KEYWORDS (see \fBmake.conf\fR(5))
+to implement a system of creating sets of different types of packages
+which can then be masked or unmasked en masse. In the Gentoo Linux
+project, they are used by the Gentoo arch teams to define what ebuilds
+are included in a particular CPU architecture's set of stable and unstable
+unmasked packages.
+
+Here's how they work. For purposes of explanation, let's assume you have
+a stable x86\-64bit system, typically referred to as "amd64".
+ARCH would be defined as "amd64". If you were using the stable build of
+Gentoo Linux, then ACCEPT_KEYWORDS would be set to "amd64" via profiles.
+Any ebuild that then has
+"amd64" in KEYWORDS will be unmasked by default.
+
+On an "unstable"
+amd64 system, ACCEPT_KEYWORDS will be set to "amd64 ~amd64", with the
+tilde denoting "unstable." Then, if an ebuild has \fIeither\fR
+"amd64" or "~amd64" in KEYWORDS, it will be keyword unmasked by default on
+that system. Similarly, if an ebuild is known to not be compatible
+with a particular architecture, the "\-" prefix ( i.e. "\-amd64") setting
+can be specified to mask it only on that arch.
+.P
+If you are developing ebuilds for Gentoo Linux, there are certain
+policies regarding KEYWORDS that you are expected to follow in order
+to align with Gentoo's arch team workflow. The most important
+policies are listed below:
+.RS
+.IP \(bu 2
+If you do not know if an ebuild runs under a particular arch, then do not
+specify it in KEYWORDS.
+It will then be masked by default on that architecture.
+.IP \(bu
+If the ebuild is known not to work on an arch, disable that arch in KEYWORDS.
+This would be done by specifying "\-ppc", for example. This will ensure that
+it is explicitly keyword\-masked for that architecture.
+.IP \(bu
+When submitting an ebuild to Gentoo Linux, it is the project policy to only
+have "~arch" set in KEYWORDS
+for the architecture for which it has been successfully tested, and no more.
+As the ebuild receives more testing, Gentoo arch teams will gradually expand
+the KEYWORDS settings to "bump" the package to unstable, and possibly stable.
+
+It is possible to customize the behavior of ACCEPT_KEYWORDS and KEYWORDS on
+a per\-package basis using package.accept_keywords and package.keywords files
+in profiles. See \fBportage\fR(5) for more information on using these files.
+.RE
+.P
+Note that while other Gentoo\-based projects
+have KEYWORDS and ACCEPT_KEYWORDS, they likely will not have exactly
+the same policies regarding their use. Therefore, it is necessary that you
+research their specific policies and how they differ from Gentoo.
+.RE
 .TP
 .B SLOT
 This sets the SLOT for packages that may need to have multiple versions

[gentoo-commits] proj/portage:master commit in: man/

[Mike Frysinger]

commit:     e31d6813d5f1cdd133726add02383c444a3f17ff
Author:     Mike Frysinger <vapier <AT> chromium <DOT> org>
AuthorDate: Wed Aug 21 21:40:10 2019 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Wed Sep 11 08:43:57 2019 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=e31d6813

make.conf: clarify distlocks usage

The current text makes it sound like distlocks control mutual access
in more scenarios than it actually does.  Clarify that it only shows
up for distfiles & binpkgs.

Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>

 man/make.conf.5 | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/man/make.conf.5 b/man/make.conf.5
index 9dcd35b2c..71165bc53 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -399,9 +399,13 @@ Enable portage support for the distcc package with pump mode.
 .TP
 .B distlocks
 Portage uses lockfiles to ensure competing instances don't clobber
-each other's files. This feature is enabled by default but may cause
+each other's files.  It covers saving distfiles to ${DISTDIR} and
+binpkgs to ${PKGDIR}.
+
+This feature is enabled by default but may cause
 heartache on less intelligent remote filesystems like NFSv2 and some
-strangely configured Samba server (oplocks off, NFS re\-export). A tool
+strangely configured Samba servers (oplocks off, NFS re\-export).
+
 /usr/lib/portage/bin/clean_locks exists to help handle lock issues
 when a problem arises (normally due to a crash or disconnect).
 .TP

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     582e681e3911d3cc09b7729e564c5862db368478
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  1 22:04:16 2019 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Sep  1 22:07:35 2019 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=582e681e

man/glsa-check.1: fix man2html formatting

Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 man/glsa-check.1 | 65 ++++++++++++++++++--------------------------------------
 1 file changed, 21 insertions(+), 44 deletions(-)

diff --git a/man/glsa-check.1 b/man/glsa-check.1
index 23b5e9d94..4fe1ad506 100644
--- a/man/glsa-check.1
+++ b/man/glsa-check.1
@@ -1,76 +1,53 @@
-.TH "GLSA\-CHECK" "1" "September 2019" "Portage VERSION" "Portage"
-.
+.TH "GLSA-CHECK" "1" "September 2019" "Portage VERSION" "Portage"
 .SH "NAME"
 \fBglsa\-check\fR \- Tool to locally monitor and manage GLSAs
-.
 .SH "SYNOPSIS"
 \fBglsa\-check\fR [options] [glsa\-id | all | affected]
-.
 .SH "DESCRIPTION"
 \fBglsa\-check\fR is used to locally monitor and manage Gentoo Linux Security Advisories\. In order for \fBglsa\-check\fR to be effective, it is required that a local repository exists containing GLSA metadata\.
-.
 .SH "OPTIONS"
+.TP
 \fB\-l\fR, \fB\-\-list\fR List a summary for the given GLSA(s) or set and whether they affect the system\.
-.
-.P
+.TP
 \fB\-d\fR, \fB\-\-dump\fR, \fB\-\-print\fR Show all information about the GLSA(s) or set\.
-.
-.P
+.TP
 \fB\-t\fR, \fB\-\-test\fR Test if this system is affected by the GLSA(s) or set and output the GLSA ID(s)\.
-.
-.P
+.TP
 \fB\-p\fR, \fB\-\-pretend\fR Show the necessary steps to remediate the system\.
-.
-.P
+.TP
 \fB\-f\fR, \fB\-\-fix\fR (experimental) Attempt to remediate the system based on the instructions given in the GLSA(s) or set\. This will only upgrade (when an upgrade path exists) or remove packages\.
-.
-.P
+.TP
 \fB\-i\fR, \fB\-\-inject\fR Inject the given GLSA(s) into the glsa_injected file\.
-.
-.P
+.TP
 \fB\-n\fR, \fB\-\-nocolor\fR Removes color from output\.
-.
-.P
+.TP
 \fB\-h\fR, \fB\-\-help\fR Show this help message\.
-.
-.P
-\fBV\fR, \fB\-\-version\fR Show information about \fBglsa\-check\fR\.
-.
-.P
+.TP
+\fB\-V\fR, \fB\-\-version\fR Show information about \fBglsa\-check\fR\.
+.TP
 \fB\-v\fR, \fB\-\-verbose\fR Print more messages\.
-.
-.P
+.TP
 \fB\-c\fR, \fB\-\-cve\fR Show CVE IDs in listing mode\.
-.
-.P
+.TP
 \fB\-q\fR, \fB\-\-quiet\fR Be less verbose and do not send empty mail\.
-.
-.P
+.TP
 \fB\-m\fR, \fB\-\-mail\fR Send a mail with the given GLSAs to the administrator\.
-.
-.P
+.TP
 \fB\-r\fR, \fB\-\-reverse\fR List GLSAs in reverse order
-.
 .SH "EXAMPLES"
 \fBglsa\-check \-t all\fR Test the system against all GLSAs in the GLSA repository\.
-.
-.P
+.TP
 \fBglsa\-check \-t 201801\-01\fR Test the system against the specific GLSA 201801\-01\.
-.
 .SH "EXIT VALUES"
+.TP
 \fB0\fR Success
-.
-.P
+.TP
 \fB1\fR Syntax or usage error
-.
-.P
+.TP
 \fB2\fR Missing permissions, solution, etc
-.
-.P
+.TP
 \fB6\fR System is affected by some GLSAs
-.
 .SH "FILES"
 \fB/var/lib/portage/glsa_injected\fR List of GLSA ids that have been injected and will never show up as \'affected\' on this system\. The file must contain one GLSA ID (e\.g\. \'200804\-02\') per line\.
-.
 .SH "BUGS"
 All bugs should be reported to the Portage team via https://bugs\.gentoo\.org

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     636ca48fa524efe5c0d1b69e35e86a422e6d4be1
Author:     Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  1 16:07:40 2019 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Sep  1 18:29:10 2019 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=636ca48f

glsa-check: update man page with -r option

Also remove duplicate --quiet documentation.

Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 man/glsa-check.1 | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/man/glsa-check.1 b/man/glsa-check.1
index bb15cf5a9..23b5e9d94 100644
--- a/man/glsa-check.1
+++ b/man/glsa-check.1
@@ -1,4 +1,4 @@
-.TH "GLSA\-CHECK" "1" "August 2019" "Portage VERSION" "Portage"
+.TH "GLSA\-CHECK" "1" "September 2019" "Portage VERSION" "Portage"
 .
 .SH "NAME"
 \fBglsa\-check\fR \- Tool to locally monitor and manage GLSAs
@@ -37,9 +37,6 @@
 \fBV\fR, \fB\-\-version\fR Show information about \fBglsa\-check\fR\.
 .
 .P
-\fB\-q\fR, \fB\-\-quiet\fR Be less verbose and do not send empty mail\.
-.
-.P
 \fB\-v\fR, \fB\-\-verbose\fR Print more messages\.
 .
 .P
@@ -51,6 +48,9 @@
 .P
 \fB\-m\fR, \fB\-\-mail\fR Send a mail with the given GLSAs to the administrator\.
 .
+.P
+\fB\-r\fR, \fB\-\-reverse\fR List GLSAs in reverse order
+.
 .SH "EXAMPLES"
 \fBglsa\-check \-t all\fR Test the system against all GLSAs in the GLSA repository\.
 .

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     d27242e08f17465da9fa94824998c427c5d81f88
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  1 04:53:49 2019 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Sep  1 04:58:35 2019 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=d27242e0

man/glsa-check.1: remove deprecated "new" target

The "new" target was remove in 82797924dcc6dbfcca22067633cd160ead1199a7.

Fixes: b8cc6a4cd999 ("man/glsa-check.1: update the glsa-check man page")
Reported-by: Aaron Bauman <bman <AT> gentoo.org>
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 man/glsa-check.1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/man/glsa-check.1 b/man/glsa-check.1
index 6bae0e9ed..bb15cf5a9 100644
--- a/man/glsa-check.1
+++ b/man/glsa-check.1
@@ -4,7 +4,7 @@
 \fBglsa\-check\fR \- Tool to locally monitor and manage GLSAs
 .
 .SH "SYNOPSIS"
-\fBglsa\-check\fR [options] [glsa\-id | all | new | affected]
+\fBglsa\-check\fR [options] [glsa\-id | all | affected]
 .
 .SH "DESCRIPTION"
 \fBglsa\-check\fR is used to locally monitor and manage Gentoo Linux Security Advisories\. In order for \fBglsa\-check\fR to be effective, it is required that a local repository exists containing GLSA metadata\.

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     712e2b3fe88fd597914ddf449849b195c15fbcf6
Author:     Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 30 19:29:00 2019 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sat Aug 31 03:40:20 2019 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=712e2b3f

glsa-check: add man page exit values

Bug: https://bugs.gentoo.org/587930

Reported-by: Bandie Yip Kojote <bandie <AT> ttygap.net>
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 man/glsa-check.1 | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/man/glsa-check.1 b/man/glsa-check.1
index f1041737f..6bae0e9ed 100644
--- a/man/glsa-check.1
+++ b/man/glsa-check.1
@@ -57,6 +57,18 @@
 .P
 \fBglsa\-check \-t 201801\-01\fR Test the system against the specific GLSA 201801\-01\.
 .
+.SH "EXIT VALUES"
+\fB0\fR Success
+.
+.P
+\fB1\fR Syntax or usage error
+.
+.P
+\fB2\fR Missing permissions, solution, etc
+.
+.P
+\fB6\fR System is affected by some GLSAs
+.
 .SH "FILES"
 \fB/var/lib/portage/glsa_injected\fR List of GLSA ids that have been injected and will never show up as \'affected\' on this system\. The file must contain one GLSA ID (e\.g\. \'200804\-02\') per line\.
 .

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     b8cc6a4cd9990a86894ff14f2832f5f3a88bbd22
Author:     Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 25 20:13:26 2019 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Aug 26 18:09:49 2019 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=b8cc6a4c

man/glsa-check.1: update the glsa-check man page

* Remove "Gentoo" from the name. It is obvious.
* Change "SYNTAX" to "SYNOPSIS" which is more common among man pages
* Update description to use the command name vice "This tool"
* Move bug reporting information to BUGS section
* Remove references to the "portage tree". Just call it a repo.
* Add the "sets" all, new, and affected to the SYNOPSIS
* Sentence case and add periods to all option descriptions

Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 man/glsa-check.1 | 119 ++++++++++++++++++++++++++-----------------------------
 1 file changed, 57 insertions(+), 62 deletions(-)

diff --git a/man/glsa-check.1 b/man/glsa-check.1
index 67527230c..a0d49d4dd 100644
--- a/man/glsa-check.1
+++ b/man/glsa-check.1
@@ -1,66 +1,61 @@
-.TH "GLSA-CHECK" "1" "Aug 2019" "Portage VERSION" "Portage"
+.TH "GLSA\-CHECK" "1" "August 2019" "Portage VERSION" "Portage"
+.
 .SH "NAME"
-.LP
-glsa\-check \- Gentoo: Tool to locally monitor and manage GLSAs
-.SH "SYNTAX"
-.LP
-glsa\-check <\fIoption\fP> [\fIglsa\-list\fP]
-
-[\fIglsa\-list\fR] can contain an arbitrary number of GLSA ids, filenames containing GLSAs or the special identifiers 'all' and 'affected'
+\fBglsa\-check\fR \- Tool to locally monitor and manage GLSAs
+.
+.SH "SYNOPSIS"
+\fBglsa\-check\fR [options] [glsa\-id | all | new | affected]
+.
 .SH "DESCRIPTION"
-.LP
-This tool is used to locally monitor and manage Gentoo Linux Security Advisories.
-Please read:
-.br
-http://www.gentoo.org/security
-.br
-before reporting a bug.
-.LP
-Note: In order for this tool to be effective, you must regularly sync your local portage tree.
+\fBglsa\-check\fR is used to locally monitor and manage Gentoo Linux Security Advisories\. In order for \fBglsa\-check\fR to be effective, it is required that a local repository exists containing GLSA metadata\.
+.
 .SH "OPTIONS"
-.LP
-.TP
-.B \-l, \-\-list
-list the a summary for all GLSAs in glsa\-list and whether they affect the system
-.TP
-.B \-d, \-\-dump, \-\-print
-show all information about the GLSAs in glsa\-list
-.TP
-.B \-t, \-\-test
-test if this system is affected by the GLSAs in glsa\-list and output the GLSA IDs
-.TP
-.B \-p, \-\-pretend
-show the necessary steps to apply the GLSAs in glsa\-list
-.TP
-.B \-f, \-\-fix
-try to auto\-apply the GLSAs in in glsa\-list using emerge. This will only upgrade packages to later version, but not remove packages when no upgrade path exists (experimental)
-.TP
-.B \-i, \-\-inject
-inject the given GLSA into the glsa_injected file
-.TP
-.B \-n, \-\-nocolor
-disable colors (option)
-.TP
-.B \-h, \-\-help
-show this help message
-.TP
-.B \-V, \-\-version
-some information about this tool
-.TP
-.B \-v, \-\-verbose
-print more messages (option)
-.TP
-.B \-c, \-\-cve
-show CVE ids in listing mode (option)
-.TP
-.B \-q, \-\-quiet
-be less verbose and do not send empty mail (option)
-.TP
-.B \-m, \-\-mail
-send a mail with the given GLSAs to the administrator
+\fB\-l\fR, \fB\-\-list\fR List a summary for the given GLSA(s) or set and whether they affect the system\.
+.
+.P
+\fB\-d\fR, \fB\-\-dump\fR, \fB\-\-print\fR Show all information about the GLSA(s) or set\.
+.
+.P
+\fB\-t\fR, \fB\-\-test\fR Test if this system is affected by the GLSA(s) or set and output the GLSA ID(s)\.
+.
+.P
+\fB\-p\fR, \fB\-\-pretend\fR Show the necessary steps to remediate the system\.
+.
+.P
+\fB\-f\fR, \fB\-\-fix\fR (experimental) Attempt to remediate the system based on the instructions given in the GLSA(s) or set\. This will only upgrade (when an upgrade path exists) or remove packages\.
+.
+.P
+\fB\-i\fR, \fB\-\-inject\fR Inject the given GLSA(s) into the glsa_injected file\.
+.
+.P
+\fB\-n\fR, \fB\-\-nocolor\fR Removes color from output\.
+.
+.P
+\fB\-h\fR, \fB\-\-help\fR Show this help message\.
+.
+.P
+\fBV\fR, \fB\-\-version\fR Show information about \fBglsa\-check\fR\.
+.
+.P
+\fB\-v\fR, \fB\-\-verbose\fR Print more messages\.
+.
+.P
+\fB\-c\fR, \fB\-\-cve\fR Show CVE IDs in listing mode\.
+.
+.P
+\fB\-q\fR, \fB\-\-quiet\fR Be less verbose and do not send empty mail\.
+.
+.P
+\fB\-m\fR, \fB\-\-mail\fR Send a mail with the given GLSAs to the administrator\.
+.
+.SH "EXAMPLES"
+\fBglsa\-check \-t all\fR Test the system against all GLSAs in the GLSA repository\.
+.
+.P
+\fBglsa\-check \-t 201801\-01\fR Test the system against the specific GLSA 201801\-01\.
+.
 .SH "FILES"
-.LP
-.TP
-.B /var/lib/portage/glsa_injected
-List of GLSA ids that have been injected and will never show up as 'affected' on this system.
-The file must contain one GLSA id (e.g. '200804\-02') per line.
+\fB/var/lib/portage/glsa_injected\fR List of GLSA ids that have been injected and will never show up as \'affected\' on this system\. The file must contain one GLSA ID (e\.g\. \'200804\-02\') per line\.
+.
+.SH "BUGS"
+All bugs should be reported to the Portage team via https://bugs\.gentoo\.org

[gentoo-commits] proj/portage:master commit in: man/

[Ulrich Müller]

commit:     132d0830cdd291f0a7b09c3b963e4da6efea31b9
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 27 14:27:39 2019 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Jul 27 14:27:39 2019 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=132d0830

man/ebuild.5: Fix .nf macro usage.

Several .nf (no-fill mode) blocks were not terminated by .fi, causing
broken formatting of the rest of the manpage.

Fixes: cdcf4a28409daa7c56a0c2c94054f48bd5e43c6d
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 man/ebuild.5 | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index 7742ffbce..31bd8f771 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -351,16 +351,18 @@ xfree\-4.2.1\-r2.ebuild \-\-> $PR=='r2'
 .B PVR
 Contains the version number with the revision (if non-zero).
 
-xfree\-4.2.1.ebuild \-\-> $PVR=='4.2.1'
 .nf
+xfree\-4.2.1.ebuild \-\-> $PVR=='4.2.1'
 xfree\-4.2.1\-r2.ebuild \-\-> $PVR=='4.2.1\-r2'
+.fi
 .TP
 .B PF
 Contains the full package name \fBPN\fR\-\fBPVR\fR
 
-xfree\-4.2.1.ebuild \-\-> $PF=='xfree\-4.2.1'
 .nf
+xfree\-4.2.1.ebuild \-\-> $PF=='xfree\-4.2.1'
 xfree\-4.2.1\-r2.ebuild \-\-> $PF=='xfree\-4.2.1\-r2'
+.fi
 .TP
 .B CATEGORY
 Contains the package category name.

[gentoo-commits] proj/portage:master commit in: man/

[Ulrich Müller]

commit:     8ac598cb3b115fe2e98f3e3e28a85950bd674099
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 27 14:34:10 2019 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Jul 27 14:34:10 2019 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=8ac598cb

man/ebuild.5: Document PROPERTIES="live".

Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 man/ebuild.5 | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index 31bd8f771..b002f3889 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -1,4 +1,4 @@
-.TH "EBUILD" "5" "Apr 2019" "Portage VERSION" "Portage"
+.TH "EBUILD" "5" "Jul 2019" "Portage VERSION" "Portage"
 
 .SH "NAME"
 ebuild \- the internal format, variables, and functions in an ebuild script
@@ -708,13 +708,17 @@ Disables userpriv for specific packages.
 .RE
 .PD 1
 .TP
-.B PROPERTIES\fR = \fI[interactive]
+.B PROPERTIES\fR = \fI[interactive,live]
 A space delimited list of properties, with conditional syntax support.
 .PD 0
 .RS
 .TP
 .I interactive
 One or more ebuild phases will produce a prompt that requires user interaction.
+.TP
+.I live
+The package uses live source code that may vary each time that the package
+is installed.
 .RE
 .PD 1
 .TP

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     5cc59a0064f2b6a79f87d6975354033eba29beaf
Author:     Daniel Robbins <drobbins <AT> funtoo <DOT> org>
AuthorDate: Wed Jul 10 02:14:55 2019 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Wed Jul 10 20:26:14 2019 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=5cc59a00

Improvements for man 5 ebuild to reflect EAPI 7 changes.

Closes: https://github.com/gentoo/portage/pull/437
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 man/ebuild.5 | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index 20684d8f4..7742ffbce 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -411,6 +411,9 @@ should be prefixed with ${D}.
 Beginning with \fBEAPI 3\fR, the offset prefix often needs
 to be taken into account here, for which the variable
 ${ED} is provided (see below).
+Note that with \fBEAPI 7\fR, any trailing slash
+contained in this path will be automatically removed for ease of concatenating
+paths within ebuilds.
 Do not modify this variable.
 .TP
 .B ED\fR = \fI"${PORTAGE_TMPDIR}/portage/${CATEGORY}/${PF}/image/${EPREFIX}/"
@@ -418,7 +421,9 @@ Beginning with \fBEAPI 3\fR, contains the path
 "${D%/}${EPREFIX}/" for convenience purposes.
 For EAPI values prior to \fBEAPI 3\fR which do
 not support ED, helpers use \fBD\fR where
-they would otherwise use ED.
+they would otherwise use ED. Note that with \fBEAPI 7\fR, any trailing slash
+contained in this path will be automatically removed for ease of concatenating
+paths within ebuilds.
 Do not modify this variable.
 .TP
 .B MERGE_TYPE
@@ -477,6 +482,18 @@ excluded during generation of \fBREQUIRES\fR metadata (see
 possible to create patterns containing quoted whitespace.
 .TP
 .B ROOT\fR = \fI"/"
+Please note an important recent change regarding the ROOT variable -- in \fBEAPI 7\fR ebuilds,
+this variable will default to "" rather than the traditional "/" within ebuilds
+when pointing to the root filesystem, and when set to a non-root path
+this variable will never contain a trailing slash. This has the added
+convenience of eliminating the need to
+specify "${ROOT%/}" when concatenating paths, making the use of ROOT
+more elegant. This applies to the variables EROOT, D and ED as well. Please
+make note that this will
+mean that ebuilds must use different logic in conditionals to determine if
+they are installing to the root filesystem -- use [[ "$ROOT" == "" ]] instead of
+[[ "$ROOT" == "/" ]].
+
 Contains the path that portage should use as the root of the live filesystem.
 When packages wish to make changes to the live filesystem, they should do so in
 the tree prefixed by ${ROOT}.  Often the offset prefix needs to be taken
@@ -486,7 +503,10 @@ below).  Do not modify this variable.
 .B EROOT\fR = \fI"${ROOT%/}${EPREFIX}/"
 Beginning with \fBEAPI 3\fR, contains
 "${ROOT%/}${EPREFIX}/" for convenience
-purposes. Do not modify this variable.
+purposes. Do not modify this variable. Also see the important note regarding
+ROOT with \fBEAPI 7\fR, above. As with ROOT, EROOT will be defined as ""
+when set to the root filesystem and never have a trailing slash within an
+ebuild.
 .TP
 .B BROOT\fR = \fI"${EPREFIX}"
 Beginning with \fBEAPI 7\fR, the absolute path to the root directory

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     b1a7ab1f7fe84818a70ac021d92facacaa14b769
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 19 20:48:23 2019 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Wed Jun 19 20:50:16 2019 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=b1a7ab1f

man/emerge.1: --update implies --selective

Reported-by: Ben Kohler <bkohler <AT> gentoo.org>
Bug: https://bugs.gentoo.org/688356#c2
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 man/emerge.1 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/man/emerge.1 b/man/emerge.1
index 78ac55e25..4db2b3e62 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -1,4 +1,4 @@
-.TH "EMERGE" "1" "Apr 2019" "Portage VERSION" "Portage"
+.TH "EMERGE" "1" "Jun 2019" "Portage VERSION" "Portage"
 .SH "NAME"
 emerge \- Command\-line interface to the Portage system
 .SH "SYNOPSIS"
@@ -992,6 +992,7 @@ not always be the highest version number due to masking
 for testing and development. Package atoms specified on
 the command line are greedy, meaning that unspecific
 atoms may match multiple versions of slotted packages.
+This option also implies the \fB\-\-selective\fR option.
 .TP
 .BR "\-\-use\-ebuild\-visibility [ y | n ]"
 Use unbuilt ebuild metadata for visibility

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     1932757ff18f46fdf83c03bb56981a31709b755f
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 17 17:22:11 2019 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Mar 17 20:49:02 2019 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=1932757f

man: Remove obsolete cross-compilation section

It makes heavy use of ambiguous terminology from EAPI 5-hdepend. Part
of it talks about the targetroot USE flag, which we do not plan to
formally adopt into PMS. Overall, it is more likely to confuse than
help people.

I thought about rewriting it but it is difficult to summarise this
complex subject in a useful way. The wiki is probably a better place
to write about it.

Closes: https://github.com/gentoo/portage/pull/413
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 man/ebuild.5 | 43 -------------------------------------------
 1 file changed, 43 deletions(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index 1d0c89529..27f47d2b1 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -314,49 +314,6 @@ the user does not specify any of the previous choices.
 Note that if any of the packages listed are already merged, the package manager
 will use that to consider the dependency satisfied.
 
-.SS "Cross-compilation"
-Portage supports cross-compilation into a subdirectory specified by \fBROOT\fR.
-.TP
-.B Host
-\fIHost\fR in this context means the platform hosting the build process, i.e.
-what autotools calls CBUILD.
-Its packages are contained in the root of the filesystem ("\fI/\fR").
-
-If \fBROOT\fR is "\fI/\fR", all dependency types will be installed there.
-Otherwise, for EAPIs that support \fBHDEPEND\fR (experimental
-\fBEAPI 5-hdepend\fR), only \fBHDEPEND\fR is installed into "\fI/\fR".
-For EAPIs that do not support \fBHDEPEND\fR, the behaviour is controlled by the
-\fI\-\-root-deps\fR flag to \fBemerge\fR(1), defaulting to install only
-\fBDEPEND\fR into the \fIhost\fR.
-.TP
-.B Target
-\fITarget\fR refers to the platform that the package will later run on, i.e.
-what autotools calls CHOST.
-The directory housing this system is specified by \fBROOT\fR.
-If it is different from "\fI/\fR", i.e. \fIhost\fR and \fItarget\fR are not the
-same, this variable contains the path to the directory housing the \fItarget\fR
-system.
-
-For EAPIs that support \fBHDEPEND\fR (experimental \fBEAPI 5-hdepend\fR),
-\fBDEPEND\fR, \fBRDEPEND\fR, and \fBPDEPEND\fR
-list the \fItarget\fR dependencies, i.e. those to be installed into \fBROOT\fR.
-For EAPIs that do not support \fBHDEPEND\fR, the \fBemerge\fR(1) flag
-\fI\-\-root-deps\fR controls what the package manager installs there.
-Without it, \fBemerge\fR defaults to install only runtime dependencies (i.e.
-\fBRDEPEND\fR and \fBPDEPEND\fR) into \fBROOT\fR.
-.PP
-See section \fBVARIABLES\fR for more information about the \fBDEPEND\fR,
-\fBRDEPEND\fR and \fBHDEPEND\fR variables.
-.TP
-.B The targetroot USE flag
-For EAPIs that support the "\fItargetroot\fR" USE flag, that flag is
-automatically enabled by the package manager if \fIhost\fR and \fItarget\fR
-system are not the same, i.e. if the \fBROOT\fR is not "\fI/\fR".
-This is necessary where the package to be built needs an executable copy of
-itself during the build process.
-A known example is dev-lang/python, which needs to run a Python interpreter
-during compilation.
-
 .SH "VARIABLES"
 .TP
 .B Usage Notes

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     e68df766397b238c26f567882f9d3dfcccb99e10
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 17 17:19:27 2019 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Mar 17 20:48:49 2019 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=e68df766

man: Replace HDEPEND description with newer BDEPEND description

Include a passing reference to HDEPEND from EAPI 5-hdepend.

Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 man/ebuild.5 | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index 85a621fa3..1d0c89529 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -616,10 +616,9 @@ This should contain a list of all packages that are required for the program
 to compile (aka \fIbuildtime\fR dependencies).  These are usually libraries and
 headers.
 
-Starting from experimental \fBEAPI 5-hdepend\fR, tools should go into the
-\fBHDEPEND\fR variable instead, as \fBDEPEND\fR will only be installed into the
-\fItarget\fR system and hence cannot be executed in a cross\-compile setting.
-(See section \fBCross\-compilation\fR for more information.)
+Starting from \fBEAPI 7\fR, tools should go into the \fBBDEPEND\fR
+variable instead, as \fBDEPEND\fR will only be installed into the
+system being built and hence cannot be executed when cross-compiling.
 
 You may use the syntax described above in the \fBDependencies\fR section.
 .TP
@@ -633,14 +632,16 @@ implicitly set.
 
 You may use the syntax described above in the \fBDependencies\fR section.
 .TP
-.B HDEPEND
-This should contain a list of all packages that are required to be executable
-during compilation of this program (aka \fIhost\fR buildtime dependencies).
-These are usually tools, like interpreters or (cross\-)compilers.
+.B BDEPEND
+This should contain a list of all packages that are required to be
+executable during compilation of this program (aka \fInative build\fR
+dependencies).  These are usually tools, like interpreters or
+(cross\-)compilers.  They will be installed into the system performing
+the build.
 
-This variable is new in experimental \fBEAPI 5-hdepend\fR and will be installed
-into the \fIhost\fR system.
-(See section \fBCross-compilation\fR for more information.)
+This variable was formally introduced in \fBEAPI 7\fR but was
+previously known as \fBHDEPEND\fR in the experimental
+\fBEAPI 5-hdepend\fR.
 
 You may use the syntax described above in the \fBDependencies\fR section.
 .TP

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     095f2391505547eb2149dd9b808c6f9bb507142a
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 17 13:50:26 2019 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Mar 17 20:27:50 2019 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=095f2391

man: Update has_version and best_version descriptions for EAPI 7

Closes: https://github.com/gentoo/portage/pull/412
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 man/ebuild.5 | 36 ++++++++++++++++++++++--------------
 1 file changed, 22 insertions(+), 14 deletions(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index 5ae84eb74..85a621fa3 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -1086,20 +1086,28 @@ has a default value of ' ', or a space.  It is a \fBbash\fR(1) setting.
 .B hasv\fR \fI<item>\fR \fI<item list>
 Like \fBhas\fR, but also echoes \fIitem\fR when \fBhas\fR returns true.
 .TP
-.B has_version\fR \fI[\-\-host\-root]\fR \fI<category/package\-version>
-Check to see if \fIcategory/package\-version\fR is installed on the system.
-The parameter accepts all values that are acceptable in the \fBDEPEND\fR
-variable.  The function returns 0 if \fIcategory/package\-version\fR is
-installed, 1 otherwise. Beginning with \fBEAPI 5\fR, the
-\-\-host\-root option may be used in order to cause the query
-to apply to the host root instead of ${ROOT}.
-.TP
-.B best_version\fR \fI[\-\-host\-root]\fR \fI<package name>
-This function will look up \fIpackage name\fR in the database of currently
-installed programs and echo the "best version" of the package that is
-currently installed. Beginning with \fBEAPI 5\fR, the
-\-\-host\-root option may be used in order to cause the query
-to apply to the host root instead of ${ROOT}.
+.B has_version\fR \fI[\-b]\fR \fI[\-d]\fR \fI[\-r]\fR \fI[\-\-host\-root]\fR \fI<category/package\-version>
+Check to see if \fIcategory/package\-version\fR is installed.  The
+parameter accepts all values that are acceptable in the \fBDEPEND\fR
+variable.  The function returns 0 if \fIcategory/package\-version\fR
+is installed, 1 otherwise. The package is searched for in \fBROOT\fR
+by default.
+
+In \fBEAPI 5\fR and \fBEAPI 6\fR, the package is searched for in the
+build host if the \fI\-\-host\-root\fR option is given.
+
+In \fBEAPI 7\fR and later, the confusing \fI\-\-host\-root\fR option
+has been replaced with \fI\-b\fR, which corresponds to a dependency
+satisfied by \fBBDEPEND\fR in the build host.  Similarly, the
+\fI\-d\fR option corresponds to \fBDEPEND\fR in \fBSYSROOT\fR and the
+\fI\-r\fR option corresponds to \fBRDEPEND\fR in \fBROOT\fR.
+.TP
+.B best_version\fR \fI[\-b]\fR \fI[\-d]\fR \fI[\-r]\fR \fI[\-\-host\-root]\fR \fI<package name>
+This function will look up \fIpackage name\fR in the database of
+currently installed packages and echo the "best version" of the
+package that is found or nothing if no version is installed.  The
+package is searched for in \fBROOT\fR by default.  It accepts the same
+options as \fBhas_version\fR.
 
 Example:
 .nf

[gentoo-commits] proj/portage:master commit in: man/

[Mike Frysinger]

commit:     792008adbec3e16902cea4976b32449fe7aaf756
Author:     Mike Frysinger <vapier <AT> chromium <DOT> org>
AuthorDate: Thu Dec 20 23:09:07 2018 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Thu Dec 20 23:09:07 2018 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=792008ad

man: fix random bad double spaces

Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>

 man/emerge.1  | 6 +++---
 man/portage.5 | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/man/emerge.1 b/man/emerge.1
index 6f53680b4..afac83e76 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -246,7 +246,7 @@ matched as regular expressions.
 .BR \-\-sync
 Updates repositories, for which auto\-sync, sync\-type and sync\-uri attributes are
 set in repos.conf. A list of repos or aliases can be specified, in which case
-they  will be updated regardless of their auto\-sync attribute. See
+they will be updated regardless of their auto\-sync attribute.  See
 \fBportage\fR(5) for more information.
 The \fBPORTAGE_SYNC_STALE\fR variable configures
 warnings that are shown when emerge \-\-sync has not
@@ -577,7 +577,7 @@ first to make sure the result is what you expect.
 .TP
 .BR "\-\-exclude " ATOMS
 A space separated list of package names or slot atoms.
-Emerge won't  install any ebuild or binary package that
+Emerge won't install any ebuild or binary package that
 matches any of the given package atoms.
 .TP
 .BR "\-\-fail\-clean [ y | n ]"
@@ -988,7 +988,7 @@ readable dependency tree.
 .TP
 .BR \-\-update ", " \-u
 Updates packages to the best version available, which may
-not always be the  highest version number due to masking
+not always be the highest version number due to masking
 for testing and development. Package atoms specified on
 the command line are greedy, meaning that unspecific
 atoms may match multiple versions of slotted packages.

diff --git a/man/portage.5 b/man/portage.5
index 62943fb76..1a36e9b86 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -347,7 +347,7 @@ Special USE flags which may be needed when bootstrapping from stage1 to stage2.
 .TP
 .BR packages
 Provides the list of packages that compose the \fI@system\fR and
-\fI@profile\fR  package sets. The motivation to have \fI@profile\fR
+\fI@profile\fR package sets.  The motivation to have \fI@profile\fR
 separate from \fI@system\fR is that \fI@system\fR packages may have
 incomplete dependency specifications (due to long-standing Gentoo
 policy), and incomplete dependency specifications have deleterious

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     38262ec5c16907161a5e4720d620f7c36be86941
Author:     M. J. Everitt <m.j.everitt <AT> iee <DOT> org>
AuthorDate: Sat Dec 15 01:59:00 2018 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Thu Dec 20 04:24:32 2018 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=38262ec5

Update documentation for PORT_LOGDIR* changes

Suggested-by: Michael Everitt <m.j.everitt <AT> iee.org>
Bug: https://bugs.gentoo.org/668538
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 man/make.conf.5 | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/man/make.conf.5 b/man/make.conf.5
index a0faf51bf..a8f5b639f 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -833,19 +833,10 @@ See the \fBPORTDIR\fR documentation for more information.
 Defaults to /usr/portage/packages.
 .TP
 .B PORT_LOGDIR
-This variable defines the directory in which per\-ebuild logs are kept.
-Logs are created only when this is set. They are stored as
-${CATEGORY}:${PF}:YYYYMMDD\-HHMMSS.log in the directory specified. If the
-directory does not exist, it will be created automatically and group
-permissions will be applied to it.  If the directory already exists, portage
-will not modify it's permissions.
+See \fIPORTAGE_LOGDIR\fR below. Deprecated.
 .TP
 .B PORT_LOGDIR_CLEAN
-This variable should contain a command for portage to call in order
-to clean PORT_LOGDIR. The command string should contain a
-\\${PORT_LOGDIR} place\-holder that will be substituted
-with the value of that variable. This variable will have no effect
-unless \fBclean\-logs\fR is enabled in \fBFEATURES\fR.
+See \fIPORTAGE_LOGDIR_CLEAN\fR below. Deprecated.
 .TP
 \fBPORTAGE_BINHOST\fR = \fI[space delimited URI list]\fR
 This is a list of hosts from which portage will grab prebuilt\-binary packages.
@@ -979,6 +970,21 @@ with an integer pid. For example, a value of "ionice \-c 3 \-p \\${PID}"
 will set idle io priority. For more information about ionice, see
 \fBionice\fR(1). This variable is unset by default.
 .TP
+.B PORTAGE_LOGDIR
+This variable defines the directory in which per\-ebuild logs are kept.
+Logs are created only when this is set. They are stored as
+${CATEGORY}:${PF}:YYYYMMDD\-HHMMSS.log in the directory specified. If the
+directory does not exist, it will be created automatically and group
+permissions will be applied to it.  If the directory already exists, portage
+will not modify it's permissions.
+.TP
+.B PORTAGE_LOGDIR_CLEAN
+This variable should contain a command for portage to call in order
+to clean PORTAGE_LOGDIR. The command string should contain a
+\\${PORTAGE_LOGDIR} place\-holder that will be substituted
+with the value of that variable. This variable will have no effect
+unless \fBclean\-logs\fR is enabled in \fBFEATURES\fR.
+.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,

[gentoo-commits] proj/portage:master commit in: man/

[Mike Frysinger]

commit:     cdcf4a28409daa7c56a0c2c94054f48bd5e43c6d
Author:     Mike Frysinger <vapier <AT> chromium <DOT> org>
AuthorDate: Tue Oct  2 17:20:04 2018 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Tue Oct  2 17:20:04 2018 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=cdcf4a28

man: ebuild: clarify revision handling in PVR/PF

Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>

 man/ebuild.5 | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index 9f491dd73..d085d5a92 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -392,13 +392,17 @@ Contains the revision number or 'r0' if no revision number exists.
 xfree\-4.2.1\-r2.ebuild \-\-> $PR=='r2'
 .TP
 .B PVR
-Contains the version number with the revision.
+Contains the version number with the revision (if non-zero).
 
+xfree\-4.2.1.ebuild \-\-> $PVR=='4.2.1'
+.nf
 xfree\-4.2.1\-r2.ebuild \-\-> $PVR=='4.2.1\-r2'
 .TP
 .B PF
 Contains the full package name \fBPN\fR\-\fBPVR\fR
 
+xfree\-4.2.1.ebuild \-\-> $PF=='xfree\-4.2.1'
+.nf
 xfree\-4.2.1\-r2.ebuild \-\-> $PF=='xfree\-4.2.1\-r2'
 .TP
 .B CATEGORY

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     35999c9dd08b695244d4b4850dfa75bce0ad9dec
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 29 18:15:46 2018 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Wed Aug 29 18:16:52 2018 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=35999c9d

man/emerge.1: fix "the the" typo (bug 664272)

Reported-by: kmac <korey <AT> koreymacdougall.com>
Bug: https://bugs.gentoo.org/664272

 man/emerge.1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/man/emerge.1 b/man/emerge.1
index 08d23388d..8662f5514 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -258,7 +258,7 @@ additions of files) inside repositories synchronized using rsync.
 
 \fBNOTE:\fR
 The emerge \-\-sync command is a compatibility command.  Sync operations are
-now performed using the the new emaint sync module. This new emaint sync module
+now performed using the new emaint sync module. This new emaint sync module
 has greater functionality and flexibility.  Please refer to \fBemaint\fR(1) for
 more information about sync operations.
 

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     86b022ce2a4fdd7b8477320d46088cb05e62e0f5
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Mon Apr  2 21:36:07 2018 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Tue May  1 08:28:44 2018 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=86b022ce

man: emerge: Describe the SYSROOT environment variable for EAPI 7

This deprecates the --root-deps option and the PORTAGE_CONFIGROOT
variable.

 man/emerge.1 | 38 +++++++++++++++++++++++++++++---------
 1 file changed, 29 insertions(+), 9 deletions(-)

diff --git a/man/emerge.1 b/man/emerge.1
index a3c8dd7cd..f53ba92f5 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -911,6 +911,9 @@ necessary.
 .BR \-\-root=DIR
 Set the \fBROOT\fR environment variable.
 .TP
+.BR \-\-sysroot=DIR
+Set the \fBSYSROOT\fR environment variable.
+.TP
 .BR \-\-root\-deps[=rdeps]
 If no argument is given then build\-time dependencies of packages for
 \fBROOT\fR are installed to \fBROOT\fR instead of /.
@@ -919,12 +922,16 @@ of packages for \fBROOT\fR.
 This option is only meaningful when used together with \fBROOT\fR and it should
 not be enabled under normal circumstances!
 
-Does not affect EAPIs that support \fBHDEPEND\fR.
-Experimental \fBEAPI 5-hdepend\fR provides \fBHDEPEND\fR as a new
-means to adjust installation into "\fI/\fR" and \fBROOT\fR.
-If ebuilds using EAPIs which \fIdo not\fR support \fBHDEPEND\fR are built in
-the same \fBemerge\fR run as those using EAPIs which \fIdo\fR support
-\fBHDEPEND\fR, this option affects only the former.
+Does not affect EAPIs that support \fBBDEPEND\fR or \fBHDEPEND\fR.
+\fBEAPI 7\fR introduces \fBBDEPEND\fR and experimental
+\fBEAPI 5-hdepend\fR features \fBHDEPEND\fR as a means to adjust
+installation into / and \fBROOT\fR.  Use the \fBSYSROOT\fR environment
+variable to control where \fBDEPEND\fR is installed to under
+\fBEAPI 7\fR.
+
+When ebuilds with different EAPIs feature in the same emerge run, the
+appropriate behaviour for each EAPI is applied independently to each
+ebuild.
 .TP
 .BR "\-\-search\-index < y | n >"
 Enable or disable indexed search for search actions. This option is
@@ -1090,8 +1097,19 @@ Defaults to the prefix where portage is currently installed.
 .TP
 \fBROOT\fR = \fI[path]\fR
 Use \fBROOT\fR to specify the target root filesystem to be used for
-merging packages or ebuilds. This variable can be set via the \fB\-\-root\fR
-option or in \fBmake.conf\fR(5) (the command line overrides other settings).
+merging the requested packages or ebuilds and their runtime
+dependencies.  This variable can be set via the \fB\-\-root\fR option
+or in \fBmake.conf\fR(5) (the command line overrides other settings).
+.br
+Defaults to /.
+.TP
+\fBSYSROOT\fR = \fI[path]\fR
+Use \fBSYSROOT\fR to specify the target root filesystem to be used for
+merging the build dependencies satisfied by \fBDEPEND\fR.  This
+variable can be set via the \fB\-\-sysroot\fR option or in
+\fBmake.conf\fR(5) (the command line overrides other settings).  The
+value must either be / or equal to \fBROOT\fR.  When cross-compiling,
+only the latter is valid.
 .br
 Defaults to /.
 .TP
@@ -1099,7 +1117,9 @@ Defaults to /.
 Use \fBPORTAGE_CONFIGROOT\fR to specify the location for various portage
 configuration files
 (see \fBFILES\fR for a detailed list of configuration files).  This variable
-can be set via the \fB\-\-config\-root\fR option.
+can be set via the \fB\-\-config\-root\fR option.  However, it is now
+superseded by the \fBSYSROOT\fR variable and can only be given if its
+value matches \fBSYSROOT\fR or if \fBROOT=/\fR.
 .br
 Defaults to /.
 .SH "OUTPUT"

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     2ce54f65e6cb1f0f8109db3de40c282388c86316
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 13 21:11:52 2018 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Fri Apr 13 21:13:08 2018 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=2ce54f65

man/portage.5: fix manual section in header

Fixes: Fixes: 8aa1a070921d ("GitSync: Support setting environment variables for git")

 man/portage.5 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/man/portage.5 b/man/portage.5
index 2c3a75ccd..82a50a8f4 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -1,4 +1,4 @@
-.TH "PORTAGE" "31" "Apr 2018" "Portage VERSION" "Portage"
+.TH "PORTAGE" "5" "Apr 2018" "Portage VERSION" "Portage"
 .SH NAME
 portage \- the heart of Gentoo
 .SH "DESCRIPTION"

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     2d277427a32f09a27fabd6eec75dfaf51ed1d3f2
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 12 22:56:52 2018 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sat Jan 13 10:08:28 2018 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=2d277427

man/ebuild.5: document that dodir is for nonempty directories.

 man/ebuild.5 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index 42a0599fe..28e9582d1 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -1271,7 +1271,8 @@ Creates directories inside of ${ED}.
 .br
 .BR 'dodir\ /usr/lib/apache'
 creates ${ED}/usr/lib/apache.  Note that the do* functions will run
-\fBdodir\fR for you.
+\fBdodir\fR for you. If this directory will be empty when it is merged,
+then please use \fBkeepdir\fR instead.
 .TP
 .B diropts\fR \fI[options for install(1)]
 Can be used to define options for the install function used in

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     40c4cf6ec4cda1a05c4bf3a4a6e9ece4ca74f803
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 12 22:56:53 2018 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sat Jan 13 10:09:57 2018 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=40c4cf6e

man/ebuild.5: document the rationale for using keepdir over dodir.

 man/ebuild.5 | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index 28e9582d1..270e47fe8 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -1285,8 +1285,9 @@ Sets the root (\fIDESTTREE\fR) for other functions like \fBdobin\fR,
 The default root is /usr.
 .TP
 .B keepdir\fR \fI<path> [more paths]
-Tells portage to leave directories behind even if they're empty.  Functions
-the same as \fBdodir\fR.
+Similar to \fBdodir\fR, but used to create directories that would otherwise
+be empty. The treatment of completely\-empty directories is undefined by
+PMS, and using \fBkeepdir\fR ensures that they are tracked.
 .TP
 .B dobin\fR \fI<binary> [list of more binaries]
 Installs a \fIbinary\fR or a list of binaries into \fIDESTTREE\fR/bin.

[gentoo-commits] proj/portage:master commit in: man/

[Mike Frysinger]

commit:     8a2d449cffbfbfb5c8f9f20e4bb9eb1aec55b474
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  9 18:38:31 2018 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Tue Jan  9 18:38:31 2018 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=8a2d449c

man: emaint: fix option styling to match standard pages

The comma separating the short & long options should not be highlighted.

Arguments to the options should be styled with \fI instead of \fB.

 man/emaint.1 | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/man/emaint.1 b/man/emaint.1
index 49c257e1e..4ded0058a 100644
--- a/man/emaint.1
+++ b/man/emaint.1
@@ -33,7 +33,7 @@ OPTIONS: check, fix
 .TP
 .BR logs
 Clean out old logs from the \fBPORT_LOGDIR\fR using the command
-\fBPORT_LOGDIR_CLEAN\fR
+\fBPORT_LOGDIR_CLEAN\fR.
 See the \fBmake.conf\fR(5) man page for additional information as well as
 enabling the \fB'clean-logs'\fR feature in emerge to do this automatically.
 .br
@@ -65,35 +65,35 @@ Fix problems in the \fIworld\fR file.
 OPTIONS: check, fix
 .SH DEFAULT OPTIONS (Not supported in all commands)
 .TP
-.B \-c, \-\-check
+.BR \-c ", " \-\-check
 Check for any problems that may exist.
 .TP
-.B \-f, \-\-fix
+.BR \-f ", " \-\-fix
 Fix any problems that may exist.
 .SH OPTIONS logs command only
 .TP
-.B \-C, \-\-clean
+.BR \-C ", " \-\-clean
 Cleans the logs from \fBPORT_LOGDIR\fR
 .TP
-.B \-p, \-\-pretend
+.BR \-p ", " \-\-pretend
 Sets pretend mode (same as \-c, \-\-check) for use with the \-C, \-\-clean
 OPTION
 .TP
-.B \-t NUM, \-\-time NUM
-Changes the minimum age \fBNUM\fR (in days) of the logs to be listed or
+.BR \-t \ \fINUM\fR,\  \-\-time \ \fINUM\fR
+Changes the minimum age \fINUM\fR (in days) of the logs to be listed or
 deleted.
 .SH OPTIONS sync command only
 .TP
-.B \-a, \-\-auto
+.BR \-a ", " \-\-auto
 Sync repositories which have their auto\-sync setting set yes, true.
 .TP
-.B \-A, \-\-allrepos
+.BR \-A ", " \-\-allrepos
 Sync all repositories which have a sync\-uri specified.
 .TP
-.B \-r, \-\-repo REPO
+.BR \-r ", " \-\-repo \ \fIREPO\fR
 Sync the repository specified.
 .TP
-.BR "\-\-sync-submodule <glsa|news|profiles>"
+.BR \-\-sync-submodule \ \fI<glsa|news|profiles>\fR
 Restrict sync to the specified submodule(s). This option may be
 specified multiple times, in order to sync multiple submodules.
 Currently, this option has no effect for sync protocols other

[gentoo-commits] proj/portage:master commit in: man/

[Mike Frysinger]

commit:     4680f098cf807d460bfab9fbd3bb3010228fc2f2
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  9 18:48:00 2018 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Tue Jan  9 18:48:00 2018 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=4680f098

man: emerge: use standard short option style

Man pages generally separate long & short options via a comma,
not by putting the short option in parens.

 man/emerge.1 | 96 ++++++++++++++++++++++++++++++------------------------------
 1 file changed, 48 insertions(+), 48 deletions(-)

diff --git a/man/emerge.1 b/man/emerge.1
index b292954a3..3c81b9c9f 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -118,12 +118,12 @@ the most recently installed version in each \fbslot\fR.  Clean should not
 remove unslotted packages. Note: Most recently installed means most
 \fBrecent\fR, not highest version.
 .TP
-.BR "\-\-config "
+.BR \-\-config
 Run package specific actions needed to be executed after the emerge process
 has completed.  This usually entails configuration file setup or other similar
 setups that the user may wish to run.
 .TP
-.BR "\-\-depclean (-c)"
+.BR \-\-depclean ", " \-c
 Cleans the system by removing packages that are not associated
 with explicitly merged packages. Depclean works by creating the
 full dependency tree from the @world set,
@@ -162,7 +162,7 @@ by uninstall actions, including \fB-\-depclean\fR,
 in order to prevent uninstall actions from removing
 atoms from the world file.
 .TP
-.BR "\-\-help " (\fB\-h\fR)
+.BR \-\-help ", " \-h
 Displays help information for emerge.  Adding one of the additional
 arguments listed above will give you more specific help information
 on that subject.  The internal \fBemerge\fR help documentation is
@@ -188,7 +188,7 @@ repositories, use \fB\-\-regen\fR.
 In versions of portage >=2.1.5 the \-\-metadata action is totally unnecessary
 unless the user has enabled FEATURES="metadata-transfer" in \fBmake.conf\fR(5).
 .TP
-.BR "\-\-prune " (\fB\-P\fR)
+.BR \-\-prune ", " \-P
 Removes all but the highest installed version of a package from your
 system. Use \fB\-\-prune\fR together with \fB\-\-verbose\fR to show
 reverse dependencies or with \fB\-\-nodeps\fR to ignore all dependencies.
@@ -209,7 +209,7 @@ a sync operation. In order to specify parallel \fB\-\-regen\fR behavior, use
 the \fB\-\-jobs\fR and \fB\-\-load\-average\fR options. If you would like to
 generate and distribute cache for use by others, use \fBegencache\fR(1).
 .TP
-.BR "\-\-resume" (\fB\-r\fR)
+.BR \-\-resume ", " \-r
 Resumes the most recent merge list that has been aborted due to an error.
 This re\-uses the arguments and options that were given with the original
 command that's being resumed, and the user may also provide
@@ -226,7 +226,7 @@ The resume lists are stored in \fI/var/cache/edb/mtimedb\fR, and may be
 explicitly discarded by running `emaint \-\-fix cleanresume` (see
 \fBemaint\fR(1)).
 .TP
-.BR "\-\-search " (\fB\-s\fR)
+.BR \-\-search ", " \-s
 Searches for matches of the supplied string in the portage tree.
 By default emerge uses a case-insensitive simple search, but you can
 enable a regular expression search by prefixing the search string with %.
@@ -238,7 +238,7 @@ category into the search string, prepend an @: \fBemerge \-\-search
 "%@^dev-java.*jdk"\fR. If you want to search the package descriptions as well,
 use the \fB\-\-searchdesc\fR action.
 .TP
-.BR "\-\-searchdesc " (\fB\-S\fR)
+.BR \-\-searchdesc ", " \-S
 Matches the search string against the description field as well as
 the package name.  \fBTake caution\fR as the descriptions are also
 matched as regular expressions.
@@ -268,7 +268,7 @@ portage tree as a tarball, which is much faster than emerge
 \-\-sync for first time syncs.
 
 .TP
-.BR "\-\-unmerge " (\fB\-C\fR)
+.BR \-\-unmerge ", " \-C
 \fBWARNING: This action can remove important packages!\fR Removes
 all matching packages following a counter governed by \fBCLEAN_DELAY\fR.
 This does no checking of dependencies, so it may remove packages necessary
@@ -277,7 +277,7 @@ or \fIebuilds\fR. For a dependency aware version of \fB\-\-unmerge\fR, use
 \fB\-\-depclean\fR or \fB\-\-prune\fR.  For a version with
 \fBCLEAN_DELAY=0\fR, use \fB\-\-rage\-clean\fR.
 .TP
-.BR "\-\-version " (\fB\-V\fR)
+.BR \-\-version ", " \-V
 Displays the version number of \fBemerge\fR.
 .SH "OPTIONS"
 .TP
@@ -310,7 +310,7 @@ re\-distributable. With default
 configuration, this would result in an effective
 \fBACCEPT_RESTRICT\fR value of "* -bindist".
 .TP
-.BR "\-\-alert [ y | n ] (\-A short option)"
+.BR "\-\-alert [ y | n ]" ", " \-A
 Add a terminal bell character ('\\a') to all interactive prompts. This
 is especially useful if dependency resolution is taking a long time, and
 you want emerge to alert you when it is finished. If you use
@@ -324,11 +324,11 @@ Try it with 'emerge -aA portage'.
 If your terminal emulator is set up to make '\\a' into a window manager
 urgency hint, move your cursor to a different window to get the effect.
 .TP
-.BR "\-\-alphabetical "
+.BR \-\-alphabetical
 When displaying USE and other flag output, combines the enabled and
 disabled lists into one list and sorts the whole list alphabetically.
 .TP
-.BR "\-\-ask [ y | n ] (\-a short option)"
+.BR "\-\-ask [ y | n ]" ", " \-a
 Before performing the action, display what will take place (server info for
 \fB\-\-sync\fR, \fB\-\-pretend\fR output for merge, and so forth), then ask
 whether to proceed with the action or abort.  Using \fB\-\-ask\fR is more
@@ -342,7 +342,7 @@ buffer is not cleared prior to the prompt, so an accidental press of the
 Use the \-\-ask\-enter\-invalid option if you want a single "Enter" key
 press to be interpreted as invalid input.\fR
 .TP
-.BR "\-\-ask\-enter\-invalid"
+.BR \-\-ask\-enter\-invalid
 When used together with the \fB\-\-ask\fR option,
 interpret a single "Enter" key press as
 invalid input. This helps prevent accidental
@@ -436,7 +436,7 @@ with resolving inconsistent USE flag settings, this option is
 automatically enabled unless the \fB\-\-usepkgonly\fR option
 is enabled.
 .TP
-.BR "\-\-buildpkg [ y | n ] (\-b short option)"
+.BR "\-\-buildpkg [ y | n ]" ", " \-b
 Tells emerge to build binary packages for all ebuilds processed in
 addition to actually merging the packages.  Useful for maintainers
 or if you administrate multiple Gentoo Linux systems (build once,
@@ -446,14 +446,14 @@ An alternative for already\-merged
 packages is to use \fBquickpkg\fR(1) which creates a tbz2 from the
 live filesystem.
 .TP
-.BR "\-\-buildpkg\-exclude " ATOMS
+.BR \-\-buildpkg\-exclude " ATOMS"
 A space separated list of package atoms for which
 no binary packages should be built. This option overrides all
 possible ways to enable building of binary packages except for
 the downgrade\-backup and unmerge\-backup \fBFEATURES\fR settings (see
 \fBmake.conf\fR(5) for more information about \fBFEATURES\fR settings).
 .TP
-.BR "\-\-buildpkgonly " (\fB\-B\fR)
+.BR \-\-buildpkgonly ", " \-B
 Creates binary packages for all ebuilds processed without actually
 merging the packages.  This comes with the caveat that all build-time
 dependencies must already be emerged on the system.
@@ -465,7 +465,7 @@ option also implies the \fB\-\-selective\fR option. Behavior with
 respect to changed build\-time dependencies is controlled by the
 \fB\-\-with\-bdeps\fR option.
 .TP
-.BR "\-\-changed\-use " (\fB\-U\fR)
+.BR \-\-changed\-use ", " \-U
 Tells emerge to include installed packages where USE flags have
 changed since installation. This option also implies the
 \fB\-\-selective\fR option. Unlike \fB\-\-newuse\fR, the
@@ -476,7 +476,7 @@ NOTE: This option ignores the state of the "test" USE flag, since that flag
 has a special binding to FEATURES="test" (see \fBmake.conf\fR(5) for more
 information about \fBFEATURES\fR settings).
 .TP
-.BR "\-\-changelog " (\fB\-l\fR)
+.BR \-\-changelog ", " \-l
 Use this in conjunction with the \fB\-\-pretend\fR option.  This will
 show the ChangeLog entries for all the packages that will be upgraded.
 .TP
@@ -485,7 +485,7 @@ Enable or disable color output.  This option will override \fINOCOLOR\fR
 (see \fBmake.conf\fR(5)) and may also be used to force color output when stdout
 is not a tty (by default, color is disabled unless stdout is a tty).
 .TP
-.BR "\-\-columns"
+.BR \-\-columns
 Used alongside \fB\-\-pretend\fR to cause the package name, new version,
 and old version to be displayed in an aligned format for easy cut\-n\-paste.
 .TP
@@ -513,13 +513,13 @@ version will change (upgrade or downgrade). This option is enabled by default.
 .BR \-\-config\-root=DIR
 Set the \fBPORTAGE_CONFIGROOT\fR environment variable.
 .TP
-.BR "\-\-debug " (\fB\-d\fR)
+.BR \-\-debug ", " \-d
 Tells emerge to run the emerge command in \fB\-\-debug\fR mode.  In this
 mode the bash build environment will run with the \-x option, causing
 it to output verbose debugging information to stdout.  This also enables
 a plethora of other output (mostly dependency resolution messages).
 .TP
-.BR "\-\-deep [DEPTH] " (\fB\-D\fR)
+.BR "\-\-deep [DEPTH]" ", " \-D
 This flag forces
 \fBemerge\fR to consider the entire dependency tree of packages,
 instead of checking only the immediate dependencies of the packages.
@@ -556,7 +556,7 @@ first run \fBfixpackages\fR(1) in order to get the best results. The
 also be performed separately by the `emaint \-\-fix moveinst` and
 `emaint \-\-fix movebin` commands (see \fBemaint\fR(1)).
 .TP
-.BR "\-\-emptytree " (\fB\-e\fR)
+.BR \-\-emptytree ", " \-e
 Reinstalls target atoms and their entire deep
 dependency tree, as though no packages are currently
 installed. You should run this with \fB\-\-pretend\fR
@@ -574,11 +574,11 @@ tmpfs. If this option is enabled, you probably also want
 to enable \fBPORT_LOGDIR\fR (see \fBmake.conf\fR(5)) in
 order to save the build log.
 .TP
-.BR "\-\-fetchonly " (\fB\-f\fR)
+.BR \-\-fetchonly ", " \-f
 Instead of doing any package building, just perform fetches for all
 packages (fetch things from SRC_URI based upon USE setting).
 .TP
-.BR "\-\-fetch\-all\-uri " (\fB\-F\fR)
+.BR \-\-fetch\-all\-uri ", " \-F
 Instead of doing any package building, just perform fetches for all
 packages (fetch everything in SRC_URI regardless of USE setting).
 .TP
@@ -590,18 +590,18 @@ by default. Fuzzy search does not support regular expressions, therefore
 it is automatically disabled for regular expression searches. Fuzzy
 search is slightly slower than non\-fuzzy search.
 .TP
-.BR "\-\-getbinpkg [ y | n ] (\-g short option)"
+.BR "\-\-getbinpkg [ y | n ]" ", " \-g
 Using the server and location defined in \fIPORTAGE_BINHOST\fR (see
 \fBmake.conf\fR(5)), portage will download the information from each binary
 package found and it will use that information to help build the dependency
 list.  This option implies \fB\-k\fR.  (Use \fB\-gK\fR for binary\-only
 merging.)
 .TP
-.BR "\-\-getbinpkgonly [ y | n ] (\-G short option)"
+.BR "\-\-getbinpkgonly [ y | n ]" ", " \-G
 This option is identical to \fB\-g\fR, as above, except binaries from the
 remote server are preferred over local packages if they are not identical.
 .TP
-.BR "\-\-ignore-default-opts"
+.BR \-\-ignore-default-opts
 Causes \fIEMERGE_DEFAULT_OPTS\fR (see \fBmake.conf\fR(5)) to be ignored.
 .TP
 .BR "\-\-ignore\-built\-slot\-operator\-deps < y | n >"
@@ -624,7 +624,7 @@ Therefore, \fB\-\-usepkgonly\fR (or \fB\-\-getbinpkgonly\fR) must be
 used in order to enable soname depedency resolution when installing
 packages.
 .TP
-.BR "-j [JOBS], \-\-jobs[=JOBS]"
+.BR \-j\ [JOBS] ", "  \-\-jobs[=JOBS]
 Specifies the number of packages to build simultaneously. If this option is
 given without an argument, emerge will not limit the number of jobs that can
 run simultaneously. Also see the related \fB\-\-load\-average\fR option.
@@ -655,12 +655,12 @@ a list of packages with similar names when a package doesn't exist.
 The \fIEMERGE_DEFAULT_OPTS\fR variable may be used to disable this
 option by default.
 .TP
-.BR "\-\-newrepo "
+.BR \-\-newrepo
 Tells emerge to recompile a package if it is now being pulled from a
 different repository. This option also implies the
 \fB\-\-selective\fR option.
 .TP
-.BR "\-\-newuse " (\fB\-N\fR)
+.BR \-\-newuse ", " \-N
 Tells emerge to include installed packages where USE
 flags have changed since compilation. This option
 also implies the \fB\-\-selective\fR option.
@@ -681,18 +681,18 @@ NOTE: This option ignores the state of the "test" USE flag, since that flag
 has a special binding to FEATURES="test" (see \fBmake.conf\fR(5) for more
 information about \fBFEATURES\fR settings).
 .TP
-.BR "\-\-noconfmem"
+.BR \-\-noconfmem
 Causes portage to disregard merge records indicating that a config file
 inside of a \fBCONFIG_PROTECT\fR directory has been merged already.  Portage
 will normally merge those files only once to prevent the user from
 dealing with the same config multiple times.  This flag will cause the
 file to always be merged.
 .TP
-.BR "\-\-nodeps " (\fB\-O\fR)
+.BR \-\-nodeps ", " \-O
 Merges specified packages without merging any dependencies.  Note that
 the build may fail if the dependencies aren't satisfied.
 .TP
-.BR "\-\-noreplace " (\fB\-n\fR)
+.BR \-\-noreplace ", " \-n
 Skips the packages specified on the command\-line that have already
 been installed.  Without this option, any package atoms or package sets
 you specify on the command\-line \fBwill\fR cause Portage to remerge
@@ -700,7 +700,7 @@ the package, even if it is already installed.  Note that Portage will
 not remerge dependencies by default. This option can be used to update the
 world file without rebuilding the packages.
 .TP
-.BR "\-\-nospinner"
+.BR \-\-nospinner
 Disables the spinner for the session.  The spinner is active when the
 terminal device is determined to be a TTY.  This flag disables it regardless.
 .TP
@@ -716,7 +716,7 @@ matching packages due to \fB\-\-rebuild\fR.
 A space separated list of package names or slot atoms. Emerge will not rebuild
 packages that depend on matching packages due to \fB\-\-rebuild\fR.
 .TP
-.BR "\-\-oneshot " (\fB\-1\fR)
+.BR \-\-oneshot ", " \-1
 Emerge as normal, but do not add the packages to the world file
 for later updating.
 
@@ -727,7 +727,7 @@ allowed to be broken when satisfying dependencies of other packages.
 Broken dependencies of this sort will invalidate assumptions that make
 it possible for \fB\-\-deep\fR to be disabled by default.
 .TP
-.BR "\-\-onlydeps " (\fB\-o\fR)
+.BR \-\-onlydeps ", " \-o
 Only merge (or pretend to merge) the dependencies of the packages
 specified, not the packages themselves.
 .TP
@@ -761,7 +761,7 @@ Possible choices now are tar and rpm or their combinations.
 .BR \-\-prefix=DIR
 Set the \fBEPREFIX\fR environment variable.
 .TP
-.BR "\-\-pretend " (\fB\-p\fR)
+.BR \-\-pretend ", " \-p
 Instead of actually performing the merge, simply display what *would*
 have been installed if \fB\-\-pretend\fR weren't used.  Using \fB\-\-pretend\fR
 is strongly recommended before installing an unfamiliar package.  In
@@ -782,7 +782,7 @@ B	blocked by another package (unresolved conflict)
 b	blocked by another package (automatically resolved conflict)
 .TE
 .TP
-.BR "\-\-quiet [ y | n ] (\-q short option)"
+.BR "\-\-quiet [ y | n ]" ", " \-q
 Results may vary, but the general outcome is a reduced or condensed
 output from portage's displays.
 .TP
@@ -817,7 +817,7 @@ Disable the warning message that's shown prior to
 to be set in the \fBmake.conf\fR(5)
 \fBEMERGE_DEFAULT_OPTS\fR variable.
 .TP
-.BR "\-\-rage\-clean"
+.BR \-\-rage\-clean
 \fBWARNING: This action can remove important packages!\fR
 \fB\-\-rage\-clean\fR does \fB\-\-unmerge\fR with \fBCLEAN_DELAY=0\fR.
 .TP
@@ -881,7 +881,7 @@ necessary.
 .BR \-\-root=DIR
 Set the \fBROOT\fR environment variable.
 .TP
-.BR "\-\-root\-deps[=rdeps]"
+.BR \-\-root\-deps[=rdeps]
 If no argument is given then build\-time dependencies of packages for
 \fBROOT\fR are installed to \fBROOT\fR instead of /.
 If the \fBrdeps\fR argument is given then discard all build\-time dependencies
@@ -910,7 +910,7 @@ Set the minimum similarity percentage (a floating-point number between
 are discarded (default: \'80\'). This option has no effect unless the
 \fB\-\-fuzzy\-search\fR option is enabled.
 .TP
-.BR "\-\-select [ y | n ] (\-w short option)"
+.BR "\-\-select [ y | n ]" ", " \-w
 Add specified packages to the world set (inverse of
 \fB\-\-oneshot\fR). This is useful if you want to
 use \fBEMERGE_DEFAULT_OPTS\fR to make
@@ -923,7 +923,7 @@ Use \fB\-\-selective=n\fR if you want to forcefully disable
 \fB\-\-selective\fR, regardless of options like \fB\-\-changed\-use\fR,
 \fB\-\-newuse\fR, \fB\-\-noreplace\fR, or \fB\-\-update\fR.
 .TP
-.BR "\-\-skipfirst"
+.BR \-\-skipfirst
 This option is only valid when used with \fB\-\-resume\fR.  It removes the
 first package in the resume list. Dependencies are recalculated for
 remaining packages and any that have unsatisfied dependencies or are
@@ -937,7 +937,7 @@ Currently, this option has no effect for sync protocols other
 than rsync.
 (--sync action only)
 .TP
-.BR "\-\-tree " (\fB\-t\fR)
+.BR \-\-tree ", " \-t
 Shows the dependency tree for the given target by indenting dependencies.
 This is only really useful in combination with \fB\-\-emptytree\fR or
 \fB\-\-update\fR and \fB\-\-deep\fR.
@@ -949,7 +949,7 @@ order in which the packages will be merged. When
 constraint is removed, hopefully leading to a more
 readable dependency tree.
 .TP
-.BR "\-\-update " (\fB\-u\fR)
+.BR \-\-update ", " \-u
 Updates packages to the best version available, which may
 not always be the  highest version number due to masking
 for testing and development. Package atoms specified on
@@ -964,20 +964,20 @@ checks on built packages.
 A space separated list of package names or slot atoms. Emerge will prefer
 matching binary packages over newer unbuilt packages.
 .TP
-.BR "\-\-usepkg [ y | n ] (\-k short option)"
+.BR "\-\-usepkg [ y | n ]" ", " \-k
 Tells emerge to use binary packages (from $PKGDIR) if they are available, thus
 possibly avoiding some time\-consuming compiles.  This option is useful for CD
 installs; you can export PKGDIR=/mnt/cdrom/packages and then use this option to
 have emerge "pull" binary packages from the CD in order to satisfy
 dependencies.
 .TP
-.BR "\-\-usepkgonly [ y | n ] (\-K short option)"
+.BR "\-\-usepkgonly [ y | n ]" ", " \-K
 Tells emerge to only use binary packages (from $PKGDIR).  All the binary
 packages must be available at the time of dependency calculation or emerge
 will simply abort.  Portage does not use ebuild repositories when calculating
 dependency information so all masking information is ignored.
 .TP
-.BR "\-\-verbose [ y | n ] (\-v short option)"
+.BR "\-\-verbose [ y | n ]" ", " \-v
 Tell emerge to run in verbose mode.  Currently this flag causes emerge to print
 out GNU info errors, if any, and to show the USE flags that will be used for
 each package when pretending. The following symbols are affixed to USE flags
@@ -996,7 +996,7 @@ Symbol	Location	Meaning
 {}	circumfix	state is bound to FEATURES settings
 .TE
 .TP
-.BR "\-\-verbose\-conflicts"
+.BR \-\-verbose\-conflicts
 Make slot conflicts more verbose. Note that this may in some cases output
 hundreds of packages for slot conflicts.
 .TP

[gentoo-commits] proj/portage:master commit in: man/

[Mike Frysinger]

commit:     fdecff607e8c6859c986965b53a71fe3c4bddc99
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  9 18:32:02 2018 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Tue Jan  9 18:32:02 2018 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=fdecff60

man: egencache(1): fix y/n arg style to match other pages

 man/egencache.1 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/man/egencache.1 b/man/egencache.1
index 9c77029e0..27cd69e63 100644
--- a/man/egencache.1
+++ b/man/egencache.1
@@ -94,13 +94,13 @@ This option should only be needed for distribution via something like
 more thorough mechanism which allows it to detect changed inode numbers
 (described in \fIracy-git.txt\fR in the git technical docs).
 .TP
-.BR "\-\-sign\-manifests< y | n >"
+.BR "\-\-sign\-manifests < y | n >"
 Manually override layout.conf sign-manifests setting.
 .TP
-.BR "\-\-strict\-manifests< y | n >"
+.BR "\-\-strict\-manifests < y | n >"
 Manually override "strict" FEATURES setting.
 .TP
-.BR "\-\-thin\-manifests< y | n >"
+.BR "\-\-thin\-manifests < y | n >"
 Manually override layout.conf thin-manifests setting.
 .TP
 .BR "\-\-tolerant"

[gentoo-commits] proj/portage:master commit in: man/

[Ulrich Müller]

commit:     606491574fd91b65447b4376b2b21bf092749a64
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 24 08:48:09 2017 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue Oct 24 10:33:50 2017 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=60649157

man/ebuild.5: Do not document internal functions.

Functions containing "hook" or "prep" in their name may not be used
or relied upon by ebuilds. Therefore they should not be documented
in ebuild(5) which describes the funtions available for ebuilds.

PMS reference: https://projects.gentoo.org/pms/6/pms.html#x1-14700011.3.3.16

Acked-by: Zac Medico <zmedico <AT> gentoo.org>

 man/ebuild.5 | 76 +-----------------------------------------------------------
 1 file changed, 1 insertion(+), 75 deletions(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index 43d12765d..42a0599fe 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -1,4 +1,4 @@
-.TH "EBUILD" "5" "Nov 2014" "Portage VERSION" "Portage"
+.TH "EBUILD" "5" "Oct 2017" "Portage VERSION" "Portage"
 
 .SH "NAME"
 ebuild \- the internal format, variables, and functions in an ebuild script
@@ -1104,16 +1104,6 @@ Example:
 	installed)
 .fi
 
-.SS "Hooks:"
-.TP
-.B register_die_hook\fR \fI[list of function names]
-Register one or more functions to call when the ebuild fails for any reason,
-including file collisions with other packages.
-.TP
-.B register_success_hook\fR \fI[list of function names]
-Register one or more functions to call when the ebuild builds and/or installs
-successfully.
-
 .SS "Output:"
 .TP
 .B einfo\fR \fI"disposable message"
@@ -1225,70 +1215,6 @@ Please do \fBnot\fR use this in place of 'emake install DESTDIR=${D}'.
 That is the preferred way of installing make\-based packages.  Also, do
 not utilize the \fIEXTRA_EINSTALL\fR variable since it is for users.
 
-.PD 0
-.TP
-.B prepall
-.TP
-.B prepalldocs
-.TP
-.B prepallinfo
-.TP
-.B prepallman
-.TP
-.B prepallstrip
-.PD 1
-Useful for when a package installs into \fB${D}\fR via scripts
-(i.e. makefiles).  If you want to be sure that libraries are executable,
-aclocal files are installed into the right place, doc/info/man files are
-all compressed, and that executables are all stripped of debugging symbols,
-then use these suite of functions.
-.RS
-.PD 0
-.TP
-.B prepall:
-Runs \fBprepallman\fR, \fBprepallinfo\fR, \fBprepallstrip\fR, sets
-libraries +x, and then checks aclocal directories.  Please note this
-does \fI*not*\fR run \fBprepalldocs\fR.
-.TP
-.B prepalldocs:
-Compresses all doc files in ${ED}/usr/share/doc.
-.TP
-.B prepallinfo:
-Compresses all info files in ${ED}/usr/share/info.
-.TP
-.B prepallman:
-Compresses all man files in ${ED}/usr/share/man.
-.TP
-.B prepallstrip:
-Strips all executable files of debugging symboles.  This includes libraries.
-.RE
-
-.TP
-.B prepinfo\fR \fI[dir]
-.TP
-.B prepman\fR \fI[dir]
-.TP
-.B prepstrip\fR \fI[dir]
-.PD 1
-Similar to the \fBprepall\fR functions, these are subtle in their differences.
-.RS
-.PD 0
-.TP
-.B prepinfo:
-If a \fIdir\fR is not specified, then \fBprepinfo\fR will assume the dir
-\fIusr\fR. \fBprepinfo\fR will then compress all the files in
-${ED}/\fIdir\fR/info.
-.TP
-.B prepman:
-If a \fIdir\fR is not specified, then \fBprepman\fR will assume the dir
-\fIusr\fR. \fBprepman\fR will then compress all the files in
-${ED}/\fIdir\fR/man/*/.
-.TP
-.B prepstrip:
-All the files found in ${ED}/\fIdir\fR will be stripped.  You may specify
-multiple directories.
-.RE
-.PD 1
 .TP
 .B docompress\fR \fI[\-x] <path> [list of more paths]
 .RS

[gentoo-commits] proj/portage:master commit in: man/

[Ulrich Müller]

commit:     d1c87038e183d15eea2de517bd355aeab85af82f
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 14 13:59:44 2017 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Oct 14 13:59:44 2017 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=d1c87038

man: Update URI of GLEP references.

GLEPs have been moved to https://www.gentoo.org/glep/.

 man/ebuild.5    | 2 +-
 man/emerge.1    | 2 +-
 man/make.conf.5 | 4 ++--
 man/portage.5   | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index e4c866cd2..43d12765d 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -730,7 +730,7 @@ allows for packages to depend on \fIvirtual/jdk\fR rather than on blackdown
 or sun specifically.
 
 The \fBPROVIDE\fR variable has been deprecated. See
-\fIhttps://wiki.gentoo.org/wiki/GLEP:37\fR for details.
+\fIhttps://www.gentoo.org/glep/glep-0037.html\fR for details.
 
 .TP
 .B DOCS

diff --git a/man/emerge.1 b/man/emerge.1
index 12a0db166..3198ba028 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -108,7 +108,7 @@ later updating.
 .BR \-\-check\-news
 Scan all repositories for relevant unread GLEP 42 news items, and display
 how many are found. See
-\fIhttps://wiki.gentoo.org/wiki/GLEP:42\fR.
+\fIhttps://www.gentoo.org/glep/glep-0042.html\fR.
 .TP
 .BR \-\-clean
 Cleans up the system by examining the installed packages and removing older

diff --git a/man/make.conf.5 b/man/make.conf.5
index 65c18cc6d..a81b497bd 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -62,7 +62,7 @@ with the '@' symbol. License groups are defined in the \fIlicense_groups\fR
 file (see \fBportage\fR(5)). In addition to license and group names, the
 \fI*\fR and \fI-*\fR wildcard tokens are also supported. Refer to GLEP 23
 for further information:
-\fIhttps://wiki.gentoo.org/wiki/GLEP:23\fR.
+\fIhttps://www.gentoo.org/glep/glep-0023.html\fR.
 .br
 Defaults to the value of * -@EULA.
 .br
@@ -503,7 +503,7 @@ configures new enough distcc to use the proxy.
 .TP
 .B news
 Enable GLEP 42 news support. See
-\fIhttps://wiki.gentoo.org/wiki/GLEP:42\fR.
+\fIhttps://www.gentoo.org/glep/glep-0042.html\fR.
 .TP
 .B noauto
 When utilizing \fBebuild\fR(1), only run the function requested. Also, forces

diff --git a/man/portage.5 b/man/portage.5
index 5b1dfa838..89dc8ce44 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -1408,7 +1408,7 @@ A list of all the variables which will be displayed when you run `emerge info`.
 This contains groups of licenses that may be specifed in the
 \fBACCEPT_LICENSE\fR variable (see \fBmake.conf\fR(5)). Refer
 to GLEP 23 for further information:
-\fIhttps://wiki.gentoo.org/wiki/GLEP:23\fR.
+\fIhttps://www.gentoo.org/glep/glep-0023.html\fR.
 
 .I Format:
 .nf
@@ -1542,7 +1542,7 @@ All local USE flags are listed here along with the package and a
 description. This file is automatically generated from the
 metadata.xml files that are included with each individual package.
 Refer to GLEP 56 for further information:
-\fIhttps://wiki.gentoo.org/wiki/GLEP:56\fR.
+\fIhttps://www.gentoo.org/glep/glep-0056.html\fR.
 
 .nf
 .I Format:

[gentoo-commits] proj/portage:master commit in: man/

[Manuel Rüger]

commit:     44437b45ed34a158a2c4b50bc0ca71988af6ef05
Author:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
AuthorDate: Tue Oct  3 14:55:59 2017 +0000
Commit:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Mon Oct  9 18:24:16 2017 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=44437b45

man/portage.5: Update example, fix a typo

Reviewed-by: Zac Medico <zmedico <AT> gentoo.org>

 man/portage.5 | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/man/portage.5 b/man/portage.5
index 5f1f2bbb0..5b1dfa838 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -1296,7 +1296,7 @@ version is followed by a hyphen and an integer build\-id.
 .RS
 .I Example:
 .nf
-# Specify the repository name (overriding profils/repo_name).
+# Specify the repository name (overriding profiles/repo_name).
 repo\-name = foo-overlay
 
 # eclasses provided by java-overlay take precedence over identically named
@@ -1310,7 +1310,7 @@ aliases = foo-overlay
 eapis\-banned = 0 1
 
 # indicate that ebuilds with the specified EAPIs are deprecated
-eapis\-deprecated = 2 3
+eapis\-deprecated = 2 3 4
 
 # sign commits in this repo, which requires Git >=1.7.9, and
 # key configured by `git config user.signingkey key_id`
@@ -1330,11 +1330,11 @@ use\-manifests = strict
 manifest\-hashes = SHA256 SHA512 WHIRLPOOL
 
 # indicate that this repo enables repoman's --echangelog=y option automatically
-update\-changelog = true
+update\-changelog = false
 
-# indicate that this repo contains both md5-dict and pms cache formats,
+# indicate that this repo contains the md5-dict cache format,
 # which may be generated by egencache(1)
-cache\-formats = md5-dict pms
+cache\-formats = md5-dict
 
 # indicate that this repo contains profiles that may use directories for
 # package.mask, package.provided, package.use, package.use.force,

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     90a15aad608c87a7a03dade22592fa95a0ac4fbd
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sun May 28 04:17:03 2017 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Tue May 30 09:56:34 2017 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=90a15aad

man/portage.5: document -* in profile "packages" files (bug 610670)

The -* wildcard has been supported since portage-2.3.4, but it was
not explicitly documented.

X-Gentoo-Bug: 610670
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=610670
Acked-by: Brian Dolbec <dolsen <AT> gentoo.org>

 man/portage.5 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/man/portage.5 b/man/portage.5
index 82e979ecf..366a1fa85 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -369,7 +369,8 @@ hurt \fBemerge\fR's ability to parallelize.
 .I Note:
 In a cascading profile setup, you can remove packages in children
 profiles which were added by parent profiles by prefixing the atom with
-a '\-'.
+a '\-'. The '\-*' wildcard discards all @system and @profile packages
+added by parent profiles.
 
 .I Example:
 .nf

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     8889360554e80e2ca461ee67bbbc11de8a9a5a1a
Author:     Brenton Horne <brentonhorne77 <AT> gmail <DOT> com>
AuthorDate: Sat Apr 22 06:50:37 2017 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sat Apr 22 07:55:00 2017 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=88893605

man/emerge.1: fix quickpkg input in tb2file section (bug 616262)

quickpkg takes atom input, not /var/db/pkg/<category>/<package>.

X-Gentoo-bug: 616262
X-Gentoo-bug-url: https://bugs.gentoo.org/show_bug.cgi?id=616262

 man/emerge.1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/man/emerge.1 b/man/emerge.1
index 7db427199..f1a9d4f3f 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -50,7 +50,7 @@ so this syntax shouldn't be used.
 .BR tbz2file
 A \fItbz2file\fR must be a valid .tbz2 created with \fBebuild
 <package>\-<version>.ebuild package\fR or \fBemerge \-\-buildpkg
-[category/]<package>\fR or \fBquickpkg /var/db/pkg/<category>/<package>\fR.
+[category/]<package>\fR or \fBquickpkg [category/]<package>\fR.
 .TP
 .BR file
 A \fIfile\fR must be a file or directory that has been installed by one or

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     92069c976b67412791bb4fe3b007244a05d11a6d
Author:     Alexandru Elisei <alexandru.elisei <AT> gmail <DOT> com>
AuthorDate: Mon Feb 27 13:32:37 2017 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Tue Feb 28 20:36:50 2017 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=92069c97

man/emerge.1: use repo names or aliases with --sync

X-Gentoo-Bug: 610852
X-Gentoo-Bug-Url: https://bugs.gentoo.org/show_bug.cgi?id=610852

 man/emerge.1 | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/man/emerge.1 b/man/emerge.1
index 7442220ba..5b6122023 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -8,7 +8,7 @@ emerge \- Command\-line interface to the Portage system
 \fI@set\fR | \fIatom\fR] ...
 .TP
 .BR emerge
-\fB\-\-sync\fR | \fB\-\-version\fR
+\fB\-\-sync\fR [\fIrepo\fR | \fIalias\fR] ...
 .TP
 .BR emerge
 \fB\-\-info\fR [\fIatom\fR]
@@ -17,7 +17,7 @@ emerge \- Command\-line interface to the Portage system
 \fB\-\-search\fR \fIsomestring\fR
 .TP
 .BR emerge
-\fB\-\-help\fR
+\fB\-\-help\fR | \fB\-\-version\fR
 .SH "DESCRIPTION"
 \fBemerge\fR is the definitive command\-line interface to the Portage
 system.  It is primarily used for installing packages, and \fBemerge\fR
@@ -245,7 +245,9 @@ matched as regular expressions.
 .TP
 .BR \-\-sync
 Updates repositories, for which auto\-sync, sync\-type and sync\-uri attributes are
-set in repos.conf. See \fBportage\fR(5) for more information.
+set in repos.conf. A list of repos or aliases can be specified, in which case
+they  will be updated regardless of their auto\-sync attribute. See
+\fBportage\fR(5) for more information.
 The \fBPORTAGE_SYNC_STALE\fR variable configures
 warnings that are shown when emerge \-\-sync has not
 been executed recently.

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     35c78fcd275eaf0b7c2a80131c37980eda6240e6
Author:     Alexandru Elisei <alexandru.elisei <AT> gmail <DOT> com>
AuthorDate: Thu Jan 26 14:02:11 2017 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Thu Jan 26 18:48:55 2017 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=35c78fcd

man/portage.5: replace repos.conf sync-type 'websync' with 'webrsync'

 man/portage.5 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/man/portage.5 b/man/portage.5
index 2cacafc..415817a 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -1,4 +1,4 @@
-.TH "PORTAGE" "5" "Nov 2016" "Portage VERSION" "Portage"
+.TH "PORTAGE" "5" "Jan 2017" "Portage VERSION" "Portage"
 .SH NAME
 portage \- the heart of Gentoo
 .SH "DESCRIPTION"
@@ -989,7 +989,7 @@ repository has changed since the previous sync operation.
 .B sync\-type
 Specifies type of synchronization performed by `emerge \-\-sync`.
 .br
-Valid non\-empty values: cvs, git, rsync, svn, websync (emerge-webrsync)
+Valid non\-empty values: cvs, git, rsync, svn, webrsync (emerge-webrsync)
 .br
 This attribute can be set to empty value to disable synchronization of given
 repository. Empty value is default.

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     e567328c17d7b03d9f773661d03673b76054570d
Author:     Chris Mayo <aklhfex <AT> gmail <DOT> com>
AuthorDate: Sat Jan  7 17:24:23 2017 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Jan  8 23:43:43 2017 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=e567328c

man/emaint.1: Add sync to synopsis and fix its in sync --auto

Signed-off-by: Chris Mayo <aklhfex <AT> gmail.com>

 man/emaint.1 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/man/emaint.1 b/man/emaint.1
index 24e4744..49c257e 100644
--- a/man/emaint.1
+++ b/man/emaint.1
@@ -1,11 +1,11 @@
-.TH "EMAINT" "1" "May 2015" "Portage VERSION" "Portage"
+.TH "EMAINT" "1" "Jan 2017" "Portage VERSION" "Portage"
 .SH NAME
 emaint \- performs package management related system health checks and maintenance
 .SH SYNOPSIS
 .BR emaint
 [\fIoptions\fR]
 [\fBall\fR | \fBbinhost\fR | \fBcleanresume\fR | \
-\fBmerges\fR | \fBmovebin\fR | \fBmoveinst\fR | \fBworld\fR]
+\fBmerges\fR | \fBmovebin\fR | \fBmoveinst\fR | \fBsync\fR | \fBworld\fR]
 .SH DESCRIPTION
 The emaint program provides a command line interface to package
 management health checks and maintenance.
@@ -85,7 +85,7 @@ deleted.
 .SH OPTIONS sync command only
 .TP
 .B \-a, \-\-auto
-Sync repositories which have its auto\-sync setting set yes, true.
+Sync repositories which have their auto\-sync setting set yes, true.
 .TP
 .B \-A, \-\-allrepos
 Sync all repositories which have a sync\-uri specified.

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     a29847f77d57f2c423c30b931fa40e65523795c4
Author:     Wim Muskee <wimmuskee <AT> gmail <DOT> com>
AuthorDate: Mon Dec 12 18:59:08 2016 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Wed Dec 14 21:05:27 2016 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=a29847f7

man: emaint typo fix, bug 575178

X-Gentoo-bug: 575178
X-Gentoo-bug-url: https://bugs.gentoo.org/575178

 man/emaint.1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/man/emaint.1 b/man/emaint.1
index cfdadc8..24e4744 100644
--- a/man/emaint.1
+++ b/man/emaint.1
@@ -1,6 +1,6 @@
 .TH "EMAINT" "1" "May 2015" "Portage VERSION" "Portage"
 .SH NAME
-emaint \- performs package managment related system health checks and maintenance
+emaint \- performs package management related system health checks and maintenance
 .SH SYNOPSIS
 .BR emaint
 [\fIoptions\fR]

[gentoo-commits] proj/portage:master commit in: man/

[Alexander Berntsen]

commit:     4369d1aca89eaecd589af4aa7a387ce36e5c42e7
Author:     Alexander Berntsen <bernalex <AT> gentoo <DOT> org>
AuthorDate: Tue Feb  2 14:10:13 2016 +0000
Commit:     Alexander Berntsen <bernalex <AT> gentoo <DOT> org>
CommitDate: Tue Feb  2 14:10:54 2016 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=4369d1ac

Be extra clear on INSTALL_MASK & dirs (bug 527004)

Signed-off-by: Alexander Berntsen <bernalex <AT> gentoo.org>

X-Gentoo-Bug: 527004
X-Gentoo-Bug-url: https://bugs.gentoo.org/show_bug.cgi?id=527004

 man/make.conf.5 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/man/make.conf.5 b/man/make.conf.5
index 1d1cfeb..49c88ce 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -705,8 +705,8 @@ proxy server for internet access.
 \fBINSTALL_MASK\fR = \fI[space delimited list of filename patterns (globs)]\fR
 Use this variable if you want to selectively prevent certain files
 from being copied into your file system tree.  This does not work on
-symlinks, but only on actual files. Useful if you wish to filter out
-files like HACKING.gz and TODO.gz.
+symlinks, but only on actual files (including directories). Useful if
+you wish to filter out files like HACKING.gz and TODO.gz.
 
 Patterns are matched against both the absolute path and the bare
 filename of each file (or directory) to be installed.

[gentoo-commits] proj/portage:master commit in: man/

[Mike Frysinger]

commit:     e0f2b2568feab394858c50da5630ee43daf9a7d5
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 25 00:04:24 2015 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Wed Nov 25 00:04:24 2015 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=e0f2b256

ebuild(5): clarify fperms/fowners arguments

 man/ebuild.5 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index e60eee1..c9b5f4b 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -1449,9 +1449,9 @@ depending on local\-file's ending.  Creates all necessary dirs.
 
 .PD 0
 .TP
-.B fowners\fR \fI<permissions> <file> [files]
+.B fowners\fR \fI[-h|-H|-L|-P|-R] [user][:group] <file> [files]
 .TP
-.B fperms\fR \fI<permissions> <file> [files]
+.B fperms\fR \fI[-R] <permissions> <file> [files]
 .PD 1
 Performs chown (\fBfowners\fR) or chmod (\fBfperms\fR), applying
 \fIpermissions\fR to \fIfiles\fR.

[gentoo-commits] proj/portage:master commit in: man/

[Brian Dolbec]

commit:     f3a7a9aaed8a3affc56cf3cbd23f18d8a01120b1
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 22 07:15:12 2015 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Tue Sep 22 16:38:41 2015 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=f3a7a9aa

man/ebuild.5: Update description of =* operator.

After commit d4966a381ee4577818bd972946647338046715b1
"match_from_list: restrict =* to match only on version part
boundaries" the description of the =* operator in ebuild(5) was
no longer accurate.

This reverts commit 2b1eceaf79ac667eecdf1ef9585592a235c8d93f.

 man/ebuild.5 | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index 6a27cc5..e60eee1 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -96,12 +96,9 @@ Example:
 .fi
 .TP
 .I *
-means match any version of the package so long
-as the specified string prefix is matched. So with a
-version of '2*', we can match '2.1', '2.2', '2.2.1',
-etc... and not match version '1.0', '3.0', '4.1', etc...
-Beware that, due to the string matching nature, '20'
-will also be matched by '2*'. The version part
+means match any version of the package so long as the specified base
+is matched.  So with a version of '2*', we can match '2.1', '2.2', '2.2.1',
+etc... and not match version '1.0', '3.0', '4.1', etc... The version part
 that comes before the '*' must be a valid version in the absence of the '*'.
 For example, '2' is a valid version and '2.' is not. Therefore, '2*' is
 allowed and '2.*' is not.

[gentoo-commits] proj/portage:master commit in: man/

[Brian Dolbec]

commit:     afea444b15c31a0cf0805c2f66b9af4d7208a374
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 20 02:17:13 2015 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Sun Sep 20 02:24:56 2015 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=afea444b

man: Document repoman ci as a synonym for repoman commit

 man/repoman.1 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/man/repoman.1 b/man/repoman.1
index 59d8ca4..e2b9c66 100644
--- a/man/repoman.1
+++ b/man/repoman.1
@@ -139,6 +139,9 @@ Check Manifests for missing or incorrect digests
 .TP
 .B commit
 Scan directory tree for QA issues; if OK, commit via VCS
+.TP
+.B ci
+Synonym for commit
 .SH QA KEYWORDS
 .TP
 .B CVS/Entries.IO_error

[gentoo-commits] proj/portage:master commit in: man/

[Brian Dolbec]

commit:     66f5190e3c44a628c01d9a554005b1debf583dc2
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 19 16:08:52 2015 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Mon Jul 20 21:42:28 2015 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=66f5190e

man/make.conf.5: Document globbing for INSTALL_MASK.

The INSTALL_MASK variable has long supported shell glob patterns, but
these were not mentioned in the man page. In fact there are two
different behaviors -- one for globs that the shell can expand, and
one for "bare globs" like "*.pdf". Both of these are now documented in
the man page.

In addition, a warning and example have been added to the man page
regarding spaces within filenames (patterns).

 man/make.conf.5 | 44 ++++++++++++++++++++++++++++++++++++--------
 1 file changed, 36 insertions(+), 8 deletions(-)

diff --git a/man/make.conf.5 b/man/make.conf.5
index a7417f3..13b8042 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -699,14 +699,42 @@ These variables are used by network clients such as \fBwget\fR(1) and
 \fBrsync\fR(1). They are only required if you use a
 proxy server for internet access.
 .TP
-\fBINSTALL_MASK\fR = \fI[space delimited list of file names]\fR
-Use this variable if you want to selectively prevent certain files from being
-copied into your file system tree.  This does not work on symlinks, but only on
-actual files.  Useful if you wish to filter out files like HACKING.gz and
-TODO.gz. The \fBINSTALL_MASK\fR is processed just before a package is merged.
-Also supported is a \fBPKG_INSTALL_MASK\fR variable that behaves exactly like
-\fBINSTALL_MASK\fR except that it is processed just before creation of a binary
-package.
+\fBINSTALL_MASK\fR = \fI[space delimited list of filename patterns (globs)]\fR
+Use this variable if you want to selectively prevent certain files
+from being copied into your file system tree.  This does not work on
+symlinks, but only on actual files. Useful if you wish to filter out
+files like HACKING.gz and TODO.gz.
+
+Patterns are matched against both the absolute path and the bare
+filename of each file (or directory) to be installed.
+
+The \fBINSTALL_MASK\fR is processed just before a package is merged.
+Also supported is a \fBPKG_INSTALL_MASK\fR variable that behaves
+exactly like \fBINSTALL_MASK\fR except that it is processed just
+before creation of a binary package.
+
+\fB***warning***\fR
+.br
+This does not place nice with filenames containing spaces. If you
+supply a pattern with a space in it, that single pattern will be
+interpreted as two separate patterns.
+
+.I Examples:
+
+.nf
+# Prevent individual files from being installed.
+INSTALL_MASK="/usr/bin/zless /usr/bin/zzxorcat"
+
+# Prevent all PDF files from being installed.
+INSTALL_MASK="*.pdf"
+
+# Block PDF files one level beneath /usr/share/doc.
+INSTALL_MASK="/usr/share/doc/*/*.pdf"
+
+# Watch out! This will be interpreted as two patterns, and
+# prevent both "README" AND all PDF files from being installed.
+INSTALL_MASK="README\\ *.pdf"
+.fi
 .TP
 .B LDFLAGS
 A list of flags to pass to the compiler when the linker will be called. See

[gentoo-commits] proj/portage:master commit in: man/

[Alexander Berntsen]

commit:     1a07f62c987622267c0142f0e96a7bb204bd8926
Author:     Alexander Berntsen <bernalex <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 18 12:16:52 2015 +0000
Commit:     Alexander Berntsen <bernalex <AT> gentoo <DOT> org>
CommitDate: Thu Jun 18 12:27:17 2015 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=1a07f62c

man/repoman.1: Fix deprecated java-devel link

Signed-off-by: Alexander Berntsen <bernalex <AT> gentoo.org>

 man/repoman.1 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/man/repoman.1 b/man/repoman.1
index 54e677e..abd998b 100644
--- a/man/repoman.1
+++ b/man/repoman.1
@@ -1,4 +1,4 @@
-.TH "REPOMAN" "1" "May 2015" "Portage VERSION" "Portage"
+.TH "REPOMAN" "1" "Jun 2015" "Portage VERSION" "Portage"
 .SH NAME
 repoman \- Gentoo's program to enforce a minimal level of quality assurance in
 packages added to the portage tree
@@ -339,7 +339,7 @@ Ebuild inherits a deprecated eclass
 .TP
 .B java.eclassesnotused
 With virtual/jdk in DEPEND you must inherit a java eclass. Refer to
-\fIhttp://www.gentoo.org/proj/en/java/java\-devel.xml\fR for more information.
+\fIhttps://wiki.gentoo.org/wiki/Project:Java\fR for more information.
 .TP
 .B manifest.bad
 Manifest has missing or incorrect digests

[gentoo-commits] proj/portage:master commit in: man/

[Brian Dolbec]

commit:     1eb8e1e38c410a6b3792d005da7a75a87c811721
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Fri May 29 07:25:55 2015 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Fri May 29 07:28:48 2015 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=1eb8e1e3

man/emaint.1: Fix missed rename of cleanconfig to cleanconfmem bug 550324

X-Gentoo-Bug: 550324
X-Gentoo-Bug-url: https://bugs.gentoo.org/show_bug.cgi?id=550324
X-Getoo-Reporter: Claudio Roberto França Pereira

 man/emaint.1 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/man/emaint.1 b/man/emaint.1
index 9a31635..7c7638f 100644
--- a/man/emaint.1
+++ b/man/emaint.1
@@ -1,4 +1,4 @@
-.TH "EMAINT" "1" "Mar 2015" "Portage VERSION" "Portage"
+.TH "EMAINT" "1" "May 2015" "Portage VERSION" "Portage"
 .SH NAME
 emaint \- performs package managment related system health checks and maintenance
 .SH SYNOPSIS
@@ -21,7 +21,7 @@ the \fBmake.conf\fR(5) man page for additional information.
 .br
 OPTIONS: check, fix
 .TP
-.BR cleanconfig
+.BR cleanconfmem
 Discard no longer installed config tracker entries.
 .br
 OPTIONS: check, fix

[gentoo-commits] proj/portage:master commit in: man/

[Alexander Berntsen]

commit:     8c0c7b8502df0c46915aaa763cd8379bb012ee15
Author:     Alexander Berntsen <bernalex <AT> gentoo <DOT> org>
AuthorDate: Tue May 19 10:46:34 2015 +0000
Commit:     Alexander Berntsen <bernalex <AT> gentoo <DOT> org>
CommitDate: Tue May 19 10:46:34 2015 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=8c0c7b85

man: Update copyright headers for recent commits

Update copyright headers for some of our manpages, as some recent
commits made changes that are probably "big enough" to warrant this. The
relevant commits are included below.

emaint.1: Update man page for better clarity (540482):
44f2a48390909050dd42404de9136bf78c97928e

man/egencache.1: Add missed --write-timestamp option (540482):
465565a0f90843133ae1ae9072244d34d82eaf73

man: Add short option (-f) for repoman --force:
e332dd6b73855096032f883d47246f39fc0ee14a

man: Document repoman --straight-to-stabl
fe59f38a84d7b22bb99d7e62e0324916c74f32a9

Signed-off-by: Alexander Berntsen <bernalex <AT> gentoo.org>

 man/egencache.1 | 2 +-
 man/emaint.1    | 2 +-
 man/repoman.1   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/man/egencache.1 b/man/egencache.1
index daf08aa..abbbdb9 100644
--- a/man/egencache.1
+++ b/man/egencache.1
@@ -1,4 +1,4 @@
-.TH "EGENCACHE" "1" "Jul 2013" "Portage VERSION" "Portage"
+.TH "EGENCACHE" "1" "Mar 2015" "Portage VERSION" "Portage"
 .SH "NAME"
 egencache \- generate metadata cache for ebuild repositories
 .SH "SYNOPSIS"

diff --git a/man/emaint.1 b/man/emaint.1
index 9d8de55..9a31635 100644
--- a/man/emaint.1
+++ b/man/emaint.1
@@ -1,4 +1,4 @@
-.TH "EMAINT" "1" "Jan 2015" "Portage VERSION" "Portage"
+.TH "EMAINT" "1" "Mar 2015" "Portage VERSION" "Portage"
 .SH NAME
 emaint \- performs package managment related system health checks and maintenance
 .SH SYNOPSIS

diff --git a/man/repoman.1 b/man/repoman.1
index 6a60e5c..54e677e 100644
--- a/man/repoman.1
+++ b/man/repoman.1
@@ -1,4 +1,4 @@
-.TH "REPOMAN" "1" "Aug 2013" "Portage VERSION" "Portage"
+.TH "REPOMAN" "1" "May 2015" "Portage VERSION" "Portage"
 .SH NAME
 repoman \- Gentoo's program to enforce a minimal level of quality assurance in
 packages added to the portage tree

[gentoo-commits] proj/portage:master commit in: man/

[Brian Dolbec]

commit:     e332dd6b73855096032f883d47246f39fc0ee14a
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Mon May 18 21:20:00 2015 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Mon May 18 21:24:07 2015 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=e332dd6b

man: Add short option (-f) for repoman --force

 man/repoman.1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/man/repoman.1 b/man/repoman.1
index d490227..6cb826a 100644
--- a/man/repoman.1
+++ b/man/repoman.1
@@ -36,7 +36,7 @@ entries that already exist. Replacement of existing Manifest
 DIST entries can be forced by using the \fBmanifest\fR mode
 together with the \fB\-\-force\fR option.
 .TP
-\fB--force\fR
+\fB-f\fR, \fB--force\fR
 Force commit to proceed, regardless of QA issues. For convenience, this option
 causes the most time consuming QA checks to be skipped. The commit message will
 include an indication that this option has been enabled, together with the

[gentoo-commits] proj/portage:master commit in: man/

[Brian Dolbec]

commit:     fe59f38a84d7b22bb99d7e62e0324916c74f32a9
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Mon May 18 21:20:01 2015 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Mon May 18 21:24:15 2015 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=fe59f38a

man: Document repoman --straight-to-stable

 man/repoman.1 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/man/repoman.1 b/man/repoman.1
index 6cb826a..6a60e5c 100644
--- a/man/repoman.1
+++ b/man/repoman.1
@@ -50,6 +50,9 @@ replacing existing digests, it is the user's responsibility to ensure that
 files contained in ${DISTDIR} have the correct identities. Especially beware
 of partially downloaded files.
 .TP
+\fB-S\fR, \fB--straight-to-stable\fR
+Allow committing straight to stable
+.TP
 \fB-q\fR, \fB--quiet\fR
 Be less verbose about extraneous info
 .TP

[gentoo-commits] proj/portage:master commit in: man/

[Brian Dolbec]

commit:     44f2a48390909050dd42404de9136bf78c97928e
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 28 23:45:29 2015 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Wed Mar  4 20:38:05 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=44f2a483

emaint.1: Update man page for better clarity (540482)

As recommended by Duncan on the gentoo-portage-dev list.
Clarify the all command.
Add OPTIONS to all commands, so a user can determine which modules
 may run when the 'all' command is used.
Remove repetitive '(* command only)' text by adding it to the section header.

 man/emaint.1 | 43 ++++++++++++++++++++++++++++++-------------
 1 file changed, 30 insertions(+), 13 deletions(-)

diff --git a/man/emaint.1 b/man/emaint.1
index c97945f..9d8de55 100644
--- a/man/emaint.1
+++ b/man/emaint.1
@@ -12,75 +12,92 @@ management health checks and maintenance.
 .SH COMMANDS
 .TP
 .BR all
-Perform all supported commands.
+Perform all supported commands that accept the specified option.
 .TP
 .BR binhost
 Generate a metadata index for binary packages located in \fBPKGDIR\fR (for
 download by remote clients). See the \fBPORTAGE_BINHOST\fR documentation in
 the \fBmake.conf\fR(5) man page for additional information.
+.br
+OPTIONS: check, fix
 .TP
 .BR cleanconfig
 Discard no longer installed config tracker entries.
+.br
+OPTIONS: check, fix
 .TP
 .BR cleanresume
 Discard merge lists saved for the \fBemerge\fR(1) \fB--resume\fR action.
+.br
+OPTIONS: check, fix
 .TP
 .BR logs
 Clean out old logs from the \fBPORT_LOGDIR\fR using the command
 \fBPORT_LOGDIR_CLEAN\fR
 See the \fBmake.conf\fR(5) man page for additional information as well as
 enabling the \fB'clean-logs'\fR feature in emerge to do this automatically.
+.br
+OPTIONS: check, clean
 .TP
 .BR merges
 Scan for failed package merges and attempt to fix those failed packages.
+.br
+OPTIONS: check, fix, purge
 .TP
 .BR movebin
 Perform package move updates for binary packages located in \fBPKGDIR\fR.
+.br
+OPTIONS: check, fix
 .TP
 .BR moveinst
 Perform package move updates for installed packages.
+.br
+OPTIONS: check, fix
 .TP
 .BR sync
 Perform sync actions on specified repositories.
+.br
+OPTIONS: allrepos, auto, repo
 .TP
 .BR world
 Fix problems in the \fIworld\fR file.
-.SH DEFAULT OPTIONS
+.br
+OPTIONS: check, fix
+.SH DEFAULT OPTIONS (Not supported in all commands)
 .TP
 .B \-c, \-\-check
-Check for any problems that may exist.  (all commands)
+Check for any problems that may exist.
 .TP
 .B \-f, \-\-fix
-Fix any problems that may exist.  (not all commands)
-.SH OPTIONS logs command
+Fix any problems that may exist.
+.SH OPTIONS logs command only
 .TP
 .B \-C, \-\-clean
-Cleans the logs from \fBPORT_LOGDIR\fR (logs command only)
+Cleans the logs from \fBPORT_LOGDIR\fR
 .TP
 .B \-p, \-\-pretend
 Sets pretend mode (same as \-c, \-\-check) for use with the \-C, \-\-clean
-OPTION (logs command only)
+OPTION
 .TP
 .B \-t NUM, \-\-time NUM
 Changes the minimum age \fBNUM\fR (in days) of the logs to be listed or
-deleted. (logs command only)
-.SH OPTIONS sync command
+deleted.
+.SH OPTIONS sync command only
 .TP
 .B \-a, \-\-auto
-Sync repositories which have its auto\-sync setting set yes, true. (sync command only)
+Sync repositories which have its auto\-sync setting set yes, true.
 .TP
 .B \-A, \-\-allrepos
-Sync all repositories which have a sync\-uri specified. (sync command only)
+Sync all repositories which have a sync\-uri specified.
 .TP
 .B \-r, \-\-repo REPO
-Sync the repository specified. (sync command only)
+Sync the repository specified.
 .TP
 .BR "\-\-sync-submodule <glsa|news|profiles>"
 Restrict sync to the specified submodule(s). This option may be
 specified multiple times, in order to sync multiple submodules.
 Currently, this option has no effect for sync protocols other
 than rsync.
-(sync command only)
 .SH "REPORTING BUGS"
 Please report bugs via http://bugs.gentoo.org/
 .SH AUTHORS

[gentoo-commits] proj/portage:master commit in: man/

[Brian Dolbec]

commit:     465565a0f90843133ae1ae9072244d34d82eaf73
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Wed Mar  4 20:18:38 2015 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Wed Mar  4 20:38:36 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=465565a0

man/egencache.1: Add missed --write-timestamp option (540482)

 man/egencache.1 | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/man/egencache.1 b/man/egencache.1
index 9c1f488..daf08aa 100644
--- a/man/egencache.1
+++ b/man/egencache.1
@@ -107,7 +107,10 @@ updates due to ebuilds that either fail to source or are not sourced
 due to invalid Manifest entries.
 .TP
 .BR "\-\-use\-local\-desc\-output=ULD_OUTPUT"
-output file for use.local.desc data (or '-' for stdout)
+Output file for use.local.desc data (or '-' for stdout)
+.TP
+.BR "\-\-write\-timestamp
+Write metadata/timestamp.chk as required for rsync repositories
 .SH "ENVIRONMENT OPTIONS"
 .TP
 \fBEGENCACHE_DEFAULT_OPTS\fR

[gentoo-commits] proj/portage:master commit in: man/

[Pavel Kazakov]

commit:     1d3a298c9d0d9aaf908542b77a8e6187965b1c78
Author:     Pavel Kazakov <nullishzero <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 28 17:32:09 2015 +0000
Commit:     Pavel Kazakov <nullishzero <AT> gentoo <DOT> org>
CommitDate: Sat Feb 28 17:32:09 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=1d3a298c

main/emaint.1: Add entry about the merges module

---
 man/emaint.1 | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/man/emaint.1 b/man/emaint.1
index 6b8fdf9..c97945f 100644
--- a/man/emaint.1
+++ b/man/emaint.1
@@ -5,7 +5,7 @@ emaint \- performs package managment related system health checks and maintenanc
 .BR emaint
 [\fIoptions\fR]
 [\fBall\fR | \fBbinhost\fR | \fBcleanresume\fR | \
-\fBmovebin\fR | \fBmoveinst\fR | \fBworld\fR]
+\fBmerges\fR | \fBmovebin\fR | \fBmoveinst\fR | \fBworld\fR]
 .SH DESCRIPTION
 The emaint program provides a command line interface to package
 management health checks and maintenance.
@@ -31,6 +31,9 @@ Clean out old logs from the \fBPORT_LOGDIR\fR using the command
 See the \fBmake.conf\fR(5) man page for additional information as well as
 enabling the \fB'clean-logs'\fR feature in emerge to do this automatically.
 .TP
+.BR merges
+Scan for failed package merges and attempt to fix those failed packages.
+.TP
 .BR movebin
 Perform package move updates for binary packages located in \fBPKGDIR\fR.
 .TP
@@ -82,6 +85,7 @@ than rsync.
 Please report bugs via http://bugs.gentoo.org/
 .SH AUTHORS
 .nf
+Pavel Kazakov <nullishzero@gentoo.org>
 Mike Frysinger <vapier@gentoo.org>
 Brian Dolbec <dolsen@gentoo.org>
 .fi
@@ -92,6 +96,10 @@ Contains a list of all user\-specified packages.
 .TP
 .B /var/lib/portage/config
 Contains the paths and md5sums of all the config files being tracked.
+.TP
+.B /var/lib/portage/failed-merges
+Contains the packages and timestamps of any failed merges being cleaned from
+the system, and to be re-emerged.
 .SH "SEE ALSO"
 .BR emerge (1),
 .BR portage (5)

[gentoo-commits] proj/portage:master commit in: man/

[Mike Frysinger]

commit:     dba953f388dc3ab5b1bdbc702ebf646fac940492
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 26 06:32:39 2015 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Thu Feb 26 06:33:03 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=dba953f3

man: fix bold style with man page sections

The section number should not be bolded like the main page.

---
 man/ebuild.5    | 4 ++--
 man/egencache.1 | 6 +++---
 man/emerge.1    | 2 +-
 man/make.conf.5 | 2 +-
 man/portage.5   | 2 +-
 man/repoman.1   | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index 95d0453..7049f17 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -1326,7 +1326,7 @@ If the item does not exist, it is ignored.
 .TP
 .B dosed\fR \fI"s:orig:change:g" <filename>
 Beginning with \fBEAPI 4\fR, the \fBdosed\fR helper no longer exists. Ebuilds
-should call \fBsed(1)\fR directly (and assume that it is GNU sed).
+should call \fBsed\fR(1) directly (and assume that it is GNU sed).
 
 Performs sed in place on \fIfilename\fR inside ${ED}. If no expression is
 given then \fI"s:${D}::g"\fR is used as the default expression.  Note
@@ -1412,7 +1412,7 @@ file name.
 .TP
 .B dohard\fR \fI<filename> <linkname>
 Beginning with \fBEAPI 4\fR, the \fBdohard\fR helper no longer exists. Ebuilds
-should call \fBln(1)\fR directly.
+should call \fBln\fR(1) directly.
 .TP
 .B dosym\fR \fI<filename> <linkname>
 .PD 1

diff --git a/man/egencache.1 b/man/egencache.1
index 3a3197f..9c1f488 100644
--- a/man/egencache.1
+++ b/man/egencache.1
@@ -120,13 +120,13 @@ Prior to portage-2.1.11.32, the 'pms' cache format was enabled by default.
 This 'pms' format, which is distributed in the \fImetadata/cache/\fR
 directory of the repository, has significant limitations related to the
 cache validation mechanism which involves comparison of
-a cache entry mtime to the mtime of the corresponding \fBebuild(5)\fR. This
+a cache entry mtime to the mtime of the corresponding \fBebuild\fR(5). This
 mechanism is unreliable in cases when eclass changes result in metadata
 changes, since no information about eclass state is available in the cache.
 Also, since the mtime of the cache entry must correspond to that of the
 ebuild, the cache format is only suitable for distribution via protocols
-that preserve timestamps (such as \fBrsync(1))\fR. For cache that is
-distributed via \fBgit(1)\fR repositories, there is currently a workaround
+that preserve timestamps (such as \fBrsync\fR(1)). For cache that is
+distributed via \fBgit\fR(1) repositories, there is currently a workaround
 implemented in \fBemerge\fR(1) \fB\-\-sync\fR which updates ebuild mtimes
 to match their corresponding cache entries (except for ebuilds that are
 modified relative to HEAD).

diff --git a/man/emerge.1 b/man/emerge.1
index 25602e0..237fb79 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -257,7 +257,7 @@ additions of files) inside repositories synchronized using rsync.
 \fBNOTE:\fR
 The emerge \-\-sync command is a compatibility command.  Sync operations are
 now performed using the the new emaint sync module. This new emaint sync module
-has greater functionality and flexibility.  Please refer to \fBemaint(1)\fR for
+has greater functionality and flexibility.  Please refer to \fBemaint\fR(1) for
 more information about sync operations.
 
 \fBNOTE:\fR

diff --git a/man/make.conf.5 b/man/make.conf.5
index 84b7191..cd1ae21 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -623,7 +623,7 @@ Enable the sandbox in the compile phase, when running without root privs
 (\fIuserpriv\fR).
 .TP
 .B usersync
-Drop privileges to the owner of ${repository_location} for \fBemerge(1) --sync\fR
+Drop privileges to the owner of ${repository_location} for \fBemerge\fR(1) --sync
 operations. Note that this feature assumes that all subdirectories of
 ${repository_location} have the same ownership as ${repository_location} itself.
 It is the user's responsibility to ensure correct ownership, since otherwise

diff --git a/man/portage.5 b/man/portage.5
index 3a64206..3b099ff 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -151,7 +151,7 @@ More reading:
 .br
 The following atom syntax extensions are only supported in user
 configuration files and command line arguments for programs such as
-\fBemerge(1)\fR:
+\fBemerge\fR(1):
 .RS
 .TP
 .B Repository Constraints

diff --git a/man/repoman.1 b/man/repoman.1
index c576768..d490227 100644
--- a/man/repoman.1
+++ b/man/repoman.1
@@ -67,7 +67,7 @@ For commit mode, call echangelog if ChangeLog is unmodified (or
 regardless of modification if 'force' is specified). This option
 can be enabled by default for a particular repository by setting
 "update\-changelog = true" in metadata/layout.conf (see
-\fBportage(5)\fR).
+\fBportage\fR(5)).
 .TP
 \fB\-\-experimental\-inherit=<y|n>\fR
 Enable experimental inherit.missing checks which may misbehave when the

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     86a675d7c9979f245499dd8d2253557933b6a3fe
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 24 00:13:41 2015 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Tue Feb 24 00:37:48 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=86a675d7

man/portage.5: document sets.conf (bug 541188)

This documents /etc/portage/sets.conf, /usr/portage/sets.conf, and
/usr/share/portage/config/sets. It refers to "Package Set Configuration"
section of the html documentation for more information.

X-Gentoo-Bug: 541188
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=541188
Acked-by: Brian Dolbec <dolsen <AT> gentoo.org>

---
 man/portage.5 | 49 ++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 48 insertions(+), 1 deletion(-)

diff --git a/man/portage.5 b/man/portage.5
index ed5140d..3a64206 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -1,4 +1,4 @@
-.TH "PORTAGE" "5" "Jan 2015" "Portage VERSION" "Portage"
+.TH "PORTAGE" "5" "Feb 2015" "Portage VERSION" "Portage"
 .SH NAME
 portage \- the heart of Gentoo
 .SH "DESCRIPTION"
@@ -65,6 +65,7 @@ package.use
 postsync.d
 repo.postsync.d
 repos.conf
+sets.conf
 .fi
 .TP
 .BR /etc/portage/env/
@@ -76,6 +77,11 @@ site-specific overrides of \fB/etc/portage/make.profile/\fR
 .BR /etc/portage/sets/
 user\-defined package sets
 .TP
+.BR /usr/portage/
+.nf
+sets.conf
+.fi
+.TP
 .BR /usr/portage/metadata/
 .nf
 layout.conf
@@ -112,6 +118,7 @@ use.stable.force
 .nf
 make.globals
 repos.conf
+sets
 .fi
 .TP
 .BR /var/cache/edb/
@@ -1066,6 +1073,30 @@ sync\-uri = git://git.overlays.gentoo.org/proj/voip.git
 auto\-sync = yes
 .fi
 .RE
+.TP
+.BR sets.conf
+A package set configuration file. Settings here override settings from
+\fB/usr/portage/sets.conf\fR and \fB/usr/share/portage/config/sets\fR.
+The format is described extensively in the
+\fIPackage Set Configuration\fR section of the html documentation which
+is installed with portage when the "doc" USE flag is enabled.
+
+.I Example:
+.nf
+[world]
+class = portage.sets.base.DummyPackageSet
+packages = @profile @selected @system
+
+[usersets]
+class = portage.sets.files.StaticFileSet
+multiset = true
+directory =  %(PORTAGE_CONFIGROOT)setc/portage/sets
+world-candidate = True
+
+[module-rebuild]
+class = portage.sets.dbapi.OwnerSet
+files = /lib/modules
+.fi
 .RE
 .TP
 .BR /etc/portage/env/
@@ -1106,6 +1137,15 @@ Also see \fB/var/lib/portage/world_sets\fR and the \fBemerge\fR(1)
 \fB\-\-list\-sets\fR option.
 .RE
 .TP
+.BR /usr/portage/
+.RS
+.TP
+.BR sets.conf
+A package set configuration file. Also see \fB/etc/portage/sets.conf\fR
+which overrides these settings, and
+\fB/usr/share/portage/config/sets\fR which contains default settings.
+.RE
+.TP
 .BR /usr/portage/metadata/
 .RS
 .TP
@@ -1470,6 +1510,13 @@ The default configuration of repositories for Portage.  This comes from
 the portage package itself.  Settings in \fB/etc/portage/repos.conf\fR
 override values set here. The format is described extensively in section
 for \fB/etc/portage/repos.conf\fR.
+.TP
+.BR sets
+A directory containing package set configuration files. Also see
+\fB/etc/portage/sets.conf\fR and \fB/usr/portage/sets.conf\fR, both of
+which override values set here. Default set configurations are installed
+in \fB/usr/share/portage/config/sets/portage.conf\fR.
+.RE
 .RE
 .TP
 .BR /var/cache/edb/

[gentoo-commits] proj/portage:master commit in: man/

[Mike Frysinger]

commit:     d9ce5bbc4cdfe2f3c5c0595b8257688336c6eba2
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 18 18:24:04 2015 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Wed Feb 18 18:24:04 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=d9ce5bbc

emerge(1): use (...) for parenthetical asides

---
 man/emerge.1 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/man/emerge.1 b/man/emerge.1
index 7d8d003..25602e0 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -71,8 +71,8 @@ necessary for your system to run properly (the differences between these
 two sets are documented in \fBportage\fR(5)).
 \fBselected\fR encompasses both the \fBselected-packages\fR
 and \fBselected-sets\fR sets, while \fBworld\fR encompasses the \fBselected\fR,
-\fBsystem\fR and \fBprofile\fR sets. [See
-\fBFILES\fR below for more information.] Other sets can exist depending
+\fBsystem\fR and \fBprofile\fR sets. (See \fBFILES\fR below for more
+information.) Other sets can exist depending
 on the current configuration. The default set configuration is located
 in the \fB/usr/share/portage/config/sets\fR directory.
 User sets may be created by placing files in the \fB/etc/portage/sets/\fR

[gentoo-commits] proj/portage:v2.2.16 commit in: man/

[Brian Dolbec]

commit:     7c912b0cfbbacdb901435e59ed8c541de9de61d7
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Thu Feb  5 21:10:08 2015 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Thu Feb  5 21:10:08 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=7c912b0c

man/portage.5: Add missing valid sync-type's

Fix some missed - escapes.

---
 man/portage.5 | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/man/portage.5 b/man/portage.5
index 74b0771..8bebd32 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -941,7 +941,7 @@ the newest commit). If set to 0, the depth is unlimited.
 .B sync\-type
 Specifies type of synchronization performed by `emerge \-\-sync`.
 .br
-Valid non\-empty values: cvs, git, rsync
+Valid non\-empty values: cvs, git, rsync, svn, websync (emerge-webrsync)
 .br
 This attribute can be set to empty value to disable synchronization of given
 repository. Empty value is default.
@@ -1038,9 +1038,9 @@ auto\-sync = yes
 # Overlay 'voip' syncronized with layman's plug-in sync module
 [voip]
 location = /var/lib/layman/voip
-sync-type = laymanator
-sync-uri = git://git.overlays.gentoo.org/proj/voip.git
-auto-sync = yes
+sync\-type = laymanator
+sync\-uri = git://git.overlays.gentoo.org/proj/voip.git
+auto\-sync = yes
 .fi
 .RE
 .RE

[gentoo-commits] proj/portage:master commit in: man/

[Brian Dolbec]

commit:     7c912b0cfbbacdb901435e59ed8c541de9de61d7
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Thu Feb  5 21:10:08 2015 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Thu Feb  5 21:10:08 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=7c912b0c

man/portage.5: Add missing valid sync-type's

Fix some missed - escapes.

---
 man/portage.5 | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/man/portage.5 b/man/portage.5
index 74b0771..8bebd32 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -941,7 +941,7 @@ the newest commit). If set to 0, the depth is unlimited.
 .B sync\-type
 Specifies type of synchronization performed by `emerge \-\-sync`.
 .br
-Valid non\-empty values: cvs, git, rsync
+Valid non\-empty values: cvs, git, rsync, svn, websync (emerge-webrsync)
 .br
 This attribute can be set to empty value to disable synchronization of given
 repository. Empty value is default.
@@ -1038,9 +1038,9 @@ auto\-sync = yes
 # Overlay 'voip' syncronized with layman's plug-in sync module
 [voip]
 location = /var/lib/layman/voip
-sync-type = laymanator
-sync-uri = git://git.overlays.gentoo.org/proj/voip.git
-auto-sync = yes
+sync\-type = laymanator
+sync\-uri = git://git.overlays.gentoo.org/proj/voip.git
+auto\-sync = yes
 .fi
 .RE
 .RE

[gentoo-commits] proj/portage:v2.2.16 commit in: man/

[Brian Dolbec]

commit:     530397434931af654c7b857d20f35ed3939cf95c
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sat Feb  7 00:24:00 2015 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Sat Feb  7 00:24:00 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=53039743

man/emaint.1: Suggested tweaks from igli

---
 man/emaint.1 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/man/emaint.1 b/man/emaint.1
index f8b2031..6b8fdf9 100644
--- a/man/emaint.1
+++ b/man/emaint.1
@@ -7,8 +7,8 @@ emaint \- performs package managment related system health checks and maintenanc
 [\fBall\fR | \fBbinhost\fR | \fBcleanresume\fR | \
 \fBmovebin\fR | \fBmoveinst\fR | \fBworld\fR]
 .SH DESCRIPTION
-The emaint program provides a command line interface to the modular package
-management system health checks and maintenance.
+The emaint program provides a command line interface to package
+management health checks and maintenance.
 .SH COMMANDS
 .TP
 .BR all

[gentoo-commits] proj/portage:master commit in: man/

[Brian Dolbec]

commit:     530397434931af654c7b857d20f35ed3939cf95c
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sat Feb  7 00:24:00 2015 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Sat Feb  7 00:24:00 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=53039743

man/emaint.1: Suggested tweaks from igli

---
 man/emaint.1 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/man/emaint.1 b/man/emaint.1
index f8b2031..6b8fdf9 100644
--- a/man/emaint.1
+++ b/man/emaint.1
@@ -7,8 +7,8 @@ emaint \- performs package managment related system health checks and maintenanc
 [\fBall\fR | \fBbinhost\fR | \fBcleanresume\fR | \
 \fBmovebin\fR | \fBmoveinst\fR | \fBworld\fR]
 .SH DESCRIPTION
-The emaint program provides a command line interface to the modular package
-management system health checks and maintenance.
+The emaint program provides a command line interface to package
+management health checks and maintenance.
 .SH COMMANDS
 .TP
 .BR all

[gentoo-commits] proj/portage:master commit in: man/

[Brian Dolbec]

commit:     ca75eb4bdce089a3f27686f031fd56f1c39d0827
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Fri Feb  6 19:39:13 2015 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Fri Feb  6 19:39:13 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=ca75eb4b

man/emaint.1: As suggested in the forums, improve the decription

---
 man/emaint.1 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/man/emaint.1 b/man/emaint.1
index 47b67f4..f8b2031 100644
--- a/man/emaint.1
+++ b/man/emaint.1
@@ -1,14 +1,14 @@
 .TH "EMAINT" "1" "Jan 2015" "Portage VERSION" "Portage"
 .SH NAME
-emaint \- performs system health checks and maintenance
+emaint \- performs package managment related system health checks and maintenance
 .SH SYNOPSIS
 .BR emaint
 [\fIoptions\fR]
 [\fBall\fR | \fBbinhost\fR | \fBcleanresume\fR | \
 \fBmovebin\fR | \fBmoveinst\fR | \fBworld\fR]
 .SH DESCRIPTION
-The emaint program provides an interface to system health
-checks and maintenance.
+The emaint program provides a command line interface to the modular package
+management system health checks and maintenance.
 .SH COMMANDS
 .TP
 .BR all

[gentoo-commits] proj/portage:v2.2.16 commit in: man/

[Brian Dolbec]

commit:     de41f86caafd105e4b836f8f2fef457336182ea2
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Wed Feb  4 21:40:47 2015 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Wed Feb  4 21:49:36 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=de41f86c

man/portage.5 Final updates for sync changes

---
 man/portage.5 | 32 +++++++++++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/man/portage.5 b/man/portage.5
index 5ac3100..74b0771 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -61,6 +61,8 @@ package.mask
 package.properties
 package.unmask
 package.use
+postsync.d
+repo.postsync.d
 repos.conf
 .fi
 .TP
@@ -808,6 +810,26 @@ x11\-libs/qt \-mysql
 */* VIDEO_CARDS: \-* radeon
 .fi
 .TP
+.BR postsync.d/
+This directory is for user supplied postsync hooks to be run once after all
+repositories have been synced.  Each script is called in alphabetic order
+without any arguments.
+.fi
+.TP
+.BR repo.postsync.d/
+This directory is for user supplied postsync hooks to be run once after each
+repository has been synced.  Each script is called in alphabetic order
+with three arguments.
+
+.I args:
+        repository name, sync-uri, location
+.fi
+
+Using this information it is possible for hooks to be run for only a certain
+repository.  This way other update actions can be performed for that repository
+only.
+.fi
+.TP
 .BR repos.conf
 Specifies \fIsite\-specific\fR repository configuration information.
 .br
@@ -871,7 +893,7 @@ desired via "\fBemaint sync \-\-repo foo\fR".
 Valid values: yes, no, true, false.
 .br
 If unset, the repo will be treated as set
-no, false.
+yes, true.
 .TP
 .B eclass\-overrides
 Makes given repository inherit eclasses from specified repositories.
@@ -1011,6 +1033,14 @@ location = /usr/portage
 sync\-type = cvs
 sync\-uri = :pserver:anonymous@anoncvs.gentoo.org:/var/cvsroot
 sync\-cvs\-repo = gentoo\-x86
+auto\-sync = yes
+
+# Overlay 'voip' syncronized with layman's plug-in sync module
+[voip]
+location = /var/lib/layman/voip
+sync-type = laymanator
+sync-uri = git://git.overlays.gentoo.org/proj/voip.git
+auto-sync = yes
 .fi
 .RE
 .RE

[gentoo-commits] proj/portage:master commit in: man/

[Brian Dolbec]

commit:     de41f86caafd105e4b836f8f2fef457336182ea2
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Wed Feb  4 21:40:47 2015 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Wed Feb  4 21:49:36 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=de41f86c

man/portage.5 Final updates for sync changes

---
 man/portage.5 | 32 +++++++++++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/man/portage.5 b/man/portage.5
index 5ac3100..74b0771 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -61,6 +61,8 @@ package.mask
 package.properties
 package.unmask
 package.use
+postsync.d
+repo.postsync.d
 repos.conf
 .fi
 .TP
@@ -808,6 +810,26 @@ x11\-libs/qt \-mysql
 */* VIDEO_CARDS: \-* radeon
 .fi
 .TP
+.BR postsync.d/
+This directory is for user supplied postsync hooks to be run once after all
+repositories have been synced.  Each script is called in alphabetic order
+without any arguments.
+.fi
+.TP
+.BR repo.postsync.d/
+This directory is for user supplied postsync hooks to be run once after each
+repository has been synced.  Each script is called in alphabetic order
+with three arguments.
+
+.I args:
+        repository name, sync-uri, location
+.fi
+
+Using this information it is possible for hooks to be run for only a certain
+repository.  This way other update actions can be performed for that repository
+only.
+.fi
+.TP
 .BR repos.conf
 Specifies \fIsite\-specific\fR repository configuration information.
 .br
@@ -871,7 +893,7 @@ desired via "\fBemaint sync \-\-repo foo\fR".
 Valid values: yes, no, true, false.
 .br
 If unset, the repo will be treated as set
-no, false.
+yes, true.
 .TP
 .B eclass\-overrides
 Makes given repository inherit eclasses from specified repositories.
@@ -1011,6 +1033,14 @@ location = /usr/portage
 sync\-type = cvs
 sync\-uri = :pserver:anonymous@anoncvs.gentoo.org:/var/cvsroot
 sync\-cvs\-repo = gentoo\-x86
+auto\-sync = yes
+
+# Overlay 'voip' syncronized with layman's plug-in sync module
+[voip]
+location = /var/lib/layman/voip
+sync-type = laymanator
+sync-uri = git://git.overlays.gentoo.org/proj/voip.git
+auto-sync = yes
 .fi
 .RE
 .RE

[gentoo-commits] proj/portage:master commit in: man/

[Michał Górny]

commit:     96c0a2d38396ff7a37fb51ddd2e7f66fd444e6e2
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 24 09:27:59 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Jan 24 17:40:38 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=96c0a2d3

Fix typo breaking the portage(5) manpage

---
 man/portage.5 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/man/portage.5 b/man/portage.5
index 5d0e7c0..189561c 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -1,4 +1,4 @@
-TH "PORTAGE" "5" "Jan 2015" "Portage VERSION" "Portage"
+.TH "PORTAGE" "5" "Jan 2015" "Portage VERSION" "Portage"
 .SH NAME
 portage \- the heart of Gentoo
 .SH "DESCRIPTION"

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     f2d25e174634151732b86e72befd3a90f048aeb8
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 26 22:28:45 2014 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Jan  5 20:08:16 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=f2d25e17

man/emerge.1: clarify --buildpkg-exclude wrt *-backup FEATURES (533036)

The --buildpkg-exclude option does not affect downgrade-backup or
unmerge-backup features, since having this option disable backups is
not necessarily desirable.

X-Gentoo-Bug: 533036
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=533036
Acked-by: Alexander Berntsen <bernalex <AT> gentoo.org>

---
 man/emerge.1 | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/man/emerge.1 b/man/emerge.1
index ec2363d..4636997 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -403,7 +403,9 @@ live filesystem.
 .BR "\-\-buildpkg\-exclude " ATOMS
 A space separated list of package atoms for which
 no binary packages should be built. This option overrides all
-possible ways to enable building of binary packages.
+possible ways to enable building of binary packages except for
+the downgrade\-backup and unmerge\-backup \fBFEATURES\fR settings (see
+\fBmake.conf\fR(5) for more information about \fBFEATURES\fR settings).
 .TP
 .BR "\-\-buildpkgonly " (\fB\-B\fR)
 Creates binary packages for all ebuilds processed without actually

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     1d267aa670e7773b31bb88fc285dec9819fd9770
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 26 22:01:25 2014 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Jan  5 20:00:59 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=1d267aa6

man pages: note that make.conf can be a directory (463266)

Commit 86e75790954e766beba75443d967b2c25055c5b0 added support for
make.conf to be a directory, but the feature was undocumented.
Therefore, update the man pages, as suggested in bug #465164,
comment #9.

Fixes 86e75790954e ("make.conf: recurse directories, bug #463266")
X-Gentoo-Bug: 463266
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=463266
Acked-by: Alexander Berntsen <bernalex <AT> gentoo.org>

---
 man/make.conf.5 | 5 ++++-
 man/portage.5   | 5 +++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/man/make.conf.5 b/man/make.conf.5
index 69d95fc..ed5fc78 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -1,4 +1,4 @@
-.TH "MAKE.CONF" "5" "Apr 2014" "Portage VERSION" "Portage"
+.TH "MAKE.CONF" "5" "Jan 2015" "Portage VERSION" "Portage"
 .SH "NAME"
 make.conf \- custom settings for Portage
 .SH "SYNOPSIS"
@@ -14,6 +14,9 @@ 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. Note that if you source
 files, they need to be in the same shlex syntax for portage to read them.
+If make.conf is a directory, then all the files in that directory will
+be sorted in ascending alphabetical order by file name and summed
+together as if it were a single file.
 .br
 Portage will check the currently\-defined environment variables
 first for any settings.  If no environment settings are found,

diff --git a/man/portage.5 b/man/portage.5
index fbff9a6..ed0423f 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -1,4 +1,4 @@
-.TH "PORTAGE" "5" "December 2014" "Portage VERSION" "Portage"
+.TH "PORTAGE" "5" "Jan 2015" "Portage VERSION" "Portage"
 .SH NAME
 portage \- the heart of Gentoo
 .SH "DESCRIPTION"
@@ -573,7 +573,8 @@ virtual/aspell\-dict   app\-dicts/aspell\-en
 .RE
 .TP
 .BR /etc/portage/
-Any file in this directory that begins with "package." or is repos.conf can be
+Files in this directory including make.conf, repos.conf, and any file
+with a name that begins with "package." can be
 more than just a flat file.  If it is a directory, then all the files in that
 directory will be sorted in ascending alphabetical order by file name and summed
 together as if it were a single file.

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     0eecbc899ad9b97cb786ad9b10cc7a5d56c35e79
Author:     Austin English <austinenglish <AT> gmail <DOT> com>
AuthorDate: Fri Dec  5 15:29:16 2014 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Dec  8 15:36:22 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=0eecbc89

man/emerge.1: --quiet-build=n overridden by --jobs (505116)

Users may be confused that --quiet-build=n has no effect when used
together with --jobs, so it deserves to be mentioned in the man page.

X-Gentoo-Bug: 505116
X-Gentoo-Url: https://bugs.gentoo.org/show_bug.cgi?id=505116
Acked-by: Alexander Berntsen <bernalex <AT> gentoo.org>

---
 man/emerge.1 | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/man/emerge.1 b/man/emerge.1
index b9ce79c..f64fd1b 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -1,4 +1,4 @@
-.TH "EMERGE" "1" "Nov 2014" "Portage VERSION" "Portage"
+.TH "EMERGE" "1" "Dec 2014" "Portage VERSION" "Portage"
 .SH "NAME"
 emerge \- Command\-line interface to the Portage system
 .SH "SYNOPSIS"
@@ -708,6 +708,8 @@ corresponding die messages.
 Note that interactive packages currently force all build output to
 be displayed on stdout. This issue can be temporarily avoided
 by specifying \fI\-\-accept\-properties=\-interactive\fR.
+Further, note that disabling \fI\-\-quiet\-build\fR has no effect if
+\fI\-\-jobs\fR is set to anything higher than 1.
 .TP
 .BR "\-\-quiet\-fail [ y | n ]"
 Suppresses display of the build log on stdout when build output is hidden

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     7f38c9cbe3ce4a1eb4791b81b1ccd1a2f4eebfd1
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sun Nov  9 19:16:58 2014 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Nov 10 18:29:30 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=7f38c9cb

man/ebuild.5: document assert for bug #528760

X-Gentoo-Bug: 528760
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=528760
Acked-by: Alexander Berntsen <bernalex <AT> gentoo.org>

---
 man/ebuild.5 | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index 89bd6a2..b587264 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -1,4 +1,4 @@
-.TH "EBUILD" "5" "Jan 2014" "Portage VERSION" "Portage"
+.TH "EBUILD" "5" "Nov 2014" "Portage VERSION" "Portage"
 
 .SH "NAME"
 ebuild \- the internal format, variables, and functions in an ebuild script
@@ -969,6 +969,11 @@ default_src_test
 
 .SS "General:"
 .TP
+.B assert\fR \fI[reason]
+Checks the value of the shell's PIPESTATUS array variable, and if any
+component is non-zero (indicating failure), calls die with \fIreason\fR
+as a failure message.
+.TP
 .B die\fR \fI[reason]
 Causes the current emerge process to be aborted. The final display will
 include \fIreason\fR.

[gentoo-commits] proj/portage:master commit in: man/

[Alexander Berntsen]

commit:     4cbf3ef951c50f727dc23af99fac254b97814afd
Author:     Alexander Berntsen <bernalex <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 19 13:49:53 2014 +0000
Commit:     Alexander Berntsen <bernalex <AT> gentoo <DOT> org>
CommitDate: Sat Jul 19 13:49:53 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=4cbf3ef9

man/repoman: Note line inaccuracies (bug 517416)

Signed-off-by: Alexander Berntsen <bernalex <AT> gentoo.org>

---
 man/repoman.1 | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/man/repoman.1 b/man/repoman.1
index a78f94e..c576768 100644
--- a/man/repoman.1
+++ b/man/repoman.1
@@ -12,6 +12,10 @@ checks the quality of ebuild repositories.
 
 Note: \fBrepoman commit\fR only works \fIinside local\fR cvs, git, or
 subversion repositories.
+
+Note: Messages pertaining to specific lines may be inaccurate in the
+prescence of continuation lines from use of the \fI\\\fR character in
+BASH.
 .SH OPTIONS
 .TP
 \fB-a\fR, \fB--ask\fR

[gentoo-commits] proj/portage:master commit in: man/

[Alexander Berntsen]

commit:     b96fb047b342d055ef2a254bbdc2960c8ad9cc6e
Author:     Alexander Berntsen <bernalex <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 14 21:52:48 2014 +0000
Commit:     Alexander Berntsen <bernalex <AT> gentoo <DOT> org>
CommitDate: Sat Jun 14 21:52:48 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=b96fb047

man/emerge.1: Make the --alert example more safe

Signed-off-by: Alexander Berntsen <bernalex <AT> gentoo.org>
Suggested-by:  Steve J. Long      <slong <AT> rathaus.eclipse.co.uk>

---
 man/emerge.1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/man/emerge.1 b/man/emerge.1
index 1db41b0..e32bb43 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -306,7 +306,7 @@ finished calculating the graph.
 
 \fB--alert\fR may be 'y' or 'n'. 'true' and 'false' mean the same thing.
 Using \fB--alert\fR without an option is the same as using it with 'y'.
-Try it with 'emerge -aAC gcc'. Remember to answer \fBno\fR!
+Try it with 'emerge -aA portage'.
 
 If your terminal emulator is set up to make '\\a' into a window manager
 urgency hint, move your cursor to a different window to get the effect.

[gentoo-commits] proj/portage:master commit in: man/

[Arfrever Frehtes Taifersar Arahesis]

commit:     73f08e1840269c14879a523f7f39375bc6cc2ba0
Author:     Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Fri Apr 18 21:15:13 2014 +0000
Commit:     Arfrever Frehtes Taifersar Arahesis <arfrever <AT> apache <DOT> org>
CommitDate: Fri Apr 18 21:15:13 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=73f08e18

make.conf.5: Fix order of some paragraphs.

---
 man/make.conf.5 | 127 ++++++++++++++++++++++++++++----------------------------
 1 file changed, 63 insertions(+), 64 deletions(-)

diff --git a/man/make.conf.5 b/man/make.conf.5
index 2281014..84e894b 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -1,4 +1,4 @@
-.TH "MAKE.CONF" "5" "Jan 2014" "Portage VERSION" "Portage"
+.TH "MAKE.CONF" "5" "Apr 2014" "Portage VERSION" "Portage"
 .SH "NAME"
 make.conf \- custom settings for Portage
 .SH "SYNOPSIS"
@@ -178,6 +178,10 @@ of \fBemerge\fR(1) for more information.
 This variable is passed by the \fIebuild scripts\fR to the \fIconfigure\fR
 as \fI\-\-target=${CTARGET}\fR only if it is defined.
 .TP
+.B DCO_SIGNED_OFF_BY
+This variable may contain a name and email address which will be used by
+\fBrepoman\fR(1) to add a Signed\-off\-by line to each commit message.
+.TP
 \fBDISTDIR\fR = \fI[path]\fR
 Defines the location of your local source file repository. After packages
 are built, it is safe to remove any and all files from this directory since
@@ -194,10 +198,6 @@ See the \fBPORTDIR\fR documentation for more information.
 .br
 Defaults to /usr/portage/distfiles.
 .TP
-.B DCO_SIGNED_OFF_BY
-This variable may contain a name and email address which will be used by
-\fBrepoman\fR(1) to add a Signed\-off\-by line to each commit message.
-.TP
 .B DOC_SYMLINKS_DIR
 If this variable contains a directory then symlinks to html documentation will
 be installed into it.
@@ -298,12 +298,6 @@ Log file names have an extension that is appropriate for the compression
 type. Currently, only \fBgzip\fR(1) compression is supported, so build
 logs will have a '.gz' extension when this feature is enabled.
 .TP
-.B compressdebug
-Compress the debug sections in the split debug files with zlib to save
-space.  Make sure you have built both binutils and gdb with USE=zlib
-support for this to work.  See \fBsplitdebug\fR for general split debug
-information (upon which this feature depends).
-.TP
 .B compress\-index
 If set then a compressed copy of 'Packages' index file will be written.
 This feature is intended for Gentoo binhosts using certain webservers
@@ -311,6 +305,12 @@ This feature is intended for Gentoo binhosts using certain webservers
 redundant on\-the\-fly compression.  The resulting file will be called
 \[aq]Packages.gz' and its modification time will match that of 'Packages'.
 .TP
+.B compressdebug
+Compress the debug sections in the split debug files with zlib to save
+space.  Make sure you have built both binutils and gdb with USE=zlib
+support for this to work.  See \fBsplitdebug\fR for general split debug
+information (upon which this feature depends).
+.TP
 .B config\-protect\-if\-modified
 This causes the \fBCONFIG_PROTECT\fR behavior to be skipped for files
 that have not been modified since they were installed. This feature is
@@ -346,10 +346,6 @@ exist). Also see the related \fIunmerge\-backup\fR feature.
 Use locks to ensure that unsandboxed ebuild phases never execute
 concurrently. Also see \fIparallel\-install\fR.
 .TP
-.B fakeroot
-Enable fakeroot for the install and package phases when a non-root user runs
-the \fBebuild\fR(1) command.
-.TP
 .B fail\-clean
 Clean up temporary files after a build failure. This is particularly useful
 if you have \fBPORTAGE_TMPDIR\fR on tmpfs. If this feature is enabled, you
@@ -357,24 +353,9 @@ probably also want to enable \fBPORT_LOGDIR\fR in order to save the build log.
 Both the \fBebuild\fR(1) command and the \fInoclean\fR feature cause the
 \fIfail\-clean\fR feature to be automatically disabled.
 .TP
-.B getbinpkg
-Force emerges to always try to fetch files from the \fIPORTAGE_BINHOST\fR.  See
-\fBmake.conf\fR(5) for more information.
-.TP
-.B installsources
-Install source code into /usr/src/debug/${CATEGORY}/${PF} (also see
-\fBsplitdebug\fR). This feature works only if debugedit is installed and CFLAGS
-is set to include debug information (such as with the \-ggdb flag).
-.TP
-.B keeptemp
-Do not delete the ${T} directory after the merge process.
-.TP
-.B keepwork
-Do not delete the ${WORKDIR} directory after the merge process. ${WORKDIR} can
-then be reused since this feature disables most of the clean phase that runs
-prior to each build. Due to lack of proper cleanup, this feature can
-interfere with normal emerge operation and therefore it should not be left
-enabled for more than a short period of time.
+.B fakeroot
+Enable fakeroot for the install and package phases when a non-root user runs
+the \fBebuild\fR(1) command.
 .TP
 .B fixlafiles
 Modifies .la files to not include other .la files and some other
@@ -390,10 +371,29 @@ 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 getbinpkg
+Force emerges to always try to fetch files from the \fIPORTAGE_BINHOST\fR.  See
+\fBmake.conf\fR(5) for more information.
+.TP
+.B installsources
+Install source code into /usr/src/debug/${CATEGORY}/${PF} (also see
+\fBsplitdebug\fR). This feature works only if debugedit is installed and CFLAGS
+is set to include debug information (such as with the \-ggdb flag).
+.TP
 .B ipc\-sandbox
 Isolate the ebuild phase functions from host IPC namespace. Supported
 only on Linux. Requires IPC namespace support in kernel.
 .TP
+.B keeptemp
+Do not delete the ${T} directory after the merge process.
+.TP
+.B keepwork
+Do not delete the ${WORKDIR} directory after the merge process. ${WORKDIR} can
+then be reused since this feature disables most of the clean phase that runs
+prior to each build. Due to lack of proper cleanup, this feature can
+interfere with normal emerge operation and therefore it should not be left
+enabled for more than a short period of time.
+.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.
@@ -574,6 +574,12 @@ continue to execute the remaining phases as if the failure had not occurred.
 Note that the test phase for a specific package may be disabled by masking
 the "test" \fBUSE\fR flag in \fBpackage.use.mask\fR (see \fBportage\fR(5)).
 .TP
+.B unknown\-features\-filter
+Filter out any unknown values that the FEATURES variable contains.
+.TP
+.B unknown\-features\-warn
+Warn if FEATURES contains one or more unknown values.
+.TP
 .B unmerge\-backup
 Call \fBquickpkg\fR(1) to create a backup of each package before it is
 unmerged (if a binary package of the same version does not already exist).
@@ -588,12 +594,6 @@ If a file is not claimed by another package in the same slot and it is not
 protected by \fICONFIG_PROTECT\fR, unmerge it even if the modification time or
 checksum differs from the file that was originally installed.
 .TP
-.B unknown\-features\-filter
-Filter out any unknown values that the FEATURES variable contains.
-.TP
-.B unknown\-features\-warn
-Warn if FEATURES contains one or more unknown values.
-.TP
 .B userfetch
 When portage is run as root, drop privileges to portage:portage during the
 fetching of package sources.
@@ -733,14 +733,14 @@ use the URI header field as a base URI for fetching binary packages. If the URI
 header field is not defined then the client will use it's ${PORTAGE_BINHOST}
 setting as the base URI.
 .TP
-.B PORTAGE_BINPKG_TAR_OPTS
-This variable contains options to be passed to the tar command for creation
-of binary packages.
-.TP
 .B PORTAGE_BINPKG_FORMAT
 This variable sets default format used for binary packages. Possible values
 are tar and rpm or both.
 .TP
+.B PORTAGE_BINPKG_TAR_OPTS
+This variable contains options to be passed to the tar command for creation
+of binary packages.
+.TP
 \fBPORTAGE_BUNZIP2_COMMAND\fR = \fI[bunzip2 command string]\fR
 This variable should contain a command that is suitable for portage to call
 for bunzip2 extraction operations.
@@ -772,27 +772,26 @@ PORTAGE_CHECKSUM_FILTER="\-* sha256"
 This variable contains the command used to compress documentation during the
 install phase.
 .TP
-\fBPORTAGE_COMPRESS_FLAGS\fR = \fI"\-9"\fR
-This variable contains flags for the \fBPORTAGE_COMPRESS\fR command.
-.TP
-.TP
 \fBPORTAGE_COMPRESS_EXCLUDE_SUFFIXES\fR = \fI"gif htm[l]? jp[e]?g pdf png"\fR
 This variable contains a space delimited list of file suffixes for which
 matching files are excluded when the \fBPORTAGE_COMPRESS\fR command is
 called. Regular expressions are supported and the match is performed only
 against the portion of the file name which follows the last period character.
 .TP
-.B PORTAGE_ELOG_CLASSES
+\fBPORTAGE_COMPRESS_FLAGS\fR = \fI"\-9"\fR
+This variable contains flags for the \fBPORTAGE_COMPRESS\fR command.
 .TP
-.B PORTAGE_ELOG_SYSTEM
+.B PORTAGE_ELOG_CLASSES
 .TP
 .B PORTAGE_ELOG_COMMAND
 .TP
-.B PORTAGE_ELOG_MAILURI
-.TP
 .B PORTAGE_ELOG_MAILFROM
 .TP
 .B PORTAGE_ELOG_MAILSUBJECT
+.TP
+.B PORTAGE_ELOG_MAILURI
+.TP
+.B PORTAGE_ELOG_SYSTEM
 Please see /usr/share/portage/config/make.conf.example for elog documentation.
 .TP
 \fBPORTAGE_FETCH_CHECKSUM_TRY_MIRRORS\fR = \fI5\fR
@@ -860,17 +859,17 @@ in this list of directories. Search order is from left to right. Note
 that the current implementation works by creating a symlink inside
 \fBDISTDIR\fR, but that may change in the future.
 .TP
+\fBPORTAGE_RSYNC_EXTRA_OPTS\fR = \fI[rsync options string]\fR
+Additional rsync options to be used by \fBemerge \-\-sync\fR.
+.br
+Defaults to no value.
+.TP
 \fBPORTAGE_RSYNC_INITIAL_TIMEOUT\fR = \fIinteger\fR
 Used by \fBemerge \-\-sync\fR as a timeout for the initial connection to an
 rsync server.
 .br
 Defaults to 15 seconds.
 .TP
-\fBPORTAGE_RSYNC_EXTRA_OPTS\fR = \fI[rsync options string]\fR
-Additional rsync options to be used by \fBemerge \-\-sync\fR.
-.br
-Defaults to no value.
-.TP
 \fBPORTAGE_RSYNC_OPTS\fR = \fI[rsync options string]\fR
 Default rsync options to be used by \fBemerge \-\-sync\fR.
 .br
@@ -952,14 +951,6 @@ Defaults to no value.
 Set this to cause portage to ignore any \fIQA_EXECSTACK\fR override
 settings from ebuilds.  See also \fBebuild\fR(5).
 .TP
-\fBQA_STRICT_WX_LOAD = \fI"set"\fR
-Set this to cause portage to ignore any \fIQA_WX_LOAD\fR override
-settings from ebuilds.  See also \fBebuild\fR(5).
-.TP
-\fBQA_STRICT_TEXTRELS = \fI"set"\fR
-Set this to cause portage to ignore any \fIQA_TEXTREL\fR override
-settings from ebuilds.  See also \fBebuild\fR(5).
-.TP
 \fBQA_STRICT_FLAGS_IGNORED = \fI"set"\fR
 Set this to cause portage to ignore any \fIQA_FLAGS_IGNORED\fR override
 settings from ebuilds.  See also \fBebuild\fR(5).
@@ -972,6 +963,14 @@ settings from ebuilds.  See also \fBebuild\fR(5).
 Set this to cause portage to ignore any \fIQA_PRESTRIPPED\fR override
 settings from ebuilds.  See also \fBebuild\fR(5).
 .TP
+\fBQA_STRICT_TEXTRELS = \fI"set"\fR
+Set this to cause portage to ignore any \fIQA_TEXTREL\fR override
+settings from ebuilds.  See also \fBebuild\fR(5).
+.TP
+\fBQA_STRICT_WX_LOAD = \fI"set"\fR
+Set this to cause portage to ignore any \fIQA_WX_LOAD\fR override
+settings from ebuilds.  See also \fBebuild\fR(5).
+.TP
 .B RESUMECOMMAND
 This variable contains the command used for resuming package sources that
 have been partially downloaded.  It should be defined using the same format

[gentoo-commits] proj/portage:master commit in: man/

[Alexander Berntsen]

commit:     b68e09039821286daa7f8cfc8cd353a397fd4ddd
Author:     Alexander Berntsen <alexander <AT> plaimi <DOT> net>
AuthorDate: Thu Mar 13 23:13:35 2014 +0000
Commit:     Alexander Berntsen <bernalex <AT> gentoo <DOT> org>
CommitDate: Thu Mar 13 23:15:07 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=b68e0903

man/make.conf.5: Fix misinformation (bug 504532)

---
 man/make.conf.5 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/man/make.conf.5 b/man/make.conf.5
index 80f642f..2281014 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -392,7 +392,7 @@ 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.
+only on Linux. Requires IPC namespace support in kernel.
 .TP
 .B lmirror
 When \fImirror\fR is enabled in \fBFEATURES\fR, fetch files even

[gentoo-commits] proj/portage:master commit in: man/

[Brian Dolbec]

commit:     dd1038e55fd9d1c7c89a6e54d355c71e6daeaa13
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sun Mar  2 08:45:06 2014 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Sun Mar  2 08:45:06 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=dd1038e5

man/ebuild.1: Add --verbose-slot-rebuilds option.

---
 man/emerge.1 | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/man/emerge.1 b/man/emerge.1
index be22f35..abb0ed8 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -1,4 +1,4 @@
-.TH "EMERGE" "1" "Feb 2014" "Portage VERSION" "Portage"
+.TH "EMERGE" "1" "Mar 2014" "Portage VERSION" "Portage"
 .SH "NAME"
 emerge \- Command\-line interface to the Portage system
 .SH "SYNOPSIS"
@@ -858,6 +858,10 @@ hundreds of packages for slot conflicts.
 .BR "\-\-verbose\-main\-repo\-display"
 In the package merge list display, print ::repository even for main repository.
 .TP
+.BR "\-\-verbose\-slot\-rebuilds [ y | n ]"
+Turns on/off the extra emerge output to list which packages are causing rebuilds.
+The default is set to "y" (on).
+.TP
 .BR "\-\-with\-bdeps < y | n >"
 In dependency calculations, pull in build time dependencies
 that are not strictly required. This defaults to \'n\' for

[gentoo-commits] proj/portage:master commit in: man/

[Mike Frysinger]

commit:     63664a2a4a4a8d6deaad6b41d01caa5c549a350b
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 23 01:07:31 2014 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Thu Jan 23 01:07:36 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=63664a2a

ebuild(5): document usev

---
 man/ebuild.5 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/man/ebuild.5 b/man/ebuild.5
index 32c3ea6..89bd6a2 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -1003,6 +1003,9 @@ fi
 .fi
 .RE
 .TP
+.B usev\fR \fI<USE item>
+Like \fBuse\fR, but also echoes \fIUSE item\fR when \fBuse\fR returns true.
+.TP
 .B usex\fR \fI<USE flag>\fR \fI[true output]\fR \fI[false output]\fR \fI[true \
 suffix]\fR \fI[false suffix]
 If USE flag is set, echo [true output][true suffix] (defaults to

[gentoo-commits] proj/portage:master commit in: man/

[Mike Frysinger]

commit:     669ccb584f4d39b764223ae44cb2d45ac6eb3903
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 22 21:18:23 2014 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Thu Jan 23 01:05:27 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=669ccb58

ebuild(5): document the "has" function

---
 man/ebuild.5 | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index 524006a..32c3ea6 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -1049,15 +1049,17 @@ of \fI\-\-without\-\fR. Beginning with \fBEAPI 4\fR, an empty \fIconfigure
 opt\fR argument is recognized. In \fBEAPI 3\fR and earlier, an empty
 \fIconfigure opt\fR argument is treated as if it weren't provided.
 .TP
-.B hasv\fR \fI<item>\fR \fI<item list>
-If \fIitem\fR is in \fIitem list\fR, then \fIitem\fR is echoed and \fBhasv\fR
-returns 0.  Otherwise, nothing is echoed and 1 is returned. As indicated with
-use, there is a non\-echoing version \fBhas\fR. Please use \fBhas\fR in all
-places where output is to be disregarded. Never use the output for calculation.
+.B has\fR \fI<item>\fR \fI<item list>
+If \fIitem\fR is in \fIitem list\fR, then \fBhas\fR returns
+0. Otherwise, 1 is returned. There is another version, \fBhasv\fR, that
+will conditionally echo \fIitem\fR.
 .br
 The \fIitem list\fR is delimited by the \fIIFS\fR variable.  This variable
 has a default value of ' ', or a space.  It is a \fBbash\fR(1) setting.
 .TP
+.B hasv\fR \fI<item>\fR \fI<item list>
+Like \fBhas\fR, but also echoes \fIitem\fR when \fBhas\fR returns true.
+.TP
 .B has_version\fR \fI[\-\-host\-root]\fR \fI<category/package\-version>
 Check to see if \fIcategory/package\-version\fR is installed on the system.
 The parameter accepts all values that are acceptable in the \fBDEPEND\fR

[gentoo-commits] proj/portage:master commit in: man/

[Arfrever Frehtes Taifersar Arahesis]

commit:     768332d706cc5cb828577743c8b3eb88dd6c0b5d
Author:     Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Wed Jan  8 13:42:23 2014 +0000
Commit:     Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
CommitDate: Wed Jan  8 13:42:23 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=768332d7

Document PORTAGE_REPOSITORIES.

---
 man/portage.5 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/man/portage.5 b/man/portage.5
index ad801ba..0aac569 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -765,6 +765,9 @@ x11\-libs/qt \-mysql
 .TP
 .BR repos.conf
 Specifies \fIsite\-specific\fR repository configuration information.
+.br
+Configuration specified in \fBrepos.conf\fR can be overriden by \fBPORTAGE_REPOSITORIES\fR
+environmental variable, which has the same format as \fBrepos.conf\fR.
 
 .I Format:
 .nf

[gentoo-commits] proj/portage:master commit in: man/

[Mike Frysinger]

commit:     7e7051c0ff05e364f7c2e2488ce0897115f2872c
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  5 22:23:05 2014 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Sun Jan  5 22:23:31 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=7e7051c0

portage(5): layout.conf: clarify profile-formats key

Reported-by: Sebastian Luther <SebastianLuther <AT> gmx.de>

---
 man/portage.5 | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/man/portage.5 b/man/portage.5
index 8f7f6e4..bfe4af8 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -1045,10 +1045,11 @@ The default setting for repoman's --echangelog option.
 The cache formats supported in the metadata tree.  There is the old "pms" format
 and the newer/faster "md5-dict" format.  Default is to detect dirs.
 .TP
-.BR profile\-formats " = [portage-1|" portage-1-compat "|portage-2]"
+.BR profile\-formats " = [pms|portage-1|portage-2]"
 Control functionality available to profiles in this repo such as which files
 may be dirs, or the syntax available in parent files.  Use "portage-2" if you're
-unsure.
+unsure.  The default is "portage-1-compat" mode which is meant to be compatible
+with old profiles, but is not allowed to be opted into directly.
 .RE
 .RE
 

[gentoo-commits] proj/portage:master commit in: man/

[Mike Frysinger]

commit:     77c4a5b31fb5b42e1e4969bf1747cc5e416eca2f
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  5 19:06:01 2014 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Sun Jan  5 19:08:58 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=77c4a5b3

portage(5): layout.conf: add a proper format/attributes section

URL: https://bugs.gentoo.org/395359

---
 man/portage.5 | 83 +++++++++++++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 70 insertions(+), 13 deletions(-)

diff --git a/man/portage.5 b/man/portage.5
index 9a191d0..8f7f6e4 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -980,26 +980,82 @@ Also see \fB/var/lib/portage/world_sets\fR and the \fBemerge\fR(1)
 .RS
 .TP
 .BR layout.conf
-Specifies information about the repository layout. A
-"masters" attribute is supported, which is used to specify names of
-repositories which satisfy dependencies on eclasses and/or ebuilds. Each
+Specifies information about the repository layout.
+\fISite-specific\fR overrides to \fBlayout.conf\fR settings may be specified in
+\fB/etc/portage/repos.conf\fR.
+Settings in \fBrepos.conf\fR take precedence over settings in
+\fBlayout.conf\fR, except tools such as \fBrepoman\fR(1) and \fBegencache\fR(1)
+ignore "aliases", "eclass-overrides" and "masters" attributes set in
+\fBrepos.conf\fR since their operations are inherently \fBnot\fR
+\fIsite\-specific\fR.
+
+.I Format:
+.nf
+\- comments begin with # (no inline comments)
+\- attributes are specified in "${attribute} = ${value}" format
+.fi
+
+.I Supported attributes.
+.RS
+.RS
+.TP
+.BR aliases
+Behaves like an "aliases" attribute in \fBrepos.conf\fR.
+.TP
+.BR eapis\-banned
+List of EAPIs which are not allowed in this repo.
+.TP
+.BR eapis\-deprecated
+List of EAPIs which are allowed but generate warnings when used.
+.TP
+.BR masters
+Names of repositories which satisfy dependencies on eclasses and/or ebuilds. Each
 repository name should correspond the value of a \fBrepo_name\fR entry
 from one of the repositories that is configured via the \fBPORTDIR\fR or
 \fBPORTDIR_OVERLAY\fR variables (see \fBmake.conf\fR(5)). Repositories listed
 toward the right of the \fBmasters\fR list take precedence over those listed
-toward the left of the list. An "aliases" attribute is also supported, which
-behaves like an "aliases" attribute in \fBrepos.conf\fR. \fISite-specific\fR
-overrides to \fBlayout.conf\fR settings may be specified in
-\fB/etc/portage/repos.conf\fR. Settings in \fBrepos.conf\fR take
-precedence over settings in \fBlayout.conf\fR, except tools such as
-\fBrepoman\fR(1) and \fBegencache\fR(1) ignore "aliases", "eclass-overrides"
-and "masters" attributes set in \fBrepos.conf\fR since their operations are
-inherently \fBnot\fR \fIsite\-specific\fR.
+toward the left of the list.
+.TP
+.BR repo\-name " = <value of profiles/repo_name>"
+The name of this repository (overrides profiles/repo_name if it exists).
+.TP
+.BR sign\-commits " = [true|" false "]"
+Boolean value whether we should sign commits in this repo.
+.TP
+.BR sign\-manifests " = [" true "|false]"
+Boolean value whether we should sign Manifest files in this repo.
+.TP
+.BR thin\-manifests " = [true|" false "]"
+Boolean value whether Manifest files contain only DIST entries.
+.TP
+.BR use\-manifests " = [" strict "|true|false]"
+How Manifest files get used.  Possible values are "strict" (require an entry
+for every file), "true" (if an entry exists for a file, enforce it), or "false"
+(don't check Manifest files at all).
+.TP
+.BR manifest\-hashes
+List of hashes to generate/check in Manifest files.  Valid hashes depend on the
+current version of portage; see the portage.const.MANIFEST2_HASH_FUNCTIONS
+constant for the current list.
+.TP
+.BR update\-changelog " = [true|" false "]"
+The default setting for repoman's --echangelog option.
+.TP
+.BR cache\-formats " = [pms] [md5-dict]"
+The cache formats supported in the metadata tree.  There is the old "pms" format
+and the newer/faster "md5-dict" format.  Default is to detect dirs.
+.TP
+.BR profile\-formats " = [portage-1|" portage-1-compat "|portage-2]"
+Control functionality available to profiles in this repo such as which files
+may be dirs, or the syntax available in parent files.  Use "portage-2" if you're
+unsure.
+.RE
+.RE
 
+.RS
 .I Example:
 .nf
-# Specify the repository name (if there is a different setting in
-# profiles/repo_name, then this layout.conf setting will take precedence)
+# Specify the repository name (overriding profils/repo_name).
 repo\-name = foo-overlay
 
 # eclasses provided by java-overlay take precedence over identically named
@@ -1051,6 +1107,7 @@ cache\-formats = md5-dict pms
 profile\-formats = portage-2
 .fi
 .RE
+.RE
 .TP
 .BR /usr/portage/profiles/
 Global Gentoo settings that are controlled by the developers.  To override

[gentoo-commits] proj/portage:master commit in: man/

[Arfrever Frehtes Taifersar Arahesis]

commit:     cea8f3ebe590663b01437d7906af7f5cc05085f9
Author:     Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Tue Dec  3 15:24:53 2013 +0000
Commit:     Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
CommitDate: Tue Dec  3 15:24:53 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=cea8f3eb

Bug #489544: Document empty value of sync-type and sync-uri attributes in repos.conf.

---
 man/portage.5 | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/man/portage.5 b/man/portage.5
index e281247..9a191d0 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -857,13 +857,19 @@ Specifies priority of given repository.
 Specifies CVS repository.
 .TP
 .B sync\-type
-Specifies type of synchronization.
+Specifies type of synchronization performed by `emerge \-\-sync`.
 .br
-Valid values: cvs, git, rsync
+Valid non-empty values: cvs, git, rsync
+.br
+This attribute can be set to empty value to disable synchronization of given
+repository. Empty value is default.
 .TP
 .B sync\-uri
 Specifies URI of repository used for synchronization performed by `emerge
 \-\-sync`.
+.br
+This attribute can be set to empty value to disable synchronization of given
+repository. Empty value is default.
 .RS
 .TP
 Syntax:

[gentoo-commits] proj/portage:master commit in: man/

[Arfrever Frehtes Taifersar Arahesis]

commit:     fec21792407c1281be38a462a872a96ac47810fc
Author:     Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Mon Dec  2 15:13:58 2013 +0000
Commit:     Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
CommitDate: Mon Dec  2 15:13:58 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=fec21792

portage.5: Fix location of note about repos.conf directory.

---
 man/portage.5 | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/man/portage.5 b/man/portage.5
index 8ab6a00..e281247 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -1,4 +1,4 @@
-.TH "PORTAGE" "5" "Aug 2013" "Portage VERSION" "Portage"
+.TH "PORTAGE" "5" "Dec 2013" "Portage VERSION" "Portage"
 .SH NAME
 portage \- the heart of Gentoo
 .SH "DESCRIPTION"
@@ -217,10 +217,9 @@ will be preferred.
 
 Any file in this directory, directories of other profiles or top-level
 "profiles" directory that begins with "package." or "use." can be more than
-just a flat file. \fBrepos.conf\fR also follows this behaviour. If you use one
-of these files as a directory, then all the files in that directory will be
-sorted in ascending alphabetical order by file name and summed together as if
-it were a single file. Note that this behavior is only supported since
+just a flat file.  If it is a directory, then all the files in that directory
+will be sorted in ascending alphabetical order by file name and summed together
+as if it were a single file. Note that this behavior is only supported since
 portage-2.1.6.7, and it is not included in PMS at this time.
 
 .I Example:
@@ -530,10 +529,10 @@ virtual/aspell\-dict   app\-dicts/aspell\-en
 .RE
 .TP
 .BR /etc/portage/
-Any file in this directory that begins with "package." can be more than just a
-flat file.  If it is a directory, then all the files in that directory will be
-sorted in ascending alphabetical order by file name and summed together as if
-it were a single file.
+Any file in this directory that begins with "package." or is repos.conf can be
+more than just a flat file.  If it is a directory, then all the files in that
+directory will be sorted in ascending alphabetical order by file name and summed
+together as if it were a single file.
 
 .I Example:
 .nf

[gentoo-commits] proj/portage:master commit in: man/

[Brian Dolbec]

commit:     affbb1ae1f19f261e21c691a745c965654721c82
Author:     Alexander Berntsen <alexander <AT> plaimi <DOT> net>
AuthorDate: Mon Dec  2 01:17:45 2013 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Mon Dec  2 01:22:22 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=affbb1ae

make.conf.5, Mention sourced files syntax

---
 man/make.conf.5 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/man/make.conf.5 b/man/make.conf.5
index ab9b44e..c271d17 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -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,

[gentoo-commits] proj/portage:master commit in: man/

[Brian Dolbec]

commit:     69132988b8a9a865d3d46f2c8af1e3f5984c1fc9
Author:     Alexander Berntsen <alexander <AT> plaimi <DOT> net>
AuthorDate: Mon Dec  2 01:20:57 2013 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Mon Dec  2 01:22:22 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=69132988

man-portage.5 Further document repos.conf fixes bug #491426

---
 man/portage.5 | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/man/portage.5 b/man/portage.5
index a57eaf0..8ab6a00 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -217,9 +217,10 @@ will be preferred.
 
 Any file in this directory, directories of other profiles or top-level
 "profiles" directory that begins with "package." or "use." can be more than
-just a flat file.  If it is a directory, then all the files in that directory
-will be sorted in ascending alphabetical order by file name and summed together
-as if it were a single file. Note that this behavior is only supported since
+just a flat file. \fBrepos.conf\fR also follows this behaviour. If you use one
+of these files as a directory, then all the files in that directory will be
+sorted in ascending alphabetical order by file name and summed together as if
+it were a single file. Note that this behavior is only supported since
 portage-2.1.6.7, and it is not included in PMS at this time.
 
 .I Example:

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     9b494c7d0135e73c57deeeb819827dbc47732629
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 12 22:40:15 2013 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Aug 12 22:40:15 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=9b494c7d

man/make.conf.5: fix substitution spelling

---
 man/make.conf.5 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/man/make.conf.5 b/man/make.conf.5
index 57d0523..63e2097 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -9,7 +9,7 @@ This file contains various variables that are used by Portage. The file has a
 newline\-delimited list of \fI<key>=<value>\fR pairs (see the default file for
 examples) which are accessible from the environment of ebuilds. It supports
 simple shell\-like expansion of the form \fIvar="${var}"\fR, the source
-keyword and variable substituton, but not some of the more advanced BASH
+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.

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     98a67ebe3ce32d7217e1f02b5331959a6d336e5c
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 12 22:21:48 2013 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Aug 12 22:21:48 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=98a67ebe

man/make.conf.5: fix documentation spelling

---
 man/make.conf.5 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/man/make.conf.5 b/man/make.conf.5
index acab65c..57d0523 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -11,7 +11,7 @@ examples) which are accessible from the environment of ebuilds. It supports
 simple shell\-like expansion of the form \fIvar="${var}"\fR, the source
 keyword and variable substituton, but not some of the more advanced BASH
 features like arrays and special parameter expansions. For more details, see
-the Simple lexical analysis documentanion:
+the Simple lexical analysis documentation:
 \fLhttp://docs.python.org/3/library/shlex.html\fR.
 .br
 Portage will check the currently\-defined environment variables

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     698c9301fa33908cd6b9bf1c0a3ce6adcdd597f3
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 12 22:19:56 2013 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Aug 12 22:19:56 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=698c9301

man/portage.5: fix environment spelling

---
 man/make.conf.5 | 2 +-
 man/portage.5   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/man/make.conf.5 b/man/make.conf.5
index 6c4710a..acab65c 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -6,7 +6,7 @@ make.conf \- custom settings for Portage
 .SH "DESCRIPTION"
 
 This file contains various variables that are used by Portage. The file has a
-newline-delimited list of \fI<key>=<value>\fR pairs (see the default file for
+newline\-delimited list of \fI<key>=<value>\fR pairs (see the default file for
 examples) which are accessible from the environment of ebuilds. It supports
 simple shell\-like expansion of the form \fIvar="${var}"\fR, the source
 keyword and variable substituton, but not some of the more advanced BASH

diff --git a/man/portage.5 b/man/portage.5
index dbc14bf..a57eaf0 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -1,4 +1,4 @@
-.TH "PORTAGE" "5" "Jul 2013" "Portage VERSION" "Portage"
+.TH "PORTAGE" "5" "Aug 2013" "Portage VERSION" "Portage"
 .SH NAME
 portage \- the heart of Gentoo
 .SH "DESCRIPTION"
@@ -941,7 +941,7 @@ bashrc approach that is described here. Also note that special variables
 such as \fBFEATURES\fR and \fBINSTALL_MASK\fR will not produce the intended
 results if they are set in bashrc, and therefore
 \fB/etc/portage/package.env\fR should be used instead. Lastly, note that these
-files are interpreted much later than the portage enviroment file
+files are interpreted much later than the portage environment file
 \fBpackage.env\fR.
 
 Portage will source all of these bashrc files after \fB/etc/portage/bashrc\fR

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     a07a9571a63f36ebbc08701d36d650c6a1ef25bf
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 12 22:14:10 2013 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Aug 12 22:14:10 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=a07a9571

man/portage.5: clarify package.env more

---
 man/portage.5 | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/man/portage.5 b/man/portage.5
index a6b0ca7..dbc14bf 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -680,8 +680,11 @@ single package.
 Per\-package environment variable settings. Entries refer to
 environment files that are placed in the \fB/etc/portage/env/\fR
 directory and have the same format as \fBmake.conf\fR(5). Note that these
-files are interpreted much earlier than the package specific bashrc files in
-\fB/etc/portage/env/\fR.
+files are interpreted much earlier than the package\-specific \fIbashrc\fR
+files which are described in a later section about \fB/etc/portage/env/\fR.
+Beginners should be careful to recognize the difference between these two types
+of files. When environment variable settings are all that's needed,
+\fBpackage.env\fR is the recommended approach to use.
 
 .I Format:
 .nf

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     b4a51b2d36676c692bbb5acfd485a849eacb3c10
Author:     Alexander Berntsen <alexander <AT> plaimi <DOT> net>
AuthorDate: Sun Aug 11 23:04:06 2013 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Aug 12 02:31:56 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=b4a51b2d

man/portage.5: Add notes about order, bug #388781

---
 man/portage.5 | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/man/portage.5 b/man/portage.5
index 38c6d8c..a6b0ca7 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -679,7 +679,9 @@ single package.
 .BR package.env
 Per\-package environment variable settings. Entries refer to
 environment files that are placed in the \fB/etc/portage/env/\fR
-directory and have the same format as \fBmake.conf\fR(5).
+directory and have the same format as \fBmake.conf\fR(5). Note that these
+files are interpreted much earlier than the package specific bashrc files in
+\fB/etc/portage/env/\fR.
 
 .I Format:
 .nf
@@ -935,7 +937,9 @@ needed, then \fB/etc/portage/package.env\fR should be used instead of the
 bashrc approach that is described here. Also note that special variables
 such as \fBFEATURES\fR and \fBINSTALL_MASK\fR will not produce the intended
 results if they are set in bashrc, and therefore
-\fB/etc/portage/package.env\fR should be used instead.
+\fB/etc/portage/package.env\fR should be used instead. Lastly, note that these
+files are interpreted much later than the portage enviroment file
+\fBpackage.env\fR.
 
 Portage will source all of these bashrc files after \fB/etc/portage/bashrc\fR
 in the following order:

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     ff54f5db6658c0bfecc7fe365d383c5879f20221
Author:     Alexander Berntsen <alexander <AT> plaimi <DOT> net>
AuthorDate: Sun Aug 11 21:32:42 2013 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Aug 11 22:27:33 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=ff54f5db

man/make.conf.5: Document shlex a bit, bug 309941

---
 man/make.conf.5 | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/man/make.conf.5 b/man/make.conf.5
index 236fdf0..f83dd03 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -4,7 +4,16 @@ make.conf \- custom settings for Portage
 .SH "SYNOPSIS"
 \fB/etc/make.conf\fR and \fB/etc/portage/make.conf\fR
 .SH "DESCRIPTION"
-This file contains various variables that are used by Portage.
+
+This file contains various variables that are used by Portage. The file has a
+newline-delimited list of \fI<key>=<value>\fR pairs (see the default file for
+examples) which are accessible from the environment of ebuilds. It supports
+simple shell\-like expansion of the form \fIvar="${var}"\fR, the source
+keyword and variable substituton, but not some of the more advanced BASH
+features like arrays and special parameter expansions. For more details, see
+the Simple lexical analysis documentanion:
+\fLhttp://docs.python.org/3/library/shlex.html\fR.
+.br
 Portage will check the currently\-defined environment variables
 first for any settings.  If no environment settings are found,
 Portage then checks the make.conf files. Both /etc/make.conf and

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     bf892931fa344f89d51d038296ca7e374ce3b30f
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Thu Aug  8 17:11:33 2013 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Thu Aug  8 17:11:33 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=bf892931

man/emerge.1: fix ._cfg???? command, bug #480192

---
 man/emerge.1 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/man/emerge.1 b/man/emerge.1
index 55e21a9..bbcd84b 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -1,4 +1,4 @@
-.TH "EMERGE" "1" "Jul 2013" "Portage VERSION" "Portage"
+.TH "EMERGE" "1" "Aug 2013" "Portage VERSION" "Portage"
 .SH "NAME"
 emerge \- Command\-line interface to the Portage system
 .SH "SYNOPSIS"
@@ -1110,8 +1110,8 @@ deleted, which is of paramount importance.
 Protected directories are set using the \fICONFIG_PROTECT\fR variable, normally
 defined in make.globals. Directory exceptions to the CONFIG_PROTECTed
 directories can be specified using the \fICONFIG_PROTECT_MASK\fR variable.
-To find files that need to be updated in /etc, type \fBfind /etc \-iname \'.
-cfg????_*\'\fR.
+To find files that need to be updated in /etc, type \fBfind /etc \-name
+\[aq]._cfg????_*\[aq]\fR.
 .LP
 You can disable this feature by setting \fICONFIG_PROTECT="\-*"\fR in
 \fBmake.conf\fR(5).

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     ffb0d6da81d1731ba165a16f702bf2465840497e
Author:     Alexander Berntsen <alexander <AT> plaimi <DOT> net>
AuthorDate: Wed Jul 31 15:25:14 2013 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Wed Jul 31 21:58:54 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=ffb0d6da

Fix imprecise paragraph, bug #339446

---
 man/ebuild.1 | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/man/ebuild.1 b/man/ebuild.1
index 4bde66e..29f88b0 100644
--- a/man/ebuild.1
+++ b/man/ebuild.1
@@ -19,11 +19,15 @@ This must be a valid ebuild script.  For further information read
 \fBebuild\fR(5).
 .SH "COMMANDS"
 By default, portage will execute all the functions in order up to the
-one actually specified.  For example, simply issuing the command \fBcompile\fR
-will trigger the functions before it to also be run (such as \fBsetup\fR
-and \fBunpack\fR).  If you wish to only have the specified command run, then
-you should use the \fInoauto\fR option in the \fBFEATURES\fR environment
-variable.  See the \fBmake.conf\fR(5) man page for more information.
+one actually specified, except for the functions that have already been
+executed in a previous invocation of ebuild.  For example, simply issuing the
+command \fBcompile\fR will trigger the functions before it to also be run (such
+as \fBsetup\fR and \fBunpack\fR), unless they were run in a previous invocation
+of ebuild.  If you want to make sure they are all run, you need to use
+the command \fBclean\fR first.  If you wish to only have the specified command
+run, then you should use the \fInoauto\fR option in the \fBFEATURES\fR
+environment variable.  See the \fBmake.conf\fR(5) man page for more
+information.
 
 .TP
 .BR help

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     2f98ae5fbe93ac03b09ba2d88827e3fe42e25fdc
Author:     Alexander Berntsen <alexander <AT> plaimi <DOT> net>
AuthorDate: Tue Jul 30 21:39:31 2013 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Tue Jul 30 23:09:09 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=2f98ae5f

man/emerge.1: Mention log files, fixes bug #462802

---
 man/emerge.1 | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/man/emerge.1 b/man/emerge.1
index 06a4e3d..55e21a9 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -1198,6 +1198,17 @@ and \fBworld\fR sets consult this file.  \fBDo not edit this file\fR.
 .B /usr/share/portage/config/make.globals
 Contains the default variables for the build process.  \fBDo not edit
 this file\fR.
+.TP
+.B /var/log/emerge.log
+Contains a log of all emerge output. This file is always appended to, so if you
+want to clean it, you need to do so manually.
+.TP
+.B /var/log/emerge-fetch.log
+Contains a log of all the fetches in the previous emerge invocation.
+.TP
+.B
+/var/log/portage/elog/summary.log
+Contains the emerge summaries. Installs \fI/etc/logrotate/elog-save-summary\fR.
 .SH "SEE ALSO"
 .BR "emerge \-\-help",
 .BR quickpkg (1),

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     76c02f707ac06913474a9d2b850b104ce8cad4e1
Author:     Alexander Berntsen <alexander <AT> plaimi <DOT> net>
AuthorDate: Tue Jul 30 21:02:29 2013 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Tue Jul 30 22:48:09 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=76c02f70

man/emerge.1: Fix bug #405783 by elaborating -n

---
 man/emerge.1 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/man/emerge.1 b/man/emerge.1
index 38e38e3..06a4e3d 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -590,7 +590,8 @@ Skips the packages specified on the command\-line that have already
 been installed.  Without this option, any package atoms or package sets
 you specify on the command\-line \fBwill\fR cause Portage to remerge
 the package, even if it is already installed.  Note that Portage will
-not remerge dependencies by default.
+not remerge dependencies by default. This option can be used to update the
+world file without rebuilding the packages.
 .TP
 .BR "\-\-nospinner"
 Disables the spinner for the session.  The spinner is active when the

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     27286032d253d95a0860838e89bb2313ccf2ab6b
Author:     Alexander Berntsen <alexander <AT> plaimi <DOT> net>
AuthorDate: Tue Jul 30 19:26:42 2013 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Tue Jul 30 22:44:21 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=27286032

man/emerge.1: Mention slots for bug #424930

---
 man/emerge.1 | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/man/emerge.1 b/man/emerge.1
index 4511414..38e38e3 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -86,7 +86,9 @@ Python greater than or equal to 2.2.1\-r2.  Similarly,
 \fB<dev\-lang/python\-2.0\fR matches the latest available version of Python
 before 2.0.  Note that in many shells you will need to escape characters such
 as '<' and '='; use single\- or double\-quotes around the \fIatom\fR
-to get around escaping problems.
+to get around escaping problems. You may also constrain an atom to match a
+specific \fBSLOT\fR by appending a colon and a \fBSLOT\fR. Example:
+\fBx11\-libs/qt:3\fR.
 .SH "ACTIONS"
 .TP
 .BR "No action"

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     cb078394988d60e5ff231712163255abebc2fc22
Author:     Alexander Berntsen <alexander <AT> plaimi <DOT> net>
AuthorDate: Tue Jul 30 18:53:51 2013 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Tue Jul 30 19:10:27 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=cb078394

man: Remove trailing spaces

---
 man/dispatch-conf.1 |   2 +-
 man/ebuild.1        |   4 +-
 man/ebuild.5        |   8 +--
 man/emaint.1        |   2 +-
 man/emerge.1        | 154 ++++++++++++++++++++++++++--------------------------
 man/env-update.1    |   6 +-
 man/etc-update.1    |   2 +-
 man/make.conf.5     |  64 +++++++++++-----------
 man/portage.5       | 152 +++++++++++++++++++++++++--------------------------
 man/quickpkg.1      |  14 ++---
 man/xpak.5          |   2 +-
 11 files changed, 205 insertions(+), 205 deletions(-)

diff --git a/man/dispatch-conf.1 b/man/dispatch-conf.1
index e16d49c..3a5264a 100644
--- a/man/dispatch-conf.1
+++ b/man/dispatch-conf.1
@@ -24,7 +24,7 @@ None.
 \fIdispatch\-conf\fR must be run as root, since the config files to be
 replaced are generally owned by root.  Before running \fIdispatch\-conf\fR
 for the first time the settings in \fB/etc/dispatch\-conf.conf\fR
-should be edited and the archive directory specified in 
+should be edited and the archive directory specified in
 \fB/etc/dispatch\-conf.conf\fR will need to be created.  All changes to
 config files will be saved in the archive directory either as patches
 or using rcs, making restoration to an earlier version rather simple.

diff --git a/man/ebuild.1 b/man/ebuild.1
index bc9d31b..4bde66e 100644
--- a/man/ebuild.1
+++ b/man/ebuild.1
@@ -74,7 +74,7 @@ for all of the files listed in SRC_URI for each ebuild. For further
 information regarding the behavior of this command, see the documentation for
 the \fIassume\-digests\fR value of the \fBFEATURES\fR variable in
 \fBmake.conf\fR(5). See the \fB\-\-force\fR option if you would like to
-prevent digests from being assumed. 
+prevent digests from being assumed.
 .TP
 .BR unpack
 Extracts the sources to a subdirectory in the \fIbuild directory\fR
@@ -112,7 +112,7 @@ current working directory will be set to ${S}.  When src_compile()
 completes, the sources should be fully compiled.
 .TP
 .BR test
-Runs package-specific test cases to verify that everything was built 
+Runs package-specific test cases to verify that everything was built
 properly.
 .TP
 .BR preinst

diff --git a/man/ebuild.5 b/man/ebuild.5
index 10ef4ee..a9f3498 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -28,7 +28,7 @@ Examples:
 .TP
 .B Atom Versions
 It is nice to be more specific and say that only certain versions of atoms are
-acceptable.  Note that versions must be combined with a prefix (see below).  
+acceptable.  Note that versions must be combined with a prefix (see below).
 Hence you may add a version number as a postfix to the base.
 
 Examples:
@@ -41,9 +41,9 @@ Examples:
 Versions are normally made up of two or three numbers separated by periods,
 such as 1.2 or 4.5.2.  This string may be followed by a character such as 1.2a
 or 4.5.2z.  Note that this letter is \fInot\fR meant to indicate alpha, beta,
-etc... status.  For that, use the optional suffix; either _alpha, _beta, _pre 
-(pre\-release), _rc (release candidate), or _p (patch).  This means for the 
-3rd pre\-release of a package, you would use something like 1.2_pre3.  The 
+etc... status.  For that, use the optional suffix; either _alpha, _beta, _pre
+(pre\-release), _rc (release candidate), or _p (patch).  This means for the
+3rd pre\-release of a package, you would use something like 1.2_pre3.  The
 suffixes here can be arbitrarily chained without limitation.
 .TP
 .B Atom Prefix Operators [> >= = <= <]

diff --git a/man/emaint.1 b/man/emaint.1
index 3fae5c2..8356299 100644
--- a/man/emaint.1
+++ b/man/emaint.1
@@ -39,7 +39,7 @@ Perform package move updates for installed packages.
 .TP
 .BR world
 Fix problems in the \fIworld\fR file.
-.SH DEFAULT OPTIONS 
+.SH DEFAULT OPTIONS
 .TP
 .B \-c, \-\-check
 Check for any problems that may exist.  (all commands)

diff --git a/man/emerge.1 b/man/emerge.1
index 66f4360..4511414 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -49,7 +49,7 @@ so this syntax shouldn't be used.
 .TP
 .BR tbz2file
 A \fItbz2file\fR must be a valid .tbz2 created with \fBebuild
-<package>\-<version>.ebuild package\fR or \fBemerge \-\-buildpkg 
+<package>\-<version>.ebuild package\fR or \fBemerge \-\-buildpkg
 [category/]<package>\fR or \fBquickpkg /var/db/pkg/<category>/<package>\fR.
 .TP
 .BR file
@@ -73,19 +73,19 @@ on the current configuration. The default set configuration is located
 in the \fB/usr/share/portage/config/sets\fR directory.
 User sets may be created by placing files in the \fB/etc/portage/sets/\fR
 directory (see \fBportage\fR(5)). Note that a \fIset\fR
-is generally used in conjunction with \fB\-\-update\fR. When used as 
+is generally used in conjunction with \fB\-\-update\fR. When used as
 arguments to \fBemerge\fR sets have to be prefixed with \fB@\fR to be
 recognized. Use the \fB\-\-list\-sets\fR action to display a list of
 available package sets.
 .TP
 .BR atom
-An \fIatom\fR describes bounds on a package that you wish to install.  
+An \fIatom\fR describes bounds on a package that you wish to install.
 \fISee ebuild(5) for the details on atom syntax.\fR  For example,
-\fB>=dev\-lang/python\-2.2.1\-r2\fR matches the latest available version of 
-Python greater than or equal to 2.2.1\-r2.  Similarly, 
-\fB<dev\-lang/python\-2.0\fR matches the latest available version of Python 
-before 2.0.  Note that in many shells you will need to escape characters such 
-as '<' and '='; use single\- or double\-quotes around the \fIatom\fR 
+\fB>=dev\-lang/python\-2.2.1\-r2\fR matches the latest available version of
+Python greater than or equal to 2.2.1\-r2.  Similarly,
+\fB<dev\-lang/python\-2.0\fR matches the latest available version of Python
+before 2.0.  Note that in many shells you will need to escape characters such
+as '<' and '='; use single\- or double\-quotes around the \fIatom\fR
 to get around escaping problems.
 .SH "ACTIONS"
 .TP
@@ -113,8 +113,8 @@ remove unslotted packages. Note: Most recently installed means most
 \fBrecent\fR, not highest version.
 .TP
 .BR "\-\-config "
-Run package specific actions needed to be executed after the emerge process 
-has completed.  This usually entails configuration file setup or other similar 
+Run package specific actions needed to be executed after the emerge process
+has completed.  This usually entails configuration file setup or other similar
 setups that the user may wish to run.
 .TP
 .BR "\-\-depclean (-c)"
@@ -164,9 +164,9 @@ updated more frequently than this man page; check it out if you
 are having problems that this man page does not help resolve.
 .TP
 .BR \-\-info
-Produces a list of information to include in bug reports which aids the 
-developers when fixing the reported problem.  \fBPlease include this 
-information when submitting a bug report.\fR  Expanded output can be obtained 
+Produces a list of information to include in bug reports which aids the
+developers when fixing the reported problem.  \fBPlease include this
+information when submitting a bug report.\fR  Expanded output can be obtained
 with the \fI\-\-verbose\fR option.
 .TP
 .BR \-\-list\-sets
@@ -191,14 +191,14 @@ the emerge output of the next \-\-depclean run carefully! Use
 \-\-depclean to avoid this issue.\fR
 .TP
 .BR \-\-regen
-Causes portage to check and update the dependency cache of all ebuilds in the 
-portage tree.  The cache is used to speed up searches and the building of 
-dependency trees.  This command is not recommended for rsync users as rsync 
-updates the cache using server\-side caches.  If you do not know the 
-differences between a 'rsync user' and some other user, then you are a 'rsync 
-user' :).  Rsync users should simply run \fBemerge \-\-sync\fR to regenerate 
-the cache.  After a portage update, rsync users may find it convenient to run 
-\fBemerge \-\-metadata\fR to rebuild the cache as portage does at the end of 
+Causes portage to check and update the dependency cache of all ebuilds in the
+portage tree.  The cache is used to speed up searches and the building of
+dependency trees.  This command is not recommended for rsync users as rsync
+updates the cache using server\-side caches.  If you do not know the
+differences between a 'rsync user' and some other user, then you are a 'rsync
+user' :).  Rsync users should simply run \fBemerge \-\-sync\fR to regenerate
+the cache.  After a portage update, rsync users may find it convenient to run
+\fBemerge \-\-metadata\fR to rebuild the cache as portage does at the end of
 a sync operation. In order to specify parallel \fB\-\-regen\fR behavior, use
 the \fB\-\-jobs\fR and \fB\-\-load\-average\fR options. If you would like to
 generate and distribute cache for use by others, use \fBegencache\fR(1).
@@ -222,14 +222,14 @@ explicitly discarded by running `emaint \-\-fix cleanresume` (see
 .TP
 .BR "\-\-search " (\fB\-s\fR)
 Searches for matches of the supplied string in the portage tree.
-By default emerge uses a case-insensitive simple search, but you can 
+By default emerge uses a case-insensitive simple search, but you can
 enable a regular expression search by prefixing the search string with %.
-For example, \fBemerge \-\-search "%^kde"\fR searches for any package whose 
-name starts with "kde"; \fBemerge \-\-search "%gcc$"\fR searches for any 
-package that ends with "gcc"; \fBemerge \-\-search "office"\fR searches for 
-any package that contains the word "office".  If you want to include the 
-category into the search string, prepend an @: \fBemerge \-\-search 
-"%@^dev-java.*jdk"\fR. If you want to search the package descriptions as well, 
+For example, \fBemerge \-\-search "%^kde"\fR searches for any package whose
+name starts with "kde"; \fBemerge \-\-search "%gcc$"\fR searches for any
+package that ends with "gcc"; \fBemerge \-\-search "office"\fR searches for
+any package that contains the word "office".  If you want to include the
+category into the search string, prepend an @: \fBemerge \-\-search
+"%@^dev-java.*jdk"\fR. If you want to search the package descriptions as well,
 use the \fB\-\-searchdesc\fR action.
 .TP
 .BR "\-\-searchdesc " (\fB\-S\fR)
@@ -379,7 +379,7 @@ possible ways to enable building of binary packages.
 .TP
 .BR "\-\-buildpkgonly " (\fB\-B\fR)
 Creates binary packages for all ebuilds processed without actually
-merging the packages.  This comes with the caveat that all build-time 
+merging the packages.  This comes with the caveat that all build-time
 dependencies must already be emerged on the system.
 .TP
 .BR "\-\-changed\-use"
@@ -403,7 +403,7 @@ Enable or disable color output.  This option will override \fINOCOLOR\fR
 is not a tty (by default, color is disabled unless stdout is a tty).
 .TP
 .BR "\-\-columns"
-Used alongside \fB\-\-pretend\fR to cause the package name, new version, 
+Used alongside \fB\-\-pretend\fR to cause the package name, new version,
 and old version to be displayed in an aligned format for easy cut\-n\-paste.
 .TP
 .BR "\-\-complete\-graph [ y | n ]"
@@ -432,7 +432,7 @@ Set the \fBPORTAGE_CONFIGROOT\fR environment variable.
 .TP
 .BR "\-\-debug " (\fB\-d\fR)
 Tells emerge to run the emerge command in \fB\-\-debug\fR mode.  In this
-mode the bash build environment will run with the \-x option, causing 
+mode the bash build environment will run with the \-x option, causing
 it to output verbose debugging information to stdout.  This also enables
 a plethora of other output (mostly dependency resolution messages).
 .TP
@@ -500,10 +500,10 @@ Instead of doing any package building, just perform fetches for all
 packages (fetch everything in SRC_URI regardless of USE setting).
 .TP
 .BR "\-\-getbinpkg [ y | n ] (\-g short option)"
-Using the server and location defined in \fIPORTAGE_BINHOST\fR (see 
-\fBmake.conf\fR(5)), portage will download the information from each binary 
-package found and it will use that information to help build the dependency 
-list.  This option implies \fB\-k\fR.  (Use \fB\-gK\fR for binary\-only 
+Using the server and location defined in \fIPORTAGE_BINHOST\fR (see
+\fBmake.conf\fR(5)), portage will download the information from each binary
+package found and it will use that information to help build the dependency
+list.  This option implies \fB\-k\fR.  (Use \fB\-gK\fR for binary\-only
 merging.)
 .TP
 .BR "\-\-getbinpkgonly [ y | n ] (\-G short option)"
@@ -648,7 +648,7 @@ the printout:
 .TS
 lI l.
 N	new (not yet installed)
-S	new SLOT installation (side-by-side versions) 
+S	new SLOT installation (side-by-side versions)
 U	updating (to another version)
 D	downgrading (best version seems lower)
 r	reinstall (forced for some reason, possibly due to slot or sub\-slot)
@@ -778,7 +778,7 @@ Use \fB\-\-selective=n\fR if you want to forcefully disable
 \fB\-\-newuse\fR, \fB\-\-noreplace\fR, or \fB\-\-update\fR.
 .TP
 .BR "\-\-skipfirst"
-This option is only valid when used with \fB\-\-resume\fR.  It removes the 
+This option is only valid when used with \fB\-\-resume\fR.  It removes the
 first package in the resume list. Dependencies are recalculated for
 remaining packages and any that have unsatisfied dependencies or are
 masked will be automatically dropped. Also see the related
@@ -786,7 +786,7 @@ masked will be automatically dropped. Also see the related
 .TP
 .BR "\-\-tree " (\fB\-t\fR)
 Shows the dependency tree for the given target by indenting dependencies.
-This is only really useful in combination with \fB\-\-emptytree\fR or 
+This is only really useful in combination with \fB\-\-emptytree\fR or
 \fB\-\-update\fR and \fB\-\-deep\fR.
 .TP
 .BR "\-\-unordered\-display"
@@ -812,21 +812,21 @@ A space separated list of package names or slot atoms. Emerge will prefer
 matching binary packages over newer unbuilt packages.
 .TP
 .BR "\-\-usepkg [ y | n ] (\-k short option)"
-Tells emerge to use binary packages (from $PKGDIR) if they are available, thus 
-possibly avoiding some time\-consuming compiles.  This option is useful for CD 
-installs; you can export PKGDIR=/mnt/cdrom/packages and then use this option to 
+Tells emerge to use binary packages (from $PKGDIR) if they are available, thus
+possibly avoiding some time\-consuming compiles.  This option is useful for CD
+installs; you can export PKGDIR=/mnt/cdrom/packages and then use this option to
 have emerge "pull" binary packages from the CD in order to satisfy
 dependencies.
 .TP
 .BR "\-\-usepkgonly [ y | n ] (\-K short option)"
-Tells emerge to only use binary packages (from $PKGDIR).  All the binary 
-packages must be available at the time of dependency calculation or emerge 
-will simply abort.  Portage does not use $PORTDIR when calculating dependency 
+Tells emerge to only use binary packages (from $PKGDIR).  All the binary
+packages must be available at the time of dependency calculation or emerge
+will simply abort.  Portage does not use $PORTDIR when calculating dependency
 information so all masking information is ignored.
 .TP
 .BR "\-\-verbose [ y | n ] (\-v short option)"
-Tell emerge to run in verbose mode.  Currently this flag causes emerge to print 
-out GNU info errors, if any, and to show the USE flags that will be used for 
+Tell emerge to run in verbose mode.  Currently this flag causes emerge to print
+out GNU info errors, if any, and to show the USE flags that will be used for
 each package when pretending. The following symbols are affixed to USE flags
 in order to indicate their status:
 
@@ -871,14 +871,14 @@ option or in \fBmake.conf\fR(5) (the command line overrides other settings).
 Defaults to /.
 .TP
 \fBPORTAGE_CONFIGROOT\fR = \fI[path]\fR
-Use \fBPORTAGE_CONFIGROOT\fR to specify the location for various portage 
+Use \fBPORTAGE_CONFIGROOT\fR to specify the location for various portage
 configuration files
 (see \fBFILES\fR for a detailed list of configuration files).  This variable
 can be set via the \fB\-\-config\-root\fR option.
 .br
 Defaults to /.
 .SH "OUTPUT"
-When utilizing \fBemerge\fR with the \fB\-\-pretend\fR and \fB\-\-verbose\fR 
+When utilizing \fBemerge\fR with the \fB\-\-pretend\fR and \fB\-\-verbose\fR
 flags, the output may be a little hard to understand at first.  This section
 explains the abbreviations.
 .TP
@@ -893,34 +893,34 @@ simultaneously emerged because they usually provide the same functionality.
 Qstat is New to your system, and will be emerged for the first time.
 .TP
 .B [ebuild  NS   ] dev-libs/glib-2.4.7
-You already have a version of glib installed, but a 'new' version in 
+You already have a version of glib installed, but a 'new' version in
 a different SLOT is available.
 .TP
 .B [ebuild   R   ] sys\-apps/sed\-4.0.5
-Sed 4.0.5 has already been emerged, but if you run the command, then 
+Sed 4.0.5 has already been emerged, but if you run the command, then
 portage will Re\-emerge the specified package (sed in this case).
 .TP
 .B [ebuild    F  ] media\-video/realplayer\-8\-r6
-The realplayer package requires that you Fetch the sources manually.  
-When you attempt to emerge the package, if the sources are not found, 
-then portage will halt and you will be provided with instructions on how 
+The realplayer package requires that you Fetch the sources manually.
+When you attempt to emerge the package, if the sources are not found,
+then portage will halt and you will be provided with instructions on how
 to download the required files.
 .TP
 .B [ebuild    f  ] media\-video/realplayer\-8\-r6
 The realplayer package's files are already downloaded.
 .TP
 .B [ebuild     U ] net\-fs/samba\-2.2.8_pre1 [2.2.7a]
-Samba 2.2.7a has already been emerged and can be Updated to version 
+Samba 2.2.7a has already been emerged and can be Updated to version
 2.2.8_pre1.
 .TP
 .B [ebuild     UD] media\-libs/libgd\-1.8.4 [2.0.11]
-Libgd 2.0.11 is already emerged, but if you run the command, then 
+Libgd 2.0.11 is already emerged, but if you run the command, then
 portage will Downgrade to version 1.8.4 for you.
-.br 
+.br
 This may occur if a newer version of a package has been masked because it is
 broken or it creates a security risk on your system and a fix has not been
 released yet.
-.br 
+.br
 Another reason this may occur is if a package you are trying to emerge requires
 an older version of a package in order to emerge successfully.  In this case,
 libgd 2.x is incompatible with libgd 1.x.  This means that packages that were
@@ -981,14 +981,14 @@ globally via \fBACCEPT_KEYWORDS\fR.
 
 
 .SH "NOTES"
-You should almost always precede any package install or update attempt with a 
-\fB\-\-pretend\fR install or update.  This lets you see how much will be 
-done, and shows you any blocking packages that you will have to rectify.  
-This goes doubly so for the \fBsystem\fR and \fBworld\fR sets, which can 
-update a large number of packages if the portage tree has been particularly 
+You should almost always precede any package install or update attempt with a
+\fB\-\-pretend\fR install or update.  This lets you see how much will be
+done, and shows you any blocking packages that you will have to rectify.
+This goes doubly so for the \fBsystem\fR and \fBworld\fR sets, which can
+update a large number of packages if the portage tree has been particularly
 active.
 .LP
-You also want to typically use \fB\-\-update\fR, which ignores packages that 
+You also want to typically use \fB\-\-update\fR, which ignores packages that
 are already fully updated but updates those that are not.
 .LP
 When you install a package with uninstalled dependencies and do
@@ -1003,7 +1003,7 @@ avoid using some dependencies you may not want to have.  \fBUSE
 flags specified on the command line are NOT remembered\fR.  For
 example, \fBenv USE="\-X \-gnome" emerge mc\fR will emerge mc with
 those USE settings (on Bourne-compatible shells you may omit the \fBenv\fR
-part).  If you want those USE settings to be more 
+part).  If you want those USE settings to be more
 permanent, you can put them in /etc/portage/package.use instead.
 .LP
 If \fBemerge \-\-update @system\fR or \fBemerge \-\-update @world\fR
@@ -1021,7 +1021,7 @@ Masks in \fBportage\fR have many uses: they allow a
 testing period where the packages can be used in live machines; they
 prevent the use of a package when it will fail; and they mask existing
 packages that are broken or could pose a security risk.  Read below
-to find out how to unmask in various cases.  Also note that if you give 
+to find out how to unmask in various cases.  Also note that if you give
 \fBemerge\fR an ebuild, then all forms of masking will be ignored and
 \fBemerge\fR will attempt to emerge the package.
 .TP
@@ -1047,15 +1047,15 @@ that are not supported by the current version of portage. Packages masked by
 \fBEAPI\fR can only be installed after portage has been upgraded.
 .TP
 .BR KEYWORDS
-The \fBKEYWORDS\fR variable in an \fBebuild\fR file is also used for masking 
-a package still in testing.  There are architecture\-specific keywords for 
-each package that let \fBportage\fR know which systems are compatible with 
-the package.  Packages which compile on an architecture, but have not been 
-proven to be "stable", are masked with a tilde (\fB~\fR) in front of the 
-architecture name.  \fBemerge\fR examines the \fBACCEPT_KEYWORDS\fR environment 
-variable to allow or disallow the emerging of a package masked by 
-\fBKEYWORDS\fR.  To inform \fBemerge\fR that it should build these 'testing' 
-versions of packages, you should update your 
+The \fBKEYWORDS\fR variable in an \fBebuild\fR file is also used for masking
+a package still in testing.  There are architecture\-specific keywords for
+each package that let \fBportage\fR know which systems are compatible with
+the package.  Packages which compile on an architecture, but have not been
+proven to be "stable", are masked with a tilde (\fB~\fR) in front of the
+architecture name.  \fBemerge\fR examines the \fBACCEPT_KEYWORDS\fR environment
+variable to allow or disallow the emerging of a package masked by
+\fBKEYWORDS\fR.  To inform \fBemerge\fR that it should build these 'testing'
+versions of packages, you should update your
 \fI/etc/portage/package.accept_keywords\fR
 file to list the packages you want the
 \'testing\' version.  See \fBportage\fR(5) for more information.
@@ -1146,7 +1146,7 @@ Zac Medico <zmedico@gentoo.org>
 Arfrever Frehtes Taifersar Arahesis <arfrever@apache.org>
 .fi
 .SH "FILES"
-Here is a common list of files you will probably be interested in.  For a 
+Here is a common list of files you will probably be interested in.  For a
 complete listing, please refer to the \fBportage\fR(5) man page.
 .TP
 .B /usr/share/portage/config/sets/
@@ -1173,7 +1173,7 @@ Contains variables customizing colors.
 Contains user package set definitions (see \fBportage\fR(5)).
 .TP
 .B /etc/dispatch\-conf.conf
-Contains settings to handle automatic updates/backups of configuration 
+Contains settings to handle automatic updates/backups of configuration
 files.
 .TP
 .B /etc/portage/make.profile/make.defaults
@@ -1206,5 +1206,5 @@ this file\fR.
 .LP
 A number of helper applications reside in \fI/usr/lib/portage/bin\fR.
 .LP
-The \fBapp\-portage/gentoolkit\fR package contains useful scripts such as 
+The \fBapp\-portage/gentoolkit\fR package contains useful scripts such as
 \fBequery\fR (a package query tool).

diff --git a/man/env-update.1 b/man/env-update.1
index 5051524..9ceddab 100644
--- a/man/env-update.1
+++ b/man/env-update.1
@@ -10,9 +10,9 @@ reads the files in \fI/etc/env.d\fR and automatically generates
 is run to update \fI/etc/ld.so.cache\fR.  \fBenv-update\fR is run by
 \fBemerge\fR(1) automatically after each package merge.  Also, if you
 make changes to \fI/etc/env.d\fR, you should run \fBenv-update\fR
-yourself for changes to take effect immediately.  Note that this would 
-only affect new processes.  In order for the changes to affect your 
-active shell, you will probably have to run \fIsource /etc/profile\fR 
+yourself for changes to take effect immediately.  Note that this would
+only affect new processes.  In order for the changes to affect your
+active shell, you will probably have to run \fIsource /etc/profile\fR
 first.
 .SH "OPTIONS"
 .TP

diff --git a/man/etc-update.1 b/man/etc-update.1
index 2662de5..71900da 100644
--- a/man/etc-update.1
+++ b/man/etc-update.1
@@ -7,7 +7,7 @@ etc\-update \- handle configuration file updates
 .SH "DESCRIPTION"
 \fIetc\-update\fR is supposed to be run after merging a new package to see if
 there are updates to the configuration files.  If a new
-configuration file will override an old one, 
+configuration file will override an old one,
 \fIetc\-update\fR will prompt the user for a decision.
 .PP
 \fIetc\-update\fR will check all directories specified on the command

diff --git a/man/make.conf.5 b/man/make.conf.5
index f75e277..236fdf0 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -37,7 +37,7 @@ Defaults to the value of $CHOST.
 \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
-set this to '~ppc'.  This is an incremental variable.  Only define a 
+set this to '~ppc'.  This is an incremental variable.  Only define a
 ~arch.
 .br
 Defaults to the value of $ARCH.
@@ -68,7 +68,7 @@ This variable is used to mask packages based on PROPERTIES restrictions.
 In addition to property names, the \fI*\fR and \fI-*\fR wildcard tokens are
 also supported. This variable can be temporarily overridden using the
 \fB\-\-accept\-properties\fR option of \fBemerge\fR(1).
-See \fBebuild\fR(5) for more information about PROPERTIES. 
+See \fBebuild\fR(5) for more information about PROPERTIES.
 .br
 Defaults to the value of *.
 .br
@@ -109,7 +109,7 @@ man page for more information.
 Defaults to /var/tmp/ccache
 .TP
 \fBCCACHE_SIZE\fR = \fI"size"\fR
-This controls the space use limitations for ccache.  The default is 2 gigabytes 
+This controls the space use limitations for ccache.  The default is 2 gigabytes
 ('2G').  Sizes are specified with 'G', 'M', or 'K'.
 .TP
 .B CFLAGS CXXFLAGS
@@ -229,7 +229,7 @@ should not be disabled by default.
 .RS
 .TP
 .B assume\-digests
-When commiting work to cvs with \fBrepoman\fR(1), assume that all existing 
+When commiting work to cvs with \fBrepoman\fR(1), assume that all existing
 SRC_URI digests are correct.  This feature also affects digest generation via
 \fBebuild\fR(1) and \fBemerge\fR(1) (emerge generates digests only when the
 \fIdigest\fR feature is enabled). Existing digests for files that do not exist
@@ -256,8 +256,8 @@ Enable a special progress indicator when \fBemerge\fR(1) is calculating
 dependencies.
 .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 
+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.
 
 \fBWarning\fR: This feature is known to cause numerous compilation failures.
@@ -344,7 +344,7 @@ Both the \fBebuild\fR(1) command and the \fInoclean\fR feature cause the
 \fIfail\-clean\fR feature to be automatically disabled.
 .TP
 .B getbinpkg
-Force emerges to always try to fetch files from the \fIPORTAGE_BINHOST\fR.  See 
+Force emerges to always try to fetch files from the \fIPORTAGE_BINHOST\fR.  See
 \fBmake.conf\fR(5) for more information.
 .TP
 .B installsources
@@ -475,10 +475,10 @@ selectively disable this feature. It is recommended to leave either
 since otherwise file collisions between packages may result in files being
 overwritten or uninstalled at inappropriate times.
 If \fIcollision\-protect\fR is enabled then it takes precedence over
-\fIprotect\-owned\fR. 
+\fIprotect\-owned\fR.
 .TP
 .B python\-trace
-Output a verbose trace of python execution to stderr when a command's 
+Output a verbose trace of python execution to stderr when a command's
 \-\-debug option is enabled.
 .TP
 .B sandbox
@@ -488,14 +488,14 @@ Enable sandbox\-ing when running \fBemerge\fR(1) and \fBebuild\fR(1).
 Enable SELinux sandbox\-ing.  Do not toggle this \fBFEATURE\fR yourself.
 .TP
 .B sfperms
-Stands for Smart Filesystem Permissions.  Before merging packages to the 
-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.  
+Stands for Smart Filesystem Permissions.  Before merging packages to the
+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
 .B sign
-When commiting work to cvs with \fBrepoman\fR(1), sign the Manifest with 
+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
@@ -512,20 +512,20 @@ incompatibility.
 Store logs created by \fBPORTAGE_ELOG_SYSTEM="save"\fR in category
 subdirectories of \fBPORT_LOGDIR/elog\fR, instead of using
 \fBPORT_LOGDIR/elog\fR directly.
-.TP 
+.TP
 .B split\-log
 Store build logs in category subdirectories of \fBPORT_LOGDIR/build\fR,
 instead of using \fBPORT_LOGDIR\fR directly.
 .TP
 .B splitdebug
-Prior to stripping ELF etdyn and etexec files, the debugging info is 
+Prior to stripping ELF etdyn and etexec files, the debugging info is
 stored for later use by various debuggers.  This feature is disabled by
 \fBnostrip\fR.  You should also consider setting \fBcompressdebug\fR so
 the files don't suck up a lot of space.  For installation of source code,
 see \fBinstallsources\fR.
 .TP
 .B strict
-Have portage react strongly to conditions that have the potential to be 
+Have portage react strongly to conditions that have the potential to be
 dangerous (like missing or incorrect digests for ebuilds).
 .TP
 .B stricter
@@ -534,12 +534,12 @@ security provisions (for example textrels, executable stack).  Read about
 the \fIQA_STRICT_*\fR variables in \fBmake.conf\fR(5).
 .TP
 .B suidctl
-Before merging packages to the live filesystem, automatically strip setuid 
+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
 .B test
-Run package\-specific tests during each merge to help make sure 
-the package compiled properly.  See \fItest\fR in \fBebuild\fR(1) 
+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). This feature implies the "test"
 \fBUSE\fR flag if it is a member of \fBIUSE\fR, either explicitly or
 implicitly (see \fBebuild\fR(5) for more information about \fBIUSE\fR).
@@ -577,7 +577,7 @@ When portage is run as root, drop privileges to portage:portage during the
 fetching of package sources.
 .TP
 .B userpriv
-Allow portage to drop root privileges and compile packages as 
+Allow portage to drop root privileges and compile packages as
 portage:portage without a sandbox (unless \fIusersandbox\fR is also used).
 .TP
 .B usersandbox
@@ -653,7 +653,7 @@ enabled for these flags may be closed as INVALID.
 .TP
 .B MAKEOPTS
 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 
+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. In order to avoid
 excess load, the \fB\-\-load\-average\fR option is recommended.
@@ -698,7 +698,7 @@ This is a list of hosts from which portage will grab prebuilt\-binary packages.
 Each entry in the list must specify the full address of a directory
 serving tbz2's for your system (this directory must contain a 'Packages' index
 file). This is only used when running with
-the get binary pkg options are given to \fBemerge\fR.  Review \fBemerge\fR(1) 
+the get binary pkg options are given to \fBemerge\fR.  Review \fBemerge\fR(1)
 for more information.
 .TP
 \fBPORTAGE_BINHOST_HEADER_URI\fR = \
@@ -850,7 +850,7 @@ Additional rsync options to be used by \fBemerge \-\-sync\fR.
 Defaults to no value.
 .TP
 \fBPORTAGE_RSYNC_OPTS\fR = \fI[rsync options string]\fR
-Default rsync options to be used by \fBemerge \-\-sync\fR. 
+Default rsync options to be used by \fBemerge \-\-sync\fR.
 .br
 \fBDon't change this unless you know exactly what you're doing!\fR
 .br
@@ -908,7 +908,7 @@ 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
 your /etc/portage/make.profile symlink accordingly.
 .br
-Defaults to /usr/portage. 
+Defaults to /usr/portage.
 .br
 \fB***Warning***\fR
 .br
@@ -916,13 +916,13 @@ Data stored inside \fBPORTDIR\fR is in peril of being overwritten or deleted by
 the emerge \-\-sync command. The default value of
 \fBPORTAGE_RSYNC_OPTS\fR will protect the default locations of
 \fBDISTDIR\fR and \fBPKGDIR\fR, but users are warned that any other locations
-inside \fBPORTDIR\fR are not necessarily safe for data storage.  You should not 
-put other data (such as overlays) in your \fBPORTDIR\fB.  Portage will walk 
+inside \fBPORTDIR\fR are not necessarily safe for data storage.  You should not
+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 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.
@@ -959,9 +959,9 @@ be necessary in order to continue a partially downloaded file located at
 \\${DISTDIR}/\\${FILE}.
 .TP
 \fBROOT\fR = \fI[path]\fR
-Use \fBROOT\fR to specify the target root filesystem to be used for merging 
+Use \fBROOT\fR to specify the target root filesystem to be used for merging
 packages or ebuilds.
-Typically, you should set this setting in the environment rather than in 
+Typically, you should set this setting in the environment rather than in
 \fImake.conf\fR itself. It's commonly used for creating new build
 images. Make sure you use an absolute path. Refer to the
 \fBCross-compilation\fR section of \fBebuild\fR(5) for information about
@@ -1085,6 +1085,6 @@ Contains a list of all local USE variables.
 .BR ebuild (1),
 .BR ebuild (5)
 .TP
-The \fI/usr/sbin/ebuild.sh\fR script. 
+The \fI/usr/sbin/ebuild.sh\fR script.
 .TP
 The helper apps in \fI/usr/lib/portage/bin\fR.

diff --git a/man/portage.5 b/man/portage.5
index 827c504..38c6d8c 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -2,16 +2,16 @@
 .SH NAME
 portage \- the heart of Gentoo
 .SH "DESCRIPTION"
-The current portage code uses many different configuration files, most of which 
-are unknown to users and normal developers.  Here we will try to collect all 
-the odds and ends so as to help users more effectively utilize portage.  This 
+The current portage code uses many different configuration files, most of which
+are unknown to users and normal developers.  Here we will try to collect all
+the odds and ends so as to help users more effectively utilize portage.  This
 is a reference only for files which do not already have a man page.
 
-All files in the make.profile directory may be tweaked via parent profiles 
-when using cascading profiles.  For more info, please see 
+All files in the make.profile directory may be tweaked via parent profiles
+when using cascading profiles.  For more info, please see
 http://www.gentoo.org/proj/en/releng/docs/cascading-profiles.xml
 .IP Note:
-If you are looking for information on how to emerge something, please see 
+If you are looking for information on how to emerge something, please see
 .BR emerge (1).
 .SH "SYNOPSIS"
 .TP
@@ -122,8 +122,8 @@ world
 world_sets
 .fi
 .SH "GLOSSARY"
-In the following sections, some terminology may be foreign to you or used 
-with meaning specific to Portage.  Please see the referenced manpages for 
+In the following sections, some terminology may be foreign to you or used
+with meaning specific to Portage.  Please see the referenced manpages for
 more detailed explanations.
 .RS
 .TP
@@ -132,7 +132,7 @@ An atom is either of the form category/package or consists of an operator
 followed by category/package followed by a hyphen and a version specification.
 An atom might be suffixed by a slot specification.
 .br
-More reading: 
+More reading:
 .BR ebuild (5)
 
 .B Extended Atom Syntax
@@ -188,26 +188,26 @@ net\-*/*
 .B KEYWORD
 Each architecture has a unique KEYWORD.
 .br
-More reading: 
+More reading:
 .BR ebuild (5)
 .TP
 .B virtual
-A DEPEND atom that is part of the "virtual" category.  They are used 
-when different packages can satisfy a dependency and only one of them is 
+A DEPEND atom that is part of the "virtual" category.  They are used
+when different packages can satisfy a dependency and only one of them is
 needed.
 .br
-More reading: 
+More reading:
 .BR ebuild (5)
 .RE
 .SH "SPECIFIC FILE DESCRIPTIONS"
 .TP
 \fB/etc/portage/make.profile/\fR or \fB/etc/make.profile/\fR
-This is usually just a symlink to the correct profile in 
-\fB/usr/portage/profiles/\fR.  Since it is part of the portage tree, it 
-may easily be updated/regenerated by running `emerge \-\-sync`.  It defines 
-what a profile is (usually arch specific stuff).  If you need a custom 
-profile, then you should make your own \fBmake.profile\fR 
-directory and populate it.  However, if you just wish to override some 
+This is usually just a symlink to the correct profile in
+\fB/usr/portage/profiles/\fR.  Since it is part of the portage tree, it
+may easily be updated/regenerated by running `emerge \-\-sync`.  It defines
+what a profile is (usually arch specific stuff).  If you need a custom
+profile, then you should make your own \fBmake.profile\fR
+directory and populate it.  However, if you just wish to override some
 settings, use \fB/etc/portage/profile/\fR (it supports all of the same file
 types that \fBmake.profile\fR does, except parent). Do NOT edit the
 settings in \fBmake.profile\fR because they WILL be lost with the next
@@ -230,9 +230,9 @@ ${PORTDIR}/profiles/package.mask/testing
 .RS
 .TP
 .BR deprecated
-The existence of this file marks a profile as deprecated, meaning it is 
-not supported by Gentoo anymore.  The first line must be the profile to which 
-users are encouraged to upgrade, optionally followed by some instructions 
+The existence of this file marks a profile as deprecated, meaning it is
+not supported by Gentoo anymore.  The first line must be the profile to which
+users are encouraged to upgrade, optionally followed by some instructions
 explaining how they can upgrade.
 
 .I Example:
@@ -255,8 +255,8 @@ previously supported USE configuration files, except that they
 only influence packages that are merged due to a stable keyword.
 .TP
 .BR make.defaults
-The profile default settings for Portage.  The general format is described 
-in \fBmake.conf\fR(5).  The \fImake.defaults\fR for your profile defines a 
+The profile default settings for Portage.  The general format is described
+in \fBmake.conf\fR(5).  The \fImake.defaults\fR for your profile defines a
 few specific variables too:
 
 .PD 0
@@ -317,11 +317,11 @@ Defines USERLAND values used to generate implicit
 Support uClibc/BSD libc/etc...
 .TP
 .B PROFILE_ONLY_VARIABLES = \fI"ARCH"\fR
-Prevent critical variables from being changed by the user in make.conf 
+Prevent critical variables from being changed by the user in make.conf
 or the env.
 .TP
 .BR PROFILE_ARCH
-Distinguish machines classes that have the same \fBARCH\fR.  All sparc 
+Distinguish machines classes that have the same \fBARCH\fR.  All sparc
 machines have ARCH=sparc but set this to either 'sparc32' or 'sparc64'.
 .TP
 .BR BOOTSTRAP_USE
@@ -340,8 +340,8 @@ Provides the list of packages that compose the special \fIsystem\fR set.
 \- atoms without * only appear for legacy reasons
 .fi
 .I Note:
-In a cascading profile setup, you can remove packages in children 
-profiles which were added by parent profiles by prefixing the atom with 
+In a cascading profile setup, you can remove packages in children
+profiles which were added by parent profiles by prefixing the atom with
 a '\-'.
 
 .I Example:
@@ -356,16 +356,16 @@ a '\-'.
 .fi
 .TP
 .BR packages.build
-A list of packages (one per line) that make up a stage1 tarball.  Really only 
+A list of packages (one per line) that make up a stage1 tarball.  Really only
 useful for stage builders.
 .TP
 .BR package.provided
-A list of packages (one per line) that portage should assume have been 
+A list of packages (one per line) that portage should assume have been
 provided.  Useful for porting to non-Linux systems. Basically, it's a
 list that replaces the \fBemerge \-\-inject\fR syntax.
 
-For example, if you manage your own copy of a 2.6 kernel, then you can 
-tell portage that 'sys-kernel/development-sources-2.6.7' is already taken 
+For example, if you manage your own copy of a 2.6 kernel, then you can
+tell portage that 'sys-kernel/development-sources-2.6.7' is already taken
 care of and it should get off your back about it.
 
 Portage will not attempt to update a package that is listed here unless
@@ -406,8 +406,8 @@ x11-base/xorg-x11-6.8
 Per\-package USE flag forcing.
 
 .I Note:
-In a cascading profile setup, you can remove USE flags in children 
-profiles which were added by parent profiles by prefixing the flag with 
+In a cascading profile setup, you can remove USE flags in children
+profiles which were added by parent profiles by prefixing the flag with
 a '\-'.
 
 .I Format:
@@ -428,8 +428,8 @@ x11\-libs/qt \-mysql
 Per\-package USE flag masks.
 
 .I Note:
-In a cascading profile setup, you can remove USE flags in children 
-profiles which were added by parent profiles by prefixing the flag with 
+In a cascading profile setup, you can remove USE flags in children
+profiles which were added by parent profiles by prefixing the flag with
 a '\-'.
 
 .I Format:
@@ -470,8 +470,8 @@ Some USE flags don't make sense to disable under certain conditions.  Here we
 list forced flags.
 
 .I Note:
-In a cascading profile setup, you can remove USE flags in children 
-profiles which were added by parent profiles by prefixing the flag with 
+In a cascading profile setup, you can remove USE flags in children
+profiles which were added by parent profiles by prefixing the flag with
 a '\-'.
 
 .I Format:
@@ -481,13 +481,13 @@ a '\-'.
 .fi
 .TP
 \fBuse.mask\fR and \fBuse.stable.mask\fR
-Some USE flags don't make sense on some archs (for example altivec on 
-non\-ppc or mmx on non\-x86), or haven't yet been tested.  Here we list 
+Some USE flags don't make sense on some archs (for example altivec on
+non\-ppc or mmx on non\-x86), or haven't yet been tested.  Here we list
 the masked ones.
 
 .I Note:
-In a cascading profile setup, you can remove USE flags in children 
-profiles which were added by parent profiles by prefixing the flag with 
+In a cascading profile setup, you can remove USE flags in children
+profiles which were added by parent profiles by prefixing the flag with
 a '\-'.
 
 .I Format:
@@ -529,8 +529,8 @@ virtual/aspell\-dict   app\-dicts/aspell\-en
 .RE
 .TP
 .BR /etc/portage/
-Any file in this directory that begins with "package." can be more than just a 
-flat file.  If it is a directory, then all the files in that directory will be 
+Any file in this directory that begins with "package." can be more than just a
+flat file.  If it is a directory, then all the files in that directory will be
 sorted in ascending alphabetical order by file name and summed together as if
 it were a single file.
 
@@ -550,8 +550,8 @@ any other bash script.
 Additional package-specific bashrc files can be created in /etc/portage/env.
 .TP
 .BR categories
-A simple list of valid categories that may be used in /usr/portage, 
-PORTDIR_OVERLAY, and PKGDIR (see \fBmake.conf\fR(5)).  This allows for custom 
+A simple list of valid categories that may be used in /usr/portage,
+PORTDIR_OVERLAY, and PKGDIR (see \fBmake.conf\fR(5)).  This allows for custom
 categories to be created.
 
 .I Format:
@@ -572,11 +572,11 @@ Contains variables customizing colors. See \fBcolor.map\fR(5).
 The global custom settings for Portage. See \fBmake.conf\fR(5).
 .TP
 .BR mirrors
-Whenever portage encounters a mirror:// style URI it will look up the actual 
-hosts here.  If the mirror set is not found here, it will check the global 
-mirrors file at /usr/portage/profiles/thirdpartymirrors.  You may also set a 
-special mirror type called "local".  This list of mirrors will be checked 
-before GENTOO_MIRRORS and will be used even if the package has 
+Whenever portage encounters a mirror:// style URI it will look up the actual
+hosts here.  If the mirror set is not found here, it will check the global
+mirrors file at /usr/portage/profiles/thirdpartymirrors.  You may also set a
+special mirror type called "local".  This list of mirrors will be checked
+before GENTOO_MIRRORS and will be used even if the package has
 RESTRICT="mirror" or RESTRICT="fetch".
 
 .I Format:
@@ -654,8 +654,8 @@ three special tokens:
 .fi
 
 .I Additional Note:
-If you encounter the \fB-*\fR KEYWORD, this indicates that the package is known 
-to be broken on all systems which are not otherwise listed in KEYWORDS.  For 
+If you encounter the \fB-*\fR KEYWORD, this indicates that the package is known
+to be broken on all systems which are not otherwise listed in KEYWORDS.  For
 example, a binary only package which is built for x86 will look like:
 
 games-fps/quake3-demo-1.11.ebuild:KEYWORDS="-* x86"
@@ -735,15 +735,15 @@ a single package.
 .fi
 .TP
 .BR package.unmask
-Just like package.mask above, except here you list packages you want to 
-unmask.  Useful for overriding the global package.mask file (see 
-above).  Note that this does not override packages that are masked via 
+Just like package.mask above, except here you list packages you want to
+unmask.  Useful for overriding the global package.mask file (see
+above).  Note that this does not override packages that are masked via
 KEYWORDS.
 .TP
 .BR package.use
-Per\-package USE flags.  Useful for tracking local USE flags or for 
-enabling USE flags for certain packages only.  Perhaps you develop GTK 
-and thus you want documentation for it, but you don't want 
+Per\-package USE flags.  Useful for tracking local USE flags or for
+enabling USE flags for certain packages only.  Perhaps you develop GTK
+and thus you want documentation for it, but you don't want
 documentation for QT.  Easy as pie my friend!
 
 .I Format:
@@ -1040,7 +1040,7 @@ profile\-formats = portage-2
 .RE
 .TP
 .BR /usr/portage/profiles/
-Global Gentoo settings that are controlled by the developers.  To override 
+Global Gentoo settings that are controlled by the developers.  To override
 these settings, you can use the files in \fB/etc/portage/\fR.
 .RS
 .TP
@@ -1060,7 +1060,7 @@ sparc
 .fi
 .TP
 .BR categories
-A simple list of valid categories that may be used in /usr/portage, 
+A simple list of valid categories that may be used in /usr/portage,
 PORTDIR_OVERLAY, and PKGDIR (see \fBmake.conf\fR(5)).
 
 .I Format:
@@ -1130,10 +1130,10 @@ net-analyzer/netcat -*
 .fi
 .TP
 .BR package.mask
-This contains a list of DEPEND atoms for packages that should not be installed 
-in any profile.  Useful for adding the latest KDE betas and making sure no 
-one accidentally upgrades to them.  Also useful for quickly masking specific 
-versions due to security issues.  ALWAYS include a comment explaining WHY the 
+This contains a list of DEPEND atoms for packages that should not be installed
+in any profile.  Useful for adding the latest KDE betas and making sure no
+one accidentally upgrades to them.  Also useful for quickly masking specific
+versions due to security issues.  ALWAYS include a comment explaining WHY the
 package has been masked and WHO is doing the masking.
 
 .I Format:
@@ -1153,7 +1153,7 @@ package has been masked and WHO is doing the masking.
 .fi
 .TP
 .BR profiles.desc
-List all the current stable and development profiles.  If a profile is listed 
+List all the current stable and development profiles.  If a profile is listed
 here, then it will be checked by repoman.
 .I Format:
 .nf
@@ -1179,7 +1179,7 @@ hyphen. If the repo\-name attribute is specified in layout.conf, then that
 setting will take precedence.
 .TP
 .BR thirdpartymirrors
-Controls the mapping of mirror:// style URIs to actual lists of 
+Controls the mapping of mirror:// style URIs to actual lists of
 mirrors.  Keeps us from overloading a single server.
 
 .I Format:
@@ -1200,7 +1200,7 @@ kernel http://www.kernel.org/pub http://www.us.kernel.org/pub
 .fi
 .TP
 .BR use.desc
-All global USE flags must be listed here with a description of what they do.  
+All global USE flags must be listed here with a description of what they do.
 
 .I Format:
 .nf
@@ -1216,7 +1216,7 @@ doc \- Adds extra documentation
 .fi
 .TP
 .BR use.local.desc
-All local USE flags are listed here along with the package and a 
+All local USE flags are listed here along with the package and a
 description. This file is automatically generated from the
 metadata.xml files that are included with each individual package.
 Refer to GLEP 56 for further information:
@@ -1238,7 +1238,7 @@ games\-emulation/xmess:net \- Adds network support
 .RS
 .TP
 .BR make.globals
-The global default settings for Portage.  This comes from the portage package 
+The global default settings for Portage.  This comes from the portage package
 itself.  Settings in \fBmake.conf\fR or \fBpackage.env\fR override values set
 here. The format is described extensively in \fBmake.conf\fR(5).
 .TP
@@ -1290,12 +1290,12 @@ directories have been modified since being installed.  Files which have not
 been modified will automatically be unmerged.
 .TP
 .BR world
-Every time you emerge a package, the package that you requested is 
-recorded here.  Then when you run `emerge world \-up`, the list of 
-packages is read from this file.  Note that this does not mean that the 
-packages that were installed as dependencies are listed here.  For 
-example, if you run `emerge mod_wsgi` and you do not have apache 
-already, then "www\-apache/mod_wsgi" is recorded in the world file but 
+Every time you emerge a package, the package that you requested is
+recorded here.  Then when you run `emerge world \-up`, the list of
+packages is read from this file.  Note that this does not mean that the
+packages that were installed as dependencies are listed here.  For
+example, if you run `emerge mod_wsgi` and you do not have apache
+already, then "www\-apache/mod_wsgi" is recorded in the world file but
 "www\-servers/apache" is not.  For more information, review \fBemerge\fR(1).
 
 .I Format:

diff --git a/man/quickpkg.1 b/man/quickpkg.1
index 0d30163..a3f6165 100644
--- a/man/quickpkg.1
+++ b/man/quickpkg.1
@@ -7,16 +7,16 @@ quickpkg \- creates portage packages
 .I quickpkg
 can be utilized to quickly create a package for portage by
 utilizing the files already on your filesystem.  This package
-then can be emerged on any system.  To review syntax for 
+then can be emerged on any system.  To review syntax for
 emerging binary packages, review \fBemerge\fR(1).  The upside
-of this process is that you don't have to wait for the package 
-to unpack, configure, compile, and install before you can have 
-the package ready to go.  The downside is that the package will 
-contain the files that exist on your filesystem even if they have 
+of this process is that you don't have to wait for the package
+to unpack, configure, compile, and install before you can have
+the package ready to go.  The downside is that the package will
+contain the files that exist on your filesystem even if they have
 modified since they were first installed.
 .br
-The packages, after being created, will be placed in \fBPKGDIR\fR.  
-This variable is defined in \fBmake.conf\fR(5) and defaults to 
+The packages, after being created, will be placed in \fBPKGDIR\fR.
+This variable is defined in \fBmake.conf\fR(5) and defaults to
 /usr/portage/packages.
 .SH OPTIONS
 .TP

diff --git a/man/xpak.5 b/man/xpak.5
index 6e3d03d..536810d 100644
--- a/man/xpak.5
+++ b/man/xpak.5
@@ -47,7 +47,7 @@ String \fI"STOP"\fR.
       |<xpak_offset>|
  <tar>|<---xpak---->|<xpak_offset>"STOP"
 
-Here you see the \fItar\fR archive, the attached \fIxpak\fR blob, the 
+Here you see the \fItar\fR archive, the attached \fIxpak\fR blob, the
 \fIxpak_offset\fR and the string \fI"STOP"\fR at the end.  This metadata
 is not considered "part" of the \fIxpak\fR, but rather part of the binpkg.
 

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     5660b2a3c71acad4bcb6135ac41ce9fd315c32a8
Author:     Alexander Berntsen <alexander <AT> plaimi <DOT> net>
AuthorDate: Tue Jul 30 18:47:24 2013 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Tue Jul 30 19:10:27 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=5660b2a3

man: Cap lines at 80 chars

---
 man/color.map.5  | 12 ++++++---
 man/ebuild.5     | 74 ++++++++++++++++++++++++++++++++------------------------
 man/egencache.1  |  3 ++-
 man/emaint.1     | 13 ++++++----
 man/emerge.1     | 44 +++++++++++++++++++--------------
 man/env-update.1 |  3 ++-
 man/make.conf.5  | 38 +++++++++++++++++------------
 man/portage.5    | 39 +++++++++++++++++------------
 man/repoman.1    | 43 ++++++++++++++++++++------------
 man/xpak.5       |  3 ++-
 10 files changed, 163 insertions(+), 109 deletions(-)

diff --git a/man/color.map.5 b/man/color.map.5
index 175729a..5543628 100644
--- a/man/color.map.5
+++ b/man/color.map.5
@@ -9,9 +9,11 @@ Portage will check this file first for color classes settings. If no setting
 of given color class is found in /etc/portage/color.map, Portage uses default
 value defined internally.
 .SH "SYNTAX"
-\fBVARIABLE\fR = \fI[space delimited list of attributes or ansi code pattern]\fR
+\fBVARIABLE\fR = \fI[space delimited list of attributes or ansi code
+pattern]\fR
 .TP
-\fBATTRIBUTE\fR = \fI[space delimited list of attributes or ansi code pattern]\fR
+\fBATTRIBUTE\fR = \fI[space delimited list of attributes or ansi code \
+pattern]\fR
 .SH "VARIABLES"
 .TP
 \fBNORMAL\fR = \fI"normal"\fR
@@ -54,10 +56,12 @@ Defines color used for world packages planned to be merged.
 Defines color used for packages planned to be merged using a binary package.
 .TP
 \fBPKG_BINARY_MERGE_SYSTEM\fR = \fI"purple"\fR
-Defines color used for system packages planned to be merged using a binary package.
+Defines color used for system packages planned to be merged using a binary
+package.
 .TP
 \fBPKG_BINARY_MERGE_WORLD\fR = \fI"fuchsia"\fR
-Defines color used for world packages planned to be merged using a binary package.
+Defines color used for world packages planned to be merged using a binary
+package.
 .TP
 \fBPKG_NOMERGE\fR = \fI"darkblue"\fR
 Defines color used for packages not planned to be merged.

diff --git a/man/ebuild.5 b/man/ebuild.5
index cca87e8..10ef4ee 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -12,9 +12,9 @@ contain pre/post install/remove commands, as required.  All ebuild scripts are
 written in bash.
 
 .SS "Dependencies"
-A \fIdepend atom\fR is simply a dependency that is used by portage when calculating
-relationships between packages.  Please note that if the atom has not already
-been emerged, then the latest version available is matched.
+A \fIdepend atom\fR is simply a dependency that is used by portage when
+calculating relationships between packages.  Please note that if the atom has
+not already been emerged, then the latest version available is matched.
 .TP
 .B Atom Bases
 The base atom is just a full category/packagename.
@@ -38,17 +38,18 @@ Examples:
 	net\-misc/dhcp\fI\-3.0_p2\fR
 .fi
 
-Versions are normally made up of two or three numbers separated by periods, such
-as 1.2 or 4.5.2.  This string may be followed by a character such as 1.2a or 
-4.5.2z.  Note that this letter is \fInot\fR meant to indicate alpha, beta,
+Versions are normally made up of two or three numbers separated by periods,
+such as 1.2 or 4.5.2.  This string may be followed by a character such as 1.2a
+or 4.5.2z.  Note that this letter is \fInot\fR meant to indicate alpha, beta,
 etc... status.  For that, use the optional suffix; either _alpha, _beta, _pre 
 (pre\-release), _rc (release candidate), or _p (patch).  This means for the 
 3rd pre\-release of a package, you would use something like 1.2_pre3.  The 
 suffixes here can be arbitrarily chained without limitation.
 .TP
 .B Atom Prefix Operators [> >= = <= <]
-Sometimes you want to be able to depend on general versions rather than specifying
-exact versions all the time.  Hence we provide standard boolean operators:
+Sometimes you want to be able to depend on general versions rather than
+specifying exact versions all the time.  Hence we provide standard boolean
+operators:
 
 Examples:
 .nf
@@ -261,13 +262,13 @@ following syntax:
 jpeg? ( media\-libs/jpeg )
 .TP
 .B !usevar? ( Atom )
-If you want to include a package only if the user does not have a certain option
-in their \fBUSE\fR variable, then use the following syntax:
+If you want to include a package only if the user does not have a certain
+option in their \fBUSE\fR variable, then use the following syntax:
 
 !nophysfs? ( dev\-games/physfs )
 
-This is often useful for those times when you want to want to add optional support
-for a feature and have it enabled by default.
+This is often useful for those times when you want to want to add optional
+support for a feature and have it enabled by default.
 .TP
 .B usevar? ( Atom if true ) !usevar? ( Atom if false )
 For functionality like the tertiary operator found in C you must use
@@ -769,7 +770,8 @@ The paths may contain fnmatch patterns.
 .B QA_FLAGS_IGNORED
 This should contain a list of file paths, relative to the image directory, of
 files that do not contain .GCC.command.line sections or contain .hash sections.
-The paths may contain regular expressions with escape\-quoted special characters.
+The paths may contain regular expressions with escape\-quoted special
+characters.
 
 This variable is intended to be used on files of binary packages which ignore
 CFLAGS, CXXFLAGS, FFLAGS, FCFLAGS, and LDFLAGS variables.
@@ -777,7 +779,8 @@ CFLAGS, CXXFLAGS, FFLAGS, FCFLAGS, and LDFLAGS variables.
 .B QA_MULTILIB_PATHS
 This should contain a list of file paths, relative to the image directory, of
 files that should be ignored for the multilib\-strict checks.
-The paths may contain regular expressions with escape\-quoted special characters.
+The paths may contain regular expressions with escape\-quoted special
+characters.
 .TP
 .B QA_PRESTRIPPED
 This should contain a list of file paths, relative to the image directory, of
@@ -999,7 +1002,8 @@ fi
 .fi
 .RE
 .TP
-.B usex\fR \fI<USE flag>\fR \fI[true output]\fR \fI[false output]\fR \fI[true suffix]\fR \fI[false suffix]
+.B usex\fR \fI<USE flag>\fR \fI[true output]\fR \fI[false output]\fR \fI[true \
+suffix]\fR \fI[false suffix]
 If USE flag is set, echo [true output][true suffix] (defaults to
 "yes"), otherwise echo [false output][false suffix] (defaults to
 "no"). The usex helper is available beginning with \fBEAPI 5\fR.
@@ -1007,14 +1011,14 @@ If USE flag is set, echo [true output][true suffix] (defaults to
 .B use_with\fR \fI<USE item>\fR \fI[configure name]\fR \fI[configure opt]
 Useful for creating custom options to pass to a configure script. If \fIUSE
 item\fR is in the \fBUSE\fR variable and a \fIconfigure opt\fR is specified,
-then the string \fI\-\-with\-[configure name]=[configure opt]\fR will be echoed.
-If \fIconfigure opt\fR is not specified, then just \fI\-\-with\-[configure
-name]\fR will be echoed.  If \fIUSE item\fR is not in the \fBUSE\fR variable,
-then the string \fI\-\-without\-[configure name]\fR will be echoed. If
-\fIconfigure name\fR is not specified, then \fIUSE item\fR will be used in
-its place. Beginning with \fBEAPI 4\fR, an empty \fIconfigure opt\fR argument
-is recognized. In \fBEAPI 3\fR and earlier, an empty \fIconfigure opt\fR
-argument is treated as if it weren't provided.
+then the string \fI\-\-with\-[configure name]=[configure opt]\fR will be
+echoed. If \fIconfigure opt\fR is not specified, then just
+\fI\-\-with\-[configure name]\fR will be echoed.  If \fIUSE item\fR is not in
+the \fBUSE\fR variable, then the string \fI\-\-without\-[configure name]\fR
+will be echoed. If \fIconfigure name\fR is not specified, then \fIUSE item\fR
+will be used in its place. Beginning with \fBEAPI 4\fR, an empty \fIconfigure
+opt\fR argument is recognized. In \fBEAPI 3\fR and earlier, an empty
+\fIconfigure opt\fR argument is treated as if it weren't provided.
 .RS
 .TP
 .I Examples:
@@ -1039,9 +1043,9 @@ myconf=$(use_with sdl SDL all\-plugins)
 .TP
 .B use_enable\fR \fI<USE item>\fR \fI[configure name]\fR \fI[configure opt]
 Same as \fBuse_with\fR above, except that the configure options are
-\fI\-\-enable\-\fR instead of \fI\-\-with\-\fR and \fI\-\-disable\-\fR instead of
-\fI\-\-without\-\fR. Beginning with \fBEAPI 4\fR, an empty \fIconfigure opt\fR
-argument is recognized. In \fBEAPI 3\fR and earlier, an empty
+\fI\-\-enable\-\fR instead of \fI\-\-with\-\fR and \fI\-\-disable\-\fR instead
+of \fI\-\-without\-\fR. Beginning with \fBEAPI 4\fR, an empty \fIconfigure
+opt\fR argument is recognized. In \fBEAPI 3\fR and earlier, an empty
 \fIconfigure opt\fR argument is treated as if it weren't provided.
 .TP
 .B hasv\fR \fI<item>\fR \fI<item list>
@@ -1071,7 +1075,8 @@ to apply to the host root instead of ${ROOT}.
 Example:
 .nf
 	VERINS="$(best_version net\-ftp/glftpd)"
-	(VERINS now has the value "net\-ftp/glftpd\-1.27" if glftpd\-1.27 is installed)
+	(VERINS now has the value "net\-ftp/glftpd\-1.27" if glftpd\-1.27 is \
+	installed)
 .fi
 
 .SS "Hooks:"
@@ -1391,12 +1396,15 @@ with file mode \fI0644\fR (this can be overridden with the
 \fBinsopts\fR function). Setting \-r sets recursive. The
 \fBdoheader\fR helper is available beginning with \fBEAPI 5\fR.
 .TP
-.B dohtml\fR \fI [\-a filetypes] [\-r] [\-x list\-of\-dirs\-to\-ignore] [list\-of\-files\-and\-dirs]
+.B dohtml\fR \fI [\-a filetypes] [\-r] [\-x list\-of\-dirs\-to\-ignore] \
+[list\-of\-files\-and\-dirs]
 Installs the files in the list of files (space\-separated list) into
-/usr/share/doc/${PF}/html provided the file ends in .htm, .html, .css, .js, .gif, .jpeg, .jpg, or .png.
+/usr/share/doc/${PF}/html provided the file ends in .htm, .html, .css, .js, \
+.gif, .jpeg, .jpg, or .png.
 Setting \fI\-a\fR limits what types of files will be included,
 \fI\-A\fR appends to the default list, setting \fI\-x\fR sets which dirs to
-exclude (CVS excluded by default), \fI\-p\fR sets a document prefix, \fI\-r\fR sets recursive.
+exclude (CVS excluded by default), \fI\-p\fR sets a document prefix,
+\fI\-r\fR sets recursive.
 .TP
 .B doinfo\fR \fI<info\-file> [list of more info\-files]
 Installs info\-pages into \fIDESTDIR\fR/info.  Files are automatically
@@ -1450,7 +1458,8 @@ when installing into the document tree
 (based in /usr/share/doc/${PF}/).  Default is no subdir, or just "".
 .TP
 .B dodoc\fR \fI[-r] <document> [list of more documents]
-Installs a document or a list of documents into /usr/share/doc/${PF}/\fI<docinto path>\fR.
+Installs a document or a list of documents into
+/usr/share/doc/${PF}/\fI<docinto path>\fR.
 Documents are marked for compression.  Creates all necessary dirs.
 Beginning with \fBEAPI 4\fR, there is support for recursion, enabled by the
 new \fI\-r\fR option.
@@ -1528,7 +1537,8 @@ The \fI/usr/lib/portage/bin/ebuild.sh\fR script.
 The helper apps in \fI/usr/lib/portage/bin\fR.
 .TP
 .B /etc/portage/make.conf
-Contains variables for the build\-process and overwrites those in make.defaults.
+Contains variables for the build\-process and overwrites those in
+make.defaults.
 .TP
 .B /usr/share/portage/config/make.globals
 Contains the default variables for the build\-process, you should edit

diff --git a/man/egencache.1 b/man/egencache.1
index 92af347..f71feb3 100644
--- a/man/egencache.1
+++ b/man/egencache.1
@@ -11,7 +11,8 @@ itself, for distribution.
 .SH ACTIONS
 .TP
 .BR "\-\-update [ATOM] ... "
-Update the \fImetadata/md5\-cache/\fR directory (generate metadata as necessary).
+Update the \fImetadata/md5\-cache/\fR directory (generate metadata as
+necessary).
 If no package atoms are specified then all will be updated. See ebuild(5)
 for the details on package atom syntax.
 .TP

diff --git a/man/emaint.1 b/man/emaint.1
index c588a0b..3fae5c2 100644
--- a/man/emaint.1
+++ b/man/emaint.1
@@ -26,9 +26,10 @@ Discard no longer installed config tracker entries.
 Discard merge lists saved for the \fBemerge\fR(1) \fB--resume\fR action.
 .TP
 .BR logs
-Clean out old logs from the \fBPORT_LOGDIR\fR using the command \fBPORT_LOGDIR_CLEAN\fR
-See the \fBmake.conf\fR(5) man page for additional information as well as enabling the
-\fB'clean-logs'\fR feature in emerge to do this automatically.
+Clean out old logs from the \fBPORT_LOGDIR\fR using the command
+\fBPORT_LOGDIR_CLEAN\fR
+See the \fBmake.conf\fR(5) man page for additional information as well as
+enabling the \fB'clean-logs'\fR feature in emerge to do this automatically.
 .TP
 .BR movebin
 Perform package move updates for binary packages located in \fBPKGDIR\fR.
@@ -51,10 +52,12 @@ Fix any problems that may exist.  (not all commands)
 Cleans the logs from \fBPORT_LOGDIR\fR (logs command only)
 .TP
 .B \-p, \-\-pretend
-Sets pretend mode (same as \-c, \-\-check) for use with the \-C, \-\-clean OPTION (logs command only)
+Sets pretend mode (same as \-c, \-\-check) for use with the \-C, \-\-clean
+OPTION (logs command only)
 .TP
 .B \-t NUM, \-\-time NUM
-Changes the minimum age \fBNUM\fR (in days) of the logs to be listed or deleted. (logs command only)
+Changes the minimum age \fBNUM\fR (in days) of the logs to be listed or
+deleted. (logs command only)
 .SH "REPORTING BUGS"
 Please report bugs via http://bugs.gentoo.org/
 .SH AUTHORS

diff --git a/man/emerge.1 b/man/emerge.1
index ac4651f..66f4360 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -4,7 +4,8 @@ emerge \- Command\-line interface to the Portage system
 .SH "SYNOPSIS"
 .TP
 .BR emerge
-[\fIoptions\fR] [\fIaction\fR] [\fIebuild\fR | \fItbz2file\fR | \fIfile\fR | \fI@set\fR | \fIatom\fR] ...
+[\fIoptions\fR] [\fIaction\fR] [\fIebuild\fR | \fItbz2file\fR | \fIfile\fR |
+\fI@set\fR | \fIatom\fR] ...
 .TP
 .BR emerge
 \fB\-\-sync\fR | \fB\-\-version\fR
@@ -100,14 +101,16 @@ later updating.
 .TP
 .BR \-\-check\-news
 Scan all repositories for relevant unread GLEP 42 news items, and display
-how many are found. See \fIhttp://www.gentoo.org/proj/en/glep/glep-0042.html\fR.
+how many are found. See
+\fIhttp://www.gentoo.org/proj/en/glep/glep-0042.html\fR.
 .TP
 .BR \-\-clean
 Cleans up the system by examining the installed packages and removing older
-packages.  This is accomplished by looking at each installed package and separating
-the installed versions by \fBslot\fR.  Clean will \fBremove all but the most recently
-installed version in each \fbslot\fR.  Clean should not remove unslotted packages.
-Note: Most recently installed means most \fBrecent\fR, not highest version.
+packages.  This is accomplished by looking at each installed package and
+separating the installed versions by \fBslot\fR.  Clean will \fBremove all but
+the most recently installed version in each \fbslot\fR.  Clean should not
+remove unslotted packages. Note: Most recently installed means most
+\fBrecent\fR, not highest version.
 .TP
 .BR "\-\-config "
 Run package specific actions needed to be executed after the emerge process 
@@ -301,9 +304,10 @@ Before performing the action, display what will take place (server info for
 \fB\-\-sync\fR, \fB\-\-pretend\fR output for merge, and so forth), then ask
 whether to proceed with the action or abort.  Using \fB\-\-ask\fR is more
 efficient than using \fB\-\-pretend\fR and then executing the same command
-without \fB\-\-pretend\fR, as dependencies will only need to be calculated once.
-\fBWARNING: If the "Enter" key is pressed at the prompt (with no other input),
-it is interpreted as acceptance of the first choice.  Note that the input
+without \fB\-\-pretend\fR, as dependencies will only need to be calculated
+once. \fBWARNING: If the "Enter" key is pressed at the prompt (with no other
+input), it is interpreted as acceptance of the first choice.  Note that the
+input
 buffer is not cleared prior to the prompt, so an accidental press of the
 "Enter" key at any time prior to the prompt will be interpreted as a choice!
 Use the \-\-ask\-enter\-invalid option if you want a single "Enter" key
@@ -811,7 +815,8 @@ matching binary packages over newer unbuilt packages.
 Tells emerge to use binary packages (from $PKGDIR) if they are available, thus 
 possibly avoiding some time\-consuming compiles.  This option is useful for CD 
 installs; you can export PKGDIR=/mnt/cdrom/packages and then use this option to 
-have emerge "pull" binary packages from the CD in order to satisfy dependencies.
+have emerge "pull" binary packages from the CD in order to satisfy
+dependencies.
 .TP
 .BR "\-\-usepkgonly [ y | n ] (\-K short option)"
 Tells emerge to only use binary packages (from $PKGDIR).  All the binary 
@@ -877,7 +882,8 @@ When utilizing \fBemerge\fR with the \fB\-\-pretend\fR and \fB\-\-verbose\fR
 flags, the output may be a little hard to understand at first.  This section
 explains the abbreviations.
 .TP
-.B [blocks B     ] app\-text/dos2unix ("app\-text/dos2unix" is blocking app\-text/hd2u\-0.8.0)
+.B [blocks B     ] app\-text/dos2unix ("app\-text/dos2unix" is blocking \
+app\-text/hd2u\-0.8.0)
 Dos2unix is Blocking hd2u from being emerged.  Blockers are defined when
 two packages will clobber each others files, or otherwise cause some form
 of breakage in your system.  However, blockers usually do not need to be
@@ -1087,8 +1093,8 @@ and the KDE configuration dirs; more may be added in the future.
 .LP
 When Portage installs a file into a protected directory tree like /etc, any
 existing files will not be overwritten. If a file of the same name already
-exists, Portage will change the name of the to\-be\-installed file from 'foo' to
-\'._cfg0000_foo\'. If \'._cfg0000_foo\' already exists, this name becomes
+exists, Portage will change the name of the to\-be\-installed file from 'foo'
+to \'._cfg0000_foo\'. If \'._cfg0000_foo\' already exists, this name becomes
 \'._cfg0001_foo\', etc. In this way, existing files are not overwritten,
 allowing the administrator to manually merge the new config files and avoid any
 unexpected changes.
@@ -1100,10 +1106,12 @@ deleted, which is of paramount importance.
 .LP
 Protected directories are set using the \fICONFIG_PROTECT\fR variable, normally
 defined in make.globals. Directory exceptions to the CONFIG_PROTECTed
-directories can be specified using the \fICONFIG_PROTECT_MASK\fR variable. To find
-files that need to be updated in /etc, type \fBfind /etc \-iname \'._cfg????_*\'\fR.
+directories can be specified using the \fICONFIG_PROTECT_MASK\fR variable.
+To find files that need to be updated in /etc, type \fBfind /etc \-iname \'.
+cfg????_*\'\fR.
 .LP
-You can disable this feature by setting \fICONFIG_PROTECT="\-*"\fR in \fBmake.conf\fR(5).
+You can disable this feature by setting \fICONFIG_PROTECT="\-*"\fR in
+\fBmake.conf\fR(5).
 Then, Portage will mercilessly auto\-update your config files. Alternatively,
 you can leave Config File Protection on but tell Portage that it can overwrite
 files in certain specific /etc subdirectories. For example, if you wanted
@@ -1113,8 +1121,8 @@ add this to \fBmake.conf\fR(5):
 .LP
 .I CONFIG_PROTECT_MASK="/etc/wget /etc/rc.d"
 .LP
-Tools such as dispatch\-conf, cfg\-update, and etc\-update are also available to
-aid in the merging of these files. They provide interactive merging and can
+Tools such as dispatch\-conf, cfg\-update, and etc\-update are also available
+to aid in the merging of these files. They provide interactive merging and can
 auto\-merge trivial changes.
 .SH "REPORTING BUGS"
 Please report any bugs you encounter through our website:

diff --git a/man/env-update.1 b/man/env-update.1
index c0503ce..5051524 100644
--- a/man/env-update.1
+++ b/man/env-update.1
@@ -17,7 +17,8 @@ first.
 .SH "OPTIONS"
 .TP
 .B \-\-no\-ldconfig
-Do not run \fBldconfig\fR (and thus skip rebuilding the \fIld.so.cache\fR, etc...).
+Do not run \fBldconfig\fR (and thus skip rebuilding the \fIld.so.cache\fR,
+etc...).
 .SH "REPORTING BUGS"
 Please report bugs via http://bugs.gentoo.org/
 .SH "AUTHORS"

diff --git a/man/make.conf.5 b/man/make.conf.5
index 451dba9..f75e277 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -154,13 +154,14 @@ automatically have /* appended to them.
 Defaults to "/lib/modules/* *.py[co]".
 .TP
 \fBCONFIG_PROTECT\fR = \fI[space delimited list of files and/or directories]\fR
-All files and/or directories that are defined here will have "config file protection"
-enabled for them. See the \fBCONFIGURATION FILES\fR section
+All files and/or directories that are defined here will have "config file
+protection" enabled for them. See the \fBCONFIGURATION FILES\fR section
 of \fBemerge\fR(1) for more information.
 .TP
-\fBCONFIG_PROTECT_MASK\fR = \fI[space delimited list of files and/or directories]\fR
-All files and/or directories that are defined here will have "config file protection"
-disabled for them. See the \fBCONFIGURATION FILES\fR section
+\fBCONFIG_PROTECT_MASK\fR = \fI[space delimited list of files and/or \
+directories]\fR
+All files and/or directories that are defined here will have "config file
+protection" disabled for them. See the \fBCONFIGURATION FILES\fR section
 of \fBemerge\fR(1) for more information.
 .TP
 .B CTARGET
@@ -196,9 +197,9 @@ Defines whether or not to ignore audible beeps when displaying important
 informational messages.  This variable is unset by default.
 .TP
 .B EMERGE_DEFAULT_OPTS
-Options to append to the end of the \fBemerge\fR(1) command line on every invocation.
-These options will not be appended to the command line if \-\-ignore\-default\-opts
-is specified.
+Options to append to the end of the \fBemerge\fR(1) command line on every
+invocation. These options will not be appended to the command line if
+\-\-ignore\-default\-opts is specified.
 .TP
 .B EMERGE_LOG_DIR
 Controls the location of emerge.log and emerge-fetch.log.
@@ -495,7 +496,8 @@ See also \fIsuidctl\fR below.
 .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).
+a GPG key.  Read about the \fIPORTAGE_GPG_KEY\fR variable in
+\fBmake.conf\fR(5).
 .TP
 .B skiprocheck
 Skip write access checks on \fBDISTDIR\fR when fetching files. This is
@@ -579,7 +581,8 @@ Allow portage to drop root privileges and compile packages as
 portage:portage without a sandbox (unless \fIusersandbox\fR is also used).
 .TP
 .B usersandbox
-Enable the sandbox in the compile phase, when running without root privs (\fIuserpriv\fR).
+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
@@ -679,9 +682,9 @@ Defaults to /usr/portage/packages.
 This variable defines the directory in which per\-ebuild logs are kept.
 Logs are created only when this is set. They are stored as
 ${CATEGORY}:${PF}:YYYYMMDD\-HHMMSS.log in the directory specified. If the
-directory does not exist, it will be created automatically and group permissions
-will be applied to it.  If the directory already exists, portage will not
-modify it's permissions.
+directory does not exist, it will be created automatically and group
+permissions will be applied to it.  If the directory already exists, portage
+will not modify it's permissions.
 .TP
 .B PORT_LOGDIR_CLEAN
 This variable should contain a command for portage to call in order
@@ -698,7 +701,8 @@ file). This is only used when running with
 the get binary pkg options are given to \fBemerge\fR.  Review \fBemerge\fR(1) 
 for more information.
 .TP
-\fBPORTAGE_BINHOST_HEADER_URI\fR = \fI"ftp://login:pass@grp.mirror.site/pub/grp/i686/athlon\-xp/"\fR
+\fBPORTAGE_BINHOST_HEADER_URI\fR = \
+\fI"ftp://login:pass@grp.mirror.site/pub/grp/i686/athlon\-xp/"\fR
 This variable only makes sense on a system that will serve as a binhost and
 build packages for clients.  It defines the URI header field for the package
 index file which is located at ${PKGDIR}/Packages. Clients that have
@@ -1060,10 +1064,12 @@ Arfrever Frehtes Taifersar Arahesis <arfrever@apache.org>
 .SH "FILES"
 .TP
 \fB/etc/make.conf\fR and \fB/etc/portage/make.conf\fR
-Contains variables for the build\-process and overwrites those in make.defaults.
+Contains variables for the build\-process and overwrites those in
+make.defaults.
 .TP
 .B /usr/share/portage/config/make.globals
-Contains the default variables for the build\-process, you should edit \fI/etc/portage/make.conf\fR instead.
+Contains the default variables for the build\-process, you should edit
+\fI/etc/portage/make.conf\fR instead.
 .TP
 .B /etc/portage/color.map
 Contains variables customizing colors.

diff --git a/man/portage.5 b/man/portage.5
index 796047f..827c504 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -240,7 +240,8 @@ explaining how they can upgrade.
 default-linux/x86/2005.0
 # emerge -n '>=sys-apps/portage-2.0.51'
 # rm -f /etc/portage/make.profile
-# ln -s /usr/portage/profiles/default-linux/alpha/2005.0 /etc/portage/make.profile
+# ln -s /usr/portage/profiles/default-linux/alpha/2005.0 \
+/etc/portage/make.profile
 .fi
 .TP
 .BR eapi
@@ -281,8 +282,8 @@ for every value in that variable, so USE_EXPAND="FOO" and FOO="bar bla" results
 in USE="foo_bar foo_bla".
 .TP
 \fBUSE_EXPAND_HIDDEN\fR = \fI[space delimited list of variable names]\fR
-Names of \fBUSE_EXPAND\fR variables that should not be shown in the verbose merge
-list output of the \fBemerge\fR(1) command.
+Names of \fBUSE_EXPAND\fR variables that should not be shown in the verbose
+merge list output of the \fBemerge\fR(1) command.
 .TP
 \fBUSE_EXPAND_IMPLICIT\fR = \fI[space delimited list of variable names]\fR
 Defines \fBUSE_EXPAND\fR and \fBUSE_EXPAND_UNPREFIXED\fR
@@ -307,7 +308,8 @@ Defines ELIBC values used to generate implicit
 Defines KERNEL values used to generate implicit
 \fBIUSE\fR for ebuilds using \fBEAPI 5\fR or later.
 .TP
-\fBUSE_EXPAND_VALUES_USERLAND\fR = \fI[space delimited list of USERLAND values]\fR
+\fBUSE_EXPAND_VALUES_USERLAND\fR = \fI[space delimited list of USERLAND \
+values]\fR
 Defines USERLAND values used to generate implicit
 \fBIUSE\fR for ebuilds using \fBEAPI 5\fR or later.
 .TP
@@ -615,9 +617,9 @@ to keep all metadata in that format alone (useful for querying), enable
 FEATURES="metadata-transfer" in \fBmake.conf\fR(5).
 .TP
 \fBpackage.accept_keywords\fR and \fBpackage.keywords\fR
-Per\-package ACCEPT_KEYWORDS.  Useful for mixing unstable packages in with a normally 
-stable system or vice versa.  This will allow ACCEPT_KEYWORDS to be augmented
-for a single package. If both \fBpackage.accept_keywords\fR and
+Per\-package ACCEPT_KEYWORDS.  Useful for mixing unstable packages in with a
+normally stable system or vice versa.  This will allow ACCEPT_KEYWORDS to be
+augmented for a single package. If both \fBpackage.accept_keywords\fR and
 \fBpackage.keywords\fR are present, both of them will be used, and values
 from \fBpackage.accept_keywords\fR will override values from
 \fBpackage.keywords\fR. The \fBpackage.accept_keywords\fR file is
@@ -658,8 +660,8 @@ example, a binary only package which is built for x86 will look like:
 
 games-fps/quake3-demo-1.11.ebuild:KEYWORDS="-* x86"
 
-If you wish to accept this package anyways, then use one of the other keywords in your 
-package.accept_keywords like this:
+If you wish to accept this package anyways, then use one of the other keywords
+in your package.accept_keywords like this:
 
 games-fps/quake3-demo x86
 
@@ -687,7 +689,8 @@ directory and have the same format as \fBmake.conf\fR(5).
 
 .I Example:
 .nf
-# use environment variables from /etc/portage/env/glibc.conf for the glibc package
+# use environment variables from /etc/portage/env/glibc.conf for the glibc \
+package
 sys\-libs/glibc glibc.conf
 .fi
 
@@ -722,8 +725,8 @@ versions earlier than 1.0.4496.  No problem!
 .fi
 .TP
 .BR package.properties
-This will allow ACCEPT_PROPERTIES (see \fBmake.conf\fR(5)) to be augmented for a
-single package.
+This will allow ACCEPT_PROPERTIES (see \fBmake.conf\fR(5)) to be augmented for
+a single package.
 
 .I Format:
 .nf
@@ -763,7 +766,8 @@ Specifies \fIsite\-specific\fR repository configuration information.
 .I Format:
 .nf
 \- comments begin with # (no inline comments)
-\- configuration of each repository is specified in a section starting with "[${repository_name}]"
+\- configuration of each repository is specified in a section starting with \
+"[${repository_name}]"
 \- attributes are specified in "${attribute} = ${value}" format
 .fi
 
@@ -853,7 +857,8 @@ Specifies type of synchronization.
 Valid values: cvs, git, rsync
 .TP
 .B sync\-uri
-Specifies URI of repository used for synchronization performed by `emerge \-\-sync`.
+Specifies URI of repository used for synchronization performed by `emerge
+\-\-sync`.
 .RS
 .TP
 Syntax:
@@ -1185,9 +1190,11 @@ mirrors.  Keeps us from overloading a single server.
 
 .I Example:
 .nf
-sourceforge http://aleron.dl.sourceforge.net/sourceforge http://unc.dl.sourceforge.net/sourceforge
+sourceforge http://aleron.dl.sourceforge.net/sourceforge \
+http://unc.dl.sourceforge.net/sourceforge
 
-gentoo http://distro.ibiblio.org/pub/linux/distributions/gentoo/distfiles/ ftp://ftp.gtlib.cc.gatech.edu/pub/gentoo/distfiles
+gentoo http://distro.ibiblio.org/pub/linux/distributions/gentoo/distfiles/ \
+ftp://ftp.gtlib.cc.gatech.edu/pub/gentoo/distfiles
 
 kernel http://www.kernel.org/pub http://www.us.kernel.org/pub
 .fi

diff --git a/man/repoman.1 b/man/repoman.1
index bf498d4..a025350 100644
--- a/man/repoman.1
+++ b/man/repoman.1
@@ -1,6 +1,7 @@
 .TH "REPOMAN" "1" "May 2013" "Portage VERSION" "Portage"
 .SH NAME
-repoman \- Gentoo's program to enforce a minimal level of quality assurance in packages added to the portage tree
+repoman \- Gentoo's program to enforce a minimal level of quality assurance in
+packages added to the portage tree
 .SH SYNOPSIS
 \fBrepoman\fR [\fIoption\fR] [\fImode\fR]
 .SH DESCRIPTION
@@ -9,7 +10,8 @@ repoman \- Gentoo's program to enforce a minimal level of quality assurance in p
 .BR repoman
 checks the quality of ebuild repositories.
 
-Note: \fBrepoman commit\fR only works \fIinside local\fR cvs, git, or subversion repositories.
+Note: \fBrepoman commit\fR only works \fIinside local\fR cvs, git, or
+subversion repositories.
 .SH OPTIONS
 .TP
 \fB-a\fR, \fB--ask\fR
@@ -151,16 +153,19 @@ Ebuilds that have a missing or empty HOMEPAGE variable
 Virtuals that have a non-empty HOMEPAGE variable
 .TP
 .B IUSE.invalid
-This ebuild has a variable in IUSE that is not in the use.desc or its metadata.xml file
+This ebuild has a variable in IUSE that is not in the use.desc or its
+metadata.xml file
 .TP
 .B IUSE.missing
-This ebuild has a USE conditional which references a flag that is not listed in IUSE
+This ebuild has a USE conditional which references a flag that is not listed in
+IUSE
 .TP
 .B KEYWORDS.dropped
 Ebuilds that appear to have dropped KEYWORDS for some arch
 .TP
 .B KEYWORDS.invalid
-This ebuild contains KEYWORDS that are not listed in profiles/arch.list or for which no valid profile was found
+This ebuild contains KEYWORDS that are not listed in profiles/arch.list or for
+which no valid profile was found
 .TP
 .B KEYWORDS.missing
 Ebuilds that have a missing or empty KEYWORDS variable
@@ -187,7 +192,8 @@ Syntax error in LICENSE (usually an extra/missing space/parenthesis)
 Virtuals that have a non-empty LICENSE variable
 .TP
 .B LIVEVCS.stable
-Ebuild is a live ebuild (cvs, git, darcs, svn, etc) checkout with stable keywords.
+Ebuild is a live ebuild (cvs, git, darcs, svn, etc) checkout with stable
+keywords.
 .TP
 .B LIVEVCS.unmasked
 Ebuild is a live ebuild (cvs, git, darcs, svn, etc) checkout but has keywords
@@ -227,19 +233,23 @@ Missing ChangeLog files
 ChangeLogs that exist but have not been added to cvs
 .TP
 .B dependency.bad
-User-visible ebuilds with unsatisfied dependencies (matched against *visible* ebuilds)
+User-visible ebuilds with unsatisfied dependencies (matched against *visible*
+ebuilds)
 .TP
 .B dependency.badindev
-User-visible ebuilds with unsatisfied dependencies (matched against *visible* ebuilds) in developing arch
+User-visible ebuilds with unsatisfied dependencies (matched against *visible*
+ebuilds) in developing arch
 .TP
 .B dependency.badmasked
 Masked ebuilds with unsatisfied dependencies (matched against *all* ebuilds)
 .TP
 .B dependency.badmaskedindev
-Masked ebuilds with unsatisfied dependencies (matched against *all* ebuilds) in developing arch
+Masked ebuilds with unsatisfied dependencies (matched against *all* ebuilds) in
+developing arch
 .TP
 .B dependency.badtilde
-Uses the ~ dep operator with a non-zero revision part, which is useless (the revision is ignored)
+Uses the ~ dep operator with a non-zero revision part, which is useless (the
+revision is ignored)
 .TP
 .B dependency.syntax
 Syntax error in dependency string (usually an extra/missing space/parenthesis)
@@ -262,10 +272,12 @@ Some files listed in the Manifest aren't referenced in SRC_URI
 This ebuild has a malformed header
 .TP
 .B ebuild.invalidname
-Ebuild files with a non-parseable or syntactically incorrect name (or using 2.1 versioning extensions)
+Ebuild files with a non-parseable or syntactically incorrect name (or using 2.1
+versioning extensions)
 .TP
 .B ebuild.majorsyn
-This ebuild has a major syntax error that may cause the ebuild to fail partially or fully
+This ebuild has a major syntax error that may cause the ebuild to fail
+partially or fully
 .TP
 .B ebuild.minorsyn
 This ebuild has a minor syntax error that contravenes gentoo coding style
@@ -286,14 +298,15 @@ A simple sourcing of the ebuild produces output; this breaks ebuild policy.
 PATCHES variable should be a bash array to ensure white space safety
 .TP
 .B ebuild.syntax
-Error generating cache entry for ebuild; typically caused by ebuild syntax error
-or digest verification failure.
+Error generating cache entry for ebuild; typically caused by ebuild syntax
+error or digest verification failure.
 .TP
 .B file.UTF8
 File is not UTF8 compliant
 .TP
 .B file.executable
-Ebuilds, digests, metadata.xml, Manifest, and ChangeLog do not need the executable bit
+Ebuilds, digests, metadata.xml, Manifest, and ChangeLog do not need the
+executable bit
 .TP
 .B file.name
 File/dir name must be composed of only the following chars: a-zA-Z0-9._-+:

diff --git a/man/xpak.5 b/man/xpak.5
index 0b5b874..6e3d03d 100644
--- a/man/xpak.5
+++ b/man/xpak.5
@@ -11,7 +11,8 @@ The following conventions cover all occurrences in this documentation
 .IP Integer
 All offsets/lengths are big endian unsigned 32bit integers
 .IP String
-All strings are ASCII encoded, and not NUL terminated (quotes are for illustration only)
+All strings are ASCII encoded, and not NUL terminated (quotes are for
+illustration only)
 .IP Values
 The actual values of the individual xpak entries are stored as Strings
 .P

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     2bdc9420cff2196a6f2783d445958ab1ed82c9c2
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 25 22:43:11 2013 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Thu Jul 25 22:43:11 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=2bdc9420

make.conf.5: restore SYNC documentation

The SYNC variable is deprecated, but it is still supported, for
backward compatibility with mirrorselect --rsync.

---
 man/make.conf.5 | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/man/make.conf.5 b/man/make.conf.5
index 74f047b..ddacf56 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -966,6 +966,32 @@ Defines the location where created RPM packages will be stored.
 .br
 Defaults to ${PORTDIR}/rpm.
 .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.
+
+Note that the \fBSYNC\fR variable is now deprecated, and instead the
+sync\-type and sync\-uri attributes in repos.conf should be used. See
+\fBportage\fR(5) for more information.
+
+Defaults to rsync://rsync.gentoo.org/gentoo\-portage
+.RS
+.TP
+.B Usage:
+(rsync|ssh)://[username@]hostname[:port]/(module|path)
+.TP
+.B Examples:
+rsync://private\-mirror.com/portage\-module
+.br
+rsync://rsync\-user@private\-mirror.com:873/gentoo\-portage
+.br
+ssh://ssh\-user@192.168.0.1:22/usr/portage
+.br
+ssh://ssh\-user@192.168.0.1:22/\\${HOME}/portage\-storage
+.TP
+Note: For the ssh:// scheme, key\-based authentication might be of interest.
+.RE
+.TP
 \fBUNINSTALL_IGNORE\fR = \fI[space delimited list of fnmatch patterns]\fR
 This variable prevents uninstallation of files that match
 specific \fBfnmatch\fR(3) patterns. In order to ignore file

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     062569bc2f02140f38828a9e9ef14ae6ea287336
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 24 21:22:21 2013 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Wed Jul 24 21:22:21 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=062569bc

emirrordist.1: fix dup REPOSITORIES_CONFIGURATION

---
 man/emirrordist.1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/man/emirrordist.1 b/man/emirrordist.1
index 715d3d7..2c93830 100644
--- a/man/emirrordist.1
+++ b/man/emirrordist.1
@@ -55,7 +55,7 @@ Override the PORTDIR variable. This option is deprecated in favor of
 Override the PORTDIR_OVERLAY variable. This option is deprecated in favor of
 \-\-repositories\-configuration option.
 .TP
-\fB\-\-repositories\-configuration=REPOSITORIES_CONFIGURATION\fR=\fIREPOSITORIES_CONFIGURATION\fR
+\fB\-\-repositories\-configuration\fR=\fIREPOSITORIES_CONFIGURATION\fR
 Override configuration of repositories. The argument of this option has
 the same format as repos.conf (see \fBportage\fR(5)).
 .TP

[gentoo-commits] proj/portage:master commit in: man/

[Arfrever Frehtes Taifersar Arahesis]

commit:     aac856ca0b6b30da90ba8dfc4363606315c46e8b
Author:     Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Tue Jul 23 22:51:35 2013 +0000
Commit:     Arfrever Frehtes Taifersar Arahesis <arfrever.fta <AT> gmail <DOT> com>
CommitDate: Tue Jul 23 22:51:35 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=aac856ca

Add anoncvs gentoo-x86 example in documentation of repos.conf.

---
 man/portage.5 | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/man/portage.5 b/man/portage.5
index 27c3ffe..8dc33fb 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -887,6 +887,13 @@ masters = gentoo kde
 # those master repos won't be required as dependencies (the user must
 # ensure that any required dependencies such as eclasses are satisfied)
 masters =
+
+# Repository 'gentoo' synchronized using CVS
+[gentoo]
+location = /usr/portage
+sync-type = cvs
+sync-uri = :pserver:anonymous@anoncvs.gentoo.org:/var/cvsroot
+sync-cvs-repo = gentoo-x86
 .fi
 .RE
 .RE

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     c81306a10124b3a4295528b34dd0393599cd5308
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 22 19:19:56 2013 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Jul 22 19:19:56 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=c81306a1

make.conf.5: note usersync reqs for bug #277970

---
 man/make.conf.5 | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/man/make.conf.5 b/man/make.conf.5
index adf32bd..fcab08d 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -1,4 +1,4 @@
-.TH "MAKE.CONF" "5" "May 2013" "Portage VERSION" "Portage"
+.TH "MAKE.CONF" "5" "Jul 2013" "Portage VERSION" "Portage"
 .SH "NAME"
 make.conf \- custom settings for Portage
 .SH "SYNOPSIS"
@@ -583,7 +583,11 @@ Enable the sandbox in the compile phase, when running without root privs (\fIuse
 .TP
 .B usersync
 Drop privileges to the owner of \fBPORTDIR\fR for \fBemerge(1) --sync\fR
-operations.
+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
+operation.
 .TP
 .B webrsync-gpg
 Enable GPG verification when using \fIemerge\-webrsync\fR.

[gentoo-commits] proj/portage:master commit in: man/

[Arfrever Frehtes Taifersar Arahesis]

commit:     c941bc4c73a7c79baa776c8fbe5c2f45d466f18f
Author:     Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Mon Jul 22 04:44:03 2013 +0000
Commit:     Arfrever Frehtes Taifersar Arahesis <arfrever.fta <AT> gmail <DOT> com>
CommitDate: Mon Jul 22 04:44:03 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=c941bc4c

Improve documentation of repos.conf.

---
 man/portage.5 | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 62 insertions(+), 10 deletions(-)

diff --git a/man/portage.5 b/man/portage.5
index 01be18b..81a026a 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -758,22 +758,74 @@ x11\-libs/qt \-mysql
 .fi
 .TP
 .BR repos.conf
-Specifies \fIsite\-specific\fR repository configuration information. Note that
-local configuration overrides (i.e. \fBaliases\fR, \fBeclass-overrides\fR and
-\fBmasters\fR attributes) which are specified here do not apply to tools
-such as \fBrepoman\fR(1) and \fBegencache\fR(1), since operations performed by
-these tools are inherently \fBnot\fR \fIsite\-specific\fR.
+Specifies \fIsite\-specific\fR repository configuration information.
+
+.I Format:
+.nf
+\- comments begin with # (no inline comments)
+\- configuration of each repository is specified in a section starting with "[${repository_name}]"
+\- attributes are specified in "${attribute} = ${value}" format
+.fi
+
+.I Attributes supported in DEFAULT section:
+.RS
+.RS
+.TP
+.B main\-repo
+Specifies main repository.
+.TP
+.B eclass\-overrides
+Makes all repositories inherit eclasses from specified repositories.
+.br
+Setting this attribute is generally not recommended since resulting changes
+in eclass inheritance may trigger performance issues due to invalidation
+of metadata cache.
+.br
+Tools such as \fBrepoman\fR(1) and \fBegencache\fR(1) ignore this attribute,
+since operations performed by these tools are inherently
+\fBnot\fR \fIsite\-specific\fR.
+.RE
+
+.I Attributes supported in sections of repositories:
+.RS
+.TP
+.B aliases
+Specifies aliases of given repository.
+.TP
+.B eclass\-overrides
+Makes given repository inherit eclasses from specified repositories.
 .br
-\fBWARNING:\fR Setting \fBaliases\fR, \fBeclass-overrides\fR or \fBmasters\fR
-attributes in \fBrepos.conf\fR is generally not recommended since resulting
-changes in eclass inheritance may trigger performance issues due to invalidation
+Setting this attribute is generally not recommended since resulting changes
+in eclass inheritance may trigger performance issues due to invalidation
 of metadata cache.
+.br
+Tools such as \fBrepoman\fR(1) and \fBegencache\fR(1) ignore this attribute,
+since operations performed by these tools are inherently
+\fBnot\fR \fIsite\-specific\fR.
+.TP
+.B location
+Specifies location of given repository.
+.TP
+.B masters
+Specifies master repositories of given repository.
+.br
+Setting this attribute is generally not recommended since resulting changes
+in eclass inheritance may trigger performance issues due to invalidation
+of metadata cache.
+.br
+Tools such as \fBrepoman\fR(1) and \fBegencache\fR(1) ignore this attribute,
+since operations performed by these tools are inherently
+\fBnot\fR \fIsite\-specific\fR.
+.TP
+.B priority
+Specifies priority of given repository.
+.RE
 
 .I Example:
 .nf
 [DEFAULT]
-# make gentoo the main repo (aka PORTDIR), which makes it the default master
-# repository for repostories that do not specify masters
+# make gentoo the main repository, which makes it the default master
+# repository for repositories that do not specify masters
 main\-repo = gentoo
 # make all repositories inherit eclasses from the java\-overlay and
 # java\-experimental repositories, with eclasses from java\-experimental

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     ab6a0321659fa448a541398c1a6083c7f856e87f
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  6 19:23:45 2013 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sat Jul  6 19:23:45 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=ab6a0321

man/portage.5: clarify package.provided virtuals

---
 man/portage.5 | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/man/portage.5 b/man/portage.5
index 31c6c88..ca468b8 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -1,4 +1,4 @@
-.TH "PORTAGE" "5" "Jun 2013" "Portage VERSION" "Portage"
+.TH "PORTAGE" "5" "Jul 2013" "Portage VERSION" "Portage"
 .SH NAME
 portage \- the heart of Gentoo
 .SH "DESCRIPTION"
@@ -372,7 +372,9 @@ entries may cause installed packages satisfying equivalent dependencies
 to be removed by \fBemerge\fR(1) \fB\-\-depclean\fR actions (see the
 \fBACTIONS\fR section of the \fBemerge\fR(1) man page for more information).
 
-Virtual packages (virtual/*) should not be specified in package.provided.
+Virtual packages (virtual/*) should not be specified in package.provided,
+since virtual packages themselves do not provide any files, and
+package.provided is intended to represent packages that do provide files.
 Depending on the type of virtual, it may be necessary to add an entry to the
 virtuals file and/or add a package that satisfies a virtual to
 package.provided.

[gentoo-commits] proj/portage:master commit in: man/

[Arfrever Frehtes Taifersar Arahesis]

commit:     5cc7fd215076d3fda765bae77e08991c8a6e0439
Author:     Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Mon Jun 24 09:28:11 2013 +0000
Commit:     Arfrever Frehtes Taifersar Arahesis <arfrever.fta <AT> gmail <DOT> com>
CommitDate: Mon Jun 24 09:28:11 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=5cc7fd21

Update notes about aliases, eclass-overrides and masters attributes in repos.conf and layout.conf.

---
 man/portage.5 | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/man/portage.5 b/man/portage.5
index 505990c..31c6c88 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -756,13 +756,15 @@ x11\-libs/qt \-mysql
 .TP
 .BR repos.conf
 Specifies \fIsite\-specific\fR repository configuration information. Note that
-local configuration overrides which are specified here do not apply to tools
-such as \fBrepoman\fR(1) and \fBegencache\fR(1), since operations
-performed by these tools
-are inherently \fBnot\fR \fIsite\-specific\fR. \fBWARNING:\fR Use of
-\fBrepos.conf\fR is generally not recommended since resulting changes in
-eclass inheritance (especially due to \fBeclass\-overrides\fR) may trigger
-performance issues under some circumstances (see \fBbug #124041\fR).
+local configuration overrides (i.e. \fBaliases\fR, \fBeclass-overrides\fR and
+\fBmasters\fR attributes) which are specified here do not apply to tools
+such as \fBrepoman\fR(1) and \fBegencache\fR(1), since operations performed by
+these tools are inherently \fBnot\fR \fIsite\-specific\fR.
+.br
+\fBWARNING:\fR Setting \fBaliases\fR, \fBeclass-overrides\fR or \fBmasters\fR
+attributes in \fBrepos.conf\fR is generally not recommended since resulting
+changes in eclass inheritance may trigger performance issues due to invalidation
+of metadata cache.
 
 .I Example:
 .nf
@@ -852,9 +854,9 @@ behaves like an "aliases" attribute in \fBrepos.conf\fR. \fISite-specific\fR
 overrides to \fBlayout.conf\fR settings may be specified in
 \fB/etc/portage/repos.conf\fR. Settings in \fBrepos.conf\fR take
 precedence over settings in \fBlayout.conf\fR, except tools such as
-\fBrepoman\fR(1) and \fBegencache\fR(1) will entirely ignore
-\fBrepos.conf\fR since their operations are inherently \fBnot\fR
-\fIsite\-specific\fR.
+\fBrepoman\fR(1) and \fBegencache\fR(1) ignore "aliases", "eclass-overrides"
+and "masters" attributes set in \fBrepos.conf\fR since their operations are
+inherently \fBnot\fR \fIsite\-specific\fR.
 
 .I Example:
 .nf

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     d444a9298471d0c2c460bf82c9b08c872e031b0d
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 18 17:57:20 2013 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Tue Jun 18 17:57:20 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=d444a929

portage.5: repos.conf: document priority

---
 man/portage.5 | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/man/portage.5 b/man/portage.5
index daad9bb..7b13073 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -776,6 +776,10 @@ main\-repo = gentoo
 eclass\-overrides = java\-overlay java\-experimental
 
 [gentoo]
+# repos with higher priorities are preferred when ebuilds with equal versions
+# are found in multiple repos (see the `emerge \-\-info \-\-verbose` repo
+# display for a listing of repos and their corresponding priorities).
+priority = 9999
 # disable all eclass overrides for ebuilds from the gentoo repository
 eclass\-overrides =
 # when processing metadata/layout.conf from other repositories, substitute

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     1d18ee12c37c2533a42a80b8b05e88f8f6a5fd4f
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 18 16:35:23 2013 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Tue Jun 18 16:35:23 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=1d18ee12

portage.5: repos.conf: document main-repo

---
 man/portage.5 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/man/portage.5 b/man/portage.5
index 7a69054..daad9bb 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -767,6 +767,9 @@ performance issues under some circumstances (see \fBbug #124041\fR).
 .I Example:
 .nf
 [DEFAULT]
+# make gentoo the main repo (aka PORTDIR), which makes it the default master
+# repository for repostories that do not specify masters
+main\-repo = gentoo
 # make all repositories inherit eclasses from the java\-overlay and
 # java\-experimental repositories, with eclasses from java\-experimental
 # taking precedence over those from java\-overlay

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     98d3bd009c0d5e710783f5e36d1056dd41b7c79e
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 13 00:14:37 2013 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Thu Jun 13 00:14:37 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=98d3bd00

man/make.conf.5: mention RSYNC_PROXY

---
 man/make.conf.5 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/man/make.conf.5 b/man/make.conf.5
index fed71f5..adf32bd 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -618,9 +618,9 @@ the \fIebuild scripts\fR. Merging 'mirrorselect' can help.  Entries in this
 variable that have no protocol and simply start with a '/' path separator may
 be used to specify mounted filesystem mirrors.
 .TP
-\fBhttp_proxy ftp_proxy\fR = \fI[protocol://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
+\fBhttp_proxy ftp_proxy RSYNC_PROXY\fR = \fI[protocol://host:port]\fR
+These variables are used by network clients such as \fBwget\fR(1) and
+\fBrsync\fR(1). They are only required if you use a
 proxy server for internet access.
 .TP
 \fBINSTALL_MASK\fR = \fI[space delimited list of file names]\fR

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     3ebdc44ef28c6001a9f408894d6f8a4670246e67
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  9 23:29:09 2013 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Jun  9 23:29:09 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=3ebdc44e

man/portage.5: remove /etc/make.conf references

Since /etc/portage/make.conf supersedes /etc/make.conf, there's no need
to mention /etc/make.conf here anymore (it's still mentioned in
make.conf(5) though).

---
 man/portage.5 | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/man/portage.5 b/man/portage.5
index e462266..7a69054 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -15,11 +15,6 @@ If you are looking for information on how to emerge something, please see
 .BR emerge (1).
 .SH "SYNOPSIS"
 .TP
-.BR /etc/
-.nf
-.BR make.conf (5)
-.fi
-.TP
 \fB/etc/portage/make.profile/\fR or \fB/etc/make.profile/\fR
 site\-specific overrides go in \fB/etc/portage/profile/\fR
 .nf
@@ -53,7 +48,7 @@ bashrc
 categories
 color.map
 license_groups
-make.conf
+.BR make.conf (5)
 mirrors
 modules
 package.accept_keywords
@@ -205,13 +200,6 @@ More reading:
 .RE
 .SH "SPECIFIC FILE DESCRIPTIONS"
 .TP
-.BR /etc/
-.RS
-.TP
-.BR make.conf
-The global custom settings for Portage.  See \fBmake.conf\fR(5).
-.RE
-.TP
 \fB/etc/portage/make.profile/\fR or \fB/etc/make.profile/\fR
 This is usually just a symlink to the correct profile in 
 \fB/usr/portage/profiles/\fR.  Since it is part of the portage tree, it 
@@ -577,7 +565,6 @@ Contains variables customizing colors. See \fBcolor.map\fR(5).
 .TP
 .BR make.conf
 The global custom settings for Portage. See \fBmake.conf\fR(5).
-If present, this file will override settings from /etc/make.conf.
 .TP
 .BR mirrors
 Whenever portage encounters a mirror:// style URI it will look up the actual 

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     dc726cc010feb04303a5f4f6ab2719d2afd59d51
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Fri May 24 02:23:17 2013 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Fri May 24 02:23:17 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=dc726cc0

man/emerge.1: --resume uses mtimedb

---
 man/emerge.1 |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/man/emerge.1 b/man/emerge.1
index b4b5002..05373cf 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -211,6 +211,9 @@ success condition. A resume list will persist until it has been completed in
 entirety or until another aborted merge list replaces it.  The resume history
 is capable of storing two merge lists.  After one resume list completes, it is
 possible to invoke \-\-resume once again in order to resume an older list.
+The resume lists are stored in \fI/var/cache/edb/mtimedb\fR, and may be
+explicitly discarded by running `emaint \-\-fix cleanresume` (see
+\fBemaint\fR(1)).
 .TP
 .BR "\-\-search " (\fB\-s\fR)
 Searches for matches of the supplied string in the portage tree.

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     b0f3c0b70042c5d0ca08ff3b19722926b8f1d086
Author:     tomboy64 <tomboy64 <AT> sina <DOT> cn>
AuthorDate: Fri May 17 16:06:40 2013 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Fri May 17 16:06:40 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=b0f3c0b7

man/make.conf.5: SYNC ssh examples, bug #470152

---
 man/make.conf.5 |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/man/make.conf.5 b/man/make.conf.5
index 19118ff..f54c93f 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -965,6 +965,22 @@ 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
+.RS
+.TP
+.B Usage:
+(rsync|ssh)://[username@]hostname[:port]/(module|path)
+.TP
+.B Examples:
+rsync://private\-mirror.com/portage\-module
+.br
+rsync://rsync\-user@private\-mirror.com:873/gentoo\-portage
+.br
+ssh://ssh\-user@192.168.0.1:22/usr/portage
+.br
+ssh://ssh\-user@192.168.0.1:22/\\${HOME}/portage\-storage
+.TP
+Note: For the ssh:// scheme, key\-based authentication might be of interest.
+.RE
 .TP
 \fBUNINSTALL_IGNORE\fR = \fI[space delimited list of fnmatch patterns]\fR
 This variable prevents uninstallation of files that match

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     6c88d52508bf08956d42961405b79c04ebafd539
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Wed May 15 21:23:09 2013 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Wed May 15 21:23:09 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=6c88d525

man/ebuild.5: note that PROVIDE is deprecated

---
 man/ebuild.5 |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index 20e7b4b..b461437 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -1,4 +1,4 @@
-.TH "EBUILD" "5" "Mar 2013" "Portage VERSION" "Portage"
+.TH "EBUILD" "5" "May 2013" "Portage VERSION" "Portage"
 
 .SH "NAME"
 ebuild \- the internal format, variables, and functions in an ebuild script
@@ -712,6 +712,10 @@ This variable should only be used when a package provides a virtual target.
 For example, blackdown\-jdk and sun\-jdk provide \fIvirtual/jdk\fR.  This
 allows for packages to depend on \fIvirtual/jdk\fR rather than on blackdown
 or sun specifically.
+
+The \fBPROVIDE\fR variable has been deprecated. See
+\fIhttp://www.gentoo.org/proj/en/glep/glep-0037.html\fR for details.
+
 .TP
 .B DOCS
 Beginning with \fBEAPI 4\fR, an array or space\-delimited list of documentation

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     ef395a76d34fea2b435cfd1856c0df198d594f65
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Wed May  1 21:05:15 2013 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Wed May  1 21:05:15 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=ef395a76

man/emerge: clarify --rebuild-if-new-slot #467924

---
 man/emerge.1 |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/man/emerge.1 b/man/emerge.1
index 944a432..874d333 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -677,6 +677,12 @@ Since this option requires
 checking of reverse dependencies, it enables \-\-complete\-graph
 mode whenever a new slot is installed. This option is enabled by
 default.
+
+NOTE: If you want to skip all rebuilds involving slot\-operator
+dependecies (including those that involve sub\-slot changes alone),
+then \fI\-\-ignore\-built\-slot\-operator\-deps=y\fR is the option
+that you are looking for, since \fI\-\-rebuild\-if\-new\-slot\fR
+does not affect rebuilds triggered by sub\-slot changes alone.
 .TP
 .BR "\-\-rebuild\-if\-new\-rev [ y | n ]"
 Rebuild packages when build\-time dependencies are built from source, if the

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     45e0fa1f556eaf66678a4f78ed003d3f8cfb892a
Author:     Vladimir Romanov <blueboar2 <AT> gmail <DOT> com>
AuthorDate: Wed Apr 24 03:46:59 2013 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Wed Apr 24 03:46:59 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=45e0fa1f

man/dispatch-conf.1: reflow text

---
 man/dispatch-conf.1 |   75 +++++++++++++++++++++------------------------------
 1 files changed, 31 insertions(+), 44 deletions(-)

diff --git a/man/dispatch-conf.1 b/man/dispatch-conf.1
index b82c215..e16d49c 100644
--- a/man/dispatch-conf.1
+++ b/man/dispatch-conf.1
@@ -1,46 +1,36 @@
 .TH "DISPATCH-CONF" "1" "Jan 2011" "Portage VERSION" "Portage"
-.SH NAME
-dispatch-conf \- Sanely update configuration files after emerging new packages
-.SH SYNOPSIS
-.B dispatch-conf
-.SH DESCRIPTION
-.I dispatch-conf
-is designed to be run after merging new packages in order to see if
-there are updates to the configuration files.  If a new
-configuration file will overwrite an old one, 
-.I dispatch-conf 
-will prompt the user for a decision about how to resolve the
-discrepancy.  
-Advantages of 
-.I dispatch-conf
-include easy rollback (changes to config files are stored either using
-patches or rcs) and the ability to automatically update config files
-that the user has never modified or 
+.SH "NAME"
+dispatch\-conf \- Sanely update configuration files after emerging new packages
+.SH "SYNOPSIS"
+.B dispatch\-conf
+.SH "DESCRIPTION"
+\fIdispatch\-conf\fR is designed to be run after merging new packages
+in order to see if there are updates to the configuration files.
+If a new configuration file will overwrite an old one, \fIdispatch\-conf\fR
+will prompt the user for a decision about how to resolve the discrepancy.
+Advantages of \fIdispatch\-conf\fR include easy rollback (changes to config
+files are stored either using patches or rcs) and the ability to
+automatically update config files that the user has never modified or
 that differ from the current version only in CVS cruft or white space.
 
-.I dispatch-conf
-will check all directories in the \fICONFIG_PROTECT\fR variable.  All
-config files found in \fICONFIG_PROTECT_MASK\fR will automatically be
-updated for you by \fIdispatch-conf\fR.  See \fBmake.conf\fR(5) for more
-information.
-.SH OPTIONS
+\fIdispatch\-conf\fR will check all directories in the \fICONFIG_PROTECT\fR
+variable.  All config files found in \fICONFIG_PROTECT_MASK\fR will
+automatically be updated for you by \fIdispatch\-conf\fR.  See
+\fBmake.conf\fR(5) for more information.
+.SH "OPTIONS"
 .TP
 None.
-.SH USAGE
-.I dispatch-conf
-must be run as root, since the config files to be replaced are generally
-owned by root.  Before running
-.I dispatch-conf
-for the first time the settings in 
-.B /etc/dispatch-conf.conf
+.SH "USAGE"
+\fIdispatch\-conf\fR must be run as root, since the config files to be
+replaced are generally owned by root.  Before running \fIdispatch\-conf\fR
+for the first time the settings in \fB/etc/dispatch\-conf.conf\fR
 should be edited and the archive directory specified in 
-\fI/etc/dispatch-conf.conf\fR will need to be created.  All changes to
+\fB/etc/dispatch\-conf.conf\fR will need to be created.  All changes to
 config files will be saved in the archive directory either as patches
 or using rcs, making restoration to an earlier version rather simple.
 
-When dispatch-conf finds a config file that has a new update the user 
-is provided
-with a menu of options for how to handle the update:
+When \fIdispatch\-conf\fR finds a config file that has a new update the user
+is provided with a menu of options for how to handle the update:
 .TP
 .B u
 Update (replace) the current config file with the new config file and continue.
@@ -53,7 +43,7 @@ Skip to the next config file, leaving both the original config file and any
 \fICONFIG_PROTECT\fRed files.
 .TP
 .B e
-Edit the new config file, using the editor defined in \fI$EDITOR\fR.
+Edit the new config file, using the editor defined in \fIEDITOR\fR.
 .TP
 .B m
 Interactively merge the current and new config files.
@@ -63,17 +53,14 @@ Look at the differences between the pre-merged and merged config files.
 .TP
 .B t
 Toggle between the merged and pre-merged config files (in terms of which
-should be installed using the 
-.Qt u
-command).
+should be installed using the \fBu\fR command).
 .TP
 .B h
 Display a help screen.
 .TP
 .B q
-Quit
-.I dispatch-conf.
-.SH FILE MODES
+Quit \fIdispatch\-conf\fR.
+.SH "FILE MODES"
 \fBWARNING:\fR When \fB/etc/dispatch\-conf.conf\fR is configured
 to use \fBrcs\fR(1), read and execute permissions of archived
 files may be inherited from the first check in of a working file,
@@ -85,7 +72,7 @@ to RCS files by setting the permissions of the directory
 containing the files.
 .SH "REPORTING BUGS"
 Please report bugs via http://bugs.gentoo.org/
-.SH AUTHORS
+.SH "AUTHORS"
 .nf
 Jeremy Wohl
 Karl Trygve Kalleberg <karltk@gentoo.org>
@@ -94,8 +81,8 @@ Grant Goodyear <g2boojum@gentoo.org>
 .fi
 .SH "FILES"
 .TP
-.B /etc/dispatch-conf.conf
-Configuration settings for \fIdispatch-conf\fR are stored here.
+.B /etc/dispatch\-conf.conf
+Configuration settings for \fIdispatch\-conf\fR are stored here.
 .SH "SEE ALSO"
 .BR make.conf (5),
 .BR ci (1),

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     48f89147f2b6631b6b66be4d2c9b2fcb8545f917
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 23 03:19:08 2013 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Tue Apr 23 03:19:08 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=48f89147

man/make.conf.5: document DCO_SIGNED_OFF_BY

Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

---
 man/make.conf.5 |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/man/make.conf.5 b/man/make.conf.5
index ffddeba..8c6d477 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -166,6 +166,10 @@ See the \fBPORTDIR\fR documentation for more information.
 .br
 Defaults to /usr/portage/distfiles.
 .TP
+.B DCO_SIGNED_OFF_BY
+This variable may contain a name and email address which will be used by
+\fBrepoman\fR(1) to add a Signed\-off\-by line to each commit message.
+.TP
 .B DOC_SYMLINKS_DIR
 If this variable contains a directory then symlinks to html documentation will
 be installed into it.

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     38204597b0e056c5c5df99bd968df008a348478d
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Mon Apr  8 00:32:11 2013 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Apr  8 00:32:11 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=38204597

man/make.conf.5: noauto sources ebuild each phase

---
 man/make.conf.5 |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/man/make.conf.5 b/man/make.conf.5
index 5e35546..ffddeba 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -1,4 +1,4 @@
-.TH "MAKE.CONF" "5" "Mar 2013" "Portage VERSION" "Portage"
+.TH "MAKE.CONF" "5" "Apr 2013" "Portage VERSION" "Portage"
 .SH "NAME"
 make.conf \- custom settings for Portage
 .SH "SYNOPSIS"
@@ -395,7 +395,9 @@ Enable GLEP 42 news support. See
 \fIhttp://www.gentoo.org/proj/en/glep/glep-0042.html\fR.
 .TP
 .B noauto
-When utilizing \fBebuild\fR(1), only run the function requested.
+When utilizing \fBebuild\fR(1), only run the function requested. Also, forces
+the corresponding ebuild and eclasses to be sourced again for each phase, in
+order to account for modifications.
 .TP
 .B noclean
 Do not delete the the source and temporary files after the merge process.

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     68ba705da919f2f58602ca2b6e571ac72593627b
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Thu Apr  4 16:47:49 2013 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Thu Apr  4 16:47:49 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=68ba705d

man/emerge.1: move --digest to option section

---
 man/emerge.1 |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/man/emerge.1 b/man/emerge.1
index e81f11b..944a432 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -114,11 +114,6 @@ Run package specific actions needed to be executed after the emerge process
 has completed.  This usually entails configuration file setup or other similar 
 setups that the user may wish to run.
 .TP
-.BR \-\-digest
-Prevent corruption from being noticed. The `repoman manifest` command is the
-preferred way to generate manifests and it is capable of doing an entire
-repository or category at once (see \fBrepoman\fR(1)).
-.TP
 .BR "\-\-depclean (-c)"
 Cleans the system by removing packages that are not associated
 with explicitly merged packages. Depclean works by creating the
@@ -439,6 +434,11 @@ when FEATURES="preserve\-libs" is enabled in
 \fBmake.conf\fR(5), since any libraries that have
 consumers will simply be preserved.
 .TP
+.BR \-\-digest
+Prevent corruption from being noticed. The `repoman manifest` command is the
+preferred way to generate manifests and it is capable of doing an entire
+repository or category at once (see \fBrepoman\fR(1)).
+.TP
 .BR "\-\-dynamic\-deps < y | n >"
 In dependency calculations, substitute the dependencies of installed
 packages with the dependencies of corresponding unbuilt ebuilds from

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     c86c05e07c5060d1a81b8b8a3880175260d79a45
Author:     Pavlos Ratis <dastergon <AT> gentoo <DOT> org>
AuthorDate: Thu Apr  4 14:20:07 2013 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Thu Apr  4 14:23:05 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=c86c05e0

man/emerge.1: document --digest, bug #161236

---
 man/emerge.1 |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/man/emerge.1 b/man/emerge.1
index f477429..e81f11b 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -114,6 +114,11 @@ Run package specific actions needed to be executed after the emerge process
 has completed.  This usually entails configuration file setup or other similar 
 setups that the user may wish to run.
 .TP
+.BR \-\-digest
+Prevent corruption from being noticed. The `repoman manifest` command is the
+preferred way to generate manifests and it is capable of doing an entire
+repository or category at once (see \fBrepoman\fR(1)).
+.TP
 .BR "\-\-depclean (-c)"
 Cleans the system by removing packages that are not associated
 with explicitly merged packages. Depclean works by creating the

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     e0a1cd8432b4c528fb47a7229002c5a3b468039e
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Wed Apr  3 03:11:47 2013 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Wed Apr  3 03:12:29 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=e0a1cd84

man/portage.5: layout.conf repo-name, bug #433561

---
 man/portage.5 |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/man/portage.5 b/man/portage.5
index cea7e71..686e318 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -853,6 +853,10 @@ precedence over settings in \fBlayout.conf\fR, except tools such as
 
 .I Example:
 .nf
+# Specify the repository name (if there is a different setting in
+# profiles/repo_name, then this layout.conf setting will take precedence)
+repo\-name = foo-overlay
+
 # eclasses provided by java-overlay take precedence over identically named
 # eclasses that are provided by gentoo
 masters = gentoo java-overlay
@@ -1033,7 +1037,8 @@ x86-linux    prefix/linux/x86            exp
 .BR repo_name
 The first line of the file should define a unique repository name. The name
 may contain any of the characters [A\-Za\-z0\-9_\-]. It must not begin with a
-hyphen.
+hyphen. If the repo\-name attribute is specified in layout.conf, then that
+setting will take precedence.
 .TP
 .BR thirdpartymirrors
 Controls the mapping of mirror:// style URIs to actual lists of 

[gentoo-commits] proj/portage:master commit in: man/

[Mike Frysinger]

commit:     1193bcc24540dc97c162f348be26f2b7a4bf92d7
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Tue Apr  2 19:57:35 2013 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Tue Apr  2 19:57:35 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=1193bcc2

ebuild(5): add missing space between doman/dohard

Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>

---
 man/ebuild.5 |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index 749a3f3..7ecb672 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -1365,6 +1365,7 @@ foo.\fI<locale>\fR.1 will be installed as
 /usr/share/man/\fI<locale>\fR/man1/foo.1. Beginning with \fBEAPI 4\fR,
 the \fI\-i18n\fR option takes precedence over the locale suffix of the
 file name.
+
 .PD 0
 .TP
 .B dohard\fR \fI<filename> <linkname>

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     c3c464acda75e0b93d33d447f419c4dbba058d00
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 24 19:23:36 2013 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Mar 24 19:23:36 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=c3c464ac

ebuild.1: correct ebuild.sh path, bug #462802

---
 man/ebuild.1 |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/man/ebuild.1 b/man/ebuild.1
index 0a937ae..bc9d31b 100644
--- a/man/ebuild.1
+++ b/man/ebuild.1
@@ -1,4 +1,4 @@
-.TH "EBUILD" "1" "Jan 2013" "Portage VERSION" "Portage"
+.TH "EBUILD" "1" "Mar 2013" "Portage VERSION" "Portage"
 .SH "NAME"
 ebuild \- a low level interface to the Portage system
 .SH "SYNOPSIS"
@@ -224,6 +224,6 @@ Contains variables customizing colors.
 .BR make.conf (5),
 .BR color.map (5)
 .TP
-The \fI/usr/sbin/ebuild.sh\fR script. 
+The \fI/usr/lib/portage/bin/ebuild.sh\fR script.
 .TP
 The helper apps in \fI/usr/lib/portage/bin\fR.

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     d4a4a98f02f6a3eba2430a0a5659b7b5bdc44cc5
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 23 19:45:34 2013 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sat Mar 23 19:45:34 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=d4a4a98f

ebuild.5: correct ebuild.sh path, bug #462802

---
 man/ebuild.5 |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index c58cf75..7e858e0 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -1,4 +1,4 @@
-.TH "EBUILD" "5" "Jan 2013" "Portage VERSION" "Portage"
+.TH "EBUILD" "5" "Mar 2013" "Portage VERSION" "Portage"
 
 .SH "NAME"
 ebuild \- the internal format, variables, and functions in an ebuild script
@@ -1508,7 +1508,7 @@ src_install() {
 
 .SH "FILES"
 .TP
-The \fI/usr/sbin/ebuild.sh\fR script.
+The \fI/usr/lib/portage/bin/ebuild.sh\fR script.
 .TP
 The helper apps in \fI/usr/lib/portage/bin\fR.
 .TP

[gentoo-commits] proj/portage:master commit in: man/

[Mike Frysinger]

commit:     360fee65272a07017ba4a342e9e2c265d987b535
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Fri Mar  1 03:42:02 2013 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Fri Mar  1 03:42:02 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=360fee65

portage(5): document multiple parents in the parent file

Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>

---
 man/portage.5 |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/man/portage.5 b/man/portage.5
index 379b20c..cea7e71 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -453,10 +453,13 @@ x11\-libs/qt \-mysql
 .fi
 .TP
 .BR parent
-This contains a path to the parent profile.  It may be either relative or 
-absolute.  The paths will be relative to the location of the profile.  Most 
-commonly this file contains '..' to indicate the directory above.  Utilized 
-only in cascading profiles.
+This contains paths to the parent profiles (one per line).  They may be either
+relative (to the location of the profile) or absolute.  Most commonly this file
+contains '..' to indicate the directory above.  Utilized only in cascading
+profiles.
+
+When multiple parent profiles are specified, they are inherited in order from
+the first line to the last.
 
 If \fBlayout.conf\fR is new enough, you can also use the <repo>:<path>
 syntax.  The <repo> is the same string as is stored in the \fBrepo_name\fR

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     8fa3fd5fa3a9a6c7c847da90b0ec88758dd16e43
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Fri Feb  1 02:33:04 2013 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Fri Feb  1 02:33:04 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=8fa3fd5f

man/emerge.1: add rebuild output, bug #454904

---
 man/emerge.1 |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/man/emerge.1 b/man/emerge.1
index 0807a4b..9e0e4f2 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -1,4 +1,4 @@
-.TH "EMERGE" "1" "Dec 2012" "Portage VERSION" "Portage"
+.TH "EMERGE" "1" "Jan 2013" "Portage VERSION" "Portage"
 .SH "NAME"
 emerge \- Command\-line interface to the Portage system
 .SH "SYNOPSIS"
@@ -894,6 +894,19 @@ displayed when you use the \fB\-\-pretend\fR and \fB\-\-verbose\fR options.
 Using the \fB\-\-quiet\fR option will prevent all information from being
 displayed.
 .TP
+.B [ebuild  r  U  ] dev\-libs/icu\-50.1.1:0/50.1.1 [50.1\-r2:0/50.1]
+Icu 50.1\-r2 has already been emerged and can be Updated to version
+50.1.1. The \fBr\fR symbol indicates that a sub\-slot change (from 50.1
+to 50.1.1 in this case) will force packages having slot\-operator
+dependencies on it to be rebuilt (as libxml2 will be rebuilt in the next
+example).
+.TP
+.B [ebuild  rR    ] dev\-libs/libxml2\-2.9.0\-r1:2  USE="icu"
+Libxml2 2.9.0\-r1 has already been emerged, but if you run the command,
+then portage will Re\-emerge it in order to satisfy a slot\-operator
+dependency which forces it to be rebuilt when the icu sub\-slot changes
+(as it changed in the previous example).
+.TP
 .B [ebuild     U *] sys\-apps/portage\-2.2.0_alpha6 [2.1.9.25]
 Portage 2.1.9.25 is installed, but if you run the command, then
 portage will upgrade to version 2.2.0_alpha6. In this case,

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     66f2f2df36df6fc7b2702694e7bddd56d0149051
Author:     Vladimir Romanov <blueboar2 <AT> gmail <DOT> com>
AuthorDate: Wed Jan 30 16:32:32 2013 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Wed Jan 30 16:32:32 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=66f2f2df

ebuild.5: update example ebuild copyright date

---
 man/ebuild.5 |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index 2d04334..c58cf75 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -1474,7 +1474,7 @@ first parameter is \- (a hyphen).
 .SH "EXAMPLES"
 .DS
 .nf
-# Copyright 1999\-2009 Gentoo Foundation
+# Copyright 1999\-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     39786370fe836cdedac653cc6d0e0de48b88e8b4
Author:     Vladimir Romanov <blueboar2 <AT> gmail <DOT> com>
AuthorDate: Wed Jan 30 16:03:20 2013 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Wed Jan 30 16:03:20 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=39786370

man pages: misc fixes and style tweaks

---
 man/ebuild.1     |    2 +-
 man/env-update.1 |   14 +++++++-------
 man/etc-update.1 |   44 ++++++++++++++++++++------------------------
 3 files changed, 28 insertions(+), 32 deletions(-)

diff --git a/man/ebuild.1 b/man/ebuild.1
index 600fed3..0a937ae 100644
--- a/man/ebuild.1
+++ b/man/ebuild.1
@@ -179,7 +179,7 @@ tarball is created and stored in \fBPKGDIR\fR (see \fBmake.conf\fR(5)).
 Builds a RedHat RPM package from the files in the temporary
 \fIinstall directory\fR.  At the moment, the ebuild's dependency
 information is not incorporated into the RPM.
-.SH OPTIONS
+.SH "OPTIONS"
 .TP
 .BR "\-\-debug"
 Run bash with the \-x option, causing it to output verbose debugging

diff --git a/man/env-update.1 b/man/env-update.1
index 4561ab4..c0503ce 100644
--- a/man/env-update.1
+++ b/man/env-update.1
@@ -1,26 +1,26 @@
 .TH "ENV-UPDATE" "1" "Aug 2008" "Portage VERSION" "Portage"
-.SH NAME
+.SH "NAME"
 env\-update \- updates environment settings automatically
-.SH SYNOPSIS
+.SH "SYNOPSIS"
 \fBenv\-update\fR \fI[options]\fR
-.SH DESCRIPTION
+.SH "DESCRIPTION"
 .B env\-update
 reads the files in \fI/etc/env.d\fR and automatically generates
 \fI/etc/profile.env\fR and \fI/etc/ld.so.conf\fR.  Then \fBldconfig\fR(8)
 is run to update \fI/etc/ld.so.cache\fR.  \fBenv-update\fR is run by
 \fBemerge\fR(1) automatically after each package merge.  Also, if you
-make changes to \fI/etc/env.d\fR, you should run \fIenv-update\fR 
+make changes to \fI/etc/env.d\fR, you should run \fBenv-update\fR
 yourself for changes to take effect immediately.  Note that this would 
 only affect new processes.  In order for the changes to affect your 
 active shell, you will probably have to run \fIsource /etc/profile\fR 
 first.
-.SH OPTIONS 
+.SH "OPTIONS"
 .TP
 .B \-\-no\-ldconfig
-Do not run ldconfig (and thus skip rebuilding the ld.so cache, etc...).
+Do not run \fBldconfig\fR (and thus skip rebuilding the \fIld.so.cache\fR, etc...).
 .SH "REPORTING BUGS"
 Please report bugs via http://bugs.gentoo.org/
-.SH AUTHORS
+.SH "AUTHORS"
 Daniel Robbins <drobbins@gentoo.org>
 .SH "SEE ALSO"
 .BR emerge (1),

diff --git a/man/etc-update.1 b/man/etc-update.1
index 366e850..2662de5 100644
--- a/man/etc-update.1
+++ b/man/etc-update.1
@@ -1,28 +1,24 @@
 .TH "ETC-UPDATE" "1" "Mar 2012" "Portage VERSION" "Portage"
-.SH NAME
-etc-update \- handle configuration file updates
-.SH SYNOPSIS
-.BR etc-update
+.SH "NAME"
+etc\-update \- handle configuration file updates
+.SH "SYNOPSIS"
+.BR etc\-update
 [\fIoptions\fR] [\fI--automode <mode>\fR] [\fIpaths to scan\fR]
-.SH DESCRIPTION
-.I etc-update
-is supposed to be run after merging a new package to see if
+.SH "DESCRIPTION"
+\fIetc\-update\fR is supposed to be run after merging a new package to see if
 there are updates to the configuration files.  If a new
 configuration file will override an old one, 
-.I etc-update 
-will prompt the user for a decision.
+\fIetc\-update\fR will prompt the user for a decision.
 .PP
-.I etc-update
-will check all directories specified on the command line.  If no paths
-are given, then the \fICONFIG_PROTECT\fR variable will be used.  All
-config files found in \fICONFIG_PROTECT_MASK\fR will automatically be
-updated for you by \fIetc-update\fR.  See \fBmake.conf\fR(5) for more
-information.
+\fIetc\-update\fR will check all directories specified on the command
+line.  If no paths are given, then the \fICONFIG_PROTECT\fR variable
+will be used.  All config files found in \fICONFIG_PROTECT_MASK\fR will
+automatically be updated for you by \fIetc\-update\fR.
+See \fBmake.conf\fR(5) for more information.
 .PP
-.I etc-update
-respects the normal \fIPORTAGE_CONFIGROOT\fR and \fIEROOT\fR variables
-for finding the aforementioned config protect variables.
-.SH OPTIONS
+\fIetc\-update\fR respects the normal \fIPORTAGE_CONFIGROOT\fR and
+\fIEROOT\fR variables for finding the aforementioned config protect variables.
+.SH "OPTIONS"
 .TP
 .BR \-d ", " \-\-debug
 Run with shell tracing enabled.
@@ -37,11 +33,11 @@ Automerge trivial changes only and quit.
 Show settings and important decision info while running.
 .TP
 .BR "\-\-automode <mode>"
-Select one of the automatic merge modes.  Valid modes are: -3 -5 -7 -9.
+Select one of the automatic merge modes.  Valid modes are: \-3 \-5 \-7 \-9.
 See the \fI\-\-help\fR text for more details.
 .SH "REPORTING BUGS"
 Please report bugs via http://bugs.gentoo.org/
-.SH AUTHORS
+.SH "AUTHORS"
 .nf
 Jochem Kossen and Leo Lipelis
 Karl Trygve Kalleberg <karltk@gentoo.org>
@@ -49,8 +45,8 @@ Mike Frysinger <vapier@gentoo.org>
 .fi
 .SH "FILES"
 .TP
-.B /etc/etc-update.conf
-Configuration settings for \fIetc-update\fR are stored here.
+.B /etc/etc\-update.conf
+Configuration settings for \fIetc\-update\fR are stored here.
 .SH "SEE ALSO"
-.BR dispatch-conf (1),
+.BR dispatch\-conf (1),
 .BR make.conf (5)

[gentoo-commits] proj/portage:master commit in: man/

[Mike Frysinger]

commit:     2d48093631a1e0e4996e2506a1b7f046278cf189
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 28 21:04:01 2013 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Mon Jan 28 21:04:01 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=2d480936

portage(5): improve layout.conf documentation

Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>

---
 man/portage.5 |   18 ++++++++++++++++--
 1 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/man/portage.5 b/man/portage.5
index 4f67233..379b20c 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -457,6 +457,11 @@ This contains a path to the parent profile.  It may be either relative or
 absolute.  The paths will be relative to the location of the profile.  Most 
 commonly this file contains '..' to indicate the directory above.  Utilized 
 only in cascading profiles.
+
+If \fBlayout.conf\fR is new enough, you can also use the <repo>:<path>
+syntax.  The <repo> is the same string as is stored in the \fBrepo_name\fR
+file (or omitted to refer to the current repo), and <path> is a subdir starting
+at profiles/.
 .TP
 .BR profile.bashrc
 If needed, this file can be used to set up a special environment for ebuilds,
@@ -848,25 +853,34 @@ precedence over settings in \fBlayout.conf\fR, except tools such as
 # eclasses provided by java-overlay take precedence over identically named
 # eclasses that are provided by gentoo
 masters = gentoo java-overlay
+
 # indicate that this repo can be used as a substitute for foo-overlay
 aliases = foo-overlay
+
 # sign commits in this repo, which requires Git >=1.7.9, and
 # key configured by `git config user.signingkey key_id`
 sign\-commits = true
-# do not sign manifests in this repo
+
+# do not sign Manifest files in this repo
 sign\-manifests = false
-# thin\-manifests only contain DIST entries
+
+# Manifest files only contain DIST entries
 thin\-manifests = true
+
 # indicate that this repo requires manifests for each package, and is
 # considered a failure if a manifest file is missing/incorrect
 use\-manifests = strict
+
 # customize the set of hashes generated for Manifest entries
 manifest\-hashes = SHA256 SHA512 WHIRLPOOL
+
 # indicate that this repo enables repoman's --echangelog=y option automatically
 update\-changelog = true
+
 # indicate that this repo contains both md5-dict and pms cache formats,
 # which may be generated by egencache(1)
 cache\-formats = md5-dict pms
+
 # indicate that this repo contains profiles that may use directories for
 # package.mask, package.provided, package.use, package.use.force,
 # package.use.mask, package.use.stable.force, package.use.stable.mask,

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     b11fb894c1522716c846170a04218282597f9ad0
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 21 14:18:04 2013 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Jan 21 16:50:57 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=b11fb894

make.conf.5: better examples for ACCEPT_LICENSE

---
 man/make.conf.5 |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/man/make.conf.5 b/man/make.conf.5
index 2adccda..42a5b25 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -55,12 +55,12 @@ Defaults to the value of * -@EULA.
 .br
 .I Examples:
 .nf
-# Accept any license
-ACCEPT_LICENSE="*"
-# Accept any license except the "public-domain" license
-ACCEPT_LICENSE="* -public-domain"
-# Only accept licenses in the FSF-APPROVED license group
-ACCEPT_LICENSE="-* @FSF-APPROVED"
+# Only accept licenses in the FREE license group (i.e. Free Software)
+ACCEPT_LICENSE="-* @FREE"
+# As before, but exclude the "Artistic" license
+ACCEPT_LICENSE="-* @FREE -Artistic"
+# Accept any license except those in the EULA license group (default)
+ACCEPT_LICENSE="* -@EULA"
 .fi
 .TP
 \fBACCEPT_PROPERTIES\fR = \fI[space delimited list of properties]\fR

[gentoo-commits] proj/portage:master commit in: man/

[Mike Frysinger]

commit:     5978d78f56f0708d3bbbcdb9adc1b96097f3d034
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 15 20:36:11 2013 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Tue Jan 15 20:36:11 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=5978d78f

portage(5): add more pointers to make.conf

Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>

---
 man/portage.5 |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/man/portage.5 b/man/portage.5
index 39ccfb2..4f67233 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -684,7 +684,8 @@ sys\-libs/glibc glibc.conf
 
 .TP
 .BR package.license
-This will allow ACCEPT_LICENSE to be augmented for a single package.
+This will allow ACCEPT_LICENSE (see \fBmake.conf\fR(5)) to be augmented for a
+single package.
 
 .I Format:
 .nf
@@ -712,7 +713,8 @@ versions earlier than 1.0.4496.  No problem!
 .fi
 .TP
 .BR package.properties
-This will allow ACCEPT_PROPERTIES to be augmented for a single package.
+This will allow ACCEPT_PROPERTIES (see \fBmake.conf\fR(5)) to be augmented for a
+single package.
 
 .I Format:
 .nf

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     cb49dfc3319a0a202fb26f3cf825cf12790d2bd3
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 15 21:44:19 2013 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Tue Jan 15 21:44:19 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=cb49dfc3

make.conf.5: document @preserved-rebuild

---
 man/make.conf.5 |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/man/make.conf.5 b/man/make.conf.5
index b574137..2adccda 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -441,6 +441,9 @@ already prelinked files to be merged.
 .B preserve\-libs
 Preserve libraries when the sonames change during upgrade or downgrade.
 Libraries are preserved only if consumers of those libraries are detected.
+Preserved libraries are automatically removed when there are no remaining
+consumers. Run `emerge @preserved\-rebuild` in order to rebuild all
+consumers of preserved libraries.
 .TP
 .B protect\-owned
 This is identical to the \fIcollision\-protect\fR feature except that files

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     a8d775aeb0256e8fbde687ea44749b81bfd2b509
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 15 11:10:22 2013 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Tue Jan 15 11:10:22 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=a8d775ae

ebuild.1: update obsolete md5 references

---
 man/ebuild.1 |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/man/ebuild.1 b/man/ebuild.1
index b6a7b30..600fed3 100644
--- a/man/ebuild.1
+++ b/man/ebuild.1
@@ -1,4 +1,4 @@
-.TH "EBUILD" "1" "Dec 2012" "Portage VERSION" "Portage"
+.TH "EBUILD" "1" "Jan 2013" "Portage VERSION" "Portage"
 .SH "NAME"
 ebuild \- a low level interface to the Portage system
 .SH "SYNOPSIS"
@@ -53,13 +53,13 @@ manually clean these files with \fIrm \-rf /var/tmp/portage\fR.
 .BR fetch
 Checks to see if all the sources specified in SRC_URI are available in
 DISTDIR (see \fBmake.conf\fR(5) for more information) and have a valid
-md5 checksum.  If the sources aren't available, an attempt is made to
+checksum.  If the sources aren't available, an attempt is made to
 download them from the locations specified in SRC_URI.  If multiple
 download locations are listed for a particular file, Portage pings
 each location to see which location is closer. (May not be true
 presently.)  The Gentoo Linux mirrors defined by GENTOO_MIRRORS is
 always considered first.  If for some reason the current or
-just\-downloaded sources' md5 digests don't match those recorded
+just\-downloaded sources' checksums don't match those recorded
 in files/digest\-[package]\-[version\-rev], a warning is printed
 and ebuild exits with an error code of 1.
 .TP
@@ -135,8 +135,8 @@ shown here.
 This function installs all the files in the \fIinstall directory\fR
 to the live filesystem.  The process works as follows: first, the
 \fIpkg_preinst()\fR function (if specified) is run.  Then, the files
-are merged into the live filesystem, and the installed files' md5
-digests are recorded in
+are merged into the live filesystem, and the installed files'
+checksums are recorded in
 \fI/var/db/pkg/${CATEGORY}/${PN}\-${PVR}/CONTENTS\fR.  After
 all the files have been merged, the \fIpkg_postinst()\fR function
 (if specified) is executed.
@@ -150,7 +150,7 @@ particular step doesn't complete successfully.
 .TP
 .BR unmerge
 This function first executes the \fIpkg_prerm()\fR function (if specified).
-Then it removes all files from the live filesystem that have a valid md5
+Then it removes all files from the live filesystem that have a valid
 checksum and mtime in the package contents file.  Any empty directories
 are recursively removed.  Finally, it runs \fIpkg_postrm()\fR function (if
 specified).  It is safe to merge a new version of a package first and

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     0fc94e206280dc5aac9a486cccc0968a279939a8
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 11 08:07:29 2013 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Fri Jan 11 08:07:29 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=0fc94e20

make.conf.5: tweak escape format for apostrophy

---
 man/make.conf.5 |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/man/make.conf.5 b/man/make.conf.5
index 0048da5..b574137 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -273,7 +273,7 @@ If set then a compressed copy of 'Packages' index file will be written.
 This feature is intended for Gentoo binhosts using certain webservers
 (such as, but not limited to, Nginx with gzip_static module) to avoid
 redundant on\-the\-fly compression.  The resulting file will be called
-\(aqPackages.gz' and its modification time will match that of 'Packages'.
+\[aq]Packages.gz' and its modification time will match that of 'Packages'.
 .TP
 .B config\-protect\-if\-modified
 This causes the \fBCONFIG_PROTECT\fR behavior to be skipped for files

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     51d27450460126b40d9416327b50316e4794c205
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 10 07:17:09 2013 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Thu Jan 10 07:17:09 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=51d27450

make.conf.5: escape apostropy quote, bug #451118

---
 man/make.conf.5 |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/man/make.conf.5 b/man/make.conf.5
index fe873df..0048da5 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -1,4 +1,4 @@
-.TH "MAKE.CONF" "5" "Dec 2012" "Portage VERSION" "Portage"
+.TH "MAKE.CONF" "5" "Jan 2013" "Portage VERSION" "Portage"
 .SH "NAME"
 make.conf \- custom settings for Portage
 .SH "SYNOPSIS"
@@ -273,7 +273,7 @@ If set then a compressed copy of 'Packages' index file will be written.
 This feature is intended for Gentoo binhosts using certain webservers
 (such as, but not limited to, Nginx with gzip_static module) to avoid
 redundant on\-the\-fly compression.  The resulting file will be called
-'Packages.gz' and its modification time will match that of 'Packages'.
+\(aqPackages.gz' and its modification time will match that of 'Packages'.
 .TP
 .B config\-protect\-if\-modified
 This causes the \fBCONFIG_PROTECT\fR behavior to be skipped for files

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     a4c4e125ee7fdcedef1903eb9272c76d963978be
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 28 21:36:04 2012 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Fri Dec 28 21:44:02 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=a4c4e125

man pages: refer to /etc/portage/make.conf

---
 man/color.map.5 |    4 ++--
 man/ebuild.1    |    4 ++--
 man/ebuild.5    |    4 ++--
 man/egencache.1 |    4 ++--
 man/emerge.1    |    6 +++---
 man/make.conf.5 |    6 +++---
 man/portage.5   |    2 +-
 man/quickpkg.1  |    2 +-
 8 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/man/color.map.5 b/man/color.map.5
index ca6b17d..b5f5a81 100644
--- a/man/color.map.5
+++ b/man/color.map.5
@@ -1,4 +1,4 @@
-.TH "COLOR.MAP" "5" "Mar 2010" "Portage VERSION" "Portage"
+.TH "COLOR.MAP" "5" "Dec 2012" "Portage VERSION" "Portage"
 .SH "NAME"
 color.map \- custom color settings for Portage
 .SH "SYNOPSIS"
@@ -192,7 +192,7 @@ Arfrever Frehtes Taifersar Arahesis <Arfrever.FTA@gmail.com>
 .B /etc/portage/color.map
 Contains variables customizing colors.
 .TP
-.B /etc/make.conf
+.B /etc/portage/make.conf
 Contains other variables.
 .SH "SEE ALSO"
 .BR console_codes (4),

diff --git a/man/ebuild.1 b/man/ebuild.1
index e74779a..b6a7b30 100644
--- a/man/ebuild.1
+++ b/man/ebuild.1
@@ -1,4 +1,4 @@
-.TH "EBUILD" "1" "Feb 2011" "Portage VERSION" "Portage"
+.TH "EBUILD" "1" "Dec 2012" "Portage VERSION" "Portage"
 .SH "NAME"
 ebuild \- a low level interface to the Portage system
 .SH "SYNOPSIS"
@@ -212,7 +212,7 @@ Mike Frysinger <vapier@gentoo.org>
 .fi
 .SH "FILES"
 .TP
-.B /etc/make.conf 
+.B /etc/portage/make.conf
 Contains variables for the build\-process and overwrites those
 in make.globals.
 .TP

diff --git a/man/ebuild.5 b/man/ebuild.5
index 0045efd..ffc2139 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -1507,12 +1507,12 @@ The \fI/usr/sbin/ebuild.sh\fR script.
 .TP
 The helper apps in \fI/usr/lib/portage/bin\fR.
 .TP
-.B /etc/make.conf
+.B /etc/portage/make.conf
 Contains variables for the build\-process and overwrites those in make.defaults.
 .TP
 .B /usr/share/portage/config/make.globals
 Contains the default variables for the build\-process, you should edit
-\fI/etc/make.conf\fR instead.
+\fI/etc/portage/make.conf\fR instead.
 .TP
 .B /etc/portage/color.map
 Contains variables customizing colors.

diff --git a/man/egencache.1 b/man/egencache.1
index 57a509d..7f942c7 100644
--- a/man/egencache.1
+++ b/man/egencache.1
@@ -1,4 +1,4 @@
-.TH "EGENCACHE" "1" "Oct 2010" "Portage VERSION" "Portage"
+.TH "EGENCACHE" "1" "Dec 2012" "Portage VERSION" "Portage"
 .SH "NAME"
 egencache \- generate metadata cache for ebuild repositories
 .SH "SYNOPSIS"
@@ -150,7 +150,7 @@ Zac Medico <zmedico@gentoo.org>
 .fi
 .SH "FILES"
 .TP
-.B /etc/make.conf
+.B /etc/portage/make.conf
 Contains variables.
 .SH "SEE ALSO"
 .BR emerge (1),

diff --git a/man/emerge.1 b/man/emerge.1
index cd54dab..356bb93 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -1040,13 +1040,13 @@ defined in make.globals. Directory exceptions to the CONFIG_PROTECTed
 directories can be specified using the \fICONFIG_PROTECT_MASK\fR variable. To find
 files that need to be updated in /etc, type \fBfind /etc \-iname \'._cfg????_*\'\fR.
 .LP
-You can disable this feature by setting \fICONFIG_PROTECT="\-*"\fR in /etc/make.conf.
+You can disable this feature by setting \fICONFIG_PROTECT="\-*"\fR in \fBmake.conf\fR(5).
 Then, Portage will mercilessly auto\-update your config files. Alternatively,
 you can leave Config File Protection on but tell Portage that it can overwrite
 files in certain specific /etc subdirectories. For example, if you wanted
 Portage to automatically update your rc scripts and your wget configuration,
 but didn't want any other changes made without your explicit approval, you'd
-add this to /etc/make.conf:
+add this to \fBmake.conf\fR(5):
 .LP
 .I CONFIG_PROTECT_MASK="/etc/wget /etc/rc.d"
 .LP
@@ -1090,7 +1090,7 @@ This is like the world file but instead of package atoms it contains
 packages sets which always begin with the \fB@\fR character. Use
 \fB/etc/portage/sets/\fR to define user package sets.
 .TP
-.B /etc/make.conf
+.B /etc/portage/make.conf
 Contains variables for the build process, overriding those in
 \fBmake.globals\fR.
 .TP

diff --git a/man/make.conf.5 b/man/make.conf.5
index 9152ab2..fe873df 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -1,4 +1,4 @@
-.TH "MAKE.CONF" "5" "Oct 2012" "Portage VERSION" "Portage"
+.TH "MAKE.CONF" "5" "Dec 2012" "Portage VERSION" "Portage"
 .SH "NAME"
 make.conf \- custom settings for Portage
 .SH "SYNOPSIS"
@@ -915,7 +915,7 @@ be necessary in order to continue a partially downloaded file located at
 Use \fBROOT\fR to specify the target root filesystem to be used for merging 
 packages or ebuilds.
 Typically, you should set this setting in the environment rather than in 
-\fI/etc/make.conf\fR itself.  It's commonly used for creating new build 
+\fImake.conf\fR itself. It's commonly used for creating new build
 images. Make sure you use an absolute path. Refer to the
 \fBCross-compilation\fR section of \fBebuild\fR(5) for information about
 how dependencies are handled for \fBROOT\fR.
@@ -999,7 +999,7 @@ Saleem Abdulrasool <compnerd@gentoo.org>
 Contains variables for the build\-process and overwrites those in make.defaults.
 .TP
 .B /usr/share/portage/config/make.globals
-Contains the default variables for the build\-process, you should edit \fI/etc/make.conf\fR instead.
+Contains the default variables for the build\-process, you should edit \fI/etc/portage/make.conf\fR instead.
 .TP
 .B /etc/portage/color.map
 Contains variables customizing colors.

diff --git a/man/portage.5 b/man/portage.5
index 067ae68..39ccfb2 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -1,4 +1,4 @@
-.TH "PORTAGE" "5" "Oct 2012" "Portage VERSION" "Portage"
+.TH "PORTAGE" "5" "Nov 2012" "Portage VERSION" "Portage"
 .SH NAME
 portage \- the heart of Gentoo
 .SH "DESCRIPTION"

diff --git a/man/quickpkg.1 b/man/quickpkg.1
index 7e78c1e..0d30163 100644
--- a/man/quickpkg.1
+++ b/man/quickpkg.1
@@ -66,7 +66,7 @@ Mike Frysinger <vapier@gentoo.org> (revamped version)
 .fi
 .SH "FILES"
 .TP
-.B /etc/make.conf
+.B /etc/portage/make.conf
 The \fBPKGDIR\fR variable is defined here.
 .SH "SEE ALSO"
 .BR ebuild (5),

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     98417474b074e9f6a58deb6915c47411066b3d33
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 28 21:36:04 2012 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Fri Dec 28 21:36:04 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=98417474

man pages: refer to /etc/portage/make.conf

---
 man/color.map.5 |    4 ++--
 man/ebuild.1    |    4 ++--
 man/ebuild.5    |    4 ++--
 man/egencache.1 |    4 ++--
 man/emerge.1    |    6 +++---
 man/make.conf.5 |    6 +++---
 man/portage.5   |    2 +-
 man/quickpkg.1  |    2 +-
 8 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/man/color.map.5 b/man/color.map.5
index ca6b17d..b5f5a81 100644
--- a/man/color.map.5
+++ b/man/color.map.5
@@ -1,4 +1,4 @@
-.TH "COLOR.MAP" "5" "Mar 2010" "Portage VERSION" "Portage"
+.TH "COLOR.MAP" "5" "Dec 2012" "Portage VERSION" "Portage"
 .SH "NAME"
 color.map \- custom color settings for Portage
 .SH "SYNOPSIS"
@@ -192,7 +192,7 @@ Arfrever Frehtes Taifersar Arahesis <Arfrever.FTA@gmail.com>
 .B /etc/portage/color.map
 Contains variables customizing colors.
 .TP
-.B /etc/make.conf
+.B /etc/portage/make.conf
 Contains other variables.
 .SH "SEE ALSO"
 .BR console_codes (4),

diff --git a/man/ebuild.1 b/man/ebuild.1
index e74779a..b6a7b30 100644
--- a/man/ebuild.1
+++ b/man/ebuild.1
@@ -1,4 +1,4 @@
-.TH "EBUILD" "1" "Feb 2011" "Portage VERSION" "Portage"
+.TH "EBUILD" "1" "Dec 2012" "Portage VERSION" "Portage"
 .SH "NAME"
 ebuild \- a low level interface to the Portage system
 .SH "SYNOPSIS"
@@ -212,7 +212,7 @@ Mike Frysinger <vapier@gentoo.org>
 .fi
 .SH "FILES"
 .TP
-.B /etc/make.conf 
+.B /etc/portage/make.conf
 Contains variables for the build\-process and overwrites those
 in make.globals.
 .TP

diff --git a/man/ebuild.5 b/man/ebuild.5
index 0045efd..ffc2139 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -1507,12 +1507,12 @@ The \fI/usr/sbin/ebuild.sh\fR script.
 .TP
 The helper apps in \fI/usr/lib/portage/bin\fR.
 .TP
-.B /etc/make.conf
+.B /etc/portage/make.conf
 Contains variables for the build\-process and overwrites those in make.defaults.
 .TP
 .B /usr/share/portage/config/make.globals
 Contains the default variables for the build\-process, you should edit
-\fI/etc/make.conf\fR instead.
+\fI/etc/portage/make.conf\fR instead.
 .TP
 .B /etc/portage/color.map
 Contains variables customizing colors.

diff --git a/man/egencache.1 b/man/egencache.1
index 57a509d..7f942c7 100644
--- a/man/egencache.1
+++ b/man/egencache.1
@@ -1,4 +1,4 @@
-.TH "EGENCACHE" "1" "Oct 2010" "Portage VERSION" "Portage"
+.TH "EGENCACHE" "1" "Dec 2012" "Portage VERSION" "Portage"
 .SH "NAME"
 egencache \- generate metadata cache for ebuild repositories
 .SH "SYNOPSIS"
@@ -150,7 +150,7 @@ Zac Medico <zmedico@gentoo.org>
 .fi
 .SH "FILES"
 .TP
-.B /etc/make.conf
+.B /etc/portage/make.conf
 Contains variables.
 .SH "SEE ALSO"
 .BR emerge (1),

diff --git a/man/emerge.1 b/man/emerge.1
index cd54dab..356bb93 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -1040,13 +1040,13 @@ defined in make.globals. Directory exceptions to the CONFIG_PROTECTed
 directories can be specified using the \fICONFIG_PROTECT_MASK\fR variable. To find
 files that need to be updated in /etc, type \fBfind /etc \-iname \'._cfg????_*\'\fR.
 .LP
-You can disable this feature by setting \fICONFIG_PROTECT="\-*"\fR in /etc/make.conf.
+You can disable this feature by setting \fICONFIG_PROTECT="\-*"\fR in \fBmake.conf\fR(5).
 Then, Portage will mercilessly auto\-update your config files. Alternatively,
 you can leave Config File Protection on but tell Portage that it can overwrite
 files in certain specific /etc subdirectories. For example, if you wanted
 Portage to automatically update your rc scripts and your wget configuration,
 but didn't want any other changes made without your explicit approval, you'd
-add this to /etc/make.conf:
+add this to \fBmake.conf\fR(5):
 .LP
 .I CONFIG_PROTECT_MASK="/etc/wget /etc/rc.d"
 .LP
@@ -1090,7 +1090,7 @@ This is like the world file but instead of package atoms it contains
 packages sets which always begin with the \fB@\fR character. Use
 \fB/etc/portage/sets/\fR to define user package sets.
 .TP
-.B /etc/make.conf
+.B /etc/portage/make.conf
 Contains variables for the build process, overriding those in
 \fBmake.globals\fR.
 .TP

diff --git a/man/make.conf.5 b/man/make.conf.5
index 9152ab2..fe873df 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -1,4 +1,4 @@
-.TH "MAKE.CONF" "5" "Oct 2012" "Portage VERSION" "Portage"
+.TH "MAKE.CONF" "5" "Dec 2012" "Portage VERSION" "Portage"
 .SH "NAME"
 make.conf \- custom settings for Portage
 .SH "SYNOPSIS"
@@ -915,7 +915,7 @@ be necessary in order to continue a partially downloaded file located at
 Use \fBROOT\fR to specify the target root filesystem to be used for merging 
 packages or ebuilds.
 Typically, you should set this setting in the environment rather than in 
-\fI/etc/make.conf\fR itself.  It's commonly used for creating new build 
+\fImake.conf\fR itself. It's commonly used for creating new build
 images. Make sure you use an absolute path. Refer to the
 \fBCross-compilation\fR section of \fBebuild\fR(5) for information about
 how dependencies are handled for \fBROOT\fR.
@@ -999,7 +999,7 @@ Saleem Abdulrasool <compnerd@gentoo.org>
 Contains variables for the build\-process and overwrites those in make.defaults.
 .TP
 .B /usr/share/portage/config/make.globals
-Contains the default variables for the build\-process, you should edit \fI/etc/make.conf\fR instead.
+Contains the default variables for the build\-process, you should edit \fI/etc/portage/make.conf\fR instead.
 .TP
 .B /etc/portage/color.map
 Contains variables customizing colors.

diff --git a/man/portage.5 b/man/portage.5
index 067ae68..06388de 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -1,4 +1,4 @@
-.TH "PORTAGE" "5" "Oct 2012" "Portage VERSION" "Portage"
+.TH "PORTAGE" "5" "Dec 2012" "Portage VERSION" "Portage"
 .SH NAME
 portage \- the heart of Gentoo
 .SH "DESCRIPTION"

diff --git a/man/quickpkg.1 b/man/quickpkg.1
index 7e78c1e..0d30163 100644
--- a/man/quickpkg.1
+++ b/man/quickpkg.1
@@ -66,7 +66,7 @@ Mike Frysinger <vapier@gentoo.org> (revamped version)
 .fi
 .SH "FILES"
 .TP
-.B /etc/make.conf
+.B /etc/portage/make.conf
 The \fBPKGDIR\fR variable is defined here.
 .SH "SEE ALSO"
 .BR ebuild (5),

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     74cf5fac5c2425a743233156a52abb0654995530
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 28 21:21:45 2012 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Fri Dec 28 21:21:45 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=74cf5fac

quickpkg.1: document options, bug #243192

---
 man/quickpkg.1 |   18 ++++++++++++++++--
 1 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/man/quickpkg.1 b/man/quickpkg.1
index 7389400..7e78c1e 100644
--- a/man/quickpkg.1
+++ b/man/quickpkg.1
@@ -1,8 +1,8 @@
-.TH "QUICKPKG" "1" "Mar 2010" "Portage VERSION" "Portage"
+.TH "QUICKPKG" "1" "Dec 2012" "Portage VERSION" "Portage"
 .SH NAME
 quickpkg \- creates portage packages
 .SH SYNOPSIS
-.B quickpkg <list of packages or package\-sets>
+.B quickpkg [options] <list of packages or package\-sets>
 .SH DESCRIPTION
 .I quickpkg
 can be utilized to quickly create a package for portage by
@@ -28,6 +28,20 @@ The second form is a portage depend atom or a portage package
 set.  The atom or set is of the same form that you would give
 \fBemerge\fR if you wanted to emerge something.
 See \fBebuild\fR(5) for full definition.
+.TP
+.BR "\-\-ignore\-default\-opts"
+Causes the \fIQUICKPKG_DEFAULT_OPTS\fR environment variable to be ignored.
+.TP
+.BR "\-\-include\-config < y | n >"
+Include all files protected by CONFIG_PROTECT (as a security precaution,
+default is 'n').
+.TP
+.BR "\-\-include\-unmodified\-config < y | n >"
+Include files protected by CONFIG_PROTECT that have not been modified
+since installation (as a security precaution, default is 'n').
+.TP
+.BR \-\-umask=UMASK
+The umask used during package creation (default is 0077).
 .SH "EXAMPLES"
 .B quickpkg
 /var/db/pkg/dev-python/pyogg-1.1

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     a73d9ae594b24efe35fa8c0c1c00ea06dc80886a
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 28 12:13:57 2012 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Wed Nov 28 12:13:57 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=a73d9ae5

portage.5: rm obsolete eclass-overrides warning

This will fix bug #434942. The warning shouldn't be needed anymore
since commit e760c8d2a4ccc56e351ac37904c715f596b58e42 makes egencache
generate md5-dict format by default, and use of the older pms format
triggers a deprecation warning since commit
02a6bf1ac95861831a303f220c7a41b9bbd398ab.

---
 man/portage.5 |    8 +-------
 1 files changed, 1 insertions(+), 7 deletions(-)

diff --git a/man/portage.5 b/man/portage.5
index 12938e2..067ae68 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -754,13 +754,7 @@ performed by these tools
 are inherently \fBnot\fR \fIsite\-specific\fR. \fBWARNING:\fR Use of
 \fBrepos.conf\fR is generally not recommended since resulting changes in
 eclass inheritance (especially due to \fBeclass\-overrides\fR) may trigger
-performance issues under some circumstances (see \fBbug #124041\fR). When
-using \fBeclass\-overrides\fR, due to bug #276264, you must ensure that
-your portage tree does not contain a metadata/cache/ directory. If that
-directory exists then you should remove it entirely, and set
-PORTAGE_RSYNC_EXTRA_OPTS="\-\-exclude=/metadata/cache" in
-make.conf in order to exclude the metadata/cache/ directory during
-\fBemerge\fR(1) \-\-sync operations.
+performance issues under some circumstances (see \fBbug #124041\fR).
 
 .I Example:
 .nf

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     916bf3fb28bb5266258a3e375520e4fdc0e62121
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 14 21:38:16 2012 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Oct 14 21:38:16 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=916bf3fb

emerge.1: broaden description of "r" merge attr

This attribute actually applies to anything matched by the internal
@__auto_* sets, which can mean a number of different things (see
depgraph._gen_reinstall_sets).

---
 man/emerge.1 |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/man/emerge.1 b/man/emerge.1
index 9299967..a6c20a9 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -1,4 +1,4 @@
-.TH "EMERGE" "1" "Sep 2012" "Portage VERSION" "Portage"
+.TH "EMERGE" "1" "Oct 2012" "Portage VERSION" "Portage"
 .SH "NAME"
 emerge \- Command\-line interface to the Portage system
 .SH "SYNOPSIS"
@@ -619,7 +619,7 @@ N	new (not yet installed)
 S	new SLOT installation (side-by-side versions) 
 U	updating (to another version)
 D	downgrading (best version seems lower)
-r	reinstall (forced due to slot or sub\-slot change of a dependency)
+r	reinstall (forced for some reason, possibly due to slot or sub\-slot)
 R	replacing (remerging same version)
 F	fetch restricted (must be manually downloaded)
 f	fetch restricted (already downloaded)

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     824631135d50c58a2176a724df2a68b9b9ae9501
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 25 17:28:26 2012 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Tue Sep 25 17:28:26 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=82463113

repoman.1: unify *DEPEND.bad*, *DEPEND.syntax docs

---
 man/repoman.1 |   78 +++++++++------------------------------------------------
 1 files changed, 12 insertions(+), 66 deletions(-)

diff --git a/man/repoman.1 b/man/repoman.1
index 530927d..4301e96 100644
--- a/man/repoman.1
+++ b/man/repoman.1
@@ -124,23 +124,23 @@ Scan directory tree for QA issues; if OK, commit via cvs
 .B CVS/Entries.IO_error
 Attempting to commit, and an IO error was encountered access the Entries file
 .TP
-.B DEPEND.bad
-User-visible ebuilds with bad DEPEND settings (matched against *visible* ebuilds)
+.B DEPEND.bad HDEPEND.bad PDEPEND.bad RDEPEND.bad
+User-visible ebuilds with unsatisfied dependencies (matched against *visible* ebuilds)
 .TP
-.B DEPEND.badindev
-User-visible ebuilds with bad DEPEND settings (matched against *visible* ebuilds) in developing arch
+.B DEPEND.badindev HDEPEND.badindev PDEPEND.badindev RDEPEND.badindev
+User-visible ebuilds with unsatisfied dependencies (matched against *visible* ebuilds) in developing arch
 .TP
-.B DEPEND.badmasked
-Masked ebuilds with bad DEPEND settings (matched against *all* ebuilds)
+.B DEPEND.badmasked HDEPEND.badmasked PDEPEND.badmasked RDEPEND.badmasked
+Masked ebuilds with unsatisfied dependencies (matched against *all* ebuilds)
 .TP
-.B DEPEND.badmaskedindev
-Masked ebuilds with bad DEPEND settings (matched against *all* ebuilds) in developing arch
+.B DEPEND.badmaskedindev HDEPEND.badmaskedindev PDEPEND.badmaskedindev RDEPEND.badmaskedindev
+Masked ebuilds with unsatisfied dependencies (matched against *all* ebuilds) in developing arch
 .TP
-.B DEPEND.badtilde
-DEPEND uses the ~ dep operator with a non-zero revision part, which is useless (the revision is ignored)
+.B DEPEND.badtilde HDEPEND.badtilde PDEPEND.badtilde RDEPEND.badtilde
+Uses the ~ dep operator with a non-zero revision part, which is useless (the revision is ignored)
 .TP
-.B DEPEND.syntax
-Syntax error in DEPEND (usually an extra/missing space/parenthesis)
+.B DEPEND.syntax HDEPEND.syntax PDEPEND.syntax RDEPEND.syntax
+Syntax error in *DEPEND (usually an extra/missing space/parenthesis)
 .TP
 .B DESCRIPTION.missing
 Ebuilds that have a missing or empty DESCRIPTION variable
@@ -158,24 +158,6 @@ Ebuilds that use features that are only available with a different EAPI
 .B EAPI.unsupported
 Ebuilds that have an unsupported EAPI version (you must upgrade portage)
 .TP
-.B HDEPEND.bad
-User-visible ebuilds with bad HDEPEND settings (matched against *visible* ebuilds)
-.TP
-.B HDEPEND.badindev
-User-visible ebuilds with bad HDEPEND settings (matched against *visible* ebuilds) in developing arch
-.TP
-.B HDEPEND.badmasked
-Masked ebuilds with bad HDEPEND settings (matched against *all* ebuilds)
-.TP
-.B HDEPEND.badmaskedindev
-Masked ebuilds with bad HDEPEND settings (matched against *all* ebuilds) in developing arch
-.TP
-.B HDEPEND.badtilde
-HDEPEND uses the ~ dep operator with a non-zero revision part, which is useless (the revision is ignored)
-.TP
-.B HDEPEND.syntax
-Syntax error in HDEPEND (usually an extra/missing space/parenthesis)
-.TP
 .B HOMEPAGE.missing
 Ebuilds that have a missing or empty HOMEPAGE variable
 .TP
@@ -222,45 +204,12 @@ Ebuild is a live ebuild (cvs, git, darcs, svn, etc) checkout with stable keyword
 Ebuild is a live ebuild (cvs, git, darcs, svn, etc) checkout but has keywords
 and is not masked in the global package.mask.
 .TP
-.B PDEPEND.bad
-User-visible ebuilds with bad PDEPEND settings (matched against *visible* ebuilds)
-.TP
-.B PDEPEND.badindev
-User-visible ebuilds with bad PDEPEND settings (matched against *visible* ebuilds) in developing arch
-.TP
-.B PDEPEND.badmasked
-Masked ebuilds with PDEPEND settings (matched against *all* ebuilds)
-.TP
-.B PDEPEND.badmaskedindev
-Masked ebuilds with PDEPEND settings (matched against *all* ebuilds) in developing arch
-.TP
-.B PDEPEND.badtilde
-PDEPEND uses the ~ dep operator with a non-zero revision part, which is useless (the revision is ignored)
-.TP
 .B PDEPEND.suspect
 PDEPEND contains a package that usually only belongs in DEPEND
 .TP
-.B PDEPEND.syntax
-Syntax error in PDEPEND (usually an extra/missing space/parenthesis)
-.TP
 .B PROVIDE.syntax
 Syntax error in PROVIDE (usually an extra/missing space/parenthesis)
 .TP
-.B RDEPEND.bad
-User-visible ebuilds with bad RDEPEND settings (matched against *visible* ebuilds)
-.TP
-.B RDEPEND.badindev
-User-visible ebuilds with bad RDEPEND settings (matched against *visible* ebuilds) in developing arch
-.TP
-.B RDEPEND.badmasked
-Masked ebuilds with RDEPEND settings (matched against *all* ebuilds)
-.TP
-.B RDEPEND.badmaskedindev
-Masked ebuilds with RDEPEND settings (matched against *all* ebuilds) in developing arch
-.TP
-.B RDEPEND.badtilde
-RDEPEND uses the ~ dep operator with a non-zero revision part, which is useless (the revision is ignored)
-.TP
 .B RDEPEND.implicit
 RDEPEND is unset in the ebuild which triggers implicit RDEPEND=$DEPEND
 assignment (prior to EAPI 4)
@@ -268,9 +217,6 @@ assignment (prior to EAPI 4)
 .B RDEPEND.suspect
 RDEPEND contains a package that usually only belongs in DEPEND
 .TP
-.B RDEPEND.syntax
-Syntax error in RDEPEND (usually an extra/missing space/parenthesis)
-.TP
 .B PROPERTIES.syntax
 Syntax error in PROPERTIES (usually an extra/missing space/parenthesis)
 .TP

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     25b0c4545c9a3e8b80347bd458d80b4add330ef6
Author:     Dennis Schridde <devurandom <AT> gmx <DOT> net>
AuthorDate: Tue Sep 25 13:58:24 2012 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Tue Sep 25 16:49:10 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=25b0c454

Document targetroot useflag in ebuild(5)

---
 man/ebuild.5 |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index 2652f89..0d5e448 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -349,6 +349,15 @@ Without it, \fBemerge\fR defaults to install only runtime dependencies (i.e.
 .PP
 See section \fBVARIABLES\fR for more information about the \fBDEPEND\fR,
 \fBRDEPEND\fR and \fBHDEPEND\fR variables.
+.TP
+.B The targetroot USE flag
+For EAPIs that support the "\fItargetroot\fR" USE flag, that flag is
+automatically enabled by the package manager if \fIhost\fR and \fItarget\fR
+system are not the same, i.e. if the \fBROOT\fR is not "\fI/\fR".
+This is necessary where the package to be built needs an executable copy of
+itself during the build process.
+A known example is dev-lang/python, which needs to run a Python interpreter
+during compilation.
 
 .SH "VARIABLES"
 .TP

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     127228fb14fa8a2f12b3a2710eb5a0ecad38f29e
Author:     Dennis Schridde <devurandom <AT> gmx <DOT> net>
AuthorDate: Tue Sep 25 13:58:23 2012 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Tue Sep 25 16:49:10 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=127228fb

Document default behaviour without --root-deps for EAPI 5- in ebuild(5)

---
 man/ebuild.5 |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index 3c2200c..2652f89 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -344,6 +344,8 @@ For EAPIs that support \fBHDEPEND\fR (experimental \fBEAPI 5-hdepend\fR),
 list the \fItarget\fR dependencies, i.e. those to be installed into \fBROOT\fR.
 For EAPIs that do not support \fBHDEPEND\fR, the \fBemerge\fR(1) flag
 \fI\-\-root-deps\fR controls what the package manager installs there.
+Without it, \fBemerge\fR defaults to install only runtime dependencies (i.e.
+\fBRDEPEND\fR and \fBPDEPEND\fR) into \fBROOT\fR.
 .PP
 See section \fBVARIABLES\fR for more information about the \fBDEPEND\fR,
 \fBRDEPEND\fR and \fBHDEPEND\fR variables.

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     0c09bd722b091b6efd8c2c0b3a039965dd6fca58
Author:     Dennis Schridde <devurandom <AT> gmx <DOT> net>
AuthorDate: Tue Sep 25 13:58:22 2012 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Tue Sep 25 16:49:10 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=0c09bd72

Put lengthy install-location documentation into an own paragraph for cross-compile docs in ebuild(5)

---
 man/ebuild.5 |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index fc06eee..3c2200c 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -323,6 +323,7 @@ Portage supports cross-compilation into a subdirectory specified by \fBROOT\fR.
 \fIHost\fR in this context means the platform hosting the build process, i.e.
 what autotools calls CBUILD.
 Its packages are contained in the root of the filesystem ("\fI/\fR").
+
 If \fBROOT\fR is "\fI/\fR", all dependency types will be installed there.
 Otherwise, for EAPIs that support \fBHDEPEND\fR (experimental
 \fBEAPI 5-hdepend\fR), only \fBHDEPEND\fR is installed into "\fI/\fR".
@@ -337,6 +338,7 @@ The directory housing this system is specified by \fBROOT\fR.
 If it is different from "\fI/\fR", i.e. \fIhost\fR and \fItarget\fR are not the
 same, this variable contains the path to the directory housing the \fItarget\fR
 system.
+
 For EAPIs that support \fBHDEPEND\fR (experimental \fBEAPI 5-hdepend\fR),
 \fBDEPEND\fR, \fBRDEPEND\fR, and \fBPDEPEND\fR
 list the \fItarget\fR dependencies, i.e. those to be installed into \fBROOT\fR.

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     cae908bf076f05dbee9082183d6bf8c9750b632b
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 25 02:18:50 2012 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Tue Sep 25 02:18:50 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=cae908bf

make.conf.5: refer to ebuild.5 for cross-compile

---
 man/make.conf.5 |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/man/make.conf.5 b/man/make.conf.5
index b8ed475..61daa90 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -908,11 +908,12 @@ be necessary in order to continue a partially downloaded file located at
 .TP
 \fBROOT\fR = \fI[path]\fR
 Use \fBROOT\fR to specify the target root filesystem to be used for merging 
-packages or ebuilds.  All \fBRDEPEND\fR and \fBPDEPEND\fR will be installed 
-into \fBROOT\fR while all \fBDEPEND\fR will be still be installed into /.  
+packages or ebuilds.
 Typically, you should set this setting in the environment rather than in 
 \fI/etc/make.conf\fR itself.  It's commonly used for creating new build 
-images.  Make sure you use an absolute path.
+images. Make sure you use an absolute path. Refer to the
+\fBCross-compilation\fR section of \fBebuild\fR(5) for information about
+how dependencies are handled for \fBROOT\fR.
 .br
 Defaults to /.
 .TP

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     11ad9440901f17cb01d43d8d0f2bdded1efb24a6
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 24 21:43:03 2012 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Sep 24 21:43:03 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=11ad9440

man/emerge.1: italics for emphasis

---
 man/emerge.1 |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/man/emerge.1 b/man/emerge.1
index 4720e26..c030307 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -714,8 +714,8 @@ not be enabled under normal circumstances!
 Does not affect EAPIs that support \fBHDEPEND\fR.
 Experimental \fBEAPI 5-hdepend\fR provides \fBHDEPEND\fR as a new
 means to adjust installation into "\fI/\fR" and \fBROOT\fR.
-If ebuilds using EAPIs which \fBdo not\fR support \fBHDEPEND\fR are built in
-the same \fBemerge\fR run as those using EAPIs which \fBdo\fR support
+If ebuilds using EAPIs which \fIdo not\fR support \fBHDEPEND\fR are built in
+the same \fBemerge\fR run as those using EAPIs which \fIdo\fR support
 \fBHDEPEND\fR, this option affects only the former.
 .TP
 .BR "\-\-select [ y | n ]"

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     a2e36694d14cc895592b36ba812e55f5cfdd9923
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 24 21:01:11 2012 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Sep 24 21:01:11 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=a2e36694

Re-word HDEPEND docs wrt "EAPI 5 and earlier"

Referring to ranges like this is ambigous when when don't know what
EAPI 6 will bring, and we have both EAPI 5-progress and 5-hdepend which
add different feature sets to EAPI 5.

---
 man/ebuild.5 |   14 +++++++-------
 man/emerge.1 |    9 +++++----
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index ad73034..fc06eee 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -324,9 +324,9 @@ Portage supports cross-compilation into a subdirectory specified by \fBROOT\fR.
 what autotools calls CBUILD.
 Its packages are contained in the root of the filesystem ("\fI/\fR").
 If \fBROOT\fR is "\fI/\fR", all dependency types will be installed there.
-Otherwise, starting from experimental \fBEAPI 5-hdepend\fR, only \fBHDEPEND\fR
-is installed into "\fI/\fR".
-In \fBEAPI 5\fR and earlier, the behaviour is controlled by the
+Otherwise, for EAPIs that support \fBHDEPEND\fR (experimental
+\fBEAPI 5-hdepend\fR), only \fBHDEPEND\fR is installed into "\fI/\fR".
+For EAPIs that do not support \fBHDEPEND\fR, the behaviour is controlled by the
 \fI\-\-root-deps\fR flag to \fBemerge\fR(1), defaulting to install only
 \fBDEPEND\fR into the \fIhost\fR.
 .TP
@@ -337,11 +337,11 @@ The directory housing this system is specified by \fBROOT\fR.
 If it is different from "\fI/\fR", i.e. \fIhost\fR and \fItarget\fR are not the
 same, this variable contains the path to the directory housing the \fItarget\fR
 system.
-Starting from experimental \fBEAPI 5-hdepend\fR, \fBDEPEND\fR and \fBRDEPEND\fR
+For EAPIs that support \fBHDEPEND\fR (experimental \fBEAPI 5-hdepend\fR),
+\fBDEPEND\fR, \fBRDEPEND\fR, and \fBPDEPEND\fR
 list the \fItarget\fR dependencies, i.e. those to be installed into \fBROOT\fR.
-In \fBEAPI 5\fR and earlier, the \fBemerge\fR(1) flag \fI\-\-root-deps\fR
-controlled what the package manager installed there, defaulting to only
-\fBRDEPEND\fR.
+For EAPIs that do not support \fBHDEPEND\fR, the \fBemerge\fR(1) flag
+\fI\-\-root-deps\fR controls what the package manager installs there.
 .PP
 See section \fBVARIABLES\fR for more information about the \fBDEPEND\fR,
 \fBRDEPEND\fR and \fBHDEPEND\fR variables.

diff --git a/man/emerge.1 b/man/emerge.1
index 5861bb6..4720e26 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -711,11 +711,12 @@ of packages for \fBROOT\fR.
 This option is only meaningful when used together with \fBROOT\fR and it should
 not be enabled under normal circumstances!
 
-Affects \fBEAPI 5\fR and earlier ebuilds only.
-Experimental \fBEAPI 5-hdepend\fR and later provide \fBHDEPEND\fR as a new
+Does not affect EAPIs that support \fBHDEPEND\fR.
+Experimental \fBEAPI 5-hdepend\fR provides \fBHDEPEND\fR as a new
 means to adjust installation into "\fI/\fR" and \fBROOT\fR.
-If \fBEAPI 5\fR and earlier ebuilds are built in the same \fBemerge\fR run as
-\fBEAPI 5-hdepend\fR and later ebuilds, this option affects only the former.
+If ebuilds using EAPIs which \fBdo not\fR support \fBHDEPEND\fR are built in
+the same \fBemerge\fR run as those using EAPIs which \fBdo\fR support
+\fBHDEPEND\fR, this option affects only the former.
 .TP
 .BR "\-\-select [ y | n ]"
 Add specified packages to the world set (inverse of

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     cadafa05ca3f8ec19140fbc6a5a6213e938f2abb
Author:     Dennis Schridde <devurandom <AT> gmx <DOT> net>
AuthorDate: Mon Sep 24 12:16:02 2012 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Sep 24 20:27:30 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=cadafa05

Document behaviour of --root-deps for EAPI 6+ in emerge(1)

---
 man/emerge.1 |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/man/emerge.1 b/man/emerge.1
index ea6409c..5861bb6 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -711,10 +711,11 @@ of packages for \fBROOT\fR.
 This option is only meaningful when used together with \fBROOT\fR and it should
 not be enabled under normal circumstances!
 
-For currently supported \fBEAPI\fR values, the build-time dependencies are
-specified in the \fBDEPEND\fR variable.
-However, behavior may change for new \fBEAPI\fRs when related extensions are
-added in the future.
+Affects \fBEAPI 5\fR and earlier ebuilds only.
+Experimental \fBEAPI 5-hdepend\fR and later provide \fBHDEPEND\fR as a new
+means to adjust installation into "\fI/\fR" and \fBROOT\fR.
+If \fBEAPI 5\fR and earlier ebuilds are built in the same \fBemerge\fR run as
+\fBEAPI 5-hdepend\fR and later ebuilds, this option affects only the former.
 .TP
 .BR "\-\-select [ y | n ]"
 Add specified packages to the world set (inverse of

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     2e39f26cad22946d8ffe378c512de49cdac8d24c
Author:     Dennis Schridde <devurandom <AT> gmx <DOT> net>
AuthorDate: Mon Sep 24 12:16:01 2012 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Sep 24 20:27:30 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=2e39f26c

Document HDEPEND in ebuild(5)

---
 man/ebuild.5 |   46 ++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 46 insertions(+), 0 deletions(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index 45819d7..ad73034 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -316,6 +316,36 @@ the user does not specify any of the previous choices.
 Note that if any of the packages listed are already merged, the package manager
 will use that to consider the dependency satisfied.
 
+.SS "Cross-compilation"
+Portage supports cross-compilation into a subdirectory specified by \fBROOT\fR.
+.TP
+.B Host
+\fIHost\fR in this context means the platform hosting the build process, i.e.
+what autotools calls CBUILD.
+Its packages are contained in the root of the filesystem ("\fI/\fR").
+If \fBROOT\fR is "\fI/\fR", all dependency types will be installed there.
+Otherwise, starting from experimental \fBEAPI 5-hdepend\fR, only \fBHDEPEND\fR
+is installed into "\fI/\fR".
+In \fBEAPI 5\fR and earlier, the behaviour is controlled by the
+\fI\-\-root-deps\fR flag to \fBemerge\fR(1), defaulting to install only
+\fBDEPEND\fR into the \fIhost\fR.
+.TP
+.B Target
+\fITarget\fR refers to the platform that the package will later run on, i.e.
+what autotools calls CHOST.
+The directory housing this system is specified by \fBROOT\fR.
+If it is different from "\fI/\fR", i.e. \fIhost\fR and \fItarget\fR are not the
+same, this variable contains the path to the directory housing the \fItarget\fR
+system.
+Starting from experimental \fBEAPI 5-hdepend\fR, \fBDEPEND\fR and \fBRDEPEND\fR
+list the \fItarget\fR dependencies, i.e. those to be installed into \fBROOT\fR.
+In \fBEAPI 5\fR and earlier, the \fBemerge\fR(1) flag \fI\-\-root-deps\fR
+controlled what the package manager installed there, defaulting to only
+\fBRDEPEND\fR.
+.PP
+See section \fBVARIABLES\fR for more information about the \fBDEPEND\fR,
+\fBRDEPEND\fR and \fBHDEPEND\fR variables.
+
 .SH "VARIABLES"
 .TP
 .B Usage Notes
@@ -547,6 +577,11 @@ This should contain a list of all packages that are required for the program
 to compile (aka \fIbuildtime\fR dependencies).  These are usually libraries and
 headers.
 
+Starting from experimental \fBEAPI 5-hdepend\fR, tools should go into the
+\fBHDEPEND\fR variable instead, as \fBDEPEND\fR will only be installed into the
+\fItarget\fR system and hence cannot be executed in a cross\-compile setting.
+(See section \fBCross\-compilation\fR for more information.)
+
 You may use the syntax described above in the \fBDependencies\fR section.
 .TP
 .B RDEPEND
@@ -559,6 +594,17 @@ implicitly set.
 
 You may use the syntax described above in the \fBDependencies\fR section.
 .TP
+.B HDEPEND
+This should contain a list of all packages that are required to be executable
+during compilation of this program (aka \fIhost\fR buildtime dependencies).
+These are usually tools, like interpreters or (cross\-)compilers.
+
+This variable is new in experimental \fBEAPI 5-hdepend\fR and will be installed
+into the \fIhost\fR system.
+(See section \fBCross-compilation\fR for more information.)
+
+You may use the syntax described above in the \fBDependencies\fR section.
+.TP
 .B PDEPEND
 This should contain a list of all packages that should be merged after this
 one (aka \fIpost\fR merge dependencies), but which may be installed by the

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     f2da08db6ad7b8c207a58f75e4daf96a74f29c56
Author:     Dennis Schridde <devurandom <AT> gmx <DOT> net>
AuthorDate: Sun Sep 23 17:51:52 2012 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Sep 24 02:39:33 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=f2da08db

Better documentation of PDEPEND in ebuild(5)

---
 man/ebuild.5 |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index dbd024c..0d4d4e5 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -555,8 +555,13 @@ or earlier, then it defaults to the value of \fBDEPEND\fR. In
 You may use the same syntax to vary dependencies as seen above in \fBDependencies\fR.
 .TP
 .B PDEPEND
-This should contain a list of all packages that should be merged after this one,
-but may be merged before if need be.
+This should contain a list of all packages that should be merged after this
+one, but which may be installed by the package manager at any time, if that is
+not possible.
+
+.B ***WARNING***
+.br
+Use this only as last resort to break cyclic dependencies!
 
 You may use the same syntax to vary dependencies as seen above in \fBDependencies\fR.
 .TP

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     9dd83334c56262de44b0efa3c98777f1a3cc27af
Author:     Dennis Schridde <devurandom <AT> gmx <DOT> net>
AuthorDate: Sun Sep 23 18:01:12 2012 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Sep 24 02:39:39 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=9dd83334

Improve wording of *DEPEND variable description in ebuild(5) a bit

---
 man/ebuild.5 |   23 ++++++++++++++---------
 1 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index 0d4d4e5..d340c85 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -543,27 +543,32 @@ repo\-level USE settings, since profile and user configuration settings
 override them.
 .TP
 .B DEPEND
-This should contain a list of all packages that are required for the
-program to compile as described in \fBDependencies\fR.
+This should contain a list of all packages that are required for the program
+to compile (aka \fIbuildtime\fR dependencies).  These are usually libraries and
+headers.
+
+You may use the syntax described above in the \fBDependencies\fR section.
 .TP
 .B RDEPEND
 This should contain a list of all packages that are required for this
-program to run (aka runtime depend). If this is not set in \fBEAPI 3\fR
-or earlier, then it defaults to the value of \fBDEPEND\fR. In
-\fBEAPI 4\fR or later, \fBRDEPEND\fR will never be implicitly set.
+program to run (aka \fIruntime\fR dependencies).  These are usually libraries.
+
+In \fBEAPI 3\fR or earlier, if this is not set, then it defaults to the value
+of \fBDEPEND\fR. In \fBEAPI 4\fR or later, \fBRDEPEND\fR will never be
+implicitly set.
 
-You may use the same syntax to vary dependencies as seen above in \fBDependencies\fR.
+You may use the syntax described above in the \fBDependencies\fR section.
 .TP
 .B PDEPEND
 This should contain a list of all packages that should be merged after this
-one, but which may be installed by the package manager at any time, if that is
-not possible.
+one (aka \fIpost\fR merge dependencies), but which may be installed by the
+package manager at any time, if that is not possible.
 
 .B ***WARNING***
 .br
 Use this only as last resort to break cyclic dependencies!
 
-You may use the same syntax to vary dependencies as seen above in \fBDependencies\fR.
+You may use the syntax described above in the \fBDependencies\fR section.
 .TP
 .B REQUIRED_USE
 Beginning with \fBEAPI 4\fR, the \fBREQUIRED_USE\fR variable can be

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     62525844120c5308830c7140b9d5f037a4afe9c9
Author:     Dennis Schridde <devurandom <AT> gmx <DOT> net>
AuthorDate: Sun Sep 23 18:31:52 2012 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Sep 24 02:39:45 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=62525844

Reorder description of --root-deps in emerge(1)

80 char width and max 1 sentence per line.

---
 man/emerge.1 |   18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/man/emerge.1 b/man/emerge.1
index da2c631..ea6409c 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -705,14 +705,16 @@ Set the \fBROOT\fR environment variable.
 .TP
 .BR "\-\-root\-deps[=rdeps]"
 If no argument is given then build\-time dependencies of packages for
-\fBROOT\fR are installed to
-\fBROOT\fR instead of /. If the \fBrdeps\fR argument is given then discard
-all build\-time dependencies of packages for \fBROOT\fR. This option is
-only meaningful when used together with \fBROOT\fR and it should not
-be enabled under normal circumstances. For currently supported
-\fBEAPI\fR values, the build-time dependencies are specified in the
-\fBDEPEND\fR variable. However, behavior may change for new
-\fBEAPI\fRs when related extensions are added in the future.
+\fBROOT\fR are installed to \fBROOT\fR instead of /.
+If the \fBrdeps\fR argument is given then discard all build\-time dependencies
+of packages for \fBROOT\fR.
+This option is only meaningful when used together with \fBROOT\fR and it should
+not be enabled under normal circumstances!
+
+For currently supported \fBEAPI\fR values, the build-time dependencies are
+specified in the \fBDEPEND\fR variable.
+However, behavior may change for new \fBEAPI\fRs when related extensions are
+added in the future.
 .TP
 .BR "\-\-select [ y | n ]"
 Add specified packages to the world set (inverse of

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     a1a8a79a76fd1be60f6fcf992efcbc1d98d0f941
Author:     Dennis Schridde <devurandom <AT> gmx <DOT> net>
AuthorDate: Sun Sep 23 17:51:29 2012 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Sep 24 02:39:27 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=a1a8a79a

Fix referencens to Dependencies section of ebuild(5)

---
 man/ebuild.5 |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index 4996a57..dbd024c 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -544,7 +544,7 @@ override them.
 .TP
 .B DEPEND
 This should contain a list of all packages that are required for the
-program to compile as described in \fBDEPENDENCIES\fR.
+program to compile as described in \fBDependencies\fR.
 .TP
 .B RDEPEND
 This should contain a list of all packages that are required for this
@@ -552,13 +552,13 @@ program to run (aka runtime depend). If this is not set in \fBEAPI 3\fR
 or earlier, then it defaults to the value of \fBDEPEND\fR. In
 \fBEAPI 4\fR or later, \fBRDEPEND\fR will never be implicitly set.
 
-You may use the same syntax to vary dependencies as seen above in \fBDEPENDENCIES\fR.
+You may use the same syntax to vary dependencies as seen above in \fBDependencies\fR.
 .TP
 .B PDEPEND
 This should contain a list of all packages that should be merged after this one,
 but may be merged before if need be.
 
-You may use the same syntax to vary dependencies as seen above in \fBDEPENDENCIES\fR.
+You may use the same syntax to vary dependencies as seen above in \fBDependencies\fR.
 .TP
 .B REQUIRED_USE
 Beginning with \fBEAPI 4\fR, the \fBREQUIRED_USE\fR variable can be

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     2e580d2852789b2c5deb922555f73643d0b9617a
Author:     Dennis Schridde <devurandom <AT> gmx <DOT> net>
AuthorDate: Sun Sep 23 16:07:12 2012 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Sep 24 02:39:21 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=2e580d28

Adjust code of first paragraph of ebuild(5) to 80 char width

---
 man/ebuild.5 |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index 54e368e..4996a57 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -4,12 +4,12 @@
 ebuild \- the internal format, variables, and functions in an ebuild script
 
 .SH "DESCRIPTION"
-The \fBebuild\fR(1) program accepts a single ebuild script as an argument.  This script
-contains variables and commands that specify how to download, unpack,
-patch, compile, install and merge a particular software package from
-its original sources.  In addition to all of this, the ebuild script
-can also contain pre/post install/remove commands, as required.  All
-ebuild scripts are written in bash.
+The \fBebuild\fR(1) program accepts a single ebuild script as an argument.
+This script contains variables and commands that specify how to download,
+unpack, patch, compile, install and merge a particular software package from
+its original sources.  In addition to all of this, the ebuild script can also
+contain pre/post install/remove commands, as required.  All ebuild scripts are
+written in bash.
 
 .SS "Dependencies"
 A \fIdepend atom\fR is simply a dependency that is used by portage when calculating

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     af1a287b1dc771901f1b30f2166d20c1758e8587
Author:     Dennis Schridde <devurandom <AT> gmx <DOT> net>
AuthorDate: Sat Sep 22 22:56:56 2012 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Sep 24 02:39:15 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=af1a287b

Reorder and cleanup of ebuild(5)

---
 man/ebuild.5 | 1137 ++++++++++++++++++++++++++++++----------------------------
 1 files changed, 579 insertions(+), 558 deletions(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index 22e6468..54e368e 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -1,311 +1,46 @@
 .TH "EBUILD" "5" "Sep 2012" "Portage VERSION" "Portage"
+
 .SH "NAME"
 ebuild \- the internal format, variables, and functions in an ebuild script
+
 .SH "DESCRIPTION"
-The
-.BR ebuild (1)
-program accepts a single ebuild script as an argument.  This script
+The \fBebuild\fR(1) program accepts a single ebuild script as an argument.  This script
 contains variables and commands that specify how to download, unpack,
 patch, compile, install and merge a particular software package from
 its original sources.  In addition to all of this, the ebuild script
 can also contain pre/post install/remove commands, as required.  All
 ebuild scripts are written in bash.
-.SH "EXAMPLES"
-Here's a simple example ebuild:
-
-.DS
-.nf
-# Copyright 1999\-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-
-inherit some_eclass another_eclass
-
-DESCRIPTION="Super\-useful stream editor (sed)"
-HOMEPAGE="http://www.gnu.org/software/sed/sed.html"
-SRC_URI="ftp://alpha.gnu.org/pub/gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL\-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="nls? ( sys-devel/gettext )"
-
-src_configure() {
-	econf \\
-		\-\-bindir="${EPREFIX}"/bin
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc NEWS README* THANKS AUTHORS BUGS ChangeLog
-}
-.fi
-.SH "VARIABLES"
-.TP
-.B MISC USAGE NOTES
-\- All variables defined in \fBmake.conf\fR(5) are available for use in
-ebuilds (such as the PORTAGE* and PORTDIR* variables)
-.br
-\- When assigning values to variables in ebuilds, you \fBcannot have a
-space\fR between the variable name and the equal sign.
-.br
-\- Variable values should only contain characters that are members of the
-\fBascii\fR(7) character set. This requirement is mandated by \fBGLEP 31\fR.
-.TP
-.B P
-This variable contains the package name without the ebuild revision.
-This variable must NEVER be modified.
-.br
-\fBxfree\-4.2.1\-r2.ebuild\fR \-\-> \fB$P\fR=='\fIxfree\-4.2.1\fR'
-.TP
-.B PN
-Contains the name of the script without the version number.
-.br
-\fBxfree\-4.2.1\-r2.ebuild\fR \-\-> \fB$PN\fR=='\fIxfree\fR'
-.TP
-.B PV
-Contains the version number without the revision.
-.br
-\fBxfree\-4.2.1\-r2.ebuild\fR \-\-> \fB$PV\fR=='\fI4.2.1\fR'
-.TP
-.B PR
-Contains the revision number or 'r0' if no revision number exists.
-.br
-\fBxfree\-4.2.1\-r2.ebuild\fR \-\-> \fB$PR\fR=='\fIr2\fR'
-.TP
-.B PVR
-Contains the version number with the revision.
-.br
-\fBxfree\-4.2.1\-r2.ebuild\fR \-\-> \fB$PVR\fR=='\fI4.2.1\-r2\fR'
-.TP
-.B PF
-Contains the full package name \fI[PN]\-[PVR]\fR
-.br
-\fBxfree\-4.2.1\-r2.ebuild\fR \-\-> \fB$PF\fR=='\fIxfree\-4.2.1\-r2\fR'
-.TP
-.B CATEGORY
-Contains the package category name.
-.TP
-.B A
-Contains all source files required for the package.  This variable must
-not be defined. It is autogenerated from the \fISRC_URI\fR variable.
-.TP
-\fBWORKDIR\fR = \fI"${PORTAGE_TMPDIR}/portage/${CATEGORY}/${PF}/work"\fR
-Contains the path to the package build root.  Do not modify this variable.
-.TP
-\fBFILESDIR\fR = \fI"${PORTDIR}/${CATEGORY}/${PN}/files"\fR
-Contains the path to the 'files' sub folder in the package specific
-location in the portage tree.  Do not modify this variable.
-.TP
-.B EBUILD_PHASE
-Contains the abreviated name of the phase function that is
-currently executing, such as "setup", "unpack", "compile", or
-"preinst".
-.TP
-.B EBUILD_PHASE_FUNC
-Beginning with \fBEAPI 5\fR, contains the full name of the phase
-function that is currently executing, such as "pkg_setup",
-"src_unpack", "src_compile", or "pkg_preinst".
-.TP
-.B EPREFIX
-Beginning with \fBEAPI 3\fR, contains the offset
-that this Portage was configured for during
-installation.  The offset is sometimes necessary in an ebuild or eclass,
-and is available in such cases as ${EPREFIX}.  EPREFIX does not contain
-a trailing slash, therefore an absent offset is represented by the empty
-string.  Do not modify this variable.
-.TP
-\fBS\fR = \fI"${WORKDIR}/${P}"\fR
-Contains the path to the temporary \fIbuild directory\fR.  This variable
-is used by the functions \fIsrc_compile\fR and \fIsrc_install\fR.  Both
-are executed with \fIS\fR as the current directory.  This variable may
-be modified to match the extraction directory of a tarball for the package.
-.TP
-\fBT\fR = \fI"${PORTAGE_TMPDIR}/portage/${CATEGORY}/${PF}/temp"\fR
-Contains the path to a \fItemporary directory\fR.  You may use this for
-whatever you like.
-.TP
-\fBD\fR = \fI"${PORTAGE_TMPDIR}/portage/${CATEGORY}/${PF}/image/"\fR
-Contains the path to the temporary \fIinstall directory\fR.  Every write
-operation that does not involve the helper tools and functions (found below)
-should be prefixed with ${D}.
-Beginning with \fBEAPI 3\fR, the offset prefix often needs
-to be taken into account here, for which the variable
-${ED} is provided (see below).
-Do not modify this variable.
-.TP
-\fBED\fT = \fI"${PORTAGE_TMPDIR}/portage/${CATEGORY}/${PF}/image/${EPREFIX}/"\fR
-Beginning with \fBEAPI 3\fR, contains the path
-"${D%/}${EPREFIX}/" for convenience purposes.
-For \fBEAPI\fR values prior to \fBEAPI 3\fR which do
-not support \fB${ED}\fR, helpers use \fB${D}\fR where
-they would otherwise use \fB${ED}\fR.
-Do not modify this variable.
-.TP
-.B MERGE_TYPE
-Beginning with \fBEAPI 4\fR, the MERGE_TYPE variable can be used to
-query the current merge type. This variable will contain one of the
-following possible values:
-
-.RS
-.TS
-l l
-__
-l l.
-Value	Meaning
-
-binary	previously\-built which is scheduled for merge
-buildonly	source\-build which is not scheduled for merge
-source	source\-build which is scheduled for merge
-.TE
-.RE
-.TP
-.B PORTAGE_LOG_FILE
-Contains the path of the build log. If \fBPORT_LOGDIR\fR variable is unset then
-\fBPORTAGE_LOG_FILE\fR=\fB"${T}/build.log"\fR.
-.TP
-.B REPLACED_BY_VERSION
-Beginning with \fBEAPI 4\fR, the REPLACED_BY_VERSION variable can be
-used in pkg_prerm and pkg_postrm to query the package version that
-is replacing the current package. If there is no replacement package,
-the variable will be empty, otherwise it will contain a single version
-number.
-.TP
-.B REPLACING_VERSIONS
-Beginning with \fBEAPI 4\fR, the REPLACING_VERSIONS variable can be
-used in pkg_pretend, pkg_setup, pkg_preinst and pkg_postinst to query
-the package version(s) that the current package is replacing. If there
-are no packages to replace, the variable will be empty, otherwise it
-will contain a space\-separated list of version numbers corresponding
-to the package version(s) being replaced. Typically, this variable will
-not contain more than one version, but according to PMS it can contain
-more.
-.TP
-\fBROOT\fR = \fI"/"\fR
-Contains the path that portage should use as the root of the live filesystem.
-When packages wish to make changes to the live filesystem, they should do so in
-the tree prefixed by ${ROOT}.  Often the offset prefix needs to be taken
-into account here, for which the variable ${EROOT} is provided (see
-below).  Do not modify this variable.
-.TP
-\fBEROOT\fR = \fI"${ROOT%/}${EPREFIX}/"\fR
-Beginning with \fBEAPI 3\fR, contains
-"${ROOT%/}${EPREFIX}/" for convenience
-purposes. Do not modify this variable.
-.TP
-\fBDESCRIPTION\fR = \fI"A happy little package"\fR
-Should contain a short description of the package.
-.TP
-\fBEAPI\fR = \fI"0"\fR
-Defines the ebuild API version to which this package conforms. If not
-defined then it defaults to "0". If portage does not recognize the
-EAPI value then it will mask the package and refuse to perform any
-operations with it since this means that a newer version of portage
-needs to be installed first. For maximum backward compatiblity, a
-package should conform to the lowest possible EAPI. Note that anyone
-who uses the \fBebuild\fR(1) and \fBrepoman\fR(1) commands with this
-package will be required to have a version of portage that recognizes
-the EAPI to which this package conforms.
-.TP
-\fBSRC_URI\fR = \fI"http://example.com/path/${P}.tar.gz"\fR
-Contains a list of URIs for the required source files.  It can contain
-multiple URIs for a single source file.  The list is processed in order
-if the file was not found on any of the \fIGENTOO_MIRRORS\fR.
-Beginning with \fBEAPI 2\fR, the output file name of a given URI may be
-customized with a "->" operator on the right hand side, followed by the
-desired output file name. All tokens, including the operator and output
-file name, should be separated by whitespace.
-.TP
-\fBHOMEPAGE\fR = \fI"http://example.com/"\fR
-Should contain a list of URIs for the sources main sites and other further
-package dependent information.
-.TP
-\fBKEYWORDS\fR = \fI[\-~][x86,ppc,sparc,mips,alpha,arm,hppa]\fR
-Should contain appropriate list of arches that the ebuild is know to
-work/not work.  By default if you do not know if an ebuild runs under
-a particular arch simply omit that KEYWORD.  If the ebuild will not
-work on that arch include it as \-ppc for example.  If the ebuild is
-being submitted for inclusion, it must have ~arch set for architectures
-where it has been PROVEN TO WORK.  (Packages KEYWORDed this way may be
-unmasked for testing by setting ACCEPT_KEYWORDS="~arch" on the command
-line, or in \fBmake.conf\fR(5)) For an authoritative list please review
-/usr/portage/profiles/arch.list.  Please keep this list in alphabetical order.
-.TP
-\fBSLOT\fR
-This sets the SLOT for packages that may need to have multiple versions
-co\-exist.  By default you should set \fBSLOT\fR="0".  If you are unsure, then
-do not fiddle with this until you seek some guidance from some guru.  This
-value should \fINEVER\fR be left undefined.
 
-Beginning with \fBEAPI 5\fR, the SLOT variable may contain
-an optional sub\-slot part that follows the regular slot and
-is delimited by a / character. The sub\-slot must be a valid
-slot name. The sub\-slot is used to represent cases in which
-an upgrade to a new version of a package with a different
-sub\-slot may require dependent packages to be rebuilt. When
-the sub\-slot part is omitted from the SLOT definition, the
-package is considered to have an implicit sub\-slot which is
-equal to the regular slot. Refer to the \fBAtom Slot
-Operators\fR section for more information about sub\-slot
-usage.
-.TP
-\fBLICENSE\fR
-This should be a space delimited list of licenses that the package falls
-under.  This \fB_must_\fR be set to a matching license in
-/usr/portage/licenses/. If the license does not exist in portage yet, you
-must add it first.
-.TP
-\fBIUSE\fR
-This should be a list of any and all USE flags that are leveraged within
-your build script.  The only USE flags that should not be listed here are
-arch related flags (see \fBKEYWORDS\fR). Beginning with \fBEAPI 1\fR, it
-is possible to prefix flags with + or - in order to create default settings
-that respectively enable or disable the corresponding \fBUSE\fR flags. For
-details about \fBUSE\fR flag stacking order, refer to the \fBUSE_ORDER\fR
-variable in \fBmake.conf\fR(5). Given the default \fBUSE_ORDER\fR setting,
-negative IUSE default settings are effective only for negation of
-repo\-level USE settings, since profile and user configuration settings
-override them.
-.TP
-\fBDEPEND\fR
-This should contain a list of all packages that are required for the
-program to compile.
-.RS
-.TP
-.B DEPEND Atoms
-A depend atom is simply a dependency that is used by portage when calculating
+.SS "Dependencies"
+A \fIdepend atom\fR is simply a dependency that is used by portage when calculating
 relationships between packages.  Please note that if the atom has not already
 been emerged, then the latest version available is matched.
-.RS
 .TP
 .B Atom Bases
-The base atom is just a full category/packagename.  Hence, these are base atoms:
+The base atom is just a full category/packagename.
 
+Examples:
 .nf
-.I sys\-apps/sed
-.I sys\-libs/zlib
-.I net\-misc/dhcp
+.I 	sys\-apps/sed
+.I 	sys\-libs/zlib
+.I 	net\-misc/dhcp
 .fi
 .TP
 .B Atom Versions
 It is nice to be more specific and say that only certain versions of atoms are
 acceptable.  Note that versions must be combined with a prefix (see below).  
-Hence you may add a version number as a postfix to the base:
+Hence you may add a version number as a postfix to the base.
 
+Examples:
 .nf
-sys\-apps/sed\fI\-4.0.5\fR
-sys\-libs/zlib\fI\-1.1.4\-r1\fR
-net\-misc/dhcp\fI\-3.0_p2\fR
+	sys\-apps/sed\fI\-4.0.5\fR
+	sys\-libs/zlib\fI\-1.1.4\-r1\fR
+	net\-misc/dhcp\fI\-3.0_p2\fR
 .fi
 
 Versions are normally made up of two or three numbers separated by periods, such
 as 1.2 or 4.5.2.  This string may be followed by a character such as 1.2a or 
-4.5.2z.  Note that this letter is \fBnot\fR meant to indicate alpha, beta, 
+4.5.2z.  Note that this letter is \fInot\fR meant to indicate alpha, beta,
 etc... status.  For that, use the optional suffix; either _alpha, _beta, _pre 
 (pre\-release), _rc (release candidate), or _p (patch).  This means for the 
 3rd pre\-release of a package, you would use something like 1.2_pre3.  The 
@@ -315,36 +50,52 @@ suffixes here can be arbitrarily chained without limitation.
 Sometimes you want to be able to depend on general versions rather than specifying
 exact versions all the time.  Hence we provide standard boolean operators:
 
+Examples:
 .nf
-\fI>\fRmedia\-libs/libgd\-1.6
-\fI>=\fRmedia\-libs/libgd\-1.6
-\fI=\fRmedia\-libs/libgd\-1.6
-\fI<=\fRmedia\-libs/libgd\-1.6
-\fI<\fRmedia\-libs/libgd\-1.6
+	\fI>\fRmedia\-libs/libgd\-1.6
+	\fI>=\fRmedia\-libs/libgd\-1.6
+	\fI=\fRmedia\-libs/libgd\-1.6
+	\fI<=\fRmedia\-libs/libgd\-1.6
+	\fI<\fRmedia\-libs/libgd\-1.6
 .fi
 .TP
 .B Extended Atom Prefixes [!~] and Postfixes [*]
 Now to get even fancier, we provide the ability to define blocking packages and
 version range matching.  Also note that these extended prefixes/postfixes may
-be combined in any way with the atom classes defined above.  Here are some common
-examples you may find in the portage tree:
+be combined in any way with the atom classes defined above.
+.RS
+.TP
+.I ~
+means match any revision of the base version specified.  So in the
+example below, we would match versions '1.0.2a', '1.0.2a\-r1', '1.0.2a\-r2',
+etc...
 
+Example:
 .nf
-\fI!\fRapp\-text/dos2unix
-=dev\-libs/glib\-2\fI*\fR
-\fI!\fR=net\-fs/samba\-2\fI*\fR
-\fI~\fRnet\-libs/libnet\-1.0.2a
-\fI!!\fR<sys\-apps/portage\-2.1.4_rc1\fI\fR
+	\fI~\fRnet\-libs/libnet\-1.0.2a
 .fi
+.TP
+.I !
+means block packages from being installed at the same time.
 
-\fI!\fR means block packages from being installed at the same time.
-.br
-\fI!!\fR means block packages from being installed at the same time
+Example:
+.nf
+	\fI!\fRapp\-text/dos2unix
+.fi
+.TP
+.I !!
+means block packages from being installed at the same time
 and explicitly disallow them from being temporarily installed
 simultaneously during a series of upgrades. This syntax is supported
 beginning with \fBEAPI 2\fR.
-.br
-\fI*\fR means match any version of the package so long
+
+Example:
+.nf
+	\fI!!\fR<sys\-apps/portage\-2.1.4_rc1
+.fi
+.TP
+.I *
+means match any version of the package so long
 as the specified string prefix is matched. So with a
 version of '2*', we can match '2.1', '2.2', '2.2.1',
 etc... and not match version '1.0', '3.0', '4.1', etc...
@@ -353,36 +104,39 @@ will also be matched by '2*'. The version part
 that comes before the '*' must be a valid version in the absence of the '*'.
 For example, '2' is a valid version and '2.' is not. Therefore, '2*' is
 allowed and '2.*' is not.
-.br
-\fI~\fR means match any revision of the base version specified.  So in the
-above example, we would match versions '1.0.2a', '1.0.2a\-r1', '1.0.2a\-r2',
-etc...
+
+Examples:
+.nf
+	=dev\-libs/glib\-2\fI*\fR
+	\fI!\fR=net\-fs/samba\-2\fI*\fR
+.fi
+.RE
 .TP
 .B Atom Slots
 Beginning with \fBEAPI 1\fR, any atom can be constrained to match a specific
 \fBSLOT\fR. This is accomplished by appending a colon followed by a
 \fBSLOT\fR:
 
+Examples:
 .nf
-x11\-libs/qt:3
-\fI~\fRx11\-libs/qt-3.3.8:3
-\fI>=\fRx11\-libs/qt-3.3.8:3
-\fI=\fRx11\-libs/qt-3.3*:3
+	x11\-libs/qt:3
+	\fI~\fRx11\-libs/qt-3.3.8:3
+	\fI>=\fRx11\-libs/qt-3.3.8:3
+	\fI=\fRx11\-libs/qt-3.3*:3
 .fi
-
+.TP
+.B Sub Slots
 Beginning with \fBEAPI 5\fR, a slot dependency may contain an
 optional sub\-slot part that follows the regular slot and is
-delimited by a \fB/\fR character.
-
-.I Examples:
+delimited by a \fI/\fR character.
 
+Examples:
 .nf
-dev\-libs/icu:0/0
-dev\-libs/icu:0/49
-dev\-lang/perl:0/5.12
-dev\-libs/glib:2/2.30
+	dev\-libs/icu:0/0
+	dev\-libs/icu:0/49
+	dev\-lang/perl:0/5.12
+	dev\-libs/glib:2/2.30
 .fi
-
 .TP
 .B Atom Slot Operators
 Beginning with \fBEAPI 5\fR, slot operator dependency consists
@@ -395,12 +149,11 @@ for runtime dependencies, indicates that the package will not
 break if the matched package is uninstalled and replaced by
 a different matching package in a different slot.
 
-.I Examples:
-
+Examples:
 .nf
-dev\-libs/icu:*
-dev\-lang/perl:*
-dev-libs/glib:*
+	dev\-libs/icu:*
+	dev\-lang/perl:*
+	dev-libs/glib:*
 .fi
 .TP
 .I =
@@ -410,24 +163,22 @@ break unless a matching package with slot and sub\-slot equal
 to the slot and sub\-slot of the best installed version at the
 time the package was installed is available.
 
-.I Examples:
-
+Examples:
 .nf
-dev\-libs/icu:=
-dev\-lang/perl:=
-dev-libs/glib:=
+	dev\-libs/icu:=
+	dev\-lang/perl:=
+	dev-libs/glib:=
 .fi
 .TP
 .I slot=
 Indicates that only a specific slot value is acceptable, and
 otherwise behaves identically to the plain equals slot operator.
 
-.I Examples:
-
+Examples:
 .nf
-dev\-libs/icu:0=
-dev\-lang/perl:0=
-dev-libs/glib:2=
+	dev\-libs/icu:0=
+	dev\-lang/perl:0=
+	dev-libs/glib:2=
 .fi
 .PP
 To implement the equals slot operator, the package manager
@@ -441,13 +192,12 @@ dependencies. The sub\-slot part must not be omitted here
 is considered to have an implicit sub\-slot which is equal to
 the regular slot).
 
-.I Examples:
-
+Examples:
 .nf
-dev\-libs/icu:0/0=
-dev\-libs/icu:0/49=
-dev\-lang/perl:0/5.12=
-dev-libs/glib:2/2.30=
+	dev\-libs/icu:0/0=
+	dev\-libs/icu:0/49=
+	dev\-lang/perl:0/5.12=
+	dev-libs/glib:2/2.30=
 .fi
 .RE
 .TP
@@ -456,7 +206,6 @@ Beginning with \fBEAPI 2\fR, any atom can be constrained to match specific
 \fBUSE\fR flag settings. When used together with \fBSLOT\fR dependencies,
 \fBUSE\fR dependencies appear on the right hand side of \fBSLOT\fR
 dependencies.
-
 .RS
 .TP
 .B Unconditional USE Dependencies
@@ -465,125 +214,353 @@ l l
 __
 l l.
 Example	Meaning
-
 foo[bar]	foo must have bar enabled
 foo[bar,baz]	foo must have both bar and baz enabled
 foo[\-bar,baz]	foo must have bar disabled and baz enabled
 .TE
+.TP
+.B Conditional USE Dependencies
+.TS
+l l
+__
+l l.
+Compact Form	Equivalent Expanded Form
+foo[bar?]	bar? ( foo[bar] ) !bar? ( foo )
+foo[!bar?]	bar? ( foo ) !bar? ( foo[\-bar] )
+foo[bar=]	bar? ( foo[bar] ) !bar? ( foo[\-bar] )
+foo[!bar=]	bar? ( foo[\-bar] ) !bar? ( foo[bar] )
+.TE
+.RE
+.TP
+.B Atom USE defaults
+Beginning with \fBEAPI 4\fR, \fBUSE\fR dependencies may specify default
+assumptions about values for flags that may or may not be missing from
+the \fBIUSE\fR of the matched package. Such defaults are specified by
+immediately following a flag with either \fI(+)\fR or \fI(\-)\fR. Use
+\fI(+)\fR to behave as if a missing flag is present and enabled, or
+\fI(\-)\fR to behave as if it is present and disabled:
+
+Examples:
+.nf
+	media\-video/ffmpeg[threads(+)]
+	media\-video/ffmpeg[-threads(\-)]
+.fi
+.TP
+.B Dynamic Dependencies
+Sometimes programs may depend on different things depending on the USE
+variable.  Portage offers a few options to handle this.  Note that when
+using the following syntaxes, each case is considered as 1 Atom in the
+scope it appears.  That means that each Atom both conditionally include
+multiple Atoms and be nested to an infinite depth.
+.RS
+.TP
+.B usevar? ( Atom )
+To include the jpeg library when the user has jpeg in \fBUSE\fR, simply use the
+following syntax:
+
+jpeg? ( media\-libs/jpeg )
+.TP
+.B !usevar? ( Atom )
+If you want to include a package only if the user does not have a certain option
+in their \fBUSE\fR variable, then use the following syntax:
+
+!nophysfs? ( dev\-games/physfs )
+
+This is often useful for those times when you want to want to add optional support
+for a feature and have it enabled by default.
+.TP
+.B usevar? ( Atom if true ) !usevar? ( Atom if false )
+For functionality like the tertiary operator found in C you must use
+two statements, one normal and one inverted.  If a package uses
+GTK2 or GTK1, but not both, then you can handle that like this:
+
+gtk2? ( =x11\-libs/gtk+\-2* ) !gtk2? ( =x11\-libs/gtk+\-1* )
+
+That way the default is the superior GTK2 library.
+.TP
+.B || ( Atom Atom ... )
+When a package can work with a few different packages but a virtual is not
+appropriate, this syntax can easily be used.
+
+Example:
+.nf
+|| (
+	app\-games/unreal\-tournament
+	app\-games/unreal\-tournament\-goty
+)
+.fi
+
+Here we see that unreal\-tournament has a normal version and it has a goty
+version.  Since they provide the same base set of files, another package can
+use either.  Adding a virtual is inappropriate due to the small scope of it.
+
+Another good example is when a package can be built with multiple video
+interfaces, but it can only ever have just one.
+
+Example:
+.nf
+|| (
+	sdl? ( media\-libs/libsdl )
+	svga? ( media\-libs/svgalib )
+	opengl? ( virtual/opengl )
+	ggi? ( media\-libs/libggi )
+	virtual/x11
+)
+.fi
+
+Here only one of the packages will be chosen, and the order of preference is
+determined by the order in which they appear.  So sdl has the best chance of
+being chosen, followed by svga, then opengl, then ggi, with a default of X if
+the user does not specify any of the previous choices.
+
+Note that if any of the packages listed are already merged, the package manager
+will use that to consider the dependency satisfied.
+
+.SH "VARIABLES"
+.TP
+.B Usage Notes
+\- All variables defined in \fBmake.conf\fR(5) are available for use in
+ebuilds (such as the PORTAGE* and PORTDIR* variables)
+.br
+\- When assigning values to variables in ebuilds, you \fIcannot have a
+space\fR between the variable name and the equal sign.
+.br
+\- Variable values should only contain characters that are members of the
+\fBascii\fR(7) character set. This requirement is mandated by \fBGLEP 31\fR.
+.TP
+.B P
+This variable contains the package name without the ebuild revision.
+This variable must NEVER be modified.
+
+xfree\-4.2.1\-r2.ebuild \-\-> $P=='xfree\-4.2.1'
+.TP
+.B PN
+Contains the name of the script without the version number.
+
+xfree\-4.2.1\-r2.ebuild \-\-> $PN=='xfree'
+.TP
+.B PV
+Contains the version number without the revision.
+
+xfree\-4.2.1\-r2.ebuild \-\-> $PV=='4.2.1'
+.TP
+.B PR
+Contains the revision number or 'r0' if no revision number exists.
+
+xfree\-4.2.1\-r2.ebuild \-\-> $PR=='r2'
+.TP
+.B PVR
+Contains the version number with the revision.
 
+xfree\-4.2.1\-r2.ebuild \-\-> $PVR=='4.2.1\-r2'
+.TP
+.B PF
+Contains the full package name \fBPN\fR\-\fBPVR\fR
+
+xfree\-4.2.1\-r2.ebuild \-\-> $PF=='xfree\-4.2.1\-r2'
+.TP
+.B CATEGORY
+Contains the package category name.
+.TP
+.B A
+Contains all source files required for the package.  This variable must
+not be defined. It is autogenerated from the \fBSRC_URI\fR variable.
+.TP
+.B WORKDIR\fR = \fI"${PORTAGE_TMPDIR}/portage/${CATEGORY}/${PF}/work"
+Contains the path to the package build root.  Do not modify this variable.
+.TP
+.B FILESDIR\fR = \fI"${PORTDIR}/${CATEGORY}/${PN}/files"
+Contains the path to the 'files' sub folder in the package specific
+location in the portage tree.  Do not modify this variable.
+.TP
+.B EBUILD_PHASE
+Contains the abreviated name of the phase function that is
+currently executing, such as "setup", "unpack", "compile", or
+"preinst".
+.TP
+.B EBUILD_PHASE_FUNC
+Beginning with \fBEAPI 5\fR, contains the full name of the phase
+function that is currently executing, such as "pkg_setup",
+"src_unpack", "src_compile", or "pkg_preinst".
+.TP
+.B EPREFIX
+Beginning with \fBEAPI 3\fR, contains the offset
+that this Portage was configured for during
+installation.  The offset is sometimes necessary in an ebuild or eclass,
+and is available in such cases as ${EPREFIX}.  EPREFIX does not contain
+a trailing slash, therefore an absent offset is represented by the empty
+string.  Do not modify this variable.
+.TP
+.B S\fR = \fI"${WORKDIR}/${P}"
+Contains the path to the temporary \fIbuild directory\fR.  This variable
+is used by the functions \fIsrc_compile\fR and \fIsrc_install\fR.  Both
+are executed with \fIS\fR as the current directory.  This variable may
+be modified to match the extraction directory of a tarball for the package.
+.TP
+.B T\fR = \fI"${PORTAGE_TMPDIR}/portage/${CATEGORY}/${PF}/temp"
+Contains the path to a \fItemporary directory\fR.  You may use this for
+whatever you like.
+.TP
+.B D\fR = \fI"${PORTAGE_TMPDIR}/portage/${CATEGORY}/${PF}/image/"
+Contains the path to the temporary \fIinstall directory\fR.  Every write
+operation that does not involve the helper tools and functions (found below)
+should be prefixed with ${D}.
+Beginning with \fBEAPI 3\fR, the offset prefix often needs
+to be taken into account here, for which the variable
+${ED} is provided (see below).
+Do not modify this variable.
+.TP
+.B ED\fR = \fI"${PORTAGE_TMPDIR}/portage/${CATEGORY}/${PF}/image/${EPREFIX}/"
+Beginning with \fBEAPI 3\fR, contains the path
+"${D%/}${EPREFIX}/" for convenience purposes.
+For EAPI values prior to \fBEAPI 3\fR which do
+not support ED, helpers use \fBD\fR where
+they would otherwise use ED.
+Do not modify this variable.
 .TP
-.B Conditional USE Dependencies
+.B MERGE_TYPE
+Beginning with \fBEAPI 4\fR, the MERGE_TYPE variable can be used to
+query the current merge type. This variable will contain one of the
+following possible values:
+
+.RS
 .TS
 l l
 __
 l l.
-Compact Form	Equivalent Expanded Form
-
-foo[bar?]	bar? ( foo[bar] ) !bar? ( foo )
-foo[!bar?]	bar? ( foo ) !bar? ( foo[\-bar] )
-foo[bar=]	bar? ( foo[bar] ) !bar? ( foo[\-bar] )
-foo[!bar=]	bar? ( foo[\-bar] ) !bar? ( foo[bar] )
+Value	Meaning
+binary	previously\-built which is scheduled for merge
+buildonly	source\-build which is not scheduled for merge
+source	source\-build which is scheduled for merge
 .TE
 .RE
 .TP
-.B Atom USE defaults
-Beginning with \fBEAPI 4\fR, \fBUSE\fR dependencies may specify default
-assumptions about values for flags that may or may not be missing from
-the \fBIUSE\fR of the matched package. Such defaults are specified by
-immediately following a flag with either \fB(+)\fR or \fB(\-)\fR. Use
-\fB(+)\fR to behave as if a missing flag is present and enabled, or
-\fB(\-)\fR to behave as if it is present and disabled:
-
-.RS
-.nf
-media\-video/ffmpeg[threads(+)]
-media\-video/ffmpeg[-threads(\-)]
-.fi
-.RE
-.RE
+.B PORTAGE_LOG_FILE
+Contains the path of the build log. If \fBPORT_LOGDIR\fR variable is unset then
+PORTAGE_LOG_FILE=\fI"${T}/build.log"\fR.
 .TP
-.B Dynamic DEPENDs
-Sometimes programs may depend on different things depending on the USE
-variable.  Portage offers a few options to handle this.  Note that when
-using the following syntaxes, each case is considered as 1 Atom in the
-scope it appears.  That means that each Atom both conditionally include
-multiple Atoms and be nested to an infinite depth.
-.RS
+.B REPLACED_BY_VERSION
+Beginning with \fBEAPI 4\fR, the REPLACED_BY_VERSION variable can be
+used in pkg_prerm and pkg_postrm to query the package version that
+is replacing the current package. If there is no replacement package,
+the variable will be empty, otherwise it will contain a single version
+number.
 .TP
-.B usevar? ( DEPEND Atom )
-To include the jpeg library when the user has jpeg in \fBUSE\fR, simply use the
-following syntax:
-.br
-.B jpeg? ( media\-libs/jpeg )
+.B REPLACING_VERSIONS
+Beginning with \fBEAPI 4\fR, the REPLACING_VERSIONS variable can be
+used in pkg_pretend, pkg_setup, pkg_preinst and pkg_postinst to query
+the package version(s) that the current package is replacing. If there
+are no packages to replace, the variable will be empty, otherwise it
+will contain a space\-separated list of version numbers corresponding
+to the package version(s) being replaced. Typically, this variable will
+not contain more than one version, but according to PMS it can contain
+more.
 .TP
-.B !usevar? ( Atom )
-If you want to include a package only if the user does not have a certain option
-in their \fBUSE\fR variable, then use the following syntax:
-.br
-.B !nophysfs? ( dev\-games/physfs )
-.br
-This is often useful for those times when you want to want to add optional support
-for a feature and have it enabled by default.
+.B ROOT\fR = \fI"/"
+Contains the path that portage should use as the root of the live filesystem.
+When packages wish to make changes to the live filesystem, they should do so in
+the tree prefixed by ${ROOT}.  Often the offset prefix needs to be taken
+into account here, for which the variable ${EROOT} is provided (see
+below).  Do not modify this variable.
 .TP
-.B usevar? ( Atom if true ) !usevar? ( Atom if false )
-For functionality like the tertiary operator found in C you must use
-two statements, one normal and one inverted.  If a package uses
-GTK2 or GTK1, but not both, then you can handle that like this:
-.br
-.B gtk2? ( =x11\-libs/gtk+\-2* ) !gtk2? ( =x11\-libs/gtk+\-1* )
-.br
-That way the default is the superior GTK2 library.
+.B EROOT\fR = \fI"${ROOT%/}${EPREFIX}/"
+Beginning with \fBEAPI 3\fR, contains
+"${ROOT%/}${EPREFIX}/" for convenience
+purposes. Do not modify this variable.
 .TP
-.B || ( Atom Atom ... )
-When a package can work with a few different packages but a virtual is not
-appropriate, this syntax can easily be used.
-.nf
-.B || (
-.B 	app\-games/unreal\-tournament
-.B 	app\-games/unreal\-tournament\-goty
-.B )
-.fi
-Here we see that unreal\-tournament has a normal version and it has a goty
-version.  Since they provide the same base set of files, another package can
-use either.  Adding a virtual is inappropriate due to the small scope of it.
-.br
-Another good example is when a package can be built with multiple video 
-interfaces, but it can only ever have just one.
-.nf
-.B || (
-.B 	sdl? ( media\-libs/libsdl )
-.B 	svga? ( media\-libs/svgalib )
-.B 	opengl? ( virtual/opengl )
-.B 	ggi? ( media\-libs/libggi )
-.B 	virtual/x11
-.B )
-.fi
-Here only one of the packages will be chosen, and the order of preference is
-determined by the order in which they appear.  So sdl has the best chance of
-being chosen, followed by svga, then opengl, then ggi, with a default of X if
-the user does not specify any of the previous choices.
-.br
-Note that if any of the packages listed are already merged, the package manager
-will use that to consider the dependency satisfied.
-.RE
+.B DESCRIPTION\fR = \fI"A happy little package"
+Should contain a short description of the package.
+.TP
+.B EAPI\fR = \fI"0"
+Defines the ebuild API version to which this package conforms. If not
+defined then it defaults to "0". If portage does not recognize the
+EAPI value then it will mask the package and refuse to perform any
+operations with it since this means that a newer version of portage
+needs to be installed first. For maximum backward compatiblity, a
+package should conform to the lowest possible EAPI. Note that anyone
+who uses the \fBebuild\fR(1) and \fBrepoman\fR(1) commands with this
+package will be required to have a version of portage that recognizes
+the EAPI to which this package conforms.
+.TP
+.B SRC_URI\fR = \fI"http://example.com/path/${P}.tar.gz"
+Contains a list of URIs for the required source files.  It can contain
+multiple URIs for a single source file.  The list is processed in order
+if the file was not found on any of the \fIGENTOO_MIRRORS\fR.
+Beginning with \fBEAPI 2\fR, the output file name of a given URI may be
+customized with a "->" operator on the right hand side, followed by the
+desired output file name. All tokens, including the operator and output
+file name, should be separated by whitespace.
+.TP
+.B HOMEPAGE\fR = \fI"http://example.com/"
+Should contain a list of URIs for the sources main sites and other further
+package dependent information.
+.TP
+.B KEYWORDS\fR = \fI[\-~][x86,ppc,sparc,mips,alpha,arm,hppa]
+Should contain appropriate list of arches that the ebuild is know to
+work/not work.  By default if you do not know if an ebuild runs under
+a particular arch simply omit that KEYWORD.  If the ebuild will not
+work on that arch include it as \-ppc for example.  If the ebuild is
+being submitted for inclusion, it must have ~arch set for architectures
+where it has been PROVEN TO WORK.  (Packages KEYWORDed this way may be
+unmasked for testing by setting ACCEPT_KEYWORDS="~arch" on the command
+line, or in \fBmake.conf\fR(5)) For an authoritative list please review
+/usr/portage/profiles/arch.list.  Please keep this list in alphabetical order.
+.TP
+.B SLOT
+This sets the SLOT for packages that may need to have multiple versions
+co\-exist.  By default you should set \fBSLOT\fR="0".  If you are unsure, then
+do not fiddle with this until you seek some guidance from some guru.  This
+value should \fINEVER\fR be left undefined.
 
-.RE
+Beginning with \fBEAPI 5\fR, the SLOT variable may contain
+an optional sub\-slot part that follows the regular slot and
+is delimited by a / character. The sub\-slot must be a valid
+slot name. The sub\-slot is used to represent cases in which
+an upgrade to a new version of a package with a different
+sub\-slot may require dependent packages to be rebuilt. When
+the sub\-slot part is omitted from the SLOT definition, the
+package is considered to have an implicit sub\-slot which is
+equal to the regular slot. Refer to the \fBAtom Slot
+Operators\fR section for more information about sub\-slot
+usage.
+.TP
+.B LICENSE
+This should be a space delimited list of licenses that the package falls
+under.  This \fB_must_\fR be set to a matching license in
+/usr/portage/licenses/. If the license does not exist in portage yet, you
+must add it first.
+.TP
+.B IUSE
+This should be a list of any and all USE flags that are leveraged within
+your build script.  The only USE flags that should not be listed here are
+arch related flags (see \fBKEYWORDS\fR). Beginning with \fBEAPI 1\fR, it
+is possible to prefix flags with + or - in order to create default settings
+that respectively enable or disable the corresponding \fBUSE\fR flags. For
+details about \fBUSE\fR flag stacking order, refer to the \fBUSE_ORDER\fR
+variable in \fBmake.conf\fR(5). Given the default \fBUSE_ORDER\fR setting,
+negative IUSE default settings are effective only for negation of
+repo\-level USE settings, since profile and user configuration settings
+override them.
+.TP
+.B DEPEND
+This should contain a list of all packages that are required for the
+program to compile as described in \fBDEPENDENCIES\fR.
 .TP
-\fBRDEPEND\fR
+.B RDEPEND
 This should contain a list of all packages that are required for this
 program to run (aka runtime depend). If this is not set in \fBEAPI 3\fR
 or earlier, then it defaults to the value of \fBDEPEND\fR. In
 \fBEAPI 4\fR or later, \fBRDEPEND\fR will never be implicitly set.
-.br
-You may use the same syntax to vary dependencies as seen above in \fBDEPEND\fR.
+
+You may use the same syntax to vary dependencies as seen above in \fBDEPENDENCIES\fR.
 .TP
-\fBPDEPEND\fR
+.B PDEPEND
 This should contain a list of all packages that should be merged after this one,
 but may be merged before if need be.
-.br
-You may use the same syntax to vary dependencies as seen above in \fBDEPEND\fR.
+
+You may use the same syntax to vary dependencies as seen above in \fBDEPENDENCIES\fR.
 .TP
-\fBREQUIRED_USE\fR
+.B REQUIRED_USE
 Beginning with \fBEAPI 4\fR, the \fBREQUIRED_USE\fR variable can be
 used to specify combinations of \fBUSE\fR flags that are allowed
 or not allowed. Elements can be nested when necessary.
@@ -592,7 +569,6 @@ l l
 __
 l l.
 Behavior	Expression
-
 If flag1 enabled then flag2 disabled	flag1? ( !flag2 )
 If flag1 enabled then flag2 enabled	flag1? ( flag2 )
 If flag1 disabled then flag2 enabled	!flag1? ( flag2 )
@@ -602,7 +578,7 @@ Must enable exactly one but not more (exclusive or)	^^ ( flag1 flag2 flag3 )
 May enable at most one (EAPI 5 or later)	?? ( flag1 flag2 flag3 )
 .TE
 .TP
-\fBRESTRICT\fR = \fI[strip,mirror,fetch,userpriv]\fR
+.B RESTRICT\fR = \fI[strip,mirror,fetch,userpriv]
 This should be a space delimited list of portage features to restrict.
 You may use conditional syntax to vary restrictions as seen above in DEPEND.
 .PD 0
@@ -642,7 +618,7 @@ Disables userpriv for specific packages.
 .RE
 .PD 1
 .TP
-\fBPROPERTIES\fR = \fI[interactive]\fR
+.B PROPERTIES\fR = \fI[interactive]
 A space delimited list of properties, with conditional syntax support.
 .PD 0
 .RS
@@ -652,30 +628,31 @@ One or more ebuild phases will produce a prompt that requires user interaction.
 .RE
 .PD 1
 .TP
-\fBPROVIDE\fR = \fI"virtual/TARGET"\fR
+.B PROVIDE\fR = \fI"virtual/TARGET"
 This variable should only be used when a package provides a virtual target.
 For example, blackdown\-jdk and sun\-jdk provide \fIvirtual/jdk\fR.  This
 allows for packages to depend on \fIvirtual/jdk\fR rather than on blackdown
 or sun specifically.
 .TP
-\fBDOCS\fR
+.B DOCS
 Beginning with \fBEAPI 4\fR, an array or space\-delimited list of documentation
 files for the default src_install function to install using dodoc. If
 undefined, a reasonable default list is used. See the documentation for
 src_install below.
-.SH "QA CONTROL VARIABLES"
+
+.SS "QA Control Variables:"
 .TP
-.B USAGE NOTES
+.B Usage Notes
 Several QA variables are provided which allow an ebuild to manipulate some
 of the QA checks performed by portage.  Use of these variables in ebuilds
 should be kept to an absolute minimum otherwise they defeat the purpose
 of the QA checks, and their use is subject to agreement of the QA team.
 They are primarily intended for use by ebuilds that install closed\-source
 binary objects that cannot be altered.
-.br
+
 Note that objects that violate these rules may fail on some architectures.
 .TP
-\fBQA_PREBUILT\fR
+.B QA_PREBUILT
 This should contain a list of file paths, relative to the image
 directory, of files that are pre\-built binaries. Paths
 listed here will be appended to each of the QA_* variables
@@ -685,70 +662,70 @@ the QA_* variables that support regular expressions instead
 of fnmatch patterns. The translation mechanism simply replaces
 "*" with ".*".
 .TP
-\fBQA_TEXTRELS\fR
+.B QA_TEXTRELS
 This variable can be set to a list of file paths, relative to the image
 directory, of files that contain text relocations that cannot be eliminated.
 The paths may contain fnmatch patterns.
-.br
+
 This variable is intended to be used on closed\-source binary objects that
 cannot be altered.
 .TP
-\fBQA_EXECSTACK\fR
+.B QA_EXECSTACK
 This should contain a list of file paths, relative to the image directory, of
 objects that require executable stack in order to run.
 The paths may contain fnmatch patterns.
-.br
+
 This variable is intended to be used on objects that truly need executable
 stack (i.e. not those marked to need it which in fact do not).
 .TP
-\fBQA_WX_LOAD\fR
+.B QA_WX_LOAD
 This should contain a list of file paths, relative to the image directory, of
 files that contain writable and executable segments.  These are rare.
 The paths may contain fnmatch patterns.
 .TP
-\fBQA_FLAGS_IGNORED\fR
+.B QA_FLAGS_IGNORED
 This should contain a list of file paths, relative to the image directory, of
 files that do not contain .GCC.command.line sections or contain .hash sections.
 The paths may contain regular expressions with escape\-quoted special characters.
-.br
+
 This variable is intended to be used on files of binary packages which ignore
 CFLAGS, CXXFLAGS, FFLAGS, FCFLAGS, and LDFLAGS variables.
 .TP
-.TP
-\fBQA_DT_HASH\fR
+.B QA_DT_HASH
 This should contain a list of file paths, relative to the image directory, of
 files that contain .hash sections. The paths may contain regular expressions
 with escape\-quoted special characters. This variable is deprecated. Use
 \fBQA_FLAGS_IGNORED\fR instead.
-.br
+
 This variable is intended to be used on files of binary packages which ignore
 LDFLAGS variable.
 .TP
-\fBQA_PRESTRIPPED\fR
+.B QA_PRESTRIPPED
 This should contain a list of file paths, relative to the image directory, of
 files that contain pre-stripped binaries. The paths may contain regular
 expressions with escape\-quoted special characters.
 .TP
-\fBQA_SONAME\fR
+.B QA_SONAME
 This should contain a list of file paths, relative to the image directory, of
 shared libraries that lack SONAMEs. The paths may contain regular expressions
 with escape\-quoted special characters.
 .TP
-\fBQA_SONAME_NO_SYMLINK\fR
+.B QA_SONAME_NO_SYMLINK
 This should contain a list of file paths, relative to the image directory, of
 shared libraries that have SONAMEs but should not have a corresponding SONAME
 symlink in the same directory. The paths may contain regular expressions
 with escape\-quoted special characters.
 .TP
-\fBQA_DT_NEEDED\fR
+.B QA_DT_NEEDED
 This should contain a list of file paths, relative to the image directory, of
 shared libraries that lack NEEDED entries. The paths may contain regular
 expressions with escape\-quoted special characters.
 .TP
-\fBQA_DESKTOP_FILE\fR
+.B QA_DESKTOP_FILE
 This should contain a list of file paths, relative to the image directory, of
 desktop files which should not be validated. The paths may contain regular
 expressions with escape\-quoted special characters.
+
 .SH "PORTAGE DECLARATIONS"
 .TP
 .B inherit
@@ -761,6 +738,7 @@ ebuild. Specification of the eclasses contains only their name and not the
 \fI.eclass\fR extension. Also note that the inherit statement must come
 before other variable declarations unless these variables are used in global
 scope of eclasses.
+
 .SH "PHASE FUNCTIONS"
 .TP
 .B pkg_pretend
@@ -784,33 +762,33 @@ end the function with a call to \fBdie\fR.
 This function can be used if the package needs specific setup actions or
 checks to be preformed before anything else.
 .br
-Initial working directory of ${PORTAGE_TMPDIR}.
+Initial working directory: $PORTAGE_TMPDIR
 .TP
 .B src_unpack
 This function is used to unpack all the sources in \fIA\fR to \fIWORKDIR\fR.
 If not defined in the \fIebuild script\fR it calls \fIunpack ${A}\fR. Any
 patches and other pre configure/compile modifications should be done here.
 .br
-Initial working directory of $WORKDIR.
+Initial working directory: $WORKDIR
 .TP
 .B src_prepare
 All preparation of source code, such as application of patches, should be done
 here. This function is supported beginning with \fBEAPI 2\fR.
 .br
-Initial working directory of $S.
+Initial working directory: $S
 .TP
 .B src_configure
 All necessary steps for configuration should be done here. This function is
 supported beginning with \fBEAPI 2\fR.
 .br
-Initial working directory of $S.
+Initial working directory: $S
 .TP
 .B src_compile
 With less than \fBEAPI 2\fR, all necessary steps for both configuration and
 compilation should be done here. Beginning with \fBEAPI 2\fR, only compilation
 steps should be done here.
 .br
-Initial working directory of $S.
+Initial working directory: $S
 .TP
 .B src_test
 Run all package specific test cases. The default is to run
@@ -819,13 +797,13 @@ the default src_test implementation will automatically pass the
 \-j1 option as the last argument to emake, and beginning with
 \fBEAPI 5\fR it will allow the tests to run in parallel.
 .br
-Initial working directory of $S.
+Initial working directory: $S
 .TP
 .B src_install
 Should contain everything required to install the package in the temporary
 \fIinstall directory\fR.
 .br
-Initial working directory of $S.
+Initial working directory: $S
 
 Beginning with \fBEAPI 4\fR, if src_install is undefined then the
 following default implementation is used:
@@ -855,18 +833,20 @@ All modifications required on the live\-filesystem before and after the
 package is merged should be placed here. Also commentary for the user
 should be listed here as it will be displayed last.
 .br
-Initial working directory of $PWD.
+Initial working directory: $PWD
 .TP
 .B pkg_prerm pkg_postrm
 Like the pkg_*inst functions but for unmerge.
 .br
-Initial working directory of $PWD.
+Initial working directory: $PWD
 .TP
 .B pkg_config
 This function should contain optional basic configuration steps.
 .br
-Initial working directory of $PWD.
-.SH "HELPER FUNCTIONS: PHASES"
+Initial working directory: $PWD
+
+.SH "HELPER FUNCTIONS"
+.SS "Phases:"
 .TP
 .B default
 Calls the default phase function implementation for the currently executing
@@ -885,7 +865,6 @@ l
 _
 l.
 Default Phase Functions
-
 default_pkg_nofetch
 default_src_unpack
 default_src_prepare
@@ -894,9 +873,10 @@ default_src_compile
 default_src_test
 .TE
 .RE
-.SH "HELPER FUNCTIONS: GENERAL"
+
+.SS "General:"
 .TP
-\fBdie\fR \fI[reason]\fR
+.B die\fR \fI[reason]
 Causes the current emerge process to be aborted. The final display will
 include \fIreason\fR.
 
@@ -904,11 +884,11 @@ Beginning with \fBEAPI 4\fR, all helpers automatically call \fBdie\fR
 whenever some sort of error occurs. Helper calls may be prefixed with
 the \fBnonfatal\fR helper in order to prevent errors from being fatal.
 .TP
-\fBnonfatal\fR \fI<helper>\fR
+.B nonfatal\fR \fI<helper>
 Execute \fIhelper\fR and \fIdo not\fR call die if it fails.
 The \fBnonfatal\fR helper is available beginning with \fBEAPI 4\fR.
 .TP
-\fBuse\fR \fI<USE item>\fR
+.B use\fR \fI<USE item>
 If \fIUSE item\fR is in the \fBUSE\fR variable, the function will silently
 return 0 (aka shell true).  If \fIUSE item\fR is not in the \fBUSE\fR
 variable, the function will silently return 1 (aka shell false).  \fBusev\fR
@@ -930,12 +910,12 @@ fi
 .fi
 .RE
 .TP
-\fBusex\fR \fI<USE flag>\fR \fI[true output]\fR \fI[false output]\fR \fI[true suffix]\fR \fI[false suffix]\fR
+.B usex\fR \fI<USE flag>\fR \fI[true output]\fR \fI[false output]\fR \fI[true suffix]\fR \fI[false suffix]
 If USE flag is set, echo [true output][true suffix] (defaults to
 "yes"), otherwise echo [false output][false suffix] (defaults to
 "no"). The usex helper is available beginning with \fBEAPI 5\fR.
 .TP
-\fBuse_with\fR \fI<USE item>\fR \fI[configure name]\fR \fI[configure opt]\fR
+.B use_with\fR \fI<USE item>\fR \fI[configure name]\fR \fI[configure opt]
 Useful for creating custom options to pass to a configure script. If \fIUSE
 item\fR is in the \fBUSE\fR variable and a \fIconfigure opt\fR is specified,
 then the string \fI\-\-with\-[configure name]=[configure opt]\fR will be echoed.
@@ -968,14 +948,14 @@ myconf=$(use_with sdl SDL all\-plugins)
 .fi
 .RE
 .TP
-\fBuse_enable\fR \fI<USE item>\fR \fI[configure name]\fR \fI[configure opt]\fR
+.B use_enable\fR \fI<USE item>\fR \fI[configure name]\fR \fI[configure opt]
 Same as \fBuse_with\fR above, except that the configure options are
 \fI\-\-enable\-\fR instead of \fI\-\-with\-\fR and \fI\-\-disable\-\fR instead of
 \fI\-\-without\-\fR. Beginning with \fBEAPI 4\fR, an empty \fIconfigure opt\fR
 argument is recognized. In \fBEAPI 3\fR and earlier, an empty
 \fIconfigure opt\fR argument is treated as if it weren't provided.
 .TP
-\fBhasv\fR \fI<item>\fR \fI<item list>\fR
+.B hasv\fR \fI<item>\fR \fI<item list>
 If \fIitem\fR is in \fIitem list\fR, then \fIitem\fR is echoed and \fBhasv\fR
 returns 0.  Otherwise, nothing is echoed and 1 is returned. As indicated with
 use, there is a non\-echoing version \fBhas\fR. Please use \fBhas\fR in all
@@ -984,7 +964,7 @@ places where output is to be disregarded. Never use the output for calculation.
 The \fIitem list\fR is delimited by the \fIIFS\fR variable.  This variable
 has a default value of ' ', or a space.  It is a \fBbash\fR(1) setting.
 .TP
-\fBhas_version\fR \fI[\-\-host\-root]\fR \fI<category/package\-version>\fR
+.B has_version\fR \fI[\-\-host\-root]\fR \fI<category/package\-version>
 Check to see if \fIcategory/package\-version\fR is installed on the system.
 The parameter accepts all values that are acceptable in the \fBDEPEND\fR
 variable.  The function returns 0 if \fIcategory/package\-version\fR is
@@ -992,68 +972,69 @@ installed, 1 otherwise. Beginning with \fBEAPI 5\fR, the
 \-\-host\-root option may be used in order to cause the query
 to apply to the host root instead of ${ROOT}.
 .TP
-\fBbest_version\fR \fI[\-\-host\-root]\fR \fI<package name>\fR
+.B best_version\fR \fI[\-\-host\-root]\fR \fI<package name>
 This function will look up \fIpackage name\fR in the database of currently
 installed programs and echo the "best version" of the package that is
 currently installed. Beginning with \fBEAPI 5\fR, the
 \-\-host\-root option may be used in order to cause the query
 to apply to the host root instead of ${ROOT}.
-.RS
-.TP
-.I Example:
-VERINS="$(best_version net\-ftp/glftpd)"
-.br
-(VERINS now has the value "net\-ftp/glftpd\-1.27" if glftpd\-1.27 is installed)
-.RE
-.SH "HELPER FUNCTIONS: HOOKS"
+
+Example:
+.nf
+	VERINS="$(best_version net\-ftp/glftpd)"
+	(VERINS now has the value "net\-ftp/glftpd\-1.27" if glftpd\-1.27 is installed)
+.fi
+
+.SS "Hooks:"
 .TP
-\fBregister_die_hook\fR \fI[list of function names]\fR
+.B register_die_hook\fR \fI[list of function names]
 Register one or more functions to call when the ebuild fails for any reason,
 including file collisions with other packages.
 .TP
-\fBregister_success_hook\fR \fI[list of function names]\fR
+.B register_success_hook\fR \fI[list of function names]
 Register one or more functions to call when the ebuild builds and/or installs
 successfully.
+
+.SS "Output:"
 .TP
-.RE
-.SH "HELPER FUNCTIONS: OUTPUT"
-.TP
-\fBeinfo\fR \fI"disposable message"\fR
+.B einfo\fR \fI"disposable message"
 Same as \fBelog\fR, but should be used when the message isn't important to the
 user (like progress or status messages during the build process).
 .TP
-\fBelog\fR \fI"informative message"\fR
+.B elog\fR \fI"informative message"
 If you need to display a message that you wish the user to read and take
 notice of, then use \fBelog\fR.  It works just like \fBecho\fR(1), but
 adds a little more to the output so as to catch the user's eye. The message
 will also be logged by portage for later review.
 .TP
-\fBewarn\fR \fI"warning message"\fR
+.B ewarn\fR \fI"warning message"
 Same as \fBeinfo\fR, but should be used when showing a warning to the user.
 .TP
-\fBeqawarn\fR \fI"QA warning message"\fR
+.B eqawarn\fR \fI"QA warning message"
 Same as \fBeinfo\fR, but should be used when showing a QA warning to the user.
 .TP
-\fBeerror\fR \fI"error message"\fR
+.B eerror\fR \fI"error message"
 Same as \fBeinfo\fR, but should be used when showing an error to the user.
 .TP
-\fBebegin\fR \fI"helpful message"\fR
+.B ebegin\fR \fI"helpful message"
 Like \fBeinfo\fR, we output a \fIhelpful message\fR and then hint that the
 following operation may take some time to complete.  Once the task is
 finished, you need to call \fBeend\fR.
 .TP
-\fBeend\fR \fI<status>\fR \fI["error message"]\fR
+.B eend\fR \fI<status>\fR \fI["error message"]
 Followup the \fBebegin\fR message with an appropriate "OK" or "!!" (for
 errors) marker.  If \fIstatus\fR is non\-zero, then the additional \fIerror
 message\fR is displayed.
-.SH "HELPER FUNCTIONS: UNPACK"
+
+.SS "Unpack:"
 .TP
-\fBunpack\fR \fI<source>\fR \fI[list of more sources]\fR
+.B unpack\fR \fI<source>\fR \fI[list of more sources]
 This function uncompresses and/or untars a list of sources into the current
 directory. The function will append \fIsource\fR to the \fBDISTDIR\fR variable.
-.SH "HELPER FUNCTIONS: COMPILE"
+
+.SS "Compile:"
 .TP
-\fBeconf\fR \fI[configure options]\fR
+.B econf\fR \fI[configure options]
 This is used as a replacement for configure.  Performs:
 .nf
 ${\fIECONF_SOURCE\fR:-.}/configure \\
@@ -1085,20 +1066,21 @@ Beginning with \fBEAPI 5\fR, \fBeconf\fR adds
 string \fIdisable\-silent\-rules\fR occurs in the output
 of \fIconfigure \-\-help\fR.
 .TP
-\fBemake\fR \fI[make options]\fR
+.B emake\fR \fI[make options]
 This is used as a replacement for make.  Performs 'make ${MAKEOPTS}
 \fImake options\fR' (as set in make.globals), default is MAKEOPTS="\-j2".
 
-\fB***warning***\fR
+.B ***WARNING***
 .br
 if you are going to use \fBemake\fR, make sure your build is happy with
 parallel makes (make \-j2).  It should be tested thoroughly as parallel
 makes are notorious for failing _sometimes_ but not always.  If you determine
 that your package fails to build in parallel, and you are unable to resolve
 the issue, then you should run '\fBemake\fR \-j1' instead of 'make'.
-.SH "HELPER FUNCTIONS: INSTALL"
+
+.SS "Install:"
 .TP
-\fBeinstall\fR \fI[make options]\fR
+.B einstall\fR \fI[make options]
 This is used as a replacement for make install.  Performs:
 .nf
 make \\
@@ -1155,11 +1137,11 @@ Strips all executable files of debugging symboles.  This includes libraries.
 .RE
 
 .TP
-\fBprepinfo\fR \fI[dir]\fR
+.B prepinfo\fR \fI[dir]
 .TP
-\fBprepman\fR \fI[dir]\fR
+.B prepman\fR \fI[dir]
 .TP
-\fBprepstrip\fR \fI[dir]\fR
+.B prepstrip\fR \fI[dir]
 .PD 1
 Similar to the \fBprepall\fR functions, these are subtle in their differences.
 .RS
@@ -1181,7 +1163,7 @@ multiple directories.
 .RE
 .PD 1
 .TP
-\fBdocompress\fR \fI[\-x] <path> [list of more paths]\fR
+.B docompress\fR \fI[\-x] <path> [list of more paths]
 .RS
 Beginning with \fBEAPI 4\fR, the \fBdocompress\fR helper is used to
 manage lists of files to be included or excluded from optional compression.
@@ -1220,7 +1202,7 @@ If the item does not exist, it is ignored.
 .RE
 .RE
 .TP
-\fBdosed\fR \fI"s:orig:change:g" <filename>\fR
+.B dosed\fR \fI"s:orig:change:g" <filename>
 Beginning with \fBEAPI 4\fR, the \fBdosed\fR helper no longer exists. Ebuilds
 should call \fBsed(1)\fR directly (and assume that it is GNU sed).
 
@@ -1231,66 +1213,66 @@ that this expression does \fBNOT\fR use the offset prefix.
 .BR 'dosed\ "s:/usr/local:/usr:g"\ /usr/bin/some\-script'
 runs sed on ${ED}/usr/bin/some\-script
 .TP
-\fBdodir\fR \fI<path> [more paths]\fR
+.B dodir\fR \fI<path> [more paths]
 Creates directories inside of ${ED}.
 .br
 .BR 'dodir\ /usr/lib/apache'
 creates ${ED}/usr/lib/apache.  Note that the do* functions will run
 \fBdodir\fR for you.
 .TP
-\fBdiropts\fR \fI[options for install(1)]\fR
+.B diropts\fR \fI[options for install(1)]
 Can be used to define options for the install function used in
 \fBdodir\fR.  The default is \fI\-m0755\fR.
 .TP
-\fBinto\fR \fI<path>\fR
+.B into\fR \fI<path>
 Sets the root (\fIDESTTREE\fR) for other functions like \fBdobin\fR,
 \fBdosbin\fR, \fBdoman\fR, \fBdoinfo\fR, \fBdolib\fR.
 .br
 The default root is /usr.
 .TP
-\fBkeepdir\fR \fI<path> [more paths]\fR
+.B keepdir\fR \fI<path> [more paths]
 Tells portage to leave directories behind even if they're empty.  Functions
 the same as \fBdodir\fR.
 .TP
-\fBdobin\fR \fI<binary> [list of more binaries]\fR
+.B dobin\fR \fI<binary> [list of more binaries]
 Installs a \fIbinary\fR or a list of binaries into \fIDESTTREE\fR/bin.
 Creates all necessary dirs.
 .TP
-\fBdosbin\fR \fI<binary> [list of more binaries]\fR
+.B dosbin\fR \fI<binary> [list of more binaries]
 Installs a \fIbinary\fR or a list of binaries into \fIDESTTREE\fR/sbin.
 Creates all necessary dirs.
 .TP
-\fBdoinitd\fR \fI<init.d script> [list of more init.d scripts]\fR
+.B doinitd\fR \fI<init.d script> [list of more init.d scripts]
 Install Gentoo \fIinit.d scripts\fR.  They will be installed into the
 correct location for Gentoo init.d scripts (/etc/init.d/).  Creates all
 necessary dirs.
 .TP
-\fBdoconfd\fR \fI<conf.d file> [list of more conf.d file]\fR
+.B doconfd\fR \fI<conf.d file> [list of more conf.d file]
 Install Gentoo \fIconf.d files\fR.  They will be installed into the
 correct location for Gentoo conf.d files (/etc/conf.d/).  Creates all
 necessary dirs.
 .TP
-\fBdoenvd\fR \fI<env.d entry> [list of more env.d entries]\fR
+.B doenvd\fR \fI<env.d entry> [list of more env.d entries]
 Install Gentoo \fIenv.d entries\fR.  They will be installed into the
 correct location for Gentoo env.d entries (/etc/env.d/).  Creates all
 necessary dirs.
 
 .PD 0
 .TP
-\fBdolib\fR \fI<library>\fR \fI[list of more libraries]\fR
+.B dolib\fR \fI<library>\fR \fI[list of more libraries]
 .TP
-\fBdolib.a\fR \fI<library>\fR \fI[list of more libraries]\fR
+.B dolib.a\fR \fI<library>\fR \fI[list of more libraries]
 .TP
-\fBdolib.so\fR \fI<library>\fR \fI[list of more libraries]\fR
+.B dolib.so\fR \fI<library>\fR \fI[list of more libraries]
 .PD 1
 Installs a library or a list of libraries into \fIDESTTREE\fR/lib.
 Creates all necessary dirs.
 .TP
-\fBlibopts\fR \fI[options for install(1)]\fR
+.B libopts\fR \fI[options for install(1)]
 Can be used to define options for the install function used in
 the \fBdolib\fR functions.  The default is \fI\-m0644\fR.
 .TP
-\fBdoman\fR \fI[\-i18n=<locale>]\fR \fI<man\-page> [list of more man\-pages]\fR
+.B doman\fR \fI[\-i18n=<locale>]\fR \fI<man\-page> [list of more man\-pages]
 Installs manual\-pages into /usr/share/man/man[0\-9n] depending on the
 manual file ending.  The files are compressed if they are not already.  You
 can specify locale\-specific manpages with the \fI\-i18n\fR option.  Then the
@@ -1305,79 +1287,79 @@ the \fI\-i18n\fR option takes precedence over the locale suffix of the
 file name.
 .PD 0
 .TP
-\fBdohard\fR \fI<filename> <linkname>\fR
+.B dohard\fR \fI<filename> <linkname>
 Beginning with \fBEAPI 4\fR, the \fBdohard\fR helper no longer exists. Ebuilds
 should call \fBln(1)\fR directly.
 .TP
-\fBdosym\fR \fI<filename> <linkname>\fR
+.B dosym\fR \fI<filename> <linkname>
 .PD 1
 Performs the ln command to create a symlink.
 .TP
-\fBdoheader\fR \fI[\-r] <file> [list of more files]\fR
+.B doheader\fR \fI[\-r] <file> [list of more files]
 Installs the given header files into /usr/include/, by default
 with file mode \fI0644\fR (this can be overridden with the
 \fBinsopts\fR function). Setting \-r sets recursive. The
 \fBdoheader\fR helper is available beginning with \fBEAPI 5\fR.
 .TP
-\fBdohtml\fR \fI [\-a filetypes] [\-r] [\-x list\-of\-dirs\-to\-ignore] [list\-of\-files\-and\-dirs]\fR
+.B dohtml\fR \fI [\-a filetypes] [\-r] [\-x list\-of\-dirs\-to\-ignore] [list\-of\-files\-and\-dirs]
 Installs the files in the list of files (space\-separated list) into
 /usr/share/doc/${PF}/html provided the file ends in .htm, .html, .css, .js, .gif, .jpeg, .jpg, or .png.
 Setting \fI\-a\fR limits what types of files will be included,
 \fI\-A\fR appends to the default list, setting \fI\-x\fR sets which dirs to
 exclude (CVS excluded by default), \fI\-p\fR sets a document prefix, \fI\-r\fR sets recursive.
 .TP
-\fBdoinfo\fR \fI<info\-file> [list of more info\-files]\fR
+.B doinfo\fR \fI<info\-file> [list of more info\-files]
 Installs info\-pages into \fIDESTDIR\fR/info.  Files are automatically
 gzipped.  Creates all necessary dirs.
 .TP
-\fBdomo\fR \fI<locale\-file> [list of more locale\-files] \fR
+.B domo\fR \fI<locale\-file> [list of more locale\-files]
 Installs locale\-files into \fIDESTDIR\fR/usr/share/locale/[LANG]
 depending on local\-file's ending.  Creates all necessary dirs.
 
 .PD 0
 .TP
-\fBfowners\fR \fI<permissions> <file> [files]\fR
+.B fowners\fR \fI<permissions> <file> [files]
 .TP
-\fBfperms\fR \fI<permissions> <file> [files]\fR
+.B fperms\fR \fI<permissions> <file> [files]
 .PD 1
 Performs chown (\fBfowners\fR) or chmod (\fBfperms\fR), applying
 \fIpermissions\fR to \fIfiles\fR.
 .TP
-\fBinsinto\fR \fI[path]\fR
+.B insinto\fR \fI[path]
 Sets the destination path for the \fBdoins\fR function.
 .br
 The default path is /.
 .TP
-\fBinsopts\fR \fI[options for install(1)]\fR
+.B insopts\fR \fI[options for install(1)]
 Can be used to define options for the install function used in
 \fBdoins\fR.  The default is \fI\-m0644\fR.
 .TP
-\fBdoins\fR \fI[\-r] <file> [list of more files]\fR
+.B doins\fR \fI[\-r] <file> [list of more files]
 Installs files into the path controlled by \fBinsinto\fR.  This function
 uses \fBinstall\fR(1).  Creates all necessary dirs.
 Setting \-r sets recursive. Beginning with \fBEAPI 4\fR, both
 \fBdoins\fR and \fBnewins\fR preserve symlinks. In \fBEAPI 3\fR and
 earlier, symlinks are dereferenced rather than preserved.
 .TP
-\fBexeinto\fR \fI[path]\fR
+.B exeinto\fR \fI[path]
 Sets the destination path for the \fBdoexe\fR function.
 .br
 The default path is /.
 .TP
-\fBexeopts\fR \fI[options for install(1)]\fR
+.B exeopts\fR \fI[options for install(1)]
 Can be used to define options for the install function used in \fBdoexe\fR.
 The default is \fI\-m0755\fR.
 .TP
-\fBdoexe\fR \fI<executable> [list of more executables]\fR
+.B doexe\fR \fI<executable> [list of more executables]
 Installs executables into the path controlled by \fBexeinto\fR.  This function
 uses \fBinstall\fR(1).  Creates all necessary dirs.
 .TP
-\fBdocinto\fR \fI[path]\fR
+.B docinto\fR \fI[path]
 Sets the subdir used by \fBdodoc\fR and \fBdohtml\fR
 when installing into the document tree
 (based in /usr/share/doc/${PF}/).  Default is no subdir, or just "".
 .TP
-\fBdodoc\fR \fI[-r] <document> [list of more documents]\fR
+.B dodoc\fR \fI[-r] <document> [list of more documents]
 Installs a document or a list of documents into /usr/share/doc/${PF}/\fI<docinto path>\fR.
 Documents are marked for compression.  Creates all necessary dirs.
 Beginning with \fBEAPI 4\fR, there is support for recursion, enabled by the
@@ -1385,45 +1367,70 @@ new \fI\-r\fR option.
 
 .PD 0
 .TP
-\fBnewbin\fR \fI<old file> <new filename>\fR
+.B newbin\fR \fI<old file> <new filename>
 .TP
-\fBnewsbin\fR \fI<old file> <new filename>\fR
+.B newsbin\fR \fI<old file> <new filename>
 .TP
-\fBnewinitd\fR \fI<old file> <new filename>\fR
+.B newinitd\fR \fI<old file> <new filename>
 .TP
-\fBnewconfd\fR \fI<old file> <new filename>\fR
+.B newconfd\fR \fI<old file> <new filename>
 .TP
-\fBnewenvd\fR \fI<old file> <new filename>\fR
+.B newenvd\fR \fI<old file> <new filename>
 .TP
-\fBnewlib.so\fR \fI<old file> <new filename>\fR
+.B newlib.so\fR \fI<old file> <new filename>
 .TP
-\fBnewlib.a\fR \fI<old file> <new filename>\fR
+.B newlib.a\fR \fI<old file> <new filename>
 .TP
-\fBnewman\fR \fI<old file> <new filename>\fR
+.B newman\fR \fI<old file> <new filename>
 .TP
-\fBnewinfo\fR \fI<old file> <new filename>\fR
+.B newinfo\fR \fI<old file> <new filename>
 .TP
-\fBnewins\fR \fI<old file> <new filename>\fR
+.B newins\fR \fI<old file> <new filename>
 .TP
-\fBnewexe\fR \fI<old file> <new filename>\fR
+.B newexe\fR \fI<old file> <new filename>
 .TP
-\fBnewdoc\fR \fI<old file> <new filename>\fR
+.B newdoc\fR \fI<old file> <new filename>
 .PD 1
 All these functions act like the do* functions, but they only work with one
 file and the file is installed as \fI[new filename]\fR.
 Beginning with \fBEAPI 5\fR, standard input is read when the
 first parameter is \- (a hyphen).
-.SH "REPORTING BUGS"
-Please report bugs via http://bugs.gentoo.org/
-.SH "AUTHORS"
+
+.SH "EXAMPLES"
+.DS
 .nf
-Achim Gottinger <achim@gentoo.org>
-Mark Guertin <gerk@gentoo.org>
-Nicholas Jones <carpaski@gentoo.org>
-Mike Frysinger <vapier@gentoo.org>
-Arfrever Frehtes Taifersar Arahesis <Arfrever.FTA@gmail.com>
-Fabian Groffen <grobian@gentoo.org>
+# Copyright 1999\-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+
+inherit some_eclass another_eclass
+
+DESCRIPTION="Super\-useful stream editor (sed)"
+HOMEPAGE="http://www.gnu.org/software/sed/sed.html"
+SRC_URI="ftp://alpha.gnu.org/pub/gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL\-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="nls? ( sys-devel/gettext )"
+
+src_configure() {
+	econf \\
+		\-\-bindir="${EPREFIX}"/bin
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc NEWS README* THANKS AUTHORS BUGS ChangeLog
+}
 .fi
+.DE
+
 .SH "FILES"
 .TP
 The \fI/usr/sbin/ebuild.sh\fR script.
@@ -1439,7 +1446,21 @@ Contains the default variables for the build\-process, you should edit
 .TP
 .B /etc/portage/color.map
 Contains variables customizing colors.
+
 .SH "SEE ALSO"
 .BR ebuild (1),
 .BR make.conf (5),
 .BR color.map (5)
+
+.SH "REPORTING BUGS"
+Please report bugs via http://bugs.gentoo.org/
+
+.SH "AUTHORS"
+.nf
+Achim Gottinger <achim@gentoo.org>
+Mark Guertin <gerk@gentoo.org>
+Nicholas Jones <carpaski@gentoo.org>
+Mike Frysinger <vapier@gentoo.org>
+Arfrever Frehtes Taifersar Arahesis <Arfrever.FTA@gmail.com>
+Fabian Groffen <grobian@gentoo.org>
+.fi

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     80f71e3fdb06e0bf5f0ee6c4aa25f2b2c7a64dfd
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 22 17:08:03 2012 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sat Sep 22 17:08:03 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=80f71e3f

emerge.1: --depclean-lib-check not time-consuming

Since commit f393413c3f823ef4a60acfcc41c3920933510fc1, it's optimized
so that it shouldn't take much time.

---
 man/emerge.1 |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/man/emerge.1 b/man/emerge.1
index f2fb6cc..da2c631 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -428,9 +428,8 @@ required.
 .TP
 .BR "\-\-depclean\-lib\-check [ y | n ]"
 Account for library link-level dependencies during
-\fB\-\-depclean\fR and \fB\-\-prune\fR actions. This
-option is enabled by default. In some cases this can
-be somewhat time\-consuming. This option is ignored
+\fB\-\-depclean\fR and \fB\-\-prune\fR actions.
+This option is enabled by default. This option is ignored
 when FEATURES="preserve\-libs" is enabled in
 \fBmake.conf\fR(5), since any libraries that have
 consumers will simply be preserved.

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     376dfd751dc864d85d98517a63ca531207dd44ad
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 21 21:50:08 2012 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Fri Sep 21 21:50:08 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=376dfd75

portage.5: document nested package sets

---
 man/portage.5 |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/man/portage.5 b/man/portage.5
index 577ed27..705d0d9 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -816,8 +816,10 @@ in the following order:
 .RS
 For each file in this directory, a package set is created with its name
 corresponding to the name of the file. Each file should contain a list
-of package atoms, one per line. When referencing package sets in
-\fBemerge\fR(1) arguments, the set name is prefixed with \fB@\fR.
+of package atoms and nested package sets, one per line. When a package
+set is referenced as an \fBemerge\fR(1) argument or when it is
+referenced as a nested package set (inside of another package set), the
+set name is prefixed with \fB@\fR.
 
 Also see \fB/var/lib/portage/world_sets\fR and the \fBemerge\fR(1)
 \fB\-\-list\-sets\fR option.

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     0984aa88b7aaa273453fc59b0507d59502087fda
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 16 18:58:48 2012 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Sep 16 18:58:48 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=0984aa88

portage.5: Add EAPI 5 profile IUSE injection

---
 man/portage.5 |   35 +++++++++++++++++++++++++++++++++++
 1 files changed, 35 insertions(+), 0 deletions(-)

diff --git a/man/portage.5 b/man/portage.5
index 55e0ce7..577ed27 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -272,6 +272,14 @@ few specific variables too:
 .BR ARCH
 Architecture type (x86/ppc/hppa/etc...).
 .TP
+\fBIUSE_IMPLICIT\fR = \fI[space delimited list of USE flags]\fR
+Defines implicit \fBIUSE\fR for ebuilds using \fBEAPI 5\fR or
+later. Flags that come from \fBUSE_EXPAND\fR or
+\fBUSE_EXPAND_UNPREFIXED\fR variables do not belong in
+\fBIUSE_IMPLICIT\fR, since \fBUSE_EXPAND_VALUES_*\fR variables
+are used to define implicit \fBIUSE\fR for those flags. See
+\fBebuild\fR(5) for more information about \fBIUSE\fR.
+.TP
 .B USERLAND = \fI"GNU"\fR
 Support BSD/cygwin/etc...
 .TP
@@ -284,6 +292,33 @@ in USE="foo_bar foo_bla".
 Names of \fBUSE_EXPAND\fR variables that should not be shown in the verbose merge
 list output of the \fBemerge\fR(1) command.
 .TP
+\fBUSE_EXPAND_IMPLICIT\fR = \fI[space delimited list of variable names]\fR
+Defines \fBUSE_EXPAND\fR and \fBUSE_EXPAND_UNPREFIXED\fR
+variables for which the corresponding USE flags may have
+implicit \fBIUSE\fR for ebuilds using \fBEAPI 5\fR or later.
+.TP
+\fBUSE_EXPAND_UNPREFIXED\fR = \fI[space delimited list of variable names]\fR
+Any variable listed here will be used to augment USE by
+inserting a new flag for every value in that variable, so
+USE_EXPAND_UNPREFIXED="FOO" and FOO="bar bla" results in
+USE="bar bla".
+.TP
+\fBUSE_EXPAND_VALUES_ARCH\fR = \fI[space delimited list of ARCH values]\fR
+Defines ARCH values used to generate implicit
+\fBIUSE\fR for ebuilds using \fBEAPI 5\fR or later.
+.TP
+\fBUSE_EXPAND_VALUES_ELIBC\fR = \fI[space delimited list of ELIBC values]\fR
+Defines ELIBC values used to generate implicit
+\fBIUSE\fR for ebuilds using \fBEAPI 5\fR or later.
+.TP
+\fBUSE_EXPAND_VALUES_KERNEL\fR = \fI[space delimited list of KERNEL values]\fR
+Defines KERNEL values used to generate implicit
+\fBIUSE\fR for ebuilds using \fBEAPI 5\fR or later.
+.TP
+\fBUSE_EXPAND_VALUES_USERLAND\fR = \fI[space delimited list of USERLAND values]\fR
+Defines USERLAND values used to generate implicit
+\fBIUSE\fR for ebuilds using \fBEAPI 5\fR or later.
+.TP
 .B ELIBC = \fI"glibc"\fR
 Support uClibc/BSD libc/etc...
 .TP

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     fab167b72dd7b3260b70bd71efd292e7ca70500e
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 16 18:24:21 2012 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Sep 16 18:24:21 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=fab167b7

portage.5: rename STAGE1_USE to BOOTSTRAP_USE

---
 man/portage.5 |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/man/portage.5 b/man/portage.5
index 347ee06..55e0ce7 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -295,7 +295,7 @@ or the env.
 Distinguish machines classes that have the same \fBARCH\fR.  All sparc 
 machines have ARCH=sparc but set this to either 'sparc32' or 'sparc64'.
 .TP
-.BR STAGE1_USE
+.BR BOOTSTRAP_USE
 Special USE flags which may be needed when bootstrapping from stage1 to stage2.
 .RE
 .PD 1

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     5c1e3993c7f870d55a17113424a374ea711be172
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 16 18:13:36 2012 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Sep 16 18:13:36 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=5c1e3993

portage.5: move USE_EXPAND from make.conf.5

---
 man/make.conf.5 |    9 ---------
 man/portage.5   |   11 ++++++++++-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/man/make.conf.5 b/man/make.conf.5
index f11bfcb..483c08b 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -945,15 +945,6 @@ 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
-\fBUSE_EXPAND\fR = \fI[space delimited list of variable names]\fR
-Any variable listed here will be used to augment USE by inserting a new flag
-for every value in that variable, so USE_EXPAND="FOO" and FOO="bar bla" results
-in USE="foo_bar foo_bla".
-.TP
-\fBUSE_EXPAND_HIDDEN\fR = \fI[space delimited list of variable names]\fR
-Names of \fBUSE_EXPAND\fR variables that should not be shown in the verbose merge
-list output of the \fBemerge\fR(1) command.
-.TP
 \fBUSE_ORDER\fR = \fI"env:pkg:conf:defaults:pkginternal:repo:env.d"\fR
 Determines the precedence of layers in the incremental stacking of the USE
 variable. Precedence decreases from left to right such that env overrides

diff --git a/man/portage.5 b/man/portage.5
index efd4106..347ee06 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -1,4 +1,4 @@
-.TH "PORTAGE" "5" "Jun 2012" "Portage VERSION" "Portage"
+.TH "PORTAGE" "5" "Sep 2012" "Portage VERSION" "Portage"
 .SH NAME
 portage \- the heart of Gentoo
 .SH "DESCRIPTION"
@@ -275,6 +275,15 @@ Architecture type (x86/ppc/hppa/etc...).
 .B USERLAND = \fI"GNU"\fR
 Support BSD/cygwin/etc...
 .TP
+\fBUSE_EXPAND\fR = \fI[space delimited list of variable names]\fR
+Any variable listed here will be used to augment USE by inserting a new flag
+for every value in that variable, so USE_EXPAND="FOO" and FOO="bar bla" results
+in USE="foo_bar foo_bla".
+.TP
+\fBUSE_EXPAND_HIDDEN\fR = \fI[space delimited list of variable names]\fR
+Names of \fBUSE_EXPAND\fR variables that should not be shown in the verbose merge
+list output of the \fBemerge\fR(1) command.
+.TP
 .B ELIBC = \fI"glibc"\fR
 Support uClibc/BSD libc/etc...
 .TP

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     834b5ccf0eb9843beab50ebcb662425111d2f7f7
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 16 17:47:11 2012 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Sep 16 17:47:11 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=834b5ccf

portage.5: add EAPI 5 stable use mask/force

---
 man/portage.5 |   28 +++++++++++++++++++++-------
 1 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/man/portage.5 b/man/portage.5
index 173e326..efd4106 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -36,10 +36,14 @@ package.unmask
 package.use
 package.use.force
 package.use.mask
+package.use.stable.force
+package.use.stable.mask
 parent
 profile.bashrc
 use.force
 use.mask
+use.stable.mask
+use.stable.force
 virtuals
 .fi
 .TP
@@ -90,6 +94,8 @@ package.unmask
 package.use
 package.use.force
 package.use.mask
+package.use.stable.force
+package.use.stable.mask
 profiles.desc
 repo_name
 thirdpartymirrors
@@ -97,6 +103,8 @@ use.desc
 use.force
 use.local.desc
 use.mask
+use.stable.mask
+use.stable.force
 .fi
 .TP
 .BR /usr/share/portage/config/
@@ -246,7 +254,12 @@ default-linux/x86/2005.0
 .BR eapi
 The first line of this file specifies the \fBEAPI\fR to which files in the
 same directory conform. See \fBebuild\fR(5) for information about \fBEAPI\fR
-and related features.
+and related features. Beginning with \fBEAPI 5\fR, new USE
+configuration files are supported: use.stable.mask,
+use.stable.force, package.use.stable.mask and
+package.use.stable.force. These files behave similarly to
+previously supported USE configuration files, except that they
+only influence packages that are merged due to a stable keyword.
 .TP
 .BR make.defaults
 The profile default settings for Portage.  The general format is described 
@@ -349,7 +362,7 @@ x11-libs/qt-3.3.0
 x11-base/xorg-x11-6.8
 .fi
 .TP
-.BR package.use.force
+\fBpackage.use.force\fR and \fBpackage.use.stable.force\fR
 Per\-package USE flag forcing.
 
 .I Note:
@@ -371,7 +384,7 @@ a '\-'.
 x11\-libs/qt \-mysql
 .fi
 .TP
-.BR package.use.mask
+\fBpackage.use.mask\fR and \fBpackage.use.stable.mask\fR
 Per\-package USE flag masks.
 
 .I Note:
@@ -404,7 +417,7 @@ If needed, this file can be used to set up a special environment for ebuilds,
 different from the standard root environment.  The syntax is the same as for
 any other bash script.
 .TP
-.BR use.force
+\fBuse.force\fR and \fBuse.stable.force\fR
 Some USE flags don't make sense to disable under certain conditions.  Here we
 list forced flags.
 
@@ -419,7 +432,7 @@ a '\-'.
 \- one USE flag per line
 .fi
 .TP
-.BR use.mask
+\fBuse.mask\fR and \fBuse.stable.mask\fR
 Some USE flags don't make sense on some archs (for example altivec on 
 non\-ppc or mmx on non\-x86), or haven't yet been tested.  Here we list 
 the masked ones.
@@ -811,8 +824,9 @@ update\-changelog = true
 # which may be generated by egencache(1)
 cache\-formats = md5-dict pms
 # indicate that this repo contains profiles that may use directories for
-# package.mask, package.provided, package.use, package.use.mask,
-# package.use.force, use.mask and use.force.
+# package.mask, package.provided, package.use, package.use.force,
+# package.use.mask, package.use.stable.force, package.use.stable.mask,
+# use.force, use.mask, use.stable.force, and use.stable.mask.
 # profile\-formats = portage-1
 # indicate that paths such as 'gentoo:targets/desktop' or ':targets/desktop' in
 # profile parent files can be used to express paths relative to the root

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     91f30deab355d07a3df481124f71177f97ad1a6e
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 15 20:54:40 2012 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sat Sep 15 20:54:40 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=91f30dea

ebuild.5: EAPI 5 best/has_version --host-root

---
 man/ebuild.5 |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index cca6835..1ac1f92 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -979,16 +979,20 @@ places where output is to be disregarded. Never use the output for calculation.
 The \fIitem list\fR is delimited by the \fIIFS\fR variable.  This variable
 has a default value of ' ', or a space.  It is a \fBbash\fR(1) setting.
 .TP
-\fBhas_version\fR \fI<category/package\-version>\fR
+\fBhas_version\fR \fI[\-\-host\-root]\fR \fI<category/package\-version>\fR
 Check to see if \fIcategory/package\-version\fR is installed on the system.
 The parameter accepts all values that are acceptable in the \fBDEPEND\fR
 variable.  The function returns 0 if \fIcategory/package\-version\fR is
-installed, 1 otherwise.
+installed, 1 otherwise. Beginning with \fBEAPI 5\fR, the
+\-\-host\-root option may be used in order to cause the query
+to apply to the host root instead of ${ROOT}.
 .TP
-\fBbest_version\fR \fI<package name>\fR
+\fBbest_version\fR \fI[\-\-host\-root]\fR \fI<package name>\fR
 This function will look up \fIpackage name\fR in the database of currently
 installed programs and echo the "best version" of the package that is
-currently installed. 
+currently installed. Beginning with \fBEAPI 5\fR, the
+\-\-host\-root option may be used in order to cause the query
+to apply to the host root instead of ${ROOT}.
 .RS
 .TP
 .I Example:

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     6594669f13564295f7b966fea2733f4329f6b91b
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 15 20:42:50 2012 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sat Sep 15 20:42:50 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=6594669f

ebuild.5: EAPI 5 new* commands can read stdin

---
 man/ebuild.5 |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index 894cf2b..cca6835 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -1402,6 +1402,8 @@ new \fI\-r\fR option.
 .PD 1
 All these functions act like the do* functions, but they only work with one
 file and the file is installed as \fI[new filename]\fR.
+Beginning with \fBEAPI 5\fR, standard input is read when the
+first parameter is \- (a hyphen).
 .SH "REPORTING BUGS"
 Please report bugs via http://bugs.gentoo.org/
 .SH "AUTHORS"

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     b726c71804f59109d4ba800bb51986fbae0dde61
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 15 20:26:20 2012 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sat Sep 15 20:26:20 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=b726c718

ebuild.5: add EAPI 5 doheader helper

As noted in bug #21310, comment #5, PMS currently does not document
the -r option.

---
 man/ebuild.5 |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index 73e48ae..894cf2b 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -1304,6 +1304,12 @@ should call \fBln(1)\fR directly.
 .PD 1
 Performs the ln command to create a symlink.
 .TP
+\fBdoheader\fR \fI[\-r] <file> [list of more files]\fR
+Installs the given header files into /usr/include/, by default
+with file mode \fI0644\fR (this can be overridden with the
+\fBinsopts\fR function). Setting \-r sets recursive. The
+\fBdoheader\fR helper is available beginning with \fBEAPI 5\fR.
+.TP
 \fBdohtml\fR \fI [\-a filetypes] [\-r] [\-x list\-of\-dirs\-to\-ignore] [list\-of\-files\-and\-dirs]\fR
 Installs the files in the list of files (space\-separated list) into
 /usr/share/doc/${PF}/html provided the file ends in .htm, .html, .css, .js, .gif, .jpeg, .jpg, or .png.

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     0bf08c62770ef25e4888d460ab8ac068cb93110f
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 15 19:58:44 2012 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sat Sep 15 19:58:44 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=0bf08c62

ebuild.5: EAPI 5 econf add --disable-silent-rules

---
 man/ebuild.5 |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index 4319311..73e48ae 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -1071,6 +1071,10 @@ Beginning with \fBEAPI 4\fR, \fBeconf\fR adds
 \fI\-\-disable\-dependency\-tracking\fR to the arguments if the
 string \fIdisable\-dependency\-tracking\fR occurs in the output
 of \fIconfigure \-\-help\fR.
+Beginning with \fBEAPI 5\fR, \fBeconf\fR adds
+\fIdisable\-silent\-rules\fR to the arguments if the
+string \fIdisable\-silent\-rules\fR occurs in the output
+of \fIconfigure \-\-help\fR.
 .TP
 \fBemake\fR \fI[make options]\fR
 This is used as a replacement for make.  Performs 'make ${MAKEOPTS}

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     f65ec9623fb98f4c134e38643520e2a9caeaa2f9
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 15 19:53:02 2012 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sat Sep 15 19:53:02 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=f65ec962

ebuild.5: add EAPI 5 usex helper

---
 man/ebuild.5 |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index fdcf3cf..4319311 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -925,6 +925,11 @@ fi
 .fi
 .RE
 .TP
+\fBusex\fR \fI<USE flag>\fR \fI[true output]\fR \fI[false output]\fR \fI[true suffix]\fR \fI[false suffix]\fR
+If USE flag is set, echo [true output][true suffix] (defaults to
+"yes"), otherwise echo [false output][false suffix] (defaults to
+"no"). The usex helper is available beginning with \fBEAPI 5\fR.
+.TP
 \fBuse_with\fR \fI<USE item>\fR \fI[configure name]\fR \fI[configure opt]\fR
 Useful for creating custom options to pass to a configure script. If \fIUSE
 item\fR is in the \fBUSE\fR variable and a \fIconfigure opt\fR is specified,

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     ac85d5aa9f2b55850ff463f741e6f542e6d3817f
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 15 19:39:05 2012 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sat Sep 15 19:39:05 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=ac85d5aa

ebuild.5: EAPI 5 default_src_test parallel

---
 man/ebuild.5 |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index 755923e..fdcf3cf 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -808,8 +808,11 @@ steps should be done here.
 Initial working directory of $S.
 .TP
 .B src_test
-Run all package specific test cases.  The default is to run 'make check'
-followed 'make test'.
+Run all package specific test cases. The default is to run
+\'emake check\' followed \'emake test\'. Prior to \fBEAPI 5\fR,
+the default src_test implementation will automatically pass the
+\-j1 option as the last argument to emake, and beginning with
+\fBEAPI 5\fR it will allow the tests to run in parallel.
 .br
 Initial working directory of $S.
 .TP

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     345d938b7b995d7f336bf5d88dbf91affe27ac0d
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 15 19:26:46 2012 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sat Sep 15 19:26:46 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=345d938b

ebuild.5: add EAPI 5 EBUILD_PHASE_FUNC variable

---
 man/ebuild.5 |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index ef35505..755923e 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -102,6 +102,16 @@ Contains the path to the package build root.  Do not modify this variable.
 Contains the path to the 'files' sub folder in the package specific
 location in the portage tree.  Do not modify this variable.
 .TP
+.B EBUILD_PHASE
+Contains the abreviated name of the phase function that is
+currently executing, such as "setup", "unpack", "compile", or
+"preinst".
+.TP
+.B EBUILD_PHASE_FUNC
+Beginning with \fBEAPI 5\fR, contains the full name of the phase
+function that is currently executing, such as "pkg_setup",
+"src_unpack", "src_compile", or "pkg_preinst".
+.TP
 .B EPREFIX
 Beginning with \fBEAPI 3\fR, contains the offset
 that this Portage was configured for during

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     c4ac9c98510a8c61f474225d52287de29c9ce975
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 15 19:11:57 2012 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sat Sep 15 19:11:57 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=c4ac9c98

ebuild.5: add EAPI 5 REQUIRED_USE ?? operator

---
 man/ebuild.5 |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index 31a235c..ef35505 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -589,6 +589,7 @@ If flag1 disabled then flag2 enabled	!flag1? ( flag2 )
 If flag1 disabled then flag2 disabled	!flag1? ( !flag2 )
 Must enable any one or more (inclusive or)	|| ( flag1 flag2 flag3 )
 Must enable exactly one but not more (exclusive or)	^^ ( flag1 flag2 flag3 )
+May enable at most one (EAPI 5 or later)	?? ( flag1 flag2 flag3 )
 .TE
 .TP
 \fBRESTRICT\fR = \fI[strip,mirror,fetch,userpriv]\fR

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     7140f31a4ad322d05ea96250e9ef39b71ebf8c8a
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 15 19:08:45 2012 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sat Sep 15 19:08:45 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=7140f31a

ebuild.5: document EAPI 5 slot operator, sub-slot

---
 man/ebuild.5 |   95 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 94 insertions(+), 1 deletions(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index d7eec3c..31a235c 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -1,4 +1,4 @@
-.TH "EBUILD" "5" "Dec 2011" "Portage VERSION" "Portage"
+.TH "EBUILD" "5" "Sep 2012" "Portage VERSION" "Portage"
 .SH "NAME"
 ebuild \- the internal format, variables, and functions in an ebuild script
 .SH "DESCRIPTION"
@@ -231,6 +231,18 @@ This sets the SLOT for packages that may need to have multiple versions
 co\-exist.  By default you should set \fBSLOT\fR="0".  If you are unsure, then
 do not fiddle with this until you seek some guidance from some guru.  This
 value should \fINEVER\fR be left undefined.
+
+Beginning with \fBEAPI 5\fR, the SLOT variable may contain
+an optional sub\-slot part that follows the regular slot and
+is delimited by a / character. The sub\-slot must be a valid
+slot name. The sub\-slot is used to represent cases in which
+an upgrade to a new version of a package with a different
+sub\-slot may require dependent packages to be rebuilt. When
+the sub\-slot part is omitted from the SLOT definition, the
+package is considered to have an implicit sub\-slot which is
+equal to the regular slot. Refer to the \fBAtom Slot
+Operators\fR section for more information about sub\-slot
+usage.
 .TP
 \fBLICENSE\fR
 This should be a space delimited list of licenses that the package falls
@@ -347,6 +359,87 @@ x11\-libs/qt:3
 \fI>=\fRx11\-libs/qt-3.3.8:3
 \fI=\fRx11\-libs/qt-3.3*:3
 .fi
+
+Beginning with \fBEAPI 5\fR, a slot dependency may contain an
+optional sub\-slot part that follows the regular slot and is
+delimited by a \fB/\fR character.
+
+.I Examples:
+
+.nf
+dev\-libs/icu:0/0
+dev\-libs/icu:0/49
+dev\-lang/perl:0/5.12
+dev\-libs/glib:2/2.30
+.fi
+
+.TP
+.B Atom Slot Operators
+Beginning with \fBEAPI 5\fR, slot operator dependency consists
+of a colon followed by one of the following operators:
+.RS
+.TP
+.I *
+Indicates that any slot value is acceptable. In addition,
+for runtime dependencies, indicates that the package will not
+break if the matched package is uninstalled and replaced by
+a different matching package in a different slot.
+
+.I Examples:
+
+.nf
+dev\-libs/icu:*
+dev\-lang/perl:*
+dev-libs/glib:*
+.fi
+.TP
+.I =
+Indicates that any slot value is acceptable. In addition,
+for runtime dependencies, indicates that the package will
+break unless a matching package with slot and sub\-slot equal
+to the slot and sub\-slot of the best installed version at the
+time the package was installed is available.
+
+.I Examples:
+
+.nf
+dev\-libs/icu:=
+dev\-lang/perl:=
+dev-libs/glib:=
+.fi
+.TP
+.I slot=
+Indicates that only a specific slot value is acceptable, and
+otherwise behaves identically to the plain equals slot operator.
+
+.I Examples:
+
+.nf
+dev\-libs/icu:0=
+dev\-lang/perl:0=
+dev-libs/glib:2=
+.fi
+.PP
+To implement the equals slot operator, the package manager
+will need to store the slot/sub\-slot pair of the best installed
+version of the matching package. This syntax is only for package
+manager use and must not be used by ebuilds. The package manager
+may do this by inserting the appropriate slot/sub\-slot pair
+between the colon and equals sign when saving the package's
+dependencies. The sub\-slot part must not be omitted here
+(when the SLOT variable omits the sub\-slot part, the package
+is considered to have an implicit sub\-slot which is equal to
+the regular slot).
+
+.I Examples:
+
+.nf
+dev\-libs/icu:0/0=
+dev\-libs/icu:0/49=
+dev\-lang/perl:0/5.12=
+dev-libs/glib:2/2.30=
+.fi
+.RE
 .TP
 .B Atom USE
 Beginning with \fBEAPI 2\fR, any atom can be constrained to match specific

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     0cced1bd17ce277604b47717cc00ae2f13bdc5f6
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 14 18:10:40 2012 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Fri Sep 14 18:10:40 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=0cced1bd

portage.5: remove {un,}set_unless_changed docs

These functions were removed in commit
25a5296f29bc7153fa29e2dfe8de9d08d40d9944.

---
 man/portage.5 |   13 -------------
 1 files changed, 0 insertions(+), 13 deletions(-)

diff --git a/man/portage.5 b/man/portage.5
index 49f8dcd..173e326 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -742,19 +742,6 @@ such as \fBFEATURES\fR and \fBINSTALL_MASK\fR will not produce the intended
 results if they are set in bashrc, and therefore
 \fB/etc/portage/package.env\fR should be used instead.
 
-set_unless_changed and unset_unless_changed functions can be used to set or
-unset given variables only if these variable have not been set to values
-different than values set in make.conf. This functionality can be useful for
-temporary overriding of these variables during emerge invocation. Variables
-set without using set_unless_changed will unconditionally override variables
-set during emerge invocation.
-
-.I Syntax:
-.nf
-set_unless_changed VARIABLE=VALUE
-unset_unless_changed VALUE
-.fi
-
 Portage will source all of these bashrc files after \fB/etc/portage/bashrc\fR
 in the following order:
 .nr step 1 1

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     5b65319d819a476cf2a9505398a430785f49a329
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Tue Sep  4 01:05:56 2012 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Tue Sep  4 01:05:56 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=5b65319d

ebuild.5: clarify pkg_nofetch for bug #423403

---
 man/ebuild.5 |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index e9e718e..d7eec3c 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -664,9 +664,10 @@ is used to execute pkg_pretend is not saved and therefore is not
 available in phases that execute afterwards.
 .TP
 .B pkg_nofetch
-If you turn on \fIfetch\fR in \fBRESTRICT\fR, then this function will be
-run when the files in \fBSRC_URI\fR cannot be found.  Useful for
-displaying information to the user on *how* to obtain said files.  All
+This function will be executed when the files in \fBSRC_URI\fR
+cannot be fetched for any reason. If you turn on \fIfetch\fR in
+\fBRESTRICT\fR, this is useful for displaying information to the
+user on *how* to obtain said files. All
 you have to do is output a message and let the function return.  Do not
 end the function with a call to \fBdie\fR.
 .TP

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     dbcce475e8dee8b926cb593a9dc285a262edbb82
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 22 20:32:28 2012 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Wed Aug 22 20:32:28 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=dbcce475

make.conf.5: s/Hash functions/Hash function/

---
 man/make.conf.5 |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/man/make.conf.5 b/man/make.conf.5
index 59f32b8..0118667 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -699,7 +699,7 @@ called for extraction operation, with -d appended, unless the
 .TP
 \fBPORTAGE_CHECKSUM_FILTER\fR = \fI[space delimited list of hash names]\fR
 This variable may be used to filter the hash functions that are used to
-verify integrity of files. Hash functions names are case\-insensitive, and
+verify integrity of files. Hash function names are case\-insensitive, and
 the \fI*\fR and \fI\-*\fR wildcard tokens are supported.
 .br
 Defaults to the value of *.

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     fab71caabba4e57ffcbed0651abcee014d1c960f
Author:     Dave Kemper <saint.snit <AT> gmail <DOT> com>
AuthorDate: Sun Aug 19 21:33:44 2012 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Aug 19 21:33:44 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=fab71caa

make.conf.5: warn about PORTAGE_TMPDIR in PORTDIR

This will fix bug #392565.

---
 man/make.conf.5 |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/man/make.conf.5 b/man/make.conf.5
index 02cc809..c617fbc 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -827,6 +827,9 @@ Defaults to 30.
 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).
 .TP
 \fBPORTAGE_USERNAME\fR = \fI[user]\fR
 Defines the username to use when executing in userpriv/etc... modes (i.e.
@@ -852,7 +855,7 @@ the emerge \-\-sync command. The default value of
 \fBDISTDIR\fR and \fBPKGDIR\fR, but users are warned that any other locations
 inside \fBPORTDIR\fR are not necessarily safe for data storage.  You should not 
 put other data (such as overlays) in your \fBPORTDIR\fB.  Portage will walk 
-directory structures and may arbitrary add invalid categories as packages.
+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 

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     76fcf8c48671e970169de6ae025d7a0a2e75a8a9
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  5 20:34:55 2012 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Aug  5 20:34:55 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=76fcf8c4

man/portage.5: note GLEP 37 virtuals, bug #429978

---
 man/portage.5 |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/man/portage.5 b/man/portage.5
index ad84ff1..fc36ddb 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -444,12 +444,13 @@ doc
 .fi
 .TP
 .BR virtuals
-This controls what packages will provide a virtual by default.  For example, 
-if a package needs to send e\-mail, it will need virtual/mta.  In the absence 
-of a package that provides virtual/mta (like qmail, sendmail, postfix, etc...), 
-portage will look here to see what package to use.  In this case, Gentoo uses 
-net\-mail/ssmtp as the default (as defined in the virtuals file) because it's 
-the package that does the very bare minimum to send e\-mail.
+The virtuals file controls default preferences for virtuals that
+are defined via the \fBPROVIDE\fR ebuild variable (see
+\fBebuild\fR(5)). Since Gentoo now uses \fBGLEP 37\fR virtuals
+instead of \fBPROVIDE\fR virtuals, the virtuals file is
+irrelevant for all Gentoo ebuilds. However, it is still possible
+for third\-parties to distribute ebuilds that make use of
+\fBPROVIDE\fR.
 
 .I Format:
 .nf

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     a1dba60bc5b194cc868d73ae2fb3c046c0869fe1
Author:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 20 20:15:57 2012 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Fri Jul 20 20:15:57 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=a1dba60b

ebuild.5: fix (-) use dep example for bug #427384

---
 man/ebuild.5 |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index a65fef2..e9e718e 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -394,7 +394,7 @@ immediately following a flag with either \fB(+)\fR or \fB(\-)\fR. Use
 .RS
 .nf
 media\-video/ffmpeg[threads(+)]
-media\-video/ffmpeg[threads(\-)]
+media\-video/ffmpeg[-threads(\-)]
 .fi
 .RE
 .RE

[gentoo-commits] proj/portage:master commit in: man/

[Mike Frysinger]

commit:     8639e39d6c13306661261a3cb66c6827bcd2d26c
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 10 05:41:48 2012 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Tue Jul 10 05:41:48 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=8639e39d

ebuild(5): note that keepdir/dodir accept multiple paths

Current documentation indicates these only take one path, but they both
accept an arbitrary number of paths.

Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>

---
 man/ebuild.5 |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index 8ed8136..a65fef2 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -615,7 +615,7 @@ CFLAGS, CXXFLAGS, FFLAGS, FCFLAGS, and LDFLAGS variables.
 This should contain a list of file paths, relative to the image directory, of
 files that contain .hash sections. The paths may contain regular expressions
 with escape\-quoted special characters. This variable is deprecated. Use
-\fBQA_FLAGS_IGNORED\f instead.
+\fBQA_FLAGS_IGNORED\fR instead.
 .br
 This variable is intended to be used on files of binary packages which ignore
 LDFLAGS variable.
@@ -1105,8 +1105,8 @@ that this expression does \fBNOT\fR use the offset prefix.
 .BR 'dosed\ "s:/usr/local:/usr:g"\ /usr/bin/some\-script'
 runs sed on ${ED}/usr/bin/some\-script
 .TP
-\fBdodir\fR \fI<path>\fR
-Creates a directory inside of ${ED}.
+\fBdodir\fR \fI<path> [more paths]\fR
+Creates directories inside of ${ED}.
 .br
 .BR 'dodir\ /usr/lib/apache'
 creates ${ED}/usr/lib/apache.  Note that the do* functions will run
@@ -1122,8 +1122,8 @@ Sets the root (\fIDESTTREE\fR) for other functions like \fBdobin\fR,
 .br
 The default root is /usr.
 .TP
-\fBkeepdir\fR \fI<path>\fR
-Tells portage to leave a directory behind even if it is empty.  Functions
+\fBkeepdir\fR \fI<path> [more paths]\fR
+Tells portage to leave directories behind even if they're empty.  Functions
 the same as \fBdodir\fR.
 .TP
 \fBdobin\fR \fI<binary> [list of more binaries]\fR

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     d44df83d9f00405a62b25439ddc1915e6366a300
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 30 20:50:01 2012 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sat Jun 30 20:50:27 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=d44df83d

man/emerge.1: note that --resume re-uses options

---
 man/emerge.1 |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/man/emerge.1 b/man/emerge.1
index 5d0c05d..b45e41b 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -202,6 +202,9 @@ generate and distribute cache for use by others, use \fBegencache\fR(1).
 .TP
 .BR "\-\-resume" (\fB\-r\fR)
 Resumes the most recent merge list that has been aborted due to an error.
+This re\-uses the options that were given with the original
+command that's being resumed, and the user may also provide
+additional options when calling \fB\-\-resume\fR.
 Please note that this operation will only return an error on failure.  If there
 is nothing for portage to do, then portage will exit with a message and a
 success condition. A resume list will persist until it has been completed in

[gentoo-commits] proj/portage:master commit in: man/

[Mike Frysinger]

commit:     04ceb27d0813a3cd3df3451aba07007deff704fb
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 29 20:41:17 2012 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Fri Jun 29 20:41:17 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=04ceb27d

ebuild(5): add missing bold around EAPI {3,4} mention

Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>

---
 man/ebuild.5 |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index 56f3606..8ed8136 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -468,9 +468,9 @@ will use that to consider the dependency satisfied.
 .TP
 \fBRDEPEND\fR
 This should contain a list of all packages that are required for this
-program to run (aka runtime depend). If this is not set in \fBEAPI\fR
-3 or earlier, then it defaults to the value of \fBDEPEND\fR. In
-EAPI 4 or later, \fBRDEPEND\fR will never be implicitly set.
+program to run (aka runtime depend). If this is not set in \fBEAPI 3\fR
+or earlier, then it defaults to the value of \fBDEPEND\fR. In
+\fBEAPI 4\fR or later, \fBRDEPEND\fR will never be implicitly set.
 .br
 You may use the same syntax to vary dependencies as seen above in \fBDEPEND\fR.
 .TP

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     603e472f389b02e1c4a68b701a79d5d0a932765f
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 23 00:45:32 2012 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sat Jun 23 00:45:32 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=603e472f

man/portage.5: profile-formats = portage-2

---
 man/portage.5 |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/man/portage.5 b/man/portage.5
index 7341a03..9823eb1 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -822,7 +822,12 @@ cache\-formats = md5-dict pms
 # indicate that this repo contains profiles that may use directories for
 # package.mask, package.provided, package.use, package.use.mask,
 # package.use.force, use.mask and use.force.
-profile\-formats = portage-1
+# profile\-formats = portage-1
+# indicate that paths such as 'gentoo:targets/desktop' or ':targets/desktop' in
+# profile parent files can be used to express paths relative to the root
+# 'profiles' directory of a repository (when the repo name is omitted before
+# the colon, it refers to the current repository the parent file is inside)
+profile\-formats = portage-2
 .fi
 .RE
 .TP

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     5f252c72350e1671ad01630e90d5acb2226629e3
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 23 00:29:39 2012 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sat Jun 23 00:29:39 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=5f252c72

Document /etc/portage/sets and world_sets more.

---
 man/emerge.1  |   18 ++++++++++++++----
 man/portage.5 |   19 +++++++++++++++++--
 2 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/man/emerge.1 b/man/emerge.1
index 0d9f6de..5d0c05d 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -1,4 +1,4 @@
-.TH "EMERGE" "1" "Dec 2011" "Portage VERSION" "Portage"
+.TH "EMERGE" "1" "Jun 2012" "Portage VERSION" "Portage"
 .SH "NAME"
 emerge \- Command\-line interface to the Portage system
 .SH "SYNOPSIS"
@@ -69,7 +69,9 @@ packages deemed necessary for your system to run properly. \fBworld\fR
 encompasses both the \fBselected\fR and \fBsystem\fR sets. [See
 \fBFILES\fR below for more information.] Other sets can exist depending
 on the current configuration. The default set configuration is located
-in the \fB/usr/share/portage/config/sets\fR directory. Note that a \fIset\fR
+in the \fB/usr/share/portage/config/sets\fR directory.
+User sets may be created by placing files in the \fB/etc/portage/sets/\fR
+directory (see \fBportage\fR(5)). Note that a \fIset\fR
 is generally used in conjunction with \fB\-\-update\fR. When used as 
 arguments to \fBemerge\fR sets have to be prefixed with \fB@\fR to be
 recognized. Use the \fB\-\-list\-sets\fR action to display a list of
@@ -543,7 +545,7 @@ the build may fail if the dependencies aren't satisfied.
 .TP
 .BR "\-\-noreplace " (\fB\-n\fR)
 Skips the packages specified on the command\-line that have already
-been installed.  Without this option, any packages, ebuilds, or deps
+been installed.  Without this option, any package atoms or package sets
 you specify on the command\-line \fBwill\fR cause Portage to remerge
 the package, even if it is already installed.  Note that Portage will
 not remerge dependencies by default.
@@ -915,7 +917,7 @@ those USE settings (on Bourne-compatible shells you may omit the \fBenv\fR
 part).  If you want those USE settings to be more 
 permanent, you can put them in /etc/portage/package.use instead.
 .LP
-If \fBemerge \-\-update system\fR or \fBemerge \-\-update world\fR
+If \fBemerge \-\-update @system\fR or \fBemerge \-\-update @world\fR
 fails with an error message, it may be that an ebuild uses some
 newer feature not present in this version of \fBemerge\fR.  You
 can use \fBemerge \-\-update portage\fR to upgrade to the lastest
@@ -1054,6 +1056,11 @@ Contains a list of all user\-specified packages.  You can safely edit
 this file, adding packages that you want to be considered in \fBworld\fR
 set updates and removing those that you do not want to be considered.
 .TP
+.B /var/lib/portage/world_sets
+This is like the world file but instead of package atoms it contains
+packages sets which always begin with the \fB@\fR character. Use
+\fB/etc/portage/sets/\fR to define user package sets.
+.TP
 .B /etc/make.conf
 Contains variables for the build process, overriding those in
 \fBmake.globals\fR.
@@ -1061,6 +1068,9 @@ Contains variables for the build process, overriding those in
 .B /etc/portage/color.map
 Contains variables customizing colors.
 .TP
+.B /etc/portage/sets/
+Contains user package set definitions (see \fBportage\fR(5)).
+.TP
 .B /etc/dispatch\-conf.conf
 Contains settings to handle automatic updates/backups of configuration 
 files.

diff --git a/man/portage.5 b/man/portage.5
index 099d601..7341a03 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -1,4 +1,4 @@
-.TH "PORTAGE" "5" "Oct 2011" "Portage VERSION" "Portage"
+.TH "PORTAGE" "5" "Jun 2012" "Portage VERSION" "Portage"
 .SH NAME
 portage \- the heart of Gentoo
 .SH "DESCRIPTION"
@@ -69,6 +69,9 @@ package-specific bashrc files
 .BR /etc/portage/profile/
 site-specific overrides of \fB/etc/make.profile/\fR
 .TP
+.BR /etc/portage/sets/
+user\-defined package sets
+.TP
 .BR /usr/portage/metadata/
 .nf
 layout.conf
@@ -761,6 +764,17 @@ in the following order:
 /etc/portage/env/${CATEGORY}/${PF}
 .RE
 .TP
+.BR /etc/portage/sets/
+.RS
+For each file in this directory, a package set is created with its name
+corresponding to the name of the file. Each file should contain a list
+of package atoms, one per line. When referencing package sets in
+\fBemerge\fR(1) arguments, the set name is prefixed with \fB@\fR.
+
+Also see \fB/var/lib/portage/world_sets\fR and the \fBemerge\fR(1)
+\fB\-\-list\-sets\fR option.
+.RE
+.TP
 .BR /usr/portage/metadata/
 .RS
 .TP
@@ -1077,7 +1091,8 @@ app\-cdr/cdemu
 .TP
 .BR world_sets
 This is like the world file but instead of package atoms it contains
-packages sets which always begin with the @ character.
+packages sets which always begin with the \fB@\fR character. Use
+\fB/etc/portage/sets/\fR to define user package sets.
 
 .I Example:
 .nf

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     af0be826f318a2167786e5d9359b80f8537ca07c
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  2 03:05:41 2012 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sat Jun  2 03:05:41 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=af0be826

repoman.1: document inherit.missing/unused

---
 man/repoman.1 |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/man/repoman.1 b/man/repoman.1
index 49e5afa..26575a9 100644
--- a/man/repoman.1
+++ b/man/repoman.1
@@ -1,4 +1,4 @@
-.TH "REPOMAN" "1" "Mar 2012" "Portage VERSION" "Portage"
+.TH "REPOMAN" "1" "June 2012" "Portage VERSION" "Portage"
 .SH NAME
 repoman \- Gentoo's program to enforce a minimal level of quality assurance in packages added to the portage tree
 .SH SYNOPSIS
@@ -321,9 +321,6 @@ PATCHES variable should be a bash array to ensure white space safety
 Error generating cache entry for ebuild; typically caused by ebuild syntax error
 or digest verification failure.
 .TP
-.B eprefixify.defined
-The ebuild uses eprefixify, but does not inherit the prefix eclass
-.TP
 .B file.UTF8
 File is not UTF8 compliant
 .TP
@@ -336,8 +333,11 @@ File/dir name must be composed of only the following chars: a-zA-Z0-9._-+:
 .B file.size
 Files in the files directory must be under 20k
 .TP
-.B inherit.autotools
-Ebuild inherits autotools but does not call eautomake, eautoconf or eautoreconf
+.B inherit.missing
+Ebuild uses functions from an eclass but does not inherit it
+.TP
+.B inherit.unused
+Ebuild inherits an eclass but does not use it
 .TP
 .B inherit.deprecated
 Ebuild inherits a deprecated eclass

[gentoo-commits] proj/portage:master commit in: man/

[Mike Frysinger]

commit:     d9f8332397f77c7efdbd53082672c641bc19a0fc
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Fri Jun  1 03:15:55 2012 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Fri Jun  1 03:15:55 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=d9f83323

make.conf(5): document PORTAGE_{GRPNAME,USERNAME,INST_UID,INST_GID}

Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>

---
 man/make.conf.5 |   24 ++++++++++++++++++++++++
 1 files changed, 24 insertions(+), 0 deletions(-)

diff --git a/man/make.conf.5 b/man/make.conf.5
index a90e51d..6882637 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -733,6 +733,24 @@ to be configured by \fI`git config user.signingkey key_id`\fR.
 The command used by \fBrepoman\fR(1) to sign manifests when \fBsign\fR is
 in \fBFEATURES\fR.
 .TP
+\fBPORTAGE_GRPNAME\fR = \fI[group]\fR
+Defines the groupname to use when executing in userpriv/etc... modes (i.e.
+non-root).
+.br
+Defaults to portage.
+.TP
+\fBPORTAGE_INST_GID\fR = \fI[gid]\fR
+Defines the group id when installing files via dobin/dosbin.  Useful when
+running ebuild as yourself.
+.br
+Defaults to 0.
+.TP
+\fBPORTAGE_INST_UID\fR = \fI[uid]\fR
+Defines the user id when installing files via dobin/dosbin.  Useful when
+running ebuild as yourself.
+.br
+Defaults to 0.
+.TP
 \fBPORTAGE_IONICE_COMMAND\fR = \fI[ionice command string]\fR
 This variable should contain a command for portage to call in order
 to adjust the io priority of portage and it's subprocesses. The command
@@ -792,6 +810,12 @@ Defines the location of the temporary build directories.
 .br
 Defaults to /var/tmp.
 .TP
+\fBPORTAGE_USERNAME\fR = \fI[user]\fR
+Defines the username to use when executing in userpriv/etc... modes (i.e.
+non-root).
+.br
+Defaults to portage.
+.TP
 \fBPORTAGE_WORKDIR_MODE\fR = \fI"0700"\fR
 This variable controls permissions for \fIWORKDIR\fR (see \fBebuild\fR(5)).
 .TP

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     ed38cf680d220ca43f9396c1c986071ca5933bec
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Tue May  8 16:38:44 2012 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Tue May  8 16:38:44 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=ed38cf68

make.conf.5: COLLISION_IGNORE s/shell/fnmatch/

---
 man/make.conf.5 |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/man/make.conf.5 b/man/make.conf.5
index 39c3f8e..b710894 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -128,10 +128,10 @@ Determines how long the countdown delay will be after running
 .br
 Defaults to 5 seconds.
 .TP
-\fBCOLLISION_IGNORE\fR = \fI[space delimited list of shell patterns]\fR
+\fBCOLLISION_IGNORE\fR = \fI[space delimited list of fnmatch patterns]\fR
 This variable allows the user to disable \fIcollision\-protect\fR and
-\fIprotect\-owned\fR for specific shell patterns. For backward
-compatibility, directories that are listed without a shell pattern will
+\fIprotect\-owned\fR for specific \fBfnmatch\fR(3) patterns. For backward
+compatibility, directories that are listed without a fnmatch pattern will
 automatically have /* appended to them.
 .br
 Defaults to "/lib/modules/* *.py[co]".

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     f82c3cfe4dccc0eea332e8d4f3c64509b0840f56
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 13 18:27:44 2012 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Fri Apr 13 18:29:01 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=f82c3cfe

ebuild.5: use example.com for bug #411835

---
 man/ebuild.5 |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index 42b72c8..56f3606 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -202,7 +202,7 @@ who uses the \fBebuild\fR(1) and \fBrepoman\fR(1) commands with this
 package will be required to have a version of portage that recognizes
 the EAPI to which this package conforms.
 .TP
-\fBSRC_URI\fR = \fI"http://happy.com/little/${P}.tar.gz"\fR
+\fBSRC_URI\fR = \fI"http://example.com/path/${P}.tar.gz"\fR
 Contains a list of URIs for the required source files.  It can contain
 multiple URIs for a single source file.  The list is processed in order
 if the file was not found on any of the \fIGENTOO_MIRRORS\fR.
@@ -211,7 +211,7 @@ customized with a "->" operator on the right hand side, followed by the
 desired output file name. All tokens, including the operator and output
 file name, should be separated by whitespace.
 .TP
-\fBHOMEPAGE\fR = \fI"http://happy.com/"\fR
+\fBHOMEPAGE\fR = \fI"http://example.com/"\fR
 Should contain a list of URIs for the sources main sites and other further
 package dependent information.
 .TP

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     5dbea626d2305625b1562eebfde4fe7b4ee601d9
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 30 00:17:06 2012 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Fri Mar 30 00:17:06 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=5dbea626

portage.5: note more bashrc caveats, bug #409627

---
 man/portage.5 |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/man/portage.5 b/man/portage.5
index 967889d..099d601 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -730,7 +730,10 @@ masters =
 In this directory additional package\-specific bashrc files can be created.
 Note that if package\-specific environment variable settings are all that's
 needed, then \fB/etc/portage/package.env\fR should be used instead of the
-bashrc approach that is described here.
+bashrc approach that is described here. Also note that special variables
+such as \fBFEATURES\fR and \fBINSTALL_MASK\fR will not produce the intended
+results if they are set in bashrc, and therefore
+\fB/etc/portage/package.env\fR should be used instead.
 
 set_unless_changed and unset_unless_changed functions can be used to set or
 unset given variables only if these variable have not been set to values

[gentoo-commits] proj/portage:master commit in: man/

[Mike Frysinger]

commit:     6be090fb118e17348751d2eb15f8a3407c2fa6aa
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Thu Mar  8 20:13:05 2012 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Thu Mar  8 20:13:05 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=6be090fb

etc-update(1): flesh out a bit more

Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>

---
 man/etc-update.1 |   26 ++++++++++++++++++++------
 1 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/man/etc-update.1 b/man/etc-update.1
index d7c4a24..bebef5b 100644
--- a/man/etc-update.1
+++ b/man/etc-update.1
@@ -1,8 +1,9 @@
-.TH "ETC-UPDATE" "1" "Aug 2008" "Portage VERSION" "Portage"
+.TH "ETC-UPDATE" "1" "Mar 2012" "Portage VERSION" "Portage"
 .SH NAME
 etc-update \- handle configuration file updates
 .SH SYNOPSIS
-.B etc-update
+.BR etc-update
+[\fIoptions\fR] [\fI--automode <mode>\fR]
 .SH DESCRIPTION
 .I etc-update
 is supposed to be run after merging a new package to see if
@@ -16,9 +17,24 @@ will check all directories in the \fICONFIG_PROTECT\fR variable.  All
 config files found in \fICONFIG_PROTECT_MASK\fR will automatically be
 updated for you by \fIetc-update\fR.  See \fBmake.conf\fR(5) for more
 information.
+.PP
+.I etc-update
+respects the normal \fIPORTAGE_CONFIGROOT\fR and \fIEROOT\fR variables
+for finding the aforementioned config protect variables.
 .SH OPTIONS
 .TP
-None.
+.BR \-d ", " \-\-debug
+Run with shell tracing enabled.
+.TP
+.BR \h ", " \-\-help
+Surprisingly, show the help output.
+.TP
+.BR \-v ", " \-\-verbose
+Show settings and important decision info while running.
+.TP
+.BR "\-\-automode <mode>"
+Select one of the automatic merge modes.  Valid modes are: -3 -5 -7 -9.
+See the \fI\-\-help\fR text for more details.
 .SH "REPORTING BUGS"
 Please report bugs via http://bugs.gentoo.org/
 .SH AUTHORS
@@ -31,8 +47,6 @@ Mike Frysinger <vapier@gentoo.org>
 .TP
 .B /etc/etc-update.conf
 Configuration settings for \fIetc-update\fR are stored here.
-.TP
-.B /etc/dispatch-conf.conf
-Settings for dispatching configuration files right before they're merged.
 .SH "SEE ALSO"
+.BR dispatch-conf (1),
 .BR make.conf (5)

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     ea3c8864c19a5ef0d337f8a1314128faad4977aa
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 17 23:33:35 2012 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Fri Feb 17 23:33:35 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=ea3c8864

portage.5: layout.conf manifest-hashes example

---
 man/portage.5 |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/man/portage.5 b/man/portage.5
index dd94a79..967889d 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -795,6 +795,8 @@ thin\-manifests = true
 # indicate that this repo requires manifests for each package, and is
 # considered a failure if a manifest file is missing/incorrect
 use\-manifests = strict
+# customize the set of hashes generated for Manifest entries
+manifest\-hashes = SHA256 SHA512 WHIRLPOOL
 # indicate that this repo enables repoman's --echangelog=y option automatically
 update\-changelog = true
 # indicate that this repo contains both md5-dict and pms cache formats,

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     025a3667810e3a17d16f2e1c2248edf6ecef23f4
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 21 04:00:55 2012 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sat Jan 21 04:00:55 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=025a3667

document --quiet-repo-display

---
 man/emerge.1 |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/man/emerge.1 b/man/emerge.1
index 91e6c21..7b83f64 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -619,6 +619,10 @@ Note that interactive packages currently force all build output to
 be displayed on stdout. This issue can be temporarily avoided
 by specifying \fI\-\-accept\-properties=\-interactive\fR.
 .TP
+.BR "\-\-quiet\-repo\-display"
+In the package merge list display, suppress ::repository output, and
+instead use numbers to indicate which repositories package come from.
+.TP
 .BR \-\-quiet\-unmerge\-warn
 Disable the warning message that's shown prior to
 \fB\-\-unmerge\fR actions. This option is intended

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     b6c51afdaa69eb648cd71e07c880051bf734b8cd
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 20 04:46:37 2012 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Fri Jan 20 04:46:37 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=b6c51afd

man/emerge.1: reference --exclude from --newuse

---
 man/emerge.1 |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/man/emerge.1 b/man/emerge.1
index 0043d04..91e6c21 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -520,7 +520,8 @@ A USE flag was turned off for a package.
 USE flags may be toggled by your profile as well as your USE and package.use
 settings. If you would like to skip rebuilds for which disabled flags have
 been added to or removed from IUSE, see the related
-\fB\-\-changed\-use\fR option.
+\fB\-\-changed\-use\fR option. If you would like to skip rebuilds for
+specific packages, see the \fB\-\-exclude\fR option.
 .TP
 .BR "\-\-noconfmem"
 Causes portage to disregard merge records indicating that a config file

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     45ad6be3512e98791c3c0d28c6ec55c6298cfb9d
Author:     Gavin Pryke <gavinlee303 <AT> googlemail <DOT> com>
AuthorDate: Mon Jan  2 23:01:30 2012 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Jan  2 23:01:30 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=45ad6be3

ebuild.5: fix REQUIRED_USE sample for bug #397415

---
 man/ebuild.5 |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index ae64a55..42b72c8 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -491,7 +491,7 @@ l l.
 Behavior	Expression
 
 If flag1 enabled then flag2 disabled	flag1? ( !flag2 )
-If flag1 enabled then flag2 disabled	flag1? ( flag2 )
+If flag1 enabled then flag2 enabled	flag1? ( flag2 )
 If flag1 disabled then flag2 enabled	!flag1? ( flag2 )
 If flag1 disabled then flag2 disabled	!flag1? ( !flag2 )
 Must enable any one or more (inclusive or)	|| ( flag1 flag2 flag3 )

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     38fca9ab1960f9a38c5d29183224a77694337205
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 24 11:30:30 2011 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sat Dec 24 11:30:30 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=38fca9ab

Update date headers in man pages.

---
 man/ebuild.5    |    2 +-
 man/make.conf.5 |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index 2394da5..ae64a55 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -1,4 +1,4 @@
-.TH "EBUILD" "5" "Jul 2011" "Portage VERSION" "Portage"
+.TH "EBUILD" "5" "Dec 2011" "Portage VERSION" "Portage"
 .SH "NAME"
 ebuild \- the internal format, variables, and functions in an ebuild script
 .SH "DESCRIPTION"

diff --git a/man/make.conf.5 b/man/make.conf.5
index 33f4e45..f7491a9 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -1,4 +1,4 @@
-.TH "MAKE.CONF" "5" "August 2011" "Portage VERSION" "Portage"
+.TH "MAKE.CONF" "5" "Dec 2011" "Portage VERSION" "Portage"
 .SH "NAME"
 make.conf \- custom settings for Portage
 .SH "SYNOPSIS"

[gentoo-commits] proj/portage:master commit in: man/

[Arfrever Frehtes Taifersar Arahesis]

commit:     1abc862c0998de0994a75484cb915daff26cfc65
Author:     Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Gentoo <DOT> Org>
AuthorDate: Thu Dec 22 23:56:37 2011 +0000
Commit:     Arfrever Frehtes Taifersar Arahesis <arfrever <AT> gentoo <DOT> org>
CommitDate: Thu Dec 22 23:56:37 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=1abc862c

Fix description of QA_FLAGS_IGNORED.

---
 man/ebuild.5 |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index afa2731..2394da5 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -604,8 +604,8 @@ The paths may contain fnmatch patterns.
 .TP
 \fBQA_FLAGS_IGNORED\fR
 This should contain a list of file paths, relative to the image directory, of
-files that do not contain .hash or .GCC.command.line sections. The paths may
-contain regular expressions with escape\-quoted special characters.
+files that do not contain .GCC.command.line sections or contain .hash sections.
+The paths may contain regular expressions with escape\-quoted special characters.
 .br
 This variable is intended to be used on files of binary packages which ignore
 CFLAGS, CXXFLAGS, FFLAGS, FCFLAGS, and LDFLAGS variables.

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     e1fa7120dffb4b2a603a38b40269a1cc28fcd39a
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 23 09:16:15 2011 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Wed Dec 21 19:37:20 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=e1fa7120

--ask is fine for --depclean as well.

---
 man/emerge.1 |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/man/emerge.1 b/man/emerge.1
index 5ab9613..0043d04 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -131,8 +131,8 @@ recommended to use a tool such as \fBrevdep-rebuild\fR(1)
 in order to detect such breakage.
 
 \fBWARNING:\fR
-Inexperienced users are advised to use \fB\-\-pretend\fR with this
-option in order to see a preview of which packages
+Inexperienced users are advised to use \fB\-\-pretend\fR or \fB\-\-ask\fR
+with this option in order to see a preview of which packages
 will be uninstalled. Always study the list of packages
 to be cleaned for any obvious mistakes. Note that packages listed in
 package.provided (see \fBportage\fR(5)) may be removed by

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     d33a45eba7c2ee8dab019908593d213e9c727314
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 16 20:55:08 2011 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Fri Dec 16 20:55:08 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=d33a45eb

emerge.1: --changed-use/--selective interaction

Also, swap all instances of --reinstall=changed-use with --changed-use.

---
 man/emerge.1 |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/man/emerge.1 b/man/emerge.1
index 11da425..5ab9613 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -359,7 +359,11 @@ merging the packages.  This comes with the caveat that all build-time
 dependencies must already be emerged on the system.
 .TP
 .BR "\-\-changed\-use"
-This is an alias for \fB\-\-reinstall=changed\-use\fR.
+Tells emerge to include installed packages where USE flags have
+changed since installation. This option also implies the
+\fB\-\-selective\fR option. Unlike \fB\-\-newuse\fR, the
+\fB\-\-changed\-use\fR option does not trigger reinstallation when
+flags that the user has not enabled are added or removed.
 .TP
 .BR "\-\-changelog " (\fB\-l\fR)
 Use this in conjunction with the \fB\-\-pretend\fR option.  This will
@@ -516,7 +520,7 @@ A USE flag was turned off for a package.
 USE flags may be toggled by your profile as well as your USE and package.use
 settings. If you would like to skip rebuilds for which disabled flags have
 been added to or removed from IUSE, see the related
-\-\-reinstall=changed\-use option.
+\fB\-\-changed\-use\fR option.
 .TP
 .BR "\-\-noconfmem"
 Causes portage to disregard merge records indicating that a config file
@@ -648,10 +652,7 @@ and that is larger than that of the installed package will
 be considered by the rebuilt\-binaries logic.
 .TP
 .BR "\-\-reinstall changed\-use"
-Tells emerge to include installed packages where USE flags have
-changed since installation.  Unlike \fB\-\-newuse\fR, this option does
-not trigger reinstallation when flags that the user has not
-enabled are added or removed.
+This is an alias for \fB\-\-changed\-use\fR.
 .TP
 .BR "\-\-reinstall\-atoms " ATOMS
 A space separated list of package names or slot atoms. Emerge will treat
@@ -682,8 +683,8 @@ use \fBEMERGE_DEFAULT_OPTS\fR to make
 This is identical to the \fB\-\-noreplace\fR option.
 Some options, such as \fB\-\-update\fR, imply \fB\-\-selective\fR.
 Use \fB\-\-selective=n\fR if you want to forcefully disable
-\fB\-\-selective\fR, regardless of options like \fB\-\-newuse\fR,
-\fB\-\-noreplace\fR, or \fB\-\-update\fR.
+\fB\-\-selective\fR, regardless of options like \fB\-\-changed\-use\fR,
+\fB\-\-newuse\fR, \fB\-\-noreplace\fR, or \fB\-\-update\fR.
 .TP
 .BR "\-\-skipfirst"
 This option is only valid when used with \fB\-\-resume\fR.  It removes the 

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     085cc0ad1b2b05a350b96cc1654a9cfb913a8640
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 15 18:49:00 2011 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Thu Dec 15 18:49:00 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=085cc0ad

emerge.1: enumerate more --selective=n overrides

---
 man/emerge.1 |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/man/emerge.1 b/man/emerge.1
index ba29d60..11da425 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -682,7 +682,8 @@ use \fBEMERGE_DEFAULT_OPTS\fR to make
 This is identical to the \fB\-\-noreplace\fR option.
 Some options, such as \fB\-\-update\fR, imply \fB\-\-selective\fR.
 Use \fB\-\-selective=n\fR if you want to forcefully disable
-\fB\-\-selective\fR, regardless of options like \fB\-\-update\fR.
+\fB\-\-selective\fR, regardless of options like \fB\-\-newuse\fR,
+\fB\-\-noreplace\fR, or \fB\-\-update\fR.
 .TP
 .BR "\-\-skipfirst"
 This option is only valid when used with \fB\-\-resume\fR.  It removes the 

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     d454665c0421a617d49d5f765180d598b67060d7
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 15 18:04:47 2011 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Thu Dec 15 18:04:47 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=d454665c

make.conf.5: it's -> its

---
 man/make.conf.5 |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/man/make.conf.5 b/man/make.conf.5
index 63c6581..76adfe2 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -210,7 +210,7 @@ SRC_URI digests are correct.  This feature also affects digest generation via
 \fBebuild\fR(1) and \fBemerge\fR(1) (emerge generates digests only when the
 \fIdigest\fR feature is enabled). Existing digests for files that do not exist
 in ${DISTDIR} will be automatically assumed even when \fIassume\-digests\fR is
-not enabled. If a file exists in ${DISTDIR} but it's size does not match the
+not enabled. If a file exists in ${DISTDIR} but its size does not match the
 existing digest, the digest will be regenerated regardless of whether or
 not \fIassume\-digests\fR is enabled. The \fBebuild\fR(1) \fBdigest\fR command
 has a \fB\-\-force\fR option that can be used to force regeneration of digests.

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     c93a46851c43f7e8539a67b2376dc8f55af41789
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Wed Dec  7 19:20:39 2011 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Wed Dec  7 19:20:39 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=c93a4685

man: document fixpackages for bug #393517

---
 man/emerge.1      |   21 ++++++++++++++++-----
 man/fixpackages.1 |   15 +++++++++++++++
 2 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/man/emerge.1 b/man/emerge.1
index 0329e20..b4da69c 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -1,4 +1,4 @@
-.TH "EMERGE" "1" "Oct 2011" "Portage VERSION" "Portage"
+.TH "EMERGE" "1" "Dec 2011" "Portage VERSION" "Portage"
 .SH "NAME"
 emerge \- Command\-line interface to the Portage system
 .SH "SYNOPSIS"
@@ -427,8 +427,8 @@ are modified. This option is enabled by default.
 
 \fBWARNING:\fR
 If you want to disable \-\-dynamic\-deps, then it may be necessary to
-first run \fBfixpackages\fR in order to get the best results. The
-\fBfixpackages\fR command performs two different operations that can
+first run \fBfixpackages\fR(1) in order to get the best results. The
+\fBfixpackages\fR(1) command performs two different operations that can
 also be performed separately by the `emaint \-\-fix moveinst` and
 `emaint \-\-fix movebin` commands (see \fBemaint\fR(1)).
 .TP
@@ -561,11 +561,22 @@ Only merge (or pretend to merge) the dependencies of the packages
 specified, not the packages themselves.
 .TP
 .BR "\-\-package\-moves [ y | n ]"
-Perform package moves when necessary. This option
-is enabled by default. \fBWARNING:\fR This option
+Perform package moves when necessary. This option is enabled
+by default. Package moves are typically applied immediately
+after a \fB\-\-sync\fR action. They are applied in an
+incremental fashion, using only the subset of the history of
+package moves which have been added or modified since the
+previous application of package moves.
+
+\fBWARNING:\fR This option
 should remain enabled under normal circumstances.
 Do not disable it unless you know what you are
 doing.
+
+\fBNOTE:\fR The \fBfixpackages\fR(1) command can be used to
+exhaustively apply the entire history of package moves,
+regardless of whether or not any of the package moves have
+been previously applied.
 .TP
 .BR "\-\-pretend " (\fB\-p\fR)
 Instead of actually performing the merge, simply display what *would*

diff --git a/man/fixpackages.1 b/man/fixpackages.1
new file mode 100644
index 0000000..3168327
--- /dev/null
+++ b/man/fixpackages.1
@@ -0,0 +1,15 @@
+.TH "FIXPACKAGES" "1" "Dec 2011" "Portage VERSION" "Portage"
+.SH NAME
+fixpackages \- Perform package move updates for all packages
+.SH SYNOPSIS
+\fBfixpackages\fR
+.SH DESCRIPTION
+The fixpackages program performs package move updates on configuration
+files, installed packages, and binary packages.
+.SH "REPORTING BUGS"
+Please report bugs via http://bugs.gentoo.org/
+.SH AUTHORS
+Zac Medico <zmedico@gentoo.org>
+.SH "SEE ALSO"
+.BR emaint (1),
+.BR emerge (1)

[gentoo-commits] proj/portage:master commit in: man/

[Mike Frysinger]

commit:     3da4b9c384502092bf7f0fcdf47ce497907544dc
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 30 20:23:36 2011 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Wed Nov 30 20:23:36 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=3da4b9c3

make.conf(5): clarify "repo" and "defaults" sources for USE_ORDER

Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>

---
 man/make.conf.5 |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/man/make.conf.5 b/man/make.conf.5
index b9206b4..d70d7b8 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -877,13 +877,15 @@ Per\-package USE from \fB/etc/portage/package.use\fR (see \fBportage\fR(5))
 USE from make.conf
 .TP
 .B defaults
-USE from make.defaults and package.use in the profile (see \fBportage\fR(5))
+USE from make.defaults and package.use in the profile
+(e.g. /etc/portage/make.profile/package.use) (see \fBportage\fR(5))
 .TP
 .B pkginternal
 USE from \fBebuild\fR(5) IUSE defaults
 .TP
 .B repo
-USE from make.defaults and package.use in the repo (see \fBportage\fR(5))
+USE from make.defaults and package.use in the repo's profiles/ top dir
+(e.g. /usr/portage/profiles/package.use) (see \fBportage\fR(5))
 .TP
 .B env.d
 USE from the environment variables, such as LINGUAS, defined by files in

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     3d6472165f306344b768367982758f1a3d33e921
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 21 14:59:57 2011 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Nov 21 14:59:57 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=3d647216

man/emerge.1: note that --jobs redirects output

---
 man/emerge.1 |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/man/emerge.1 b/man/emerge.1
index b011125..0329e20 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -476,6 +476,8 @@ Causes \fIEMERGE_DEFAULT_OPTS\fR (see \fBmake.conf\fR(5)) to be ignored.
 Specifies the number of packages to build simultaneously. If this option is
 given without an argument, emerge will not limit the number of jobs that can
 run simultaneously. Also see the related \fB\-\-load\-average\fR option.
+Similarly to the \-\-quiet\-build option, the \-\-jobs option causes all
+build output to be redirected to logs.
 Note that interactive packages currently force a setting
 of \fI\-\-jobs=1\fR. This issue can be temporarily avoided
 by specifying \fI\-\-accept\-properties=\-interactive\fR.
@@ -599,6 +601,9 @@ the paths of the log files will be displayed together with the
 corresponding die messages. This option is enabled by default. In
 order to disable \-\-quiet\-build by default, set \-\-quiet\-build=n
 in the \fBEMERGE_DEFAULT_OPTS\fR variable in \fBmake.conf\fR(5).
+Note that interactive packages currently force all build output to
+be displayed on stdout. This issue can be temporarily avoided
+by specifying \fI\-\-accept\-properties=\-interactive\fR.
 .TP
 .BR \-\-quiet\-unmerge\-warn
 Disable the warning message that's shown prior to

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     09007bc81ad56621f0ac70b7450ea26e02de2f02
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 29 08:16:11 2011 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sat Oct 29 08:16:11 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=09007bc8

man/portage.5: profile-formats example

---
 man/portage.5 |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/man/portage.5 b/man/portage.5
index 323a729..e2ed754 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -797,6 +797,10 @@ update\-changelog = true
 # indicate that this repo contains both md5-dict and pms cache formats,
 # which may be generated by egencache(1)
 cache\-formats = md5-dict pms
+# indicate that this repo contains profiles that may use directories for
+# package.mask, package.provided, package.use, package.use.mask,
+# package.use.force, use.mask and use.force.
+profile\-formats = portage-1
 .fi
 .RE
 .TP

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     aea25123878c95e13d0d7ed6500b3ddb4e9179f0
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 29 08:11:09 2011 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sat Oct 29 08:11:09 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=aea25123

man/portage.5: cache-formats example

---
 man/portage.5 |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/man/portage.5 b/man/portage.5
index 7fa5660..323a729 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -794,6 +794,9 @@ thin\-manifests = true
 use\-manifests = strict
 # indicate that this repo enables repoman's --echangelog=y option automatically
 update\-changelog = true
+# indicate that this repo contains both md5-dict and pms cache formats,
+# which may be generated by egencache(1)
+cache\-formats = md5-dict pms
 .fi
 .RE
 .TP

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     ced0da06aaf1bf9f89e9aa7947f58980ff98e365
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 27 04:43:25 2011 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Thu Oct 27 04:43:25 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=ced0da06

man/make.conf.5: mention LINGUAS in USE_ORDER doc

The reason for env.d being in USE_ORDER is not really obvious, so
mention LINGUAS as an example (from bug #187016).

---
 man/make.conf.5 |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/man/make.conf.5 b/man/make.conf.5
index 23d5e2b..b9206b4 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -886,7 +886,8 @@ USE from \fBebuild\fR(5) IUSE defaults
 USE from make.defaults and package.use in the repo (see \fBportage\fR(5))
 .TP
 .B env.d
-USE from the environment variables defined by files in \fI/etc/env.d/\fR
+USE from the environment variables, such as LINGUAS, defined by files in
+\fI/etc/env.d/\fR
 .RE
 
 .SH "REPORTING BUGS"

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     7dd07ac115fd787d34b79d626644c1feb3291e4b
Author:     Martin von Gagern <Martin.vGagern <AT> gmx <DOT> net>
AuthorDate: Wed Oct 26 21:59:14 2011 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Wed Oct 26 21:59:14 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=7dd07ac1

man/make.conf.5: elaborate on prelink-checksums

---
 man/make.conf.5 |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/man/make.conf.5 b/man/make.conf.5
index a2221cf..23d5e2b 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -399,6 +399,12 @@ before computing checksums for merge and unmerge. This feature is
 useful only if \fBprelink\fR(8) is installed and accurate checksums (despite
 prelinking) are needed for some reason such as for checking the integrity of
 installed files or because the \fIunmerge\-orphans\fR feature is disabled.
+
+Note that normal emerging of packages from source computes the
+checksums before things will be prelinked, so in such cases, this
+feature isn't required either. Undoing prelinking while merging is
+only required when using tools like \fBquickpkg\fR(1) which can cause
+already prelinked files to be merged.
 .TP
 .B preserve\-libs
 Preserve libraries when the sonames change during upgrade or downgrade.

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     0bd369f1adc774e41c686f6651fe47a1a13ba268
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 23 21:12:40 2011 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Oct 23 21:12:40 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=0bd369f1

man/repoman.1: reference changelog/layout.conf

---
 man/repoman.1 |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/man/repoman.1 b/man/repoman.1
index 2e4c86c..7bc5c45 100644
--- a/man/repoman.1
+++ b/man/repoman.1
@@ -43,7 +43,10 @@ Displays every package name while checking
 .TP
 \fB\-\-echangelog=<y|n|force>\fR
 For commit mode, call echangelog if ChangeLog is unmodified (or
-regardless of modification if 'force' is specified)
+regardless of modification if 'force' is specified). This option
+can be enabled by default for a particular repository by setting
+"update\-changelog = true" in metadata/layout.conf (see
+\fBportage(5)\fR).
 .TP
 \fB\-\-if\-modified=<y|n>\fR
 Only check packages that have uncommitted modifications

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     e2fb971105c636f2abc7fbcc3756559ea0727ce3
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 21 08:50:06 2011 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Fri Oct 21 08:50:06 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=e2fb9711

man/portage.5: layout.conf update-changelog

---
 man/portage.5 |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/man/portage.5 b/man/portage.5
index 860803b..45eef36 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -1,4 +1,4 @@
-.TH "PORTAGE" "5" "May 2011" "Portage VERSION" "Portage"
+.TH "PORTAGE" "5" "Oct 2011" "Portage VERSION" "Portage"
 .SH NAME
 portage \- the heart of Gentoo
 .SH "DESCRIPTION"
@@ -791,6 +791,8 @@ thin\-manifests = true
 # indicate that this repo requires manifests for each package, and is
 # considered a failure if a manifest file is missing/incorrect
 use\-manifests = strict
+# indicate that this repo enables repoman's --echangelog=y option automatically
+update\-changelog = true
 .fi
 .RE
 .TP

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     366bdf7c1eab804b0acfaba01dc9e8bb7811ce96
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 17 02:56:01 2011 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Oct 17 02:56:01 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=366bdf7c

man/repoman.1: update date in header

---
 man/repoman.1 |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/man/repoman.1 b/man/repoman.1
index 4d3a59b..4d22e8d 100644
--- a/man/repoman.1
+++ b/man/repoman.1
@@ -1,4 +1,4 @@
-.TH "REPOMAN" "1" "May 2011" "Portage VERSION" "Portage"
+.TH "REPOMAN" "1" "Oct 2011" "Portage VERSION" "Portage"
 .SH NAME
 repoman \- Gentoo's program to enforce a minimal level of quality assurance in packages added to the portage tree
 .SH SYNOPSIS

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     508d5dfbf8e9e0919e3889a6b81e1dfe1b43ee43
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 16 19:44:11 2011 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Oct 16 19:44:11 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=508d5dfb

man/emerge.1: update date in header

---
 man/emerge.1 |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/man/emerge.1 b/man/emerge.1
index 0a1ec03..c10ac6b 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -1,4 +1,4 @@
-.TH "EMERGE" "1" "Sept 2011" "Portage VERSION" "Portage"
+.TH "EMERGE" "1" "Oct 2011" "Portage VERSION" "Portage"
 .SH "NAME"
 emerge \- Command\-line interface to the Portage system
 .SH "SYNOPSIS"

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     d60105f611515f32b53b1eb4afa65f3a0d8a9056
Author:     Sebastian Luther <SebastianLuther <AT> gmx <DOT> de>
AuthorDate: Fri Oct 14 10:55:22 2011 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Fri Oct 14 14:54:23 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=d60105f6

Update --prune man page entry (bug 387011)

---
 man/emerge.1 |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/man/emerge.1 b/man/emerge.1
index 6088cdc..1eab6e5 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -174,10 +174,12 @@ In versions of portage >=2.1.5 the \-\-metadata action is totally unnecessary
 unless the user has enabled FEATURES="metadata-transfer" in \fBmake.conf\fR(5).
 .TP
 .BR "\-\-prune " (\fB\-P\fR)
-\fBWARNING: This action can remove important packages!\fR  Removes all but the
-highest installed version of a package from your system. Use \fB\-\-prune\fR
-together with \fB\-\-verbose\fR to show reverse dependencies or with
-\fB\-\-nodeps\fR to ignore all dependencies.
+Removes all but the highest installed version of a package from your
+system. Use \fB\-\-prune\fR together with \fB\-\-verbose\fR to show
+reverse dependencies or with \fB\-\-nodeps\fR to ignore all dependencies.
+\fBWARNING: This action can remove packages from your world file! Check
+the emerge output of the next \-\-depclean run carefully! Use
+\-\-depclean to avoid this issue.\fR
 .TP
 .BR \-\-regen
 Causes portage to check and update the dependency cache of all ebuilds in the 

[gentoo-commits] proj/portage:master commit in: man/

[Mike Frysinger]

commit:     df6c9363bec1a7706b53ef1c6aa760bb45ccad4a
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 13 02:50:57 2011 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Thu Oct 13 02:50:57 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=df6c9363

xpak(5): fix grammar, spelling, style, and add more content

Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>

---
 man/xpak.5 |  253 +++++++++++++++++++++++++-----------------------------------
 1 files changed, 105 insertions(+), 148 deletions(-)

diff --git a/man/xpak.5 b/man/xpak.5
index 49de449..0b5b874 100644
--- a/man/xpak.5
+++ b/man/xpak.5
@@ -1,193 +1,150 @@
-.TH XPAK 5 "Apr 2009" "Portage VERSION" "Portage"
+.TH XPAK 5 "Oct 2011" "Portage VERSION" "Portage"
 .SH NAME
-xpak \- The XPAK Data Format
+xpak \- The XPAK Data Format used with Portage binary packages
+.SH DESCRIPTION
+Every Gentoo binary package has a xpak attached to it which contains build
+time information like the USE flags it was built with, the ebuild it was
+built from, the environmental variables, CFLAGS, CXXFLAGS, etc...
 .SH NOTES
 .SS Data Types
+The following conventions cover all occurrences in this documentation
 .IP Integer
-every offset or length(len) value in this documentation will be an unsigned
-32bit integer in big endian byte order(32bit unsigned big int or uint32(big)
-).
+All offsets/lengths are big endian unsigned 32bit integers
 .IP String
-All strings, mentioned in this documentation are ASCII encoded, and not
-nullterminated
+All strings are ASCII encoded, and not NUL terminated (quotes are for illustration only)
 .IP Values
-The actual values of the individual xpak entries are stored as Strings.
+The actual values of the individual xpak entries are stored as Strings
 .P
 .SS Vertical Bars
-The vertical bars '|' are not part of the file format, they are merely used to
+The vertical bars '|' are not part of the file format; they are merely used to
 illustrate how the offset values apply to the data.
-
 .SH SYNOPSIS
-
-.IP tarball
-     |<-xpak_offset->|
-.br
-<tar>|<    xpak     >|<xpak_offset>"STOP"
-
+.IP "binpkg (tbz2)"
+      |<-xpak_offset->|
+ <tar>|<    xpak     >|<xpak_offset>"STOP"
 .IP xpak
-"XPAKPACK"<index_len><data_len><index><data>"XPAKSTOP"
-
+ "XPAKPACK"<index_len><data_len><index><data>"XPAKSTOP"
 .IP index
-|<-------------index_len------------->|
-.br
-|<index1><index2><index3><index4><...>|
-
+ |<-------------index_len------------->|
+ |<index1><index2><index3><index4><...>|
 .IP indexN
-          |<-name_len->|
-.br
-<name_len>|<   name   >|<data_offset><data_len>
-
+           |<-name_len->|
+ <name_len>|<   name   >|<data_offset><data_len>
 .IP data
-|<--------------data_len------------->|
-.br
-|<-dataN_offset->|<-dataN_len->|
-.br
-|<     data     >|<  data_N   >|<data>|
+ |<--------------data_len------------->|
+ |<-dataN_offset->|<-dataN_len->|
+ |<     data     >|<  data_N   >|<data>|
+.SH DETAILS
+.SS xpak
 
-.SH DETAILED
-Every gentoo binary package has a xpak attached to it which contains build
-time information like the use flags it was built with, the ebuild it was
-built from, the environmental variables, CFLAGs, CXXFLAGs, ....
+If you look at a Gentoo binary package (binpkg) with a hex-editor you'll
+notice that after the tarball of files, you find a binary blob - the
+\fIxpak\fR, an offset which holds the bytes from the start of the
+\fIxpak\fR to the end of the file - \fIxpak_offset\fR and finally the
+String \fI"STOP"\fR.
 
-.SS xpak
+      |<xpak_offset>|
+ <tar>|<---xpak---->|<xpak_offset>"STOP"
+
+Here you see the \fItar\fR archive, the attached \fIxpak\fR blob, the 
+\fIxpak_offset\fR and the string \fI"STOP"\fR at the end.  This metadata
+is not considered "part" of the \fIxpak\fR, but rather part of the binpkg.
 
-If you look at a gentoo binary package (binpkg) with a hex-editor you'll
-notice the behinf the data, which belongs to the tarball you find a binary
-blob - the
-.I xpak
-, an offset which holds the bytes from the start of the
-.I xpak
-to the end of the file - 
-.I xpak_offset
-and finally the String
-.I "STOP".
-
-       |<xpak_offset>|
- <tbz2>|<---xpak---->|<xpak_offset>"STOP"|
-
-Here you see the 
-.I tbz2
-archive, and the attached 
-.I xpak
-blob, the 
-.I xpak-offset
-and
-the string
-.I "STOP"
-at the end.
-
-If we read the offset value and count
-.I offset
-bytes backwards from the start of
-.I xpak_offset
-, we have found the start of the
-.I xpak
-Block which starts with the String
-.I "XPAKPACK".
-This xpak block consists of the string
-.I "XPAKPACK"
-, the length of the 
-.I index
-block - 
-.I index-len
-, the length of the data block -
-.I data-len
-, an 
-.I index-len
-bytes long binary blob with the 
-.I index
-, a 
-.I data-len
-bytes long binary blob with the
-.I data
-and the string 
-.I "XPAKSTOP"
-at the end:
+If we read the offset value and count \fIoffset\fR bytes backwards from
+the start of \fIxpak_offset\fR, we have found the start of the \fIxpak\fR
+block which starts with the String \fI"XPAKPACK"\fR.
+
+This xpak block consists of the string \fI"XPAKPACK"\fR, the length of the
+\fIindex\fR block (\fIindex_len\fR), the length of the \fIdata\fR block
+(\fIdata_len\fR), an \fIindex_len\fR bytes long binary blob with the
+\fIindex\fR, a \fIdata_len\fR bytes long binary blob with the \fIdata\fR,
+and the string \fI"XPAKSTOP"\fR at the end:
 
                                 |<index_len>|<data_len>|
  "XPAKPACK"<index_len><data_len>|<--index-->|<--data-->|"XPAKSTOP"
 
-To actually get the 
-.I index
-and the
-.I data
-, we cut out
-.I index_len
-bytes after the end of 
-.I data_len
- for the index block and then cut out the next 
-.I data_len
-bytes for the data block. If we have done everything right up to this point,
-the following bytes would be the ASCII formatted string
-.I "XPAKSTOP"
-.
-
-The actual data is truncated into one big block - so if we want to read it we
-need the actual positions of each information in this big data block, this
+To actually get the \fIindex\fR and the \fIdata\fR, we cut out \fIindex_len\fR
+bytes after the end of \fIdata_len\fR for the \fIindex\fR block, and then cut
+out the next \fIdata_len\fR bytes for the \fIdata\fR block.  If we have done
+everything right up to this point, the following bytes would be the ASCII
+formatted string \fI"XPAKSTOP"\fR.
+
+The actual \fIdata\fR is merged into one big block; so if we want to read it,
+we need the actual positions of each information in this big data block.  This
 information can be obtained using the indices which are stored in the
-.I index
-block.
+\fIindex\fR block.
 
 .SS Index block
-The index block consists of several truncated index blocks:
+The \fIindex\fR block consists of several indices:
 
  |<-----------------------index_len---------------------->|
  |<index1><index2><index3><index4><index5><index6><index7>|
 
-The
-.I index
-block holds all information we need to find the data we want in the 
-.I data
-block. It consists of truncated index elements with a length
-.I index_len.
-Each of those index elements stands for one information in the data block and
-consists of the length of its name (
-.I name_len>
-), a 
-.I name_len
- bytes long string (the Name of the data block), this index belongs to, the
-offset of the 
-.I data
-block (
-.I data_offset
-) and the length of that data block (
-.I data_len
-):
+The \fIindex\fR block holds all the information we need to find the data we
+want in the \fIdata\fR block.  It consists of multiple index elements, all of
+which add up to the total length \fIindex_len\fR.  It is not zero delimited
+or anything else.
+
+Each of those elements corresponds to one chunk of data in the \fIdata\fR
+block: the length of that block's name (\fIname_len\fR), a \fIname_len\fR
+bytes long string, the offset of that block (\fIdataN_offset\fR) and the
+length of that block (\fIdataN_len\fR):
 
            |<name_len>|
  <name_len>|<--name-->|<dataN_offset><dataN_len>
 
 .SS Data block
-the data block contains truncated data blocks with a total length of
-.I data_len
-:
+The \fIdata\fR block contains multiple chunks of data with a total length of
+\fIdata_len\fR:
 
  |<------------------------data_len------------------------>|
  |<data1><data2><data3><data4><data5><data6><data7><data...>|
 
-This binary block is
-.I data_len
-bytes long and consists of truncated data.
-
-To select one data element, we need the
-.I data_offset
-and the
-.I data_len
-from
-the
-.I index
-, if we have those we can count
-.I data_offset
-bytes from the start of the
-.I data
-block, and then cut out the next
-.I data_len
-bytes. there we got our data block:
+To select one data element, we need the \fIdata_offset\fR and the
+\fIdata_len\fR from the \fIindex\fR.  With those, we can count
+\fIdata_offset\fR bytes from the start of the \fIdata\fR block,
+and then cut out the next \fIdata_len\fR bytes.  Then we got our
+data block:
 
  |<-----dataN_offset----->|<--dataN_len->|
  |<data1data2data3data...>|<data-we-want>|
+.SH EXAMPLES
+Let's say we have an xpak with two chunks of data.  The first has the name
+"file1" with the contents "ddDddDdd" and the second has the name "file2" with
+the contents "jjJjjJjj".  There is no \fI"STOP"\fR or \fIxpak_offset\fR as
+this xpak is not part of a binpkg.
+
+Here is the hexdump output (we will break it down line by line below):
+ 00  58 50 41 4b 50 41 43 4b  00 00 00 20 00 00 00 10  |XPAKPACK... ....|
+ 10  00 00 00 04 66 69 6c 31  00 00 00 00 00 00 00 08  |....fil1........|
+ 20  00 00 00 04 66 69 6c 32  00 00 00 08 00 00 00 08  |....fil2........|
+ 30  64 64 44 64 64 44 64 64  6a 6a 4a 6a 6a 4a 6a 6a  |ddDddDddjjJjjJjj|
+ 40  58 50 41 4b 53 54 4f 50                           |XPAKSTOP|
+
+The \fIindex_len\fR is 32 and the \fIdata_len\fR 16 (as there are 16 bytes:
+"ddDddDdd" and "jjJjjJjj").
+    |<------"XPAKPACK"----->||    32     |    16     |
+ 00  58 50 41 4b 50 41 43 4b  00 00 00 20 00 00 00 10
+
+Now we have the first index element with a \fIname_len\fR of 4, followed
+by the name string "fil1", followed by the data1 offset of 0 and a data1
+len of 8 (since data1 has 8 bytes: "ddDddDdd").
+    |     4     |<--"fil1"->||data1_off:0|data1_len:8|
+ 10  00 00 00 04 66 69 6c 31  00 00 00 00 00 00 00 08
+
+Now we have the second index element with a \fIname_len\fR of 4, followed
+by the name string "fil2", followed by the data2 offset of 8 and a data2
+len of 8 (since data2 has 8 bytes: "jjJjjJjj").
+    |     4     |<--"fil2"->||data2_off:8|data2_len:8|
+ 20  00 00 00 04 66 69 6c 32  00 00 00 08 00 00 00 08
+
+    |<------"XPAKSTOP"----->|
+ 40  58 50 41 4b 53 54 4f 50
 .SH AUTHORS
+.nf
 Lars Hartmann <lars@chaotika.org>
+Mike Frysinger <vapier@gentoo.org>
+.fi
 .SH "SEE ALSO"
 .BR qtbz2 (1),
 .BR quickpkg (1),

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     f64ce9b20d5db158cd231691da97580595c1f518
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 23 17:56:15 2011 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Fri Sep 23 17:56:15 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=f64ce9b2

man/emerge.1: fix spelling of behavior

---
 man/emerge.1 |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/man/emerge.1 b/man/emerge.1
index 4ec0251..62bfd5e 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -1,4 +1,4 @@
-.TH "EMERGE" "1" "May 2011" "Portage VERSION" "Portage"
+.TH "EMERGE" "1" "Sept 2011" "Portage VERSION" "Portage"
 .SH "NAME"
 emerge \- Command\-line interface to the Portage system
 .SH "SYNOPSIS"
@@ -308,7 +308,7 @@ disable this option by default in \fBmake.conf\fR(5).
 If \-\-autounmask is enabled, keyword and mask changes
 using the \'=\' operator will be written. With this
 option, \'>=\' operators will be used whenever possible.
-USE and license changes always use the latter behvior.
+USE and license changes always use the latter behavior.
 .TP
 .BR "\-\-autounmask\-keep\-masks [ y | n ]"
 If \-\-autounmask is enabled, no package.unmask or ** keyword changes

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     68462daca775701f090cf9fc442310512c585e6b
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 13 06:06:50 2011 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Tue Sep 13 06:06:50 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=68462dac

man/portage.5: layout.conf examples manifests

---
 man/portage.5 |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/man/portage.5 b/man/portage.5
index b783f62..2af6676 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -777,6 +777,10 @@ precedence over settings in \fBlayout.conf\fR, except tools such as
 masters = gentoo java-overlay
 # indicate that this repo can be used as a substitute for foo-overlay
 aliases = foo-overlay
+# do not sign manifests in this repo
+sign\-manifests = false
+# thin\-manifests only contain DIST entries
+thin\-manifests = true
 .fi
 .RE
 .TP

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     fec1b3e25dc5f278913384b88cfea2697eb7954d
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 31 18:07:05 2011 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Wed Aug 31 18:07:05 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=fec1b3e2

make.conf.5: bump date stamp

---
 man/make.conf.5 |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/man/make.conf.5 b/man/make.conf.5
index ac49c88..3f3efae 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -1,4 +1,4 @@
-.TH "MAKE.CONF" "5" "Jul 2011" "Portage VERSION" "Portage"
+.TH "MAKE.CONF" "5" "August 2011" "Portage VERSION" "Portage"
 .SH "NAME"
 make.conf \- custom settings for Portage
 .SH "SYNOPSIS"

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     a3c1e7f0c05f7be8507453324e178d041cb88796
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 22 20:35:59 2011 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Aug 22 20:35:59 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=a3c1e7f0

make.conf.5: document EMERGE_WARNING_DELAY

---
 man/make.conf.5 |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/man/make.conf.5 b/man/make.conf.5
index d83258c..76f32f7 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -182,6 +182,12 @@ Controls the location of emerge.log and emerge-fetch.log.
 .br
 Defaults to /var/log.
 .TP
+\fBEMERGE_WARNING_DELAY\fR = \fIinteger\fR
+Determines how long the countdown delay will be after running
+`emerge --unmerge` for a system package.
+.br
+Defaults to 10 seconds.
+.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.

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     d334784c83f65b75c5b0f12f1b6294e522107ae6
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Fri Jul  8 16:56:53 2011 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Fri Jul  8 16:56:53 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=d334784c

ebuild.5: remove hasq docs for bug #199722

---
 man/ebuild.5 |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index 20117e0..0ad5da1 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -1,4 +1,4 @@
-.TH "EBUILD" "5" "May 2011" "Portage VERSION" "Portage"
+.TH "EBUILD" "5" "Jul 2011" "Portage VERSION" "Portage"
 .SH "NAME"
 ebuild \- the internal format, variables, and functions in an ebuild script
 .SH "DESCRIPTION"
@@ -841,10 +841,10 @@ Same as \fBuse_with\fR above, except that the configure options are
 argument is recognized. In \fBEAPI 3\fR and earlier, an empty
 \fIconfigure opt\fR argument is treated as if it weren't provided.
 .TP
-\fBhas\fR \fI<item>\fR \fI<item list>\fR
-If \fIitem\fR is in \fIitem list\fR, then \fIitem\fR is echoed and \fBhas\fR
+\fBhasv\fR \fI<item>\fR \fI<item list>\fR
+If \fIitem\fR is in \fIitem list\fR, then \fIitem\fR is echoed and \fBhasv\fR
 returns 0.  Otherwise, nothing is echoed and 1 is returned. As indicated with
-use, there is a non\-echoing version \fBhasq\fR. Please use \fBhasq\fR in all
+use, there is a non\-echoing version \fBhas\fR. Please use \fBhas\fR in all
 places where output is to be disregarded. Never use the output for calculation.
 .br
 The \fIitem list\fR is delimited by the \fIIFS\fR variable.  This variable

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     2490f6e8f122fe2c30f1f97d85dae5594028988d
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Thu Jul  7 08:10:15 2011 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Thu Jul  7 08:10:15 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=2490f6e8

make.conf.5: fix grammar

---
 man/make.conf.5 |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/man/make.conf.5 b/man/make.conf.5
index 5206f2e..e0cb07c 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -199,7 +199,7 @@ should not be disabled by default.
 .RS
 .TP
 .B allow\-missing\-manifests
-Allow missing manifest entries. This primarily useful for temporary
+Allow missing manifest entries. This is primarily useful for temporary
 trees or instances where manifests aren't used.
 .TP
 .B assume\-digests

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     ba059b888a124269df460f82ef8b30f269dd3c50
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 19 19:44:21 2011 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Jun 19 19:44:21 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=ba059b88

portage.5: document more repo-level config files

At the repository level, package.mask has been supported for some time.
Support for use.force, package.use.force, use.mask and package.use.mask
was recently added in commit 96ab7b436ceb3543f5158aab1fab48470c3f0b98.

---
 man/portage.5 |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/man/portage.5 b/man/portage.5
index 547d996..61f4623 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -82,11 +82,16 @@ info_pkgs
 info_vars
 license_groups
 package.mask
+package.unmask
+package.use.force
+package.use.mask
 profiles.desc
 repo_name
 thirdpartymirrors
 use.desc
+use.force
 use.local.desc
+use.mask
 .fi
 .TP
 .BR /usr/share/portage/config/

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     ffbaba42bebda213154dbba32e32c245c19e16b2
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  9 22:08:29 2011 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Thu Jun  9 22:08:29 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=ffbaba42

portage.5: doc repo and wildcard atom extensions

---
 man/portage.5 |   51 ++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 46 insertions(+), 5 deletions(-)

diff --git a/man/portage.5 b/man/portage.5
index ece47e5..35dcc2b 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -115,14 +115,55 @@ more detailed explanations.
 .B DEPEND atom
 An atom is either of the form category/package or consists of an operator
 followed by category/package followed by a hyphen and a version specification.
-An atom might be prefixed by a slot specification.
-The extended atom syntax allows atoms of the form category/package, where an
-arbitrary number of characters has been replaced by a '*'. An extended atom may contain
-more than one '*', but not two next to each other. The extend atom syntax is only
-available in user configuration files and for some command line options.
+An atom might be suffixed by a slot specification.
 .br
 More reading: 
 .BR ebuild (5)
+
+.B Extended Atom Syntax
+.br
+The following atom syntax extensions that are only supported in user
+configuration files and command line arguments for programs such as
+\fBemerge(1)\fR:
+.RS
+.TP
+.B Repository Constraints
+Atoms with repository constraints have a '::' separator appended to the
+right side, followed by a repository name. Each repository name should
+correspond to the value of a \fBrepo_name\fR entry from one of the
+repositories that is configured via the \fBPORTDIR\fR or
+\fBPORTDIR_OVERLAY\fR variables (see \fBmake.conf\fR(5)).
+
+.I Examples:
+.nf
+# match sed from the 'gentoo' repository
+sys\-apps/sed::gentoo
+# match kdelibs from the 'kde\-testing' repository
+kde\-base/kdelibs::kde\-testing
+# match empathy from the 'gnome' repository
+net\-im/empathy::gnome
+.fi
+.TP
+.B Wildcard Patterns
+Atoms containing wildcard patterns are of the form category/package, where
+the special '*' wildcard character substitutes for an arbitrary number
+of normal characters. More than one '*' character is allowed, but not two
+next to each other.
+
+.I Examples:
+.nf
+# match anything from the 'sys\-apps' category
+sys\-apps/*
+# match packages named 'zlib' from any category
+*/zlib
+# match any package from a category that begins with 'net\-'
+net\-*/*
+# match any package name from any category
+*/*
+# match any package from the 'gentoo' repository
+*/*::gentoo
+.fi
+.RE
 .TP
 .B KEYWORD
 Each architecture has a unique KEYWORD.

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     e8cd26c8a67236742e4187fa4bccf4731876ed23
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Mon May 30 22:26:30 2011 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon May 30 22:26:30 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=e8cd26c8

man/ebuild.5: document DOCS variable for EAPI 4

This will fix bug #369383.

---
 man/ebuild.5 |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index 87f658d..bc5680f 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -552,6 +552,12 @@ This variable should only be used when a package provides a virtual target.
 For example, blackdown\-jdk and sun\-jdk provide \fIvirtual/jdk\fR.  This
 allows for packages to depend on \fIvirtual/jdk\fR rather than on blackdown
 or sun specifically.
+.TP
+\fBDOCS\fR
+Beginning with \fBEAPI 4\fR, an array or space\-delimited list of documentation
+files for the default src_install function to install using dodoc. If
+undefined, a reasonable default list is used. See the documentation for
+src_install below.
 .SH "QA CONTROL VARIABLES"
 .TP
 .B USAGE NOTES

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     be895ebfb1fe666696f6925327999554e488be26
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Thu May 26 18:32:26 2011 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Thu May 26 18:32:26 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=be895ebf

man/emerge.1: refer to ebuild(5) for atom syntax

---
 man/emerge.1 |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/man/emerge.1 b/man/emerge.1
index 0760e52..0129347 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -77,7 +77,7 @@ available package sets.
 .TP
 .BR atom
 An \fIatom\fR describes bounds on a package that you wish to install.  
-\fISee portage(5) for the details on atom syntax.\fR  For example, 
+\fISee ebuild(5) for the details on atom syntax.\fR  For example,
 \fB>=dev\-lang/python\-2.2.1\-r2\fR matches the latest available version of 
 Python greater than or equal to 2.2.1\-r2.  Similarly, 
 \fB<dev\-lang/python\-2.0\fR matches the latest available version of Python 

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     d3abb4f75f5bae0651eb72f1521be27ccf56fa85
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 22 17:57:25 2011 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Tue Feb 22 17:57:25 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=d3abb4f7

emerge.1: escape hyphens

---
 man/emerge.1 |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/man/emerge.1 b/man/emerge.1
index dd26d52..42bd398 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -372,7 +372,7 @@ required.
 .TP
 .BR "\-\-depclean\-lib\-check [ y | n ]"
 Account for library link-level dependencies during
-\fB-\-depclean\fR and \fB-\-prune\fR actions. This
+\fB\-\-depclean\fR and \fB\-\-prune\fR actions. This
 option is enabled by default. In some cases this can
 be somewhat time\-consuming.
 .TP

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     140dc44ad476dcabec965cd822f50180add8ca04
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 22 17:30:09 2011 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Tue Feb 22 17:30:09 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=140dc44a

emerge.1: mention revdep-rebuild in depclean docs

---
 man/emerge.1 |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/man/emerge.1 b/man/emerge.1
index 7b27089..dd26d52 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -120,7 +120,11 @@ always be kept. They can be manually added to this set with \fIemerge
 \-\-noreplace <atom>\fR. As a safety measure, depclean will not remove any
 packages unless *all* required dependencies have been resolved. As a
 consequence, it is often necessary to run \fIemerge \-\-update \-\-newuse
-\-\-deep @world\fR prior to depclean. 
+\-\-deep @world\fR prior to depclean. Also note that
+depclean may break link level dependencies, especially when the
+\fB\-\-depclean\-lib\-check\fR option is disabled. Thus, it is
+recommended to use a tool such as \fBrevdep-rebuild\fR(1)
+in order to detect such breakage.
 
 \fBWARNING:\fR
 Inexperienced users are advised to use \fB\-\-pretend\fR with this

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     435c74008fff2c76437cbb59d7b6ad0f68dabcde
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 22 02:19:45 2011 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Tue Feb 22 02:19:45 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=435c7400

emerge.1: fix arg description more for bug 354137

---
 man/emerge.1 |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/man/emerge.1 b/man/emerge.1
index 311ce75..7b27089 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -89,8 +89,9 @@ to get around escaping problems.
 .BR "No action"
 If no action is specified, the action is to merge in the specified
 packages, satisfying any dependencies that they may have.  The
-arguments can be \fIebuilds\fR, \fItbz2s\fR, \fIsets\fR, or
-\fIatoms\fR.  \fBNote that you need to use the \-\-usepkg 
+arguments can be \fIatoms\fR, \fIsets\fR, installed \fIfiles\fR,
+\fIebuilds\fR, or \fItbz2s\fR.
+\fBNote that you need to use the \-\-usepkg
 option if you want to install a tbz2\fR.  The packages are added
 to the \fBworld\fR file at the end, so that they are considered for
 later updating.

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     c2938a7fb389440460250e36c18049528e8157b8
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 13 08:56:42 2011 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Feb 13 08:56:42 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=c2938a7f

ebuild.1: update outdated BUILD_PREFIX docs

This will fix bug #354387.

---
 man/ebuild.1 |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/man/ebuild.1 b/man/ebuild.1
index 1795a8b..cb6ebc2 100644
--- a/man/ebuild.1
+++ b/man/ebuild.1
@@ -39,8 +39,8 @@ this particular ebuild file.  The temporary build directory normally
 contains the extracted source files as well as a possible
 "install image" (all the files that will be merged to the local
 filesystem or stored in a package).  The location of the build
-directory is set by the BUILD_PREFIX variable.  For information
-on what this variable is, run \fIemerge [\-v] info\fR, or to override
+directory is set by the PORTAGE_TMPDIR variable.  For information
+on what this variable is, run \fIemerge \-\-info\fR, or to override
 this variable, see \fBmake.conf\fR(5).
 
 Note: Portage cleans up almost everything after a package has been

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     88249c4a47c0354724f1d7e387c1695e4953e2d6
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Tue Feb  8 19:52:03 2011 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Tue Feb  8 19:52:03 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=88249c4a

emerge.1: clarify docs for package arguments

This will fix bug #354137.

---
 man/emerge.1 |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/man/emerge.1 b/man/emerge.1
index 5a18a9c..42b26cd 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -28,8 +28,9 @@ and binary packages, and it can be used to create binary packages for
 distribution.
 .SH "EBUILDS, TBZ2S, SETS AND ATOMS"
 \fBemerge\fR primarily installs packages.  You can specify
-packages to install in one of four main ways: an \fIebuild\fR,
-a \fItbz2file\fR, a \fIset\fR, or an \fIatom\fR.
+packages to install in five possible ways: an \fIatom\fR,
+a \fIset\fR, an installed \fIfile\fR, an \fIebuild\fR, or
+a \fItbz2file\fR.
 .LP
 .TP
 .BR ebuild
@@ -52,8 +53,9 @@ A \fItbz2file\fR must be a valid .tbz2 created with \fBebuild
 .TP
 .BR file
 A \fIfile\fR must be a file or directory that has been installed by one or
-more packages. For directories that are owned by multiple packages, all
-owning packages to be selected. See the portageq(1) owners command if you
+more packages. If an absolute path is not used, then it must begin with
+either "./" or "../". For directories that are owned by multiple packages, all
+owning packages will be selected. See the portageq(1) owners command if you
 would like to query the owners of one or more files or directories.
 .TP
 .BR set

[gentoo-commits] proj/portage:master commit in: man/

[Zac Medico]

commit:     331fa3035656b94a8ea8c56b915d43b81651f50f
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Mon Feb  7 21:25:42 2011 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Feb  7 21:25:42 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=331fa303

ebuild.5: fix spelling of "defaults"

---
 man/ebuild.5 |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/man/ebuild.5 b/man/ebuild.5
index 94d65f5..5aecefd 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -382,7 +382,7 @@ foo[!bar=]	bar? ( foo[\-bar] ) !bar? ( foo[bar] )
 .TE
 .RE
 .TP
-.B Atom USE defauts
+.B Atom USE defaults
 Beginning with \fBEAPI 4\fR, \fBUSE\fR dependencies may specify default
 assumptions about values for flags that may or may not be missing from
 the \fBIUSE\fR of the matched package. Such defaults are specified by