Merge tag 'v2.2.10' into prefix

Conflicts:
	pym/portage/dbapi/bintree.py

3 files changed, 24 insertions, 67 deletions

diff --git a/man/emerge.1 b/man/emerge.1
index b8b210e8c..f887bf723 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -1,4 +1,4 @@
-.TH "EMERGE" "1" "Jan 2014" "Portage VERSION" "Portage"
+.TH "EMERGE" "1" "Mar 2014" "Portage VERSION" "Portage"
 .SH "NAME"
 emerge \- Command\-line interface to the Portage system
 .SH "SYNOPSIS"
@@ -553,6 +553,11 @@ 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 "
+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)
 Tells emerge to include installed packages where USE
 flags have changed since compilation. This option
@@ -853,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
diff --git a/man/make.conf.5 b/man/make.conf.5
index 2785fe60e..2f934bcf2 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -395,7 +395,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
diff --git a/man/portage.5 b/man/portage.5
index 50905291c..e399f0fca 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -1,4 +1,4 @@
-.TH "PORTAGE" "5" "Jan 2014" "Portage VERSION" "Portage"
+.TH "PORTAGE" "5" "Feb 2014" "Portage VERSION" "Portage"
 .SH NAME
 portage \- the heart of Gentoo
 .SH "DESCRIPTION"
@@ -800,9 +800,7 @@ since operations performed by these tools are inherently
 Specifies names of attributes, which should be forcefully respected by
 \fBegencache\fR(1), \fBemirrordist\fR(1) and \fBrepoman\fR(1).
 .br
-Valid values: aliases, eclass\-masters, eclass\-overrides, masters,
-package.mask\-masters, use.aliases\-masters, use.force\-masters,
-use.mask\-masters
+Valid values: aliases, eclass\-overrides, masters
 .RE
 
 .I Attributes supported in sections of repositories:
@@ -836,24 +834,21 @@ since operations performed by these tools are inherently
 Specifies names of attributes, which should be forcefully respected by
 \fBegencache\fR(1), \fBemirrordist\fR(1) and \fBrepoman\fR(1).
 .br
-Valid values: aliases, eclass\-masters, eclass\-overrides, masters,
-package.mask\-masters, use.aliases\-masters, use.force\-masters,
-use.mask\-masters
+Valid values: aliases, eclass\-overrides, masters
 .TP
 .B location
 Specifies location of given repository.
 .TP
-.B masters, eclass\-masters, package.mask\-masters, use.aliases\-masters, use.force\-masters, use.mask\-masters
-Specifies master repositories of given repository. See documentation of
-\fBlayout.conf\fR file for more details.
+.B masters
+Specifies master repositories of given repository.
 .br
-Setting these attribute is generally not recommended since resulting changes
+Setting this attribute is generally not recommended since resulting changes
 in eclass inheritance may trigger performance issues due to invalidation
 of metadata cache.
 .br
-When 'force = ${attribute}' (e.g. 'force = masters') attribute is not set,
-\fBegencache\fR(1), \fBemirrordist\fR(1) and \fBrepoman\fR(1) ignore given
-attribute, since operations performed by these tools are inherently
+When 'force = masters' attribute is not set, \fBegencache\fR(1),
+\fBemirrordist\fR(1) and \fBrepoman\fR(1) ignore this attribute,
+since operations performed by these tools are inherently
 \fBnot\fR \fIsite\-specific\fR.
 .TP
 .B priority
@@ -991,10 +986,9 @@ Specifies information about the repository layout.
 \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\-masters", "eclass\-overrides", "masters",
-"package.mask\-masters", "use.aliases\-masters", "use.force\-masters" and
-"use.mask\-masters" attributes set in \fBrepos.conf\fR since their operations
-are inherently \fBnot\fR \fIsite\-specific\fR.
+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
@@ -1002,7 +996,7 @@ are inherently \fBnot\fR \fIsite\-specific\fR.
 \- attributes are specified in "${attribute} = ${value}" format
 .fi
 
-.I Supported attributes:
+.I Supported attributes.
 .RS
 .RS
 .TP
@@ -1015,14 +1009,6 @@ List of EAPIs which are not allowed in this repo.
 .BR eapis\-deprecated
 List of EAPIs which are allowed but generate warnings when used.
 .TP
-.BR eclass\-masters
-Names of repositories wherefrom eclasses can be inherited.
-.br
-This attribute overrides \fBmasters\fR attribute and should be used only when
-there is a need to set this attribute to a different value than value of
-\fBmasters\fR attribute. See documentation of \fBmasters\fR attribute for more
-details.
-.TP
 .BR masters
 Names of repositories which satisfy dependencies on eclasses and from which
 settings specified in various repository\-level files (\fBpackage.mask\fR,
@@ -1032,15 +1018,6 @@ the repositories that is configured in \fBrepos.conf\fR file. Repositories
 listed toward the right of the \fBmasters\fR list take precedence over those
 listed toward the left of the list.
 .TP
-.BR package.mask-masters
-Names of repositories wherefrom settings specified in repository\-level
-\fBpackage.mask\fR files are inherited.
-.br
-This attribute overrides \fBmasters\fR attribute and should be used only when
-there is a need to set this attribute to a different value than value of
-\fBmasters\fR attribute. See documentation of \fBmasters\fR attribute for more
-details.
-.TP
 .BR repo\-name " = <value of profiles/repo_name>"
 The name of this repository (overrides profiles/repo_name if it exists).
 .TP
@@ -1053,35 +1030,6 @@ Boolean value whether we should sign Manifest files in this repo.
 .BR thin\-manifests " = [true|" false "]"
 Boolean value whether Manifest files contain only DIST entries.
 .TP
-.BR use.aliases\-masters
-Names of repositories wherefrom settings specified in repository\-level
-\fBpackage.use.aliases\fR and \fBuse.aliases\fR files are inherited.
-.br
-This attribute overrides \fBmasters\fR attribute and should be used only when
-there is a need to set this attribute to a different value than value of
-\fBmasters\fR attribute. See documentation of \fBmasters\fR attribute for more
-details.
-.TP
-.BR use.force\-masters
-Names of repositories wherefrom settings specified in repository\-level
-\fBpackage.use.force\fR, \fBpackage.use.stable.force\fR, \fBuse.force\fR and
-\fBuse.stable.force\fR files are inherited.
-.br
-This attribute overrides \fBmasters\fR attribute and should be used only when
-there is a need to set this attribute to a different value than value of
-\fBmasters\fR attribute. See documentation of \fBmasters\fR attribute for more
-details.
-.TP
-.BR use.mask\-masters
-Names of repositories wherefrom settings specified in repository\-level
-\fBpackage.use.mask\fR, \fBpackage.use.stable.mask\fR, \fuse.mask\fR and
-\fBuse.stable.mask\fR files are inherited.
-.br
-This attribute overrides \fBmasters\fR attribute and should be used only when
-there is a need to set this attribute to a different value than value of
-\fBmasters\fR attribute. See documentation of \fBmasters\fR attribute for more
-details.
-.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"