diff options
| author | Zac Medico <zmedico@gentoo.org> | 2012-08-29 13:23:22 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2012-08-29 13:23:22 -0700 |
| commit | 78ba7f0d3a3a2defdf9807ef2e8138965490a2fc (patch) | |
| tree | 10a549acf3569d3104291e38927cd8318318da09 /man | |
| parent | 9f14ed80e65a18da06e0834961ea032e3e830319 (diff) | |
| download | portage-78ba7f0d3a3a2defdf9807ef2e8138965490a2fc.tar.gz portage-78ba7f0d3a3a2defdf9807ef2e8138965490a2fc.tar.bz2 portage-78ba7f0d3a3a2defdf9807ef2e8138965490a2fc.zip | |
Rename slot-abi stuff to refer to slot-operator.
This makes it consistent with the language in the PMS eapi-5 branch:
http://git.overlays.gentoo.org/gitweb/?p=proj/pms.git;a=commit;h=5d6749ac9e5ddc5b1daaad7737b65fa81c6ece47
Diffstat (limited to 'man')
| -rw-r--r-- | man/emerge.1 | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/man/emerge.1 b/man/emerge.1 index 7aa46226c..36e346996 100644 --- a/man/emerge.1 +++ b/man/emerge.1 @@ -485,12 +485,12 @@ remote server are preferred over local packages if they are not identical. .BR "\-\-ignore-default-opts" Causes \fIEMERGE_DEFAULT_OPTS\fR (see \fBmake.conf\fR(5)) to be ignored. .TP -.BR "\-\-ignore\-built\-slot\-abi\-deps < y | n >" -Ignore the SLOT/ABI := operator parts of dependencies that have +.BR "\-\-ignore\-built\-slot\-operator\-deps < y | n >" +Ignore the slot/sub\-slot := operator parts of dependencies that have been recorded when packages where built. This option is intended only for debugging purposes, and it only affects built packages -that specify SLOT/ABI := operator dependencies using the -experimental "4\-slot\-abi" EAPI. +that specify slot/sub\-slot := operator dependencies using the +experimental "4\-slot\-abi" or "5_pre1" EAPIs. .TP .BR "-j [JOBS], \-\-jobs[=JOBS]" Specifies the number of packages to build simultaneously. If this option is @@ -645,13 +645,13 @@ 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 "\-\-rebuild\-if\-new\-slot\-abi [ y | n ]" -Automatically rebuild or reinstall packages when SLOT/ABI := +.BR "\-\-rebuild\-if\-new\-slot [ y | n ]" +Automatically rebuild or reinstall packages when slot/sub\-slot := operator dependencies can be satisfied by a newer slot, so that older packages slots will become eligible for removal by the \-\-depclean action as soon as possible. This option only -affects packages that specify SLOT/ABI dependencies using the -experimental "4\-slot\-abi" EAPI. Since this option requires +affects packages that specify slot/sub\-slot := dependencies using the +experimental "4\-slot\-abi" or "5_pre1" EAPIs. 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. |