From a2e36694d14cc895592b36ba812e55f5cfdd9923 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Mon, 24 Sep 2012 14:01:11 -0700 Subject: [PATCH] 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 ad73034a8..fc06eee65 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 5861bb652..4720e2623 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 -- 2.26.2