1 |
commit: cb078394988d60e5ff231712163255abebc2fc22 |
2 |
Author: Alexander Berntsen <alexander <AT> plaimi <DOT> net> |
3 |
AuthorDate: Tue Jul 30 18:53:51 2013 +0000 |
4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jul 30 19:10:27 2013 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=cb078394 |
7 |
|
8 |
man: Remove trailing spaces |
9 |
|
10 |
--- |
11 |
man/dispatch-conf.1 | 2 +- |
12 |
man/ebuild.1 | 4 +- |
13 |
man/ebuild.5 | 8 +-- |
14 |
man/emaint.1 | 2 +- |
15 |
man/emerge.1 | 154 ++++++++++++++++++++++++++-------------------------- |
16 |
man/env-update.1 | 6 +- |
17 |
man/etc-update.1 | 2 +- |
18 |
man/make.conf.5 | 64 +++++++++++----------- |
19 |
man/portage.5 | 152 +++++++++++++++++++++++++-------------------------- |
20 |
man/quickpkg.1 | 14 ++--- |
21 |
man/xpak.5 | 2 +- |
22 |
11 files changed, 205 insertions(+), 205 deletions(-) |
23 |
|
24 |
diff --git a/man/dispatch-conf.1 b/man/dispatch-conf.1 |
25 |
index e16d49c..3a5264a 100644 |
26 |
--- a/man/dispatch-conf.1 |
27 |
+++ b/man/dispatch-conf.1 |
28 |
@@ -24,7 +24,7 @@ None. |
29 |
\fIdispatch\-conf\fR must be run as root, since the config files to be |
30 |
replaced are generally owned by root. Before running \fIdispatch\-conf\fR |
31 |
for the first time the settings in \fB/etc/dispatch\-conf.conf\fR |
32 |
-should be edited and the archive directory specified in |
33 |
+should be edited and the archive directory specified in |
34 |
\fB/etc/dispatch\-conf.conf\fR will need to be created. All changes to |
35 |
config files will be saved in the archive directory either as patches |
36 |
or using rcs, making restoration to an earlier version rather simple. |
37 |
|
38 |
diff --git a/man/ebuild.1 b/man/ebuild.1 |
39 |
index bc9d31b..4bde66e 100644 |
40 |
--- a/man/ebuild.1 |
41 |
+++ b/man/ebuild.1 |
42 |
@@ -74,7 +74,7 @@ for all of the files listed in SRC_URI for each ebuild. For further |
43 |
information regarding the behavior of this command, see the documentation for |
44 |
the \fIassume\-digests\fR value of the \fBFEATURES\fR variable in |
45 |
\fBmake.conf\fR(5). See the \fB\-\-force\fR option if you would like to |
46 |
-prevent digests from being assumed. |
47 |
+prevent digests from being assumed. |
48 |
.TP |
49 |
.BR unpack |
50 |
Extracts the sources to a subdirectory in the \fIbuild directory\fR |
51 |
@@ -112,7 +112,7 @@ current working directory will be set to ${S}. When src_compile() |
52 |
completes, the sources should be fully compiled. |
53 |
.TP |
54 |
.BR test |
55 |
-Runs package-specific test cases to verify that everything was built |
56 |
+Runs package-specific test cases to verify that everything was built |
57 |
properly. |
58 |
.TP |
59 |
.BR preinst |
60 |
|
61 |
diff --git a/man/ebuild.5 b/man/ebuild.5 |
62 |
index 10ef4ee..a9f3498 100644 |
63 |
--- a/man/ebuild.5 |
64 |
+++ b/man/ebuild.5 |
65 |
@@ -28,7 +28,7 @@ Examples: |
66 |
.TP |
67 |
.B Atom Versions |
68 |
It is nice to be more specific and say that only certain versions of atoms are |
69 |
-acceptable. Note that versions must be combined with a prefix (see below). |
70 |
+acceptable. Note that versions must be combined with a prefix (see below). |
71 |
Hence you may add a version number as a postfix to the base. |
72 |
|
73 |
Examples: |
74 |
@@ -41,9 +41,9 @@ Examples: |
75 |
Versions are normally made up of two or three numbers separated by periods, |
76 |
such as 1.2 or 4.5.2. This string may be followed by a character such as 1.2a |
77 |
or 4.5.2z. Note that this letter is \fInot\fR meant to indicate alpha, beta, |
78 |
-etc... status. For that, use the optional suffix; either _alpha, _beta, _pre |
79 |
-(pre\-release), _rc (release candidate), or _p (patch). This means for the |
80 |
-3rd pre\-release of a package, you would use something like 1.2_pre3. The |
81 |
+etc... status. For that, use the optional suffix; either _alpha, _beta, _pre |
82 |
+(pre\-release), _rc (release candidate), or _p (patch). This means for the |
83 |
+3rd pre\-release of a package, you would use something like 1.2_pre3. The |
84 |
suffixes here can be arbitrarily chained without limitation. |
85 |
.TP |
86 |
.B Atom Prefix Operators [> >= = <= <] |
87 |
|
88 |
diff --git a/man/emaint.1 b/man/emaint.1 |
89 |
index 3fae5c2..8356299 100644 |
90 |
--- a/man/emaint.1 |
91 |
+++ b/man/emaint.1 |
92 |
@@ -39,7 +39,7 @@ Perform package move updates for installed packages. |
93 |
.TP |
94 |
.BR world |
95 |
Fix problems in the \fIworld\fR file. |
96 |
-.SH DEFAULT OPTIONS |
97 |
+.SH DEFAULT OPTIONS |
98 |
.TP |
99 |
.B \-c, \-\-check |
100 |
Check for any problems that may exist. (all commands) |
101 |
|
102 |
diff --git a/man/emerge.1 b/man/emerge.1 |
103 |
index 66f4360..4511414 100644 |
104 |
--- a/man/emerge.1 |
105 |
+++ b/man/emerge.1 |
106 |
@@ -49,7 +49,7 @@ so this syntax shouldn't be used. |
107 |
.TP |
108 |
.BR tbz2file |
109 |
A \fItbz2file\fR must be a valid .tbz2 created with \fBebuild |
110 |
-<package>\-<version>.ebuild package\fR or \fBemerge \-\-buildpkg |
111 |
+<package>\-<version>.ebuild package\fR or \fBemerge \-\-buildpkg |
112 |
[category/]<package>\fR or \fBquickpkg /var/db/pkg/<category>/<package>\fR. |
113 |
.TP |
114 |
.BR file |
115 |
@@ -73,19 +73,19 @@ on the current configuration. The default set configuration is located |
116 |
in the \fB/usr/share/portage/config/sets\fR directory. |
117 |
User sets may be created by placing files in the \fB/etc/portage/sets/\fR |
118 |
directory (see \fBportage\fR(5)). Note that a \fIset\fR |
119 |
-is generally used in conjunction with \fB\-\-update\fR. When used as |
120 |
+is generally used in conjunction with \fB\-\-update\fR. When used as |
121 |
arguments to \fBemerge\fR sets have to be prefixed with \fB@\fR to be |
122 |
recognized. Use the \fB\-\-list\-sets\fR action to display a list of |
123 |
available package sets. |
124 |
.TP |
125 |
.BR atom |
126 |
-An \fIatom\fR describes bounds on a package that you wish to install. |
127 |
+An \fIatom\fR describes bounds on a package that you wish to install. |
128 |
\fISee ebuild(5) for the details on atom syntax.\fR For example, |
129 |
-\fB>=dev\-lang/python\-2.2.1\-r2\fR matches the latest available version of |
130 |
-Python greater than or equal to 2.2.1\-r2. Similarly, |
131 |
-\fB<dev\-lang/python\-2.0\fR matches the latest available version of Python |
132 |
-before 2.0. Note that in many shells you will need to escape characters such |
133 |
-as '<' and '='; use single\- or double\-quotes around the \fIatom\fR |
134 |
+\fB>=dev\-lang/python\-2.2.1\-r2\fR matches the latest available version of |
135 |
+Python greater than or equal to 2.2.1\-r2. Similarly, |
136 |
+\fB<dev\-lang/python\-2.0\fR matches the latest available version of Python |
137 |
+before 2.0. Note that in many shells you will need to escape characters such |
138 |
+as '<' and '='; use single\- or double\-quotes around the \fIatom\fR |
139 |
to get around escaping problems. |
140 |
.SH "ACTIONS" |
141 |
.TP |
142 |
@@ -113,8 +113,8 @@ remove unslotted packages. Note: Most recently installed means most |
143 |
\fBrecent\fR, not highest version. |
144 |
.TP |
145 |
.BR "\-\-config " |
146 |
-Run package specific actions needed to be executed after the emerge process |
147 |
-has completed. This usually entails configuration file setup or other similar |
148 |
+Run package specific actions needed to be executed after the emerge process |
149 |
+has completed. This usually entails configuration file setup or other similar |
150 |
setups that the user may wish to run. |
151 |
.TP |
152 |
.BR "\-\-depclean (-c)" |
153 |
@@ -164,9 +164,9 @@ updated more frequently than this man page; check it out if you |
154 |
are having problems that this man page does not help resolve. |
155 |
.TP |
156 |
.BR \-\-info |
157 |
-Produces a list of information to include in bug reports which aids the |
158 |
-developers when fixing the reported problem. \fBPlease include this |
159 |
-information when submitting a bug report.\fR Expanded output can be obtained |
160 |
+Produces a list of information to include in bug reports which aids the |
161 |
+developers when fixing the reported problem. \fBPlease include this |
162 |
+information when submitting a bug report.\fR Expanded output can be obtained |
163 |
with the \fI\-\-verbose\fR option. |
164 |
.TP |
165 |
.BR \-\-list\-sets |
166 |
@@ -191,14 +191,14 @@ the emerge output of the next \-\-depclean run carefully! Use |
167 |
\-\-depclean to avoid this issue.\fR |
168 |
.TP |
169 |
.BR \-\-regen |
170 |
-Causes portage to check and update the dependency cache of all ebuilds in the |
171 |
-portage tree. The cache is used to speed up searches and the building of |
172 |
-dependency trees. This command is not recommended for rsync users as rsync |
173 |
-updates the cache using server\-side caches. If you do not know the |
174 |
-differences between a 'rsync user' and some other user, then you are a 'rsync |
175 |
-user' :). Rsync users should simply run \fBemerge \-\-sync\fR to regenerate |
176 |
-the cache. After a portage update, rsync users may find it convenient to run |
177 |
-\fBemerge \-\-metadata\fR to rebuild the cache as portage does at the end of |
178 |
+Causes portage to check and update the dependency cache of all ebuilds in the |
179 |
+portage tree. The cache is used to speed up searches and the building of |
180 |
+dependency trees. This command is not recommended for rsync users as rsync |
181 |
+updates the cache using server\-side caches. If you do not know the |
182 |
+differences between a 'rsync user' and some other user, then you are a 'rsync |
183 |
+user' :). Rsync users should simply run \fBemerge \-\-sync\fR to regenerate |
184 |
+the cache. After a portage update, rsync users may find it convenient to run |
185 |
+\fBemerge \-\-metadata\fR to rebuild the cache as portage does at the end of |
186 |
a sync operation. In order to specify parallel \fB\-\-regen\fR behavior, use |
187 |
the \fB\-\-jobs\fR and \fB\-\-load\-average\fR options. If you would like to |
188 |
generate and distribute cache for use by others, use \fBegencache\fR(1). |
189 |
@@ -222,14 +222,14 @@ explicitly discarded by running `emaint \-\-fix cleanresume` (see |
190 |
.TP |
191 |
.BR "\-\-search " (\fB\-s\fR) |
192 |
Searches for matches of the supplied string in the portage tree. |
193 |
-By default emerge uses a case-insensitive simple search, but you can |
194 |
+By default emerge uses a case-insensitive simple search, but you can |
195 |
enable a regular expression search by prefixing the search string with %. |
196 |
-For example, \fBemerge \-\-search "%^kde"\fR searches for any package whose |
197 |
-name starts with "kde"; \fBemerge \-\-search "%gcc$"\fR searches for any |
198 |
-package that ends with "gcc"; \fBemerge \-\-search "office"\fR searches for |
199 |
-any package that contains the word "office". If you want to include the |
200 |
-category into the search string, prepend an @: \fBemerge \-\-search |
201 |
-"%@^dev-java.*jdk"\fR. If you want to search the package descriptions as well, |
202 |
+For example, \fBemerge \-\-search "%^kde"\fR searches for any package whose |
203 |
+name starts with "kde"; \fBemerge \-\-search "%gcc$"\fR searches for any |
204 |
+package that ends with "gcc"; \fBemerge \-\-search "office"\fR searches for |
205 |
+any package that contains the word "office". If you want to include the |
206 |
+category into the search string, prepend an @: \fBemerge \-\-search |
207 |
+"%@^dev-java.*jdk"\fR. If you want to search the package descriptions as well, |
208 |
use the \fB\-\-searchdesc\fR action. |
209 |
.TP |
210 |
.BR "\-\-searchdesc " (\fB\-S\fR) |
211 |
@@ -379,7 +379,7 @@ possible ways to enable building of binary packages. |
212 |
.TP |
213 |
.BR "\-\-buildpkgonly " (\fB\-B\fR) |
214 |
Creates binary packages for all ebuilds processed without actually |
215 |
-merging the packages. This comes with the caveat that all build-time |
216 |
+merging the packages. This comes with the caveat that all build-time |
217 |
dependencies must already be emerged on the system. |
218 |
.TP |
219 |
.BR "\-\-changed\-use" |
220 |
@@ -403,7 +403,7 @@ Enable or disable color output. This option will override \fINOCOLOR\fR |
221 |
is not a tty (by default, color is disabled unless stdout is a tty). |
222 |
.TP |
223 |
.BR "\-\-columns" |
224 |
-Used alongside \fB\-\-pretend\fR to cause the package name, new version, |
225 |
+Used alongside \fB\-\-pretend\fR to cause the package name, new version, |
226 |
and old version to be displayed in an aligned format for easy cut\-n\-paste. |
227 |
.TP |
228 |
.BR "\-\-complete\-graph [ y | n ]" |
229 |
@@ -432,7 +432,7 @@ Set the \fBPORTAGE_CONFIGROOT\fR environment variable. |
230 |
.TP |
231 |
.BR "\-\-debug " (\fB\-d\fR) |
232 |
Tells emerge to run the emerge command in \fB\-\-debug\fR mode. In this |
233 |
-mode the bash build environment will run with the \-x option, causing |
234 |
+mode the bash build environment will run with the \-x option, causing |
235 |
it to output verbose debugging information to stdout. This also enables |
236 |
a plethora of other output (mostly dependency resolution messages). |
237 |
.TP |
238 |
@@ -500,10 +500,10 @@ Instead of doing any package building, just perform fetches for all |
239 |
packages (fetch everything in SRC_URI regardless of USE setting). |
240 |
.TP |
241 |
.BR "\-\-getbinpkg [ y | n ] (\-g short option)" |
242 |
-Using the server and location defined in \fIPORTAGE_BINHOST\fR (see |
243 |
-\fBmake.conf\fR(5)), portage will download the information from each binary |
244 |
-package found and it will use that information to help build the dependency |
245 |
-list. This option implies \fB\-k\fR. (Use \fB\-gK\fR for binary\-only |
246 |
+Using the server and location defined in \fIPORTAGE_BINHOST\fR (see |
247 |
+\fBmake.conf\fR(5)), portage will download the information from each binary |
248 |
+package found and it will use that information to help build the dependency |
249 |
+list. This option implies \fB\-k\fR. (Use \fB\-gK\fR for binary\-only |
250 |
merging.) |
251 |
.TP |
252 |
.BR "\-\-getbinpkgonly [ y | n ] (\-G short option)" |
253 |
@@ -648,7 +648,7 @@ the printout: |
254 |
.TS |
255 |
lI l. |
256 |
N new (not yet installed) |
257 |
-S new SLOT installation (side-by-side versions) |
258 |
+S new SLOT installation (side-by-side versions) |
259 |
U updating (to another version) |
260 |
D downgrading (best version seems lower) |
261 |
r reinstall (forced for some reason, possibly due to slot or sub\-slot) |
262 |
@@ -778,7 +778,7 @@ Use \fB\-\-selective=n\fR if you want to forcefully disable |
263 |
\fB\-\-newuse\fR, \fB\-\-noreplace\fR, or \fB\-\-update\fR. |
264 |
.TP |
265 |
.BR "\-\-skipfirst" |
266 |
-This option is only valid when used with \fB\-\-resume\fR. It removes the |
267 |
+This option is only valid when used with \fB\-\-resume\fR. It removes the |
268 |
first package in the resume list. Dependencies are recalculated for |
269 |
remaining packages and any that have unsatisfied dependencies or are |
270 |
masked will be automatically dropped. Also see the related |
271 |
@@ -786,7 +786,7 @@ masked will be automatically dropped. Also see the related |
272 |
.TP |
273 |
.BR "\-\-tree " (\fB\-t\fR) |
274 |
Shows the dependency tree for the given target by indenting dependencies. |
275 |
-This is only really useful in combination with \fB\-\-emptytree\fR or |
276 |
+This is only really useful in combination with \fB\-\-emptytree\fR or |
277 |
\fB\-\-update\fR and \fB\-\-deep\fR. |
278 |
.TP |
279 |
.BR "\-\-unordered\-display" |
280 |
@@ -812,21 +812,21 @@ A space separated list of package names or slot atoms. Emerge will prefer |
281 |
matching binary packages over newer unbuilt packages. |
282 |
.TP |
283 |
.BR "\-\-usepkg [ y | n ] (\-k short option)" |
284 |
-Tells emerge to use binary packages (from $PKGDIR) if they are available, thus |
285 |
-possibly avoiding some time\-consuming compiles. This option is useful for CD |
286 |
-installs; you can export PKGDIR=/mnt/cdrom/packages and then use this option to |
287 |
+Tells emerge to use binary packages (from $PKGDIR) if they are available, thus |
288 |
+possibly avoiding some time\-consuming compiles. This option is useful for CD |
289 |
+installs; you can export PKGDIR=/mnt/cdrom/packages and then use this option to |
290 |
have emerge "pull" binary packages from the CD in order to satisfy |
291 |
dependencies. |
292 |
.TP |
293 |
.BR "\-\-usepkgonly [ y | n ] (\-K short option)" |
294 |
-Tells emerge to only use binary packages (from $PKGDIR). All the binary |
295 |
-packages must be available at the time of dependency calculation or emerge |
296 |
-will simply abort. Portage does not use $PORTDIR when calculating dependency |
297 |
+Tells emerge to only use binary packages (from $PKGDIR). All the binary |
298 |
+packages must be available at the time of dependency calculation or emerge |
299 |
+will simply abort. Portage does not use $PORTDIR when calculating dependency |
300 |
information so all masking information is ignored. |
301 |
.TP |
302 |
.BR "\-\-verbose [ y | n ] (\-v short option)" |
303 |
-Tell emerge to run in verbose mode. Currently this flag causes emerge to print |
304 |
-out GNU info errors, if any, and to show the USE flags that will be used for |
305 |
+Tell emerge to run in verbose mode. Currently this flag causes emerge to print |
306 |
+out GNU info errors, if any, and to show the USE flags that will be used for |
307 |
each package when pretending. The following symbols are affixed to USE flags |
308 |
in order to indicate their status: |
309 |
|
310 |
@@ -871,14 +871,14 @@ option or in \fBmake.conf\fR(5) (the command line overrides other settings). |
311 |
Defaults to /. |
312 |
.TP |
313 |
\fBPORTAGE_CONFIGROOT\fR = \fI[path]\fR |
314 |
-Use \fBPORTAGE_CONFIGROOT\fR to specify the location for various portage |
315 |
+Use \fBPORTAGE_CONFIGROOT\fR to specify the location for various portage |
316 |
configuration files |
317 |
(see \fBFILES\fR for a detailed list of configuration files). This variable |
318 |
can be set via the \fB\-\-config\-root\fR option. |
319 |
.br |
320 |
Defaults to /. |
321 |
.SH "OUTPUT" |
322 |
-When utilizing \fBemerge\fR with the \fB\-\-pretend\fR and \fB\-\-verbose\fR |
323 |
+When utilizing \fBemerge\fR with the \fB\-\-pretend\fR and \fB\-\-verbose\fR |
324 |
flags, the output may be a little hard to understand at first. This section |
325 |
explains the abbreviations. |
326 |
.TP |
327 |
@@ -893,34 +893,34 @@ simultaneously emerged because they usually provide the same functionality. |
328 |
Qstat is New to your system, and will be emerged for the first time. |
329 |
.TP |
330 |
.B [ebuild NS ] dev-libs/glib-2.4.7 |
331 |
-You already have a version of glib installed, but a 'new' version in |
332 |
+You already have a version of glib installed, but a 'new' version in |
333 |
a different SLOT is available. |
334 |
.TP |
335 |
.B [ebuild R ] sys\-apps/sed\-4.0.5 |
336 |
-Sed 4.0.5 has already been emerged, but if you run the command, then |
337 |
+Sed 4.0.5 has already been emerged, but if you run the command, then |
338 |
portage will Re\-emerge the specified package (sed in this case). |
339 |
.TP |
340 |
.B [ebuild F ] media\-video/realplayer\-8\-r6 |
341 |
-The realplayer package requires that you Fetch the sources manually. |
342 |
-When you attempt to emerge the package, if the sources are not found, |
343 |
-then portage will halt and you will be provided with instructions on how |
344 |
+The realplayer package requires that you Fetch the sources manually. |
345 |
+When you attempt to emerge the package, if the sources are not found, |
346 |
+then portage will halt and you will be provided with instructions on how |
347 |
to download the required files. |
348 |
.TP |
349 |
.B [ebuild f ] media\-video/realplayer\-8\-r6 |
350 |
The realplayer package's files are already downloaded. |
351 |
.TP |
352 |
.B [ebuild U ] net\-fs/samba\-2.2.8_pre1 [2.2.7a] |
353 |
-Samba 2.2.7a has already been emerged and can be Updated to version |
354 |
+Samba 2.2.7a has already been emerged and can be Updated to version |
355 |
2.2.8_pre1. |
356 |
.TP |
357 |
.B [ebuild UD] media\-libs/libgd\-1.8.4 [2.0.11] |
358 |
-Libgd 2.0.11 is already emerged, but if you run the command, then |
359 |
+Libgd 2.0.11 is already emerged, but if you run the command, then |
360 |
portage will Downgrade to version 1.8.4 for you. |
361 |
-.br |
362 |
+.br |
363 |
This may occur if a newer version of a package has been masked because it is |
364 |
broken or it creates a security risk on your system and a fix has not been |
365 |
released yet. |
366 |
-.br |
367 |
+.br |
368 |
Another reason this may occur is if a package you are trying to emerge requires |
369 |
an older version of a package in order to emerge successfully. In this case, |
370 |
libgd 2.x is incompatible with libgd 1.x. This means that packages that were |
371 |
@@ -981,14 +981,14 @@ globally via \fBACCEPT_KEYWORDS\fR. |
372 |
|
373 |
|
374 |
.SH "NOTES" |
375 |
-You should almost always precede any package install or update attempt with a |
376 |
-\fB\-\-pretend\fR install or update. This lets you see how much will be |
377 |
-done, and shows you any blocking packages that you will have to rectify. |
378 |
-This goes doubly so for the \fBsystem\fR and \fBworld\fR sets, which can |
379 |
-update a large number of packages if the portage tree has been particularly |
380 |
+You should almost always precede any package install or update attempt with a |
381 |
+\fB\-\-pretend\fR install or update. This lets you see how much will be |
382 |
+done, and shows you any blocking packages that you will have to rectify. |
383 |
+This goes doubly so for the \fBsystem\fR and \fBworld\fR sets, which can |
384 |
+update a large number of packages if the portage tree has been particularly |
385 |
active. |
386 |
.LP |
387 |
-You also want to typically use \fB\-\-update\fR, which ignores packages that |
388 |
+You also want to typically use \fB\-\-update\fR, which ignores packages that |
389 |
are already fully updated but updates those that are not. |
390 |
.LP |
391 |
When you install a package with uninstalled dependencies and do |
392 |
@@ -1003,7 +1003,7 @@ avoid using some dependencies you may not want to have. \fBUSE |
393 |
flags specified on the command line are NOT remembered\fR. For |
394 |
example, \fBenv USE="\-X \-gnome" emerge mc\fR will emerge mc with |
395 |
those USE settings (on Bourne-compatible shells you may omit the \fBenv\fR |
396 |
-part). If you want those USE settings to be more |
397 |
+part). If you want those USE settings to be more |
398 |
permanent, you can put them in /etc/portage/package.use instead. |
399 |
.LP |
400 |
If \fBemerge \-\-update @system\fR or \fBemerge \-\-update @world\fR |
401 |
@@ -1021,7 +1021,7 @@ Masks in \fBportage\fR have many uses: they allow a |
402 |
testing period where the packages can be used in live machines; they |
403 |
prevent the use of a package when it will fail; and they mask existing |
404 |
packages that are broken or could pose a security risk. Read below |
405 |
-to find out how to unmask in various cases. Also note that if you give |
406 |
+to find out how to unmask in various cases. Also note that if you give |
407 |
\fBemerge\fR an ebuild, then all forms of masking will be ignored and |
408 |
\fBemerge\fR will attempt to emerge the package. |
409 |
.TP |
410 |
@@ -1047,15 +1047,15 @@ that are not supported by the current version of portage. Packages masked by |
411 |
\fBEAPI\fR can only be installed after portage has been upgraded. |
412 |
.TP |
413 |
.BR KEYWORDS |
414 |
-The \fBKEYWORDS\fR variable in an \fBebuild\fR file is also used for masking |
415 |
-a package still in testing. There are architecture\-specific keywords for |
416 |
-each package that let \fBportage\fR know which systems are compatible with |
417 |
-the package. Packages which compile on an architecture, but have not been |
418 |
-proven to be "stable", are masked with a tilde (\fB~\fR) in front of the |
419 |
-architecture name. \fBemerge\fR examines the \fBACCEPT_KEYWORDS\fR environment |
420 |
-variable to allow or disallow the emerging of a package masked by |
421 |
-\fBKEYWORDS\fR. To inform \fBemerge\fR that it should build these 'testing' |
422 |
-versions of packages, you should update your |
423 |
+The \fBKEYWORDS\fR variable in an \fBebuild\fR file is also used for masking |
424 |
+a package still in testing. There are architecture\-specific keywords for |
425 |
+each package that let \fBportage\fR know which systems are compatible with |
426 |
+the package. Packages which compile on an architecture, but have not been |
427 |
+proven to be "stable", are masked with a tilde (\fB~\fR) in front of the |
428 |
+architecture name. \fBemerge\fR examines the \fBACCEPT_KEYWORDS\fR environment |
429 |
+variable to allow or disallow the emerging of a package masked by |
430 |
+\fBKEYWORDS\fR. To inform \fBemerge\fR that it should build these 'testing' |
431 |
+versions of packages, you should update your |
432 |
\fI/etc/portage/package.accept_keywords\fR |
433 |
file to list the packages you want the |
434 |
\'testing\' version. See \fBportage\fR(5) for more information. |
435 |
@@ -1146,7 +1146,7 @@ Zac Medico <zmedico@g.o> |
436 |
Arfrever Frehtes Taifersar Arahesis <arfrever@××××××.org> |
437 |
.fi |
438 |
.SH "FILES" |
439 |
-Here is a common list of files you will probably be interested in. For a |
440 |
+Here is a common list of files you will probably be interested in. For a |
441 |
complete listing, please refer to the \fBportage\fR(5) man page. |
442 |
.TP |
443 |
.B /usr/share/portage/config/sets/ |
444 |
@@ -1173,7 +1173,7 @@ Contains variables customizing colors. |
445 |
Contains user package set definitions (see \fBportage\fR(5)). |
446 |
.TP |
447 |
.B /etc/dispatch\-conf.conf |
448 |
-Contains settings to handle automatic updates/backups of configuration |
449 |
+Contains settings to handle automatic updates/backups of configuration |
450 |
files. |
451 |
.TP |
452 |
.B /etc/portage/make.profile/make.defaults |
453 |
@@ -1206,5 +1206,5 @@ this file\fR. |
454 |
.LP |
455 |
A number of helper applications reside in \fI/usr/lib/portage/bin\fR. |
456 |
.LP |
457 |
-The \fBapp\-portage/gentoolkit\fR package contains useful scripts such as |
458 |
+The \fBapp\-portage/gentoolkit\fR package contains useful scripts such as |
459 |
\fBequery\fR (a package query tool). |
460 |
|
461 |
diff --git a/man/env-update.1 b/man/env-update.1 |
462 |
index 5051524..9ceddab 100644 |
463 |
--- a/man/env-update.1 |
464 |
+++ b/man/env-update.1 |
465 |
@@ -10,9 +10,9 @@ reads the files in \fI/etc/env.d\fR and automatically generates |
466 |
is run to update \fI/etc/ld.so.cache\fR. \fBenv-update\fR is run by |
467 |
\fBemerge\fR(1) automatically after each package merge. Also, if you |
468 |
make changes to \fI/etc/env.d\fR, you should run \fBenv-update\fR |
469 |
-yourself for changes to take effect immediately. Note that this would |
470 |
-only affect new processes. In order for the changes to affect your |
471 |
-active shell, you will probably have to run \fIsource /etc/profile\fR |
472 |
+yourself for changes to take effect immediately. Note that this would |
473 |
+only affect new processes. In order for the changes to affect your |
474 |
+active shell, you will probably have to run \fIsource /etc/profile\fR |
475 |
first. |
476 |
.SH "OPTIONS" |
477 |
.TP |
478 |
|
479 |
diff --git a/man/etc-update.1 b/man/etc-update.1 |
480 |
index 2662de5..71900da 100644 |
481 |
--- a/man/etc-update.1 |
482 |
+++ b/man/etc-update.1 |
483 |
@@ -7,7 +7,7 @@ etc\-update \- handle configuration file updates |
484 |
.SH "DESCRIPTION" |
485 |
\fIetc\-update\fR is supposed to be run after merging a new package to see if |
486 |
there are updates to the configuration files. If a new |
487 |
-configuration file will override an old one, |
488 |
+configuration file will override an old one, |
489 |
\fIetc\-update\fR will prompt the user for a decision. |
490 |
.PP |
491 |
\fIetc\-update\fR will check all directories specified on the command |
492 |
|
493 |
diff --git a/man/make.conf.5 b/man/make.conf.5 |
494 |
index f75e277..236fdf0 100644 |
495 |
--- a/man/make.conf.5 |
496 |
+++ b/man/make.conf.5 |
497 |
@@ -37,7 +37,7 @@ Defaults to the value of $CHOST. |
498 |
\fBACCEPT_KEYWORDS\fR = \fI[space delimited list of KEYWORDS]\fR |
499 |
Enable testing of ebuilds that have not yet been deemed 'stable'. Users |
500 |
of the 'x86' architecture would set this to '~x86' while ppc users would |
501 |
-set this to '~ppc'. This is an incremental variable. Only define a |
502 |
+set this to '~ppc'. This is an incremental variable. Only define a |
503 |
~arch. |
504 |
.br |
505 |
Defaults to the value of $ARCH. |
506 |
@@ -68,7 +68,7 @@ This variable is used to mask packages based on PROPERTIES restrictions. |
507 |
In addition to property names, the \fI*\fR and \fI-*\fR wildcard tokens are |
508 |
also supported. This variable can be temporarily overridden using the |
509 |
\fB\-\-accept\-properties\fR option of \fBemerge\fR(1). |
510 |
-See \fBebuild\fR(5) for more information about PROPERTIES. |
511 |
+See \fBebuild\fR(5) for more information about PROPERTIES. |
512 |
.br |
513 |
Defaults to the value of *. |
514 |
.br |
515 |
@@ -109,7 +109,7 @@ man page for more information. |
516 |
Defaults to /var/tmp/ccache |
517 |
.TP |
518 |
\fBCCACHE_SIZE\fR = \fI"size"\fR |
519 |
-This controls the space use limitations for ccache. The default is 2 gigabytes |
520 |
+This controls the space use limitations for ccache. The default is 2 gigabytes |
521 |
('2G'). Sizes are specified with 'G', 'M', or 'K'. |
522 |
.TP |
523 |
.B CFLAGS CXXFLAGS |
524 |
@@ -229,7 +229,7 @@ should not be disabled by default. |
525 |
.RS |
526 |
.TP |
527 |
.B assume\-digests |
528 |
-When commiting work to cvs with \fBrepoman\fR(1), assume that all existing |
529 |
+When commiting work to cvs with \fBrepoman\fR(1), assume that all existing |
530 |
SRC_URI digests are correct. This feature also affects digest generation via |
531 |
\fBebuild\fR(1) and \fBemerge\fR(1) (emerge generates digests only when the |
532 |
\fIdigest\fR feature is enabled). Existing digests for files that do not exist |
533 |
@@ -256,8 +256,8 @@ Enable a special progress indicator when \fBemerge\fR(1) is calculating |
534 |
dependencies. |
535 |
.TP |
536 |
.B ccache |
537 |
-Enable portage support for the ccache package. If the ccache dir is not |
538 |
-present in the user's environment, then portage will default to |
539 |
+Enable portage support for the ccache package. If the ccache dir is not |
540 |
+present in the user's environment, then portage will default to |
541 |
${PORTAGE_TMPDIR}/ccache. |
542 |
|
543 |
\fBWarning\fR: This feature is known to cause numerous compilation failures. |
544 |
@@ -344,7 +344,7 @@ Both the \fBebuild\fR(1) command and the \fInoclean\fR feature cause the |
545 |
\fIfail\-clean\fR feature to be automatically disabled. |
546 |
.TP |
547 |
.B getbinpkg |
548 |
-Force emerges to always try to fetch files from the \fIPORTAGE_BINHOST\fR. See |
549 |
+Force emerges to always try to fetch files from the \fIPORTAGE_BINHOST\fR. See |
550 |
\fBmake.conf\fR(5) for more information. |
551 |
.TP |
552 |
.B installsources |
553 |
@@ -475,10 +475,10 @@ selectively disable this feature. It is recommended to leave either |
554 |
since otherwise file collisions between packages may result in files being |
555 |
overwritten or uninstalled at inappropriate times. |
556 |
If \fIcollision\-protect\fR is enabled then it takes precedence over |
557 |
-\fIprotect\-owned\fR. |
558 |
+\fIprotect\-owned\fR. |
559 |
.TP |
560 |
.B python\-trace |
561 |
-Output a verbose trace of python execution to stderr when a command's |
562 |
+Output a verbose trace of python execution to stderr when a command's |
563 |
\-\-debug option is enabled. |
564 |
.TP |
565 |
.B sandbox |
566 |
@@ -488,14 +488,14 @@ Enable sandbox\-ing when running \fBemerge\fR(1) and \fBebuild\fR(1). |
567 |
Enable SELinux sandbox\-ing. Do not toggle this \fBFEATURE\fR yourself. |
568 |
.TP |
569 |
.B sfperms |
570 |
-Stands for Smart Filesystem Permissions. Before merging packages to the |
571 |
-live filesystem, automatically search for and set permissions on setuid |
572 |
-and setgid files. Files that are setuid have the group and other read |
573 |
-bits removed while files that are setgid have the other read bit removed. |
574 |
+Stands for Smart Filesystem Permissions. Before merging packages to the |
575 |
+live filesystem, automatically search for and set permissions on setuid |
576 |
+and setgid files. Files that are setuid have the group and other read |
577 |
+bits removed while files that are setgid have the other read bit removed. |
578 |
See also \fIsuidctl\fR below. |
579 |
.TP |
580 |
.B sign |
581 |
-When commiting work to cvs with \fBrepoman\fR(1), sign the Manifest with |
582 |
+When commiting work to cvs with \fBrepoman\fR(1), sign the Manifest with |
583 |
a GPG key. Read about the \fIPORTAGE_GPG_KEY\fR variable in |
584 |
\fBmake.conf\fR(5). |
585 |
.TP |
586 |
@@ -512,20 +512,20 @@ incompatibility. |
587 |
Store logs created by \fBPORTAGE_ELOG_SYSTEM="save"\fR in category |
588 |
subdirectories of \fBPORT_LOGDIR/elog\fR, instead of using |
589 |
\fBPORT_LOGDIR/elog\fR directly. |
590 |
-.TP |
591 |
+.TP |
592 |
.B split\-log |
593 |
Store build logs in category subdirectories of \fBPORT_LOGDIR/build\fR, |
594 |
instead of using \fBPORT_LOGDIR\fR directly. |
595 |
.TP |
596 |
.B splitdebug |
597 |
-Prior to stripping ELF etdyn and etexec files, the debugging info is |
598 |
+Prior to stripping ELF etdyn and etexec files, the debugging info is |
599 |
stored for later use by various debuggers. This feature is disabled by |
600 |
\fBnostrip\fR. You should also consider setting \fBcompressdebug\fR so |
601 |
the files don't suck up a lot of space. For installation of source code, |
602 |
see \fBinstallsources\fR. |
603 |
.TP |
604 |
.B strict |
605 |
-Have portage react strongly to conditions that have the potential to be |
606 |
+Have portage react strongly to conditions that have the potential to be |
607 |
dangerous (like missing or incorrect digests for ebuilds). |
608 |
.TP |
609 |
.B stricter |
610 |
@@ -534,12 +534,12 @@ security provisions (for example textrels, executable stack). Read about |
611 |
the \fIQA_STRICT_*\fR variables in \fBmake.conf\fR(5). |
612 |
.TP |
613 |
.B suidctl |
614 |
-Before merging packages to the live filesystem, automatically strip setuid |
615 |
+Before merging packages to the live filesystem, automatically strip setuid |
616 |
bits from any file that is not listed in \fI/etc/portage/suidctl.conf\fR. |
617 |
.TP |
618 |
.B test |
619 |
-Run package\-specific tests during each merge to help make sure |
620 |
-the package compiled properly. See \fItest\fR in \fBebuild\fR(1) |
621 |
+Run package\-specific tests during each merge to help make sure |
622 |
+the package compiled properly. See \fItest\fR in \fBebuild\fR(1) |
623 |
and \fIsrc_test()\fR in \fBebuild\fR(5). This feature implies the "test" |
624 |
\fBUSE\fR flag if it is a member of \fBIUSE\fR, either explicitly or |
625 |
implicitly (see \fBebuild\fR(5) for more information about \fBIUSE\fR). |
626 |
@@ -577,7 +577,7 @@ When portage is run as root, drop privileges to portage:portage during the |
627 |
fetching of package sources. |
628 |
.TP |
629 |
.B userpriv |
630 |
-Allow portage to drop root privileges and compile packages as |
631 |
+Allow portage to drop root privileges and compile packages as |
632 |
portage:portage without a sandbox (unless \fIusersandbox\fR is also used). |
633 |
.TP |
634 |
.B usersandbox |
635 |
@@ -653,7 +653,7 @@ enabled for these flags may be closed as INVALID. |
636 |
.TP |
637 |
.B MAKEOPTS |
638 |
Use this variable if you want to use parallel make. For example, if you |
639 |
-have a dual\-processor system, set this variable to "\-j2" or "\-j3" for |
640 |
+have a dual\-processor system, set this variable to "\-j2" or "\-j3" for |
641 |
enhanced build performance with many packages. Suggested settings are |
642 |
between \fICPUs+1\fR and \fI2*CPUs+1\fR. In order to avoid |
643 |
excess load, the \fB\-\-load\-average\fR option is recommended. |
644 |
@@ -698,7 +698,7 @@ This is a list of hosts from which portage will grab prebuilt\-binary packages. |
645 |
Each entry in the list must specify the full address of a directory |
646 |
serving tbz2's for your system (this directory must contain a 'Packages' index |
647 |
file). This is only used when running with |
648 |
-the get binary pkg options are given to \fBemerge\fR. Review \fBemerge\fR(1) |
649 |
+the get binary pkg options are given to \fBemerge\fR. Review \fBemerge\fR(1) |
650 |
for more information. |
651 |
.TP |
652 |
\fBPORTAGE_BINHOST_HEADER_URI\fR = \ |
653 |
@@ -850,7 +850,7 @@ Additional rsync options to be used by \fBemerge \-\-sync\fR. |
654 |
Defaults to no value. |
655 |
.TP |
656 |
\fBPORTAGE_RSYNC_OPTS\fR = \fI[rsync options string]\fR |
657 |
-Default rsync options to be used by \fBemerge \-\-sync\fR. |
658 |
+Default rsync options to be used by \fBemerge \-\-sync\fR. |
659 |
.br |
660 |
\fBDon't change this unless you know exactly what you're doing!\fR |
661 |
.br |
662 |
@@ -908,7 +908,7 @@ Defines the location of the Portage tree. This is the repository for all |
663 |
profile information as well as all ebuilds. If you change this, you must update |
664 |
your /etc/portage/make.profile symlink accordingly. |
665 |
.br |
666 |
-Defaults to /usr/portage. |
667 |
+Defaults to /usr/portage. |
668 |
.br |
669 |
\fB***Warning***\fR |
670 |
.br |
671 |
@@ -916,13 +916,13 @@ Data stored inside \fBPORTDIR\fR is in peril of being overwritten or deleted by |
672 |
the emerge \-\-sync command. The default value of |
673 |
\fBPORTAGE_RSYNC_OPTS\fR will protect the default locations of |
674 |
\fBDISTDIR\fR and \fBPKGDIR\fR, but users are warned that any other locations |
675 |
-inside \fBPORTDIR\fR are not necessarily safe for data storage. You should not |
676 |
-put other data (such as overlays) in your \fBPORTDIR\fB. Portage will walk |
677 |
+inside \fBPORTDIR\fR are not necessarily safe for data storage. You should not |
678 |
+put other data (such as overlays) in your \fBPORTDIR\fB. Portage will walk |
679 |
directory structures and may arbitrarily add invalid categories as packages. |
680 |
.TP |
681 |
\fBPORTDIR_OVERLAY\fR = \fI"[path] [different\-path] [etc...]"\fR |
682 |
-Defines the directories in which user made ebuilds may be stored and not |
683 |
-overwriten when `emerge \-\-sync` is run. This is a space delimited list of |
684 |
+Defines the directories in which user made ebuilds may be stored and not |
685 |
+overwriten when `emerge \-\-sync` is run. This is a space delimited list of |
686 |
directories. |
687 |
.br |
688 |
Defaults to no value. |
689 |
@@ -959,9 +959,9 @@ be necessary in order to continue a partially downloaded file located at |
690 |
\\${DISTDIR}/\\${FILE}. |
691 |
.TP |
692 |
\fBROOT\fR = \fI[path]\fR |
693 |
-Use \fBROOT\fR to specify the target root filesystem to be used for merging |
694 |
+Use \fBROOT\fR to specify the target root filesystem to be used for merging |
695 |
packages or ebuilds. |
696 |
-Typically, you should set this setting in the environment rather than in |
697 |
+Typically, you should set this setting in the environment rather than in |
698 |
\fImake.conf\fR itself. It's commonly used for creating new build |
699 |
images. Make sure you use an absolute path. Refer to the |
700 |
\fBCross-compilation\fR section of \fBebuild\fR(5) for information about |
701 |
@@ -1085,6 +1085,6 @@ Contains a list of all local USE variables. |
702 |
.BR ebuild (1), |
703 |
.BR ebuild (5) |
704 |
.TP |
705 |
-The \fI/usr/sbin/ebuild.sh\fR script. |
706 |
+The \fI/usr/sbin/ebuild.sh\fR script. |
707 |
.TP |
708 |
The helper apps in \fI/usr/lib/portage/bin\fR. |
709 |
|
710 |
diff --git a/man/portage.5 b/man/portage.5 |
711 |
index 827c504..38c6d8c 100644 |
712 |
--- a/man/portage.5 |
713 |
+++ b/man/portage.5 |
714 |
@@ -2,16 +2,16 @@ |
715 |
.SH NAME |
716 |
portage \- the heart of Gentoo |
717 |
.SH "DESCRIPTION" |
718 |
-The current portage code uses many different configuration files, most of which |
719 |
-are unknown to users and normal developers. Here we will try to collect all |
720 |
-the odds and ends so as to help users more effectively utilize portage. This |
721 |
+The current portage code uses many different configuration files, most of which |
722 |
+are unknown to users and normal developers. Here we will try to collect all |
723 |
+the odds and ends so as to help users more effectively utilize portage. This |
724 |
is a reference only for files which do not already have a man page. |
725 |
|
726 |
-All files in the make.profile directory may be tweaked via parent profiles |
727 |
-when using cascading profiles. For more info, please see |
728 |
+All files in the make.profile directory may be tweaked via parent profiles |
729 |
+when using cascading profiles. For more info, please see |
730 |
http://www.gentoo.org/proj/en/releng/docs/cascading-profiles.xml |
731 |
.IP Note: |
732 |
-If you are looking for information on how to emerge something, please see |
733 |
+If you are looking for information on how to emerge something, please see |
734 |
.BR emerge (1). |
735 |
.SH "SYNOPSIS" |
736 |
.TP |
737 |
@@ -122,8 +122,8 @@ world |
738 |
world_sets |
739 |
.fi |
740 |
.SH "GLOSSARY" |
741 |
-In the following sections, some terminology may be foreign to you or used |
742 |
-with meaning specific to Portage. Please see the referenced manpages for |
743 |
+In the following sections, some terminology may be foreign to you or used |
744 |
+with meaning specific to Portage. Please see the referenced manpages for |
745 |
more detailed explanations. |
746 |
.RS |
747 |
.TP |
748 |
@@ -132,7 +132,7 @@ An atom is either of the form category/package or consists of an operator |
749 |
followed by category/package followed by a hyphen and a version specification. |
750 |
An atom might be suffixed by a slot specification. |
751 |
.br |
752 |
-More reading: |
753 |
+More reading: |
754 |
.BR ebuild (5) |
755 |
|
756 |
.B Extended Atom Syntax |
757 |
@@ -188,26 +188,26 @@ net\-*/* |
758 |
.B KEYWORD |
759 |
Each architecture has a unique KEYWORD. |
760 |
.br |
761 |
-More reading: |
762 |
+More reading: |
763 |
.BR ebuild (5) |
764 |
.TP |
765 |
.B virtual |
766 |
-A DEPEND atom that is part of the "virtual" category. They are used |
767 |
-when different packages can satisfy a dependency and only one of them is |
768 |
+A DEPEND atom that is part of the "virtual" category. They are used |
769 |
+when different packages can satisfy a dependency and only one of them is |
770 |
needed. |
771 |
.br |
772 |
-More reading: |
773 |
+More reading: |
774 |
.BR ebuild (5) |
775 |
.RE |
776 |
.SH "SPECIFIC FILE DESCRIPTIONS" |
777 |
.TP |
778 |
\fB/etc/portage/make.profile/\fR or \fB/etc/make.profile/\fR |
779 |
-This is usually just a symlink to the correct profile in |
780 |
-\fB/usr/portage/profiles/\fR. Since it is part of the portage tree, it |
781 |
-may easily be updated/regenerated by running `emerge \-\-sync`. It defines |
782 |
-what a profile is (usually arch specific stuff). If you need a custom |
783 |
-profile, then you should make your own \fBmake.profile\fR |
784 |
-directory and populate it. However, if you just wish to override some |
785 |
+This is usually just a symlink to the correct profile in |
786 |
+\fB/usr/portage/profiles/\fR. Since it is part of the portage tree, it |
787 |
+may easily be updated/regenerated by running `emerge \-\-sync`. It defines |
788 |
+what a profile is (usually arch specific stuff). If you need a custom |
789 |
+profile, then you should make your own \fBmake.profile\fR |
790 |
+directory and populate it. However, if you just wish to override some |
791 |
settings, use \fB/etc/portage/profile/\fR (it supports all of the same file |
792 |
types that \fBmake.profile\fR does, except parent). Do NOT edit the |
793 |
settings in \fBmake.profile\fR because they WILL be lost with the next |
794 |
@@ -230,9 +230,9 @@ ${PORTDIR}/profiles/package.mask/testing |
795 |
.RS |
796 |
.TP |
797 |
.BR deprecated |
798 |
-The existence of this file marks a profile as deprecated, meaning it is |
799 |
-not supported by Gentoo anymore. The first line must be the profile to which |
800 |
-users are encouraged to upgrade, optionally followed by some instructions |
801 |
+The existence of this file marks a profile as deprecated, meaning it is |
802 |
+not supported by Gentoo anymore. The first line must be the profile to which |
803 |
+users are encouraged to upgrade, optionally followed by some instructions |
804 |
explaining how they can upgrade. |
805 |
|
806 |
.I Example: |
807 |
@@ -255,8 +255,8 @@ previously supported USE configuration files, except that they |
808 |
only influence packages that are merged due to a stable keyword. |
809 |
.TP |
810 |
.BR make.defaults |
811 |
-The profile default settings for Portage. The general format is described |
812 |
-in \fBmake.conf\fR(5). The \fImake.defaults\fR for your profile defines a |
813 |
+The profile default settings for Portage. The general format is described |
814 |
+in \fBmake.conf\fR(5). The \fImake.defaults\fR for your profile defines a |
815 |
few specific variables too: |
816 |
|
817 |
.PD 0 |
818 |
@@ -317,11 +317,11 @@ Defines USERLAND values used to generate implicit |
819 |
Support uClibc/BSD libc/etc... |
820 |
.TP |
821 |
.B PROFILE_ONLY_VARIABLES = \fI"ARCH"\fR |
822 |
-Prevent critical variables from being changed by the user in make.conf |
823 |
+Prevent critical variables from being changed by the user in make.conf |
824 |
or the env. |
825 |
.TP |
826 |
.BR PROFILE_ARCH |
827 |
-Distinguish machines classes that have the same \fBARCH\fR. All sparc |
828 |
+Distinguish machines classes that have the same \fBARCH\fR. All sparc |
829 |
machines have ARCH=sparc but set this to either 'sparc32' or 'sparc64'. |
830 |
.TP |
831 |
.BR BOOTSTRAP_USE |
832 |
@@ -340,8 +340,8 @@ Provides the list of packages that compose the special \fIsystem\fR set. |
833 |
\- atoms without * only appear for legacy reasons |
834 |
.fi |
835 |
.I Note: |
836 |
-In a cascading profile setup, you can remove packages in children |
837 |
-profiles which were added by parent profiles by prefixing the atom with |
838 |
+In a cascading profile setup, you can remove packages in children |
839 |
+profiles which were added by parent profiles by prefixing the atom with |
840 |
a '\-'. |
841 |
|
842 |
.I Example: |
843 |
@@ -356,16 +356,16 @@ a '\-'. |
844 |
.fi |
845 |
.TP |
846 |
.BR packages.build |
847 |
-A list of packages (one per line) that make up a stage1 tarball. Really only |
848 |
+A list of packages (one per line) that make up a stage1 tarball. Really only |
849 |
useful for stage builders. |
850 |
.TP |
851 |
.BR package.provided |
852 |
-A list of packages (one per line) that portage should assume have been |
853 |
+A list of packages (one per line) that portage should assume have been |
854 |
provided. Useful for porting to non-Linux systems. Basically, it's a |
855 |
list that replaces the \fBemerge \-\-inject\fR syntax. |
856 |
|
857 |
-For example, if you manage your own copy of a 2.6 kernel, then you can |
858 |
-tell portage that 'sys-kernel/development-sources-2.6.7' is already taken |
859 |
+For example, if you manage your own copy of a 2.6 kernel, then you can |
860 |
+tell portage that 'sys-kernel/development-sources-2.6.7' is already taken |
861 |
care of and it should get off your back about it. |
862 |
|
863 |
Portage will not attempt to update a package that is listed here unless |
864 |
@@ -406,8 +406,8 @@ x11-base/xorg-x11-6.8 |
865 |
Per\-package USE flag forcing. |
866 |
|
867 |
.I Note: |
868 |
-In a cascading profile setup, you can remove USE flags in children |
869 |
-profiles which were added by parent profiles by prefixing the flag with |
870 |
+In a cascading profile setup, you can remove USE flags in children |
871 |
+profiles which were added by parent profiles by prefixing the flag with |
872 |
a '\-'. |
873 |
|
874 |
.I Format: |
875 |
@@ -428,8 +428,8 @@ x11\-libs/qt \-mysql |
876 |
Per\-package USE flag masks. |
877 |
|
878 |
.I Note: |
879 |
-In a cascading profile setup, you can remove USE flags in children |
880 |
-profiles which were added by parent profiles by prefixing the flag with |
881 |
+In a cascading profile setup, you can remove USE flags in children |
882 |
+profiles which were added by parent profiles by prefixing the flag with |
883 |
a '\-'. |
884 |
|
885 |
.I Format: |
886 |
@@ -470,8 +470,8 @@ Some USE flags don't make sense to disable under certain conditions. Here we |
887 |
list forced flags. |
888 |
|
889 |
.I Note: |
890 |
-In a cascading profile setup, you can remove USE flags in children |
891 |
-profiles which were added by parent profiles by prefixing the flag with |
892 |
+In a cascading profile setup, you can remove USE flags in children |
893 |
+profiles which were added by parent profiles by prefixing the flag with |
894 |
a '\-'. |
895 |
|
896 |
.I Format: |
897 |
@@ -481,13 +481,13 @@ a '\-'. |
898 |
.fi |
899 |
.TP |
900 |
\fBuse.mask\fR and \fBuse.stable.mask\fR |
901 |
-Some USE flags don't make sense on some archs (for example altivec on |
902 |
-non\-ppc or mmx on non\-x86), or haven't yet been tested. Here we list |
903 |
+Some USE flags don't make sense on some archs (for example altivec on |
904 |
+non\-ppc or mmx on non\-x86), or haven't yet been tested. Here we list |
905 |
the masked ones. |
906 |
|
907 |
.I Note: |
908 |
-In a cascading profile setup, you can remove USE flags in children |
909 |
-profiles which were added by parent profiles by prefixing the flag with |
910 |
+In a cascading profile setup, you can remove USE flags in children |
911 |
+profiles which were added by parent profiles by prefixing the flag with |
912 |
a '\-'. |
913 |
|
914 |
.I Format: |
915 |
@@ -529,8 +529,8 @@ virtual/aspell\-dict app\-dicts/aspell\-en |
916 |
.RE |
917 |
.TP |
918 |
.BR /etc/portage/ |
919 |
-Any file in this directory that begins with "package." can be more than just a |
920 |
-flat file. If it is a directory, then all the files in that directory will be |
921 |
+Any file in this directory that begins with "package." can be more than just a |
922 |
+flat file. If it is a directory, then all the files in that directory will be |
923 |
sorted in ascending alphabetical order by file name and summed together as if |
924 |
it were a single file. |
925 |
|
926 |
@@ -550,8 +550,8 @@ any other bash script. |
927 |
Additional package-specific bashrc files can be created in /etc/portage/env. |
928 |
.TP |
929 |
.BR categories |
930 |
-A simple list of valid categories that may be used in /usr/portage, |
931 |
-PORTDIR_OVERLAY, and PKGDIR (see \fBmake.conf\fR(5)). This allows for custom |
932 |
+A simple list of valid categories that may be used in /usr/portage, |
933 |
+PORTDIR_OVERLAY, and PKGDIR (see \fBmake.conf\fR(5)). This allows for custom |
934 |
categories to be created. |
935 |
|
936 |
.I Format: |
937 |
@@ -572,11 +572,11 @@ Contains variables customizing colors. See \fBcolor.map\fR(5). |
938 |
The global custom settings for Portage. See \fBmake.conf\fR(5). |
939 |
.TP |
940 |
.BR mirrors |
941 |
-Whenever portage encounters a mirror:// style URI it will look up the actual |
942 |
-hosts here. If the mirror set is not found here, it will check the global |
943 |
-mirrors file at /usr/portage/profiles/thirdpartymirrors. You may also set a |
944 |
-special mirror type called "local". This list of mirrors will be checked |
945 |
-before GENTOO_MIRRORS and will be used even if the package has |
946 |
+Whenever portage encounters a mirror:// style URI it will look up the actual |
947 |
+hosts here. If the mirror set is not found here, it will check the global |
948 |
+mirrors file at /usr/portage/profiles/thirdpartymirrors. You may also set a |
949 |
+special mirror type called "local". This list of mirrors will be checked |
950 |
+before GENTOO_MIRRORS and will be used even if the package has |
951 |
RESTRICT="mirror" or RESTRICT="fetch". |
952 |
|
953 |
.I Format: |
954 |
@@ -654,8 +654,8 @@ three special tokens: |
955 |
.fi |
956 |
|
957 |
.I Additional Note: |
958 |
-If you encounter the \fB-*\fR KEYWORD, this indicates that the package is known |
959 |
-to be broken on all systems which are not otherwise listed in KEYWORDS. For |
960 |
+If you encounter the \fB-*\fR KEYWORD, this indicates that the package is known |
961 |
+to be broken on all systems which are not otherwise listed in KEYWORDS. For |
962 |
example, a binary only package which is built for x86 will look like: |
963 |
|
964 |
games-fps/quake3-demo-1.11.ebuild:KEYWORDS="-* x86" |
965 |
@@ -735,15 +735,15 @@ a single package. |
966 |
.fi |
967 |
.TP |
968 |
.BR package.unmask |
969 |
-Just like package.mask above, except here you list packages you want to |
970 |
-unmask. Useful for overriding the global package.mask file (see |
971 |
-above). Note that this does not override packages that are masked via |
972 |
+Just like package.mask above, except here you list packages you want to |
973 |
+unmask. Useful for overriding the global package.mask file (see |
974 |
+above). Note that this does not override packages that are masked via |
975 |
KEYWORDS. |
976 |
.TP |
977 |
.BR package.use |
978 |
-Per\-package USE flags. Useful for tracking local USE flags or for |
979 |
-enabling USE flags for certain packages only. Perhaps you develop GTK |
980 |
-and thus you want documentation for it, but you don't want |
981 |
+Per\-package USE flags. Useful for tracking local USE flags or for |
982 |
+enabling USE flags for certain packages only. Perhaps you develop GTK |
983 |
+and thus you want documentation for it, but you don't want |
984 |
documentation for QT. Easy as pie my friend! |
985 |
|
986 |
.I Format: |
987 |
@@ -1040,7 +1040,7 @@ profile\-formats = portage-2 |
988 |
.RE |
989 |
.TP |
990 |
.BR /usr/portage/profiles/ |
991 |
-Global Gentoo settings that are controlled by the developers. To override |
992 |
+Global Gentoo settings that are controlled by the developers. To override |
993 |
these settings, you can use the files in \fB/etc/portage/\fR. |
994 |
.RS |
995 |
.TP |
996 |
@@ -1060,7 +1060,7 @@ sparc |
997 |
.fi |
998 |
.TP |
999 |
.BR categories |
1000 |
-A simple list of valid categories that may be used in /usr/portage, |
1001 |
+A simple list of valid categories that may be used in /usr/portage, |
1002 |
PORTDIR_OVERLAY, and PKGDIR (see \fBmake.conf\fR(5)). |
1003 |
|
1004 |
.I Format: |
1005 |
@@ -1130,10 +1130,10 @@ net-analyzer/netcat -* |
1006 |
.fi |
1007 |
.TP |
1008 |
.BR package.mask |
1009 |
-This contains a list of DEPEND atoms for packages that should not be installed |
1010 |
-in any profile. Useful for adding the latest KDE betas and making sure no |
1011 |
-one accidentally upgrades to them. Also useful for quickly masking specific |
1012 |
-versions due to security issues. ALWAYS include a comment explaining WHY the |
1013 |
+This contains a list of DEPEND atoms for packages that should not be installed |
1014 |
+in any profile. Useful for adding the latest KDE betas and making sure no |
1015 |
+one accidentally upgrades to them. Also useful for quickly masking specific |
1016 |
+versions due to security issues. ALWAYS include a comment explaining WHY the |
1017 |
package has been masked and WHO is doing the masking. |
1018 |
|
1019 |
.I Format: |
1020 |
@@ -1153,7 +1153,7 @@ package has been masked and WHO is doing the masking. |
1021 |
.fi |
1022 |
.TP |
1023 |
.BR profiles.desc |
1024 |
-List all the current stable and development profiles. If a profile is listed |
1025 |
+List all the current stable and development profiles. If a profile is listed |
1026 |
here, then it will be checked by repoman. |
1027 |
.I Format: |
1028 |
.nf |
1029 |
@@ -1179,7 +1179,7 @@ hyphen. If the repo\-name attribute is specified in layout.conf, then that |
1030 |
setting will take precedence. |
1031 |
.TP |
1032 |
.BR thirdpartymirrors |
1033 |
-Controls the mapping of mirror:// style URIs to actual lists of |
1034 |
+Controls the mapping of mirror:// style URIs to actual lists of |
1035 |
mirrors. Keeps us from overloading a single server. |
1036 |
|
1037 |
.I Format: |
1038 |
@@ -1200,7 +1200,7 @@ kernel http://www.kernel.org/pub http://www.us.kernel.org/pub |
1039 |
.fi |
1040 |
.TP |
1041 |
.BR use.desc |
1042 |
-All global USE flags must be listed here with a description of what they do. |
1043 |
+All global USE flags must be listed here with a description of what they do. |
1044 |
|
1045 |
.I Format: |
1046 |
.nf |
1047 |
@@ -1216,7 +1216,7 @@ doc \- Adds extra documentation |
1048 |
.fi |
1049 |
.TP |
1050 |
.BR use.local.desc |
1051 |
-All local USE flags are listed here along with the package and a |
1052 |
+All local USE flags are listed here along with the package and a |
1053 |
description. This file is automatically generated from the |
1054 |
metadata.xml files that are included with each individual package. |
1055 |
Refer to GLEP 56 for further information: |
1056 |
@@ -1238,7 +1238,7 @@ games\-emulation/xmess:net \- Adds network support |
1057 |
.RS |
1058 |
.TP |
1059 |
.BR make.globals |
1060 |
-The global default settings for Portage. This comes from the portage package |
1061 |
+The global default settings for Portage. This comes from the portage package |
1062 |
itself. Settings in \fBmake.conf\fR or \fBpackage.env\fR override values set |
1063 |
here. The format is described extensively in \fBmake.conf\fR(5). |
1064 |
.TP |
1065 |
@@ -1290,12 +1290,12 @@ directories have been modified since being installed. Files which have not |
1066 |
been modified will automatically be unmerged. |
1067 |
.TP |
1068 |
.BR world |
1069 |
-Every time you emerge a package, the package that you requested is |
1070 |
-recorded here. Then when you run `emerge world \-up`, the list of |
1071 |
-packages is read from this file. Note that this does not mean that the |
1072 |
-packages that were installed as dependencies are listed here. For |
1073 |
-example, if you run `emerge mod_wsgi` and you do not have apache |
1074 |
-already, then "www\-apache/mod_wsgi" is recorded in the world file but |
1075 |
+Every time you emerge a package, the package that you requested is |
1076 |
+recorded here. Then when you run `emerge world \-up`, the list of |
1077 |
+packages is read from this file. Note that this does not mean that the |
1078 |
+packages that were installed as dependencies are listed here. For |
1079 |
+example, if you run `emerge mod_wsgi` and you do not have apache |
1080 |
+already, then "www\-apache/mod_wsgi" is recorded in the world file but |
1081 |
"www\-servers/apache" is not. For more information, review \fBemerge\fR(1). |
1082 |
|
1083 |
.I Format: |
1084 |
|
1085 |
diff --git a/man/quickpkg.1 b/man/quickpkg.1 |
1086 |
index 0d30163..a3f6165 100644 |
1087 |
--- a/man/quickpkg.1 |
1088 |
+++ b/man/quickpkg.1 |
1089 |
@@ -7,16 +7,16 @@ quickpkg \- creates portage packages |
1090 |
.I quickpkg |
1091 |
can be utilized to quickly create a package for portage by |
1092 |
utilizing the files already on your filesystem. This package |
1093 |
-then can be emerged on any system. To review syntax for |
1094 |
+then can be emerged on any system. To review syntax for |
1095 |
emerging binary packages, review \fBemerge\fR(1). The upside |
1096 |
-of this process is that you don't have to wait for the package |
1097 |
-to unpack, configure, compile, and install before you can have |
1098 |
-the package ready to go. The downside is that the package will |
1099 |
-contain the files that exist on your filesystem even if they have |
1100 |
+of this process is that you don't have to wait for the package |
1101 |
+to unpack, configure, compile, and install before you can have |
1102 |
+the package ready to go. The downside is that the package will |
1103 |
+contain the files that exist on your filesystem even if they have |
1104 |
modified since they were first installed. |
1105 |
.br |
1106 |
-The packages, after being created, will be placed in \fBPKGDIR\fR. |
1107 |
-This variable is defined in \fBmake.conf\fR(5) and defaults to |
1108 |
+The packages, after being created, will be placed in \fBPKGDIR\fR. |
1109 |
+This variable is defined in \fBmake.conf\fR(5) and defaults to |
1110 |
/usr/portage/packages. |
1111 |
.SH OPTIONS |
1112 |
.TP |
1113 |
|
1114 |
diff --git a/man/xpak.5 b/man/xpak.5 |
1115 |
index 6e3d03d..536810d 100644 |
1116 |
--- a/man/xpak.5 |
1117 |
+++ b/man/xpak.5 |
1118 |
@@ -47,7 +47,7 @@ String \fI"STOP"\fR. |
1119 |
|<xpak_offset>| |
1120 |
<tar>|<---xpak---->|<xpak_offset>"STOP" |
1121 |
|
1122 |
-Here you see the \fItar\fR archive, the attached \fIxpak\fR blob, the |
1123 |
+Here you see the \fItar\fR archive, the attached \fIxpak\fR blob, the |
1124 |
\fIxpak_offset\fR and the string \fI"STOP"\fR at the end. This metadata |
1125 |
is not considered "part" of the \fIxpak\fR, but rather part of the binpkg. |