From f1033d724465291c2afb9e0c80cfad23572b1b95 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Thu, 21 Jun 2007 05:41:14 +0000 Subject: [PATCH] make PDEPEND wording less restrictive #172511 and clarify install status wrt ||() as noted by ferringb (trunk r6324) svn path=/main/branches/2.1.2/; revision=6904 --- man/ebuild.5 | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/man/ebuild.5 b/man/ebuild.5 index 47cadfb76..006204387 100644 --- a/man/ebuild.5 +++ b/man/ebuild.5 @@ -279,9 +279,9 @@ appropriate, this syntax can easily be used. .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. +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. @@ -295,9 +295,12 @@ interfaces, but it can only ever have just one. .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. +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 .RE @@ -310,8 +313,8 @@ defaults to the value of \fBDEPEND\fR. You may use the same syntax to vary dependencies as seen above in \fBDEPEND\fR. .TP \fBPDEPEND\fR -This should contain a list of all packages that will have to be installed after -the program has been merged. +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. .TP -- 2.26.2