Gentoo Archives: gentoo-commits

From: Zac Medico <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage:master commit in: man/
Date: Tue, 30 Jul 2013 19:14:03
Message-Id: 1375211427.5660b2a3c71acad4bcb6135ac41ce9fd315c32a8.zmedico@gentoo
1 commit: 5660b2a3c71acad4bcb6135ac41ce9fd315c32a8
2 Author: Alexander Berntsen <alexander <AT> plaimi <DOT> net>
3 AuthorDate: Tue Jul 30 18:47:24 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=5660b2a3
7
8 man: Cap lines at 80 chars
9
10 ---
11 man/color.map.5 | 12 ++++++---
12 man/ebuild.5 | 74 ++++++++++++++++++++++++++++++++------------------------
13 man/egencache.1 | 3 ++-
14 man/emaint.1 | 13 ++++++----
15 man/emerge.1 | 44 +++++++++++++++++++--------------
16 man/env-update.1 | 3 ++-
17 man/make.conf.5 | 38 +++++++++++++++++------------
18 man/portage.5 | 39 +++++++++++++++++------------
19 man/repoman.1 | 43 ++++++++++++++++++++------------
20 man/xpak.5 | 3 ++-
21 10 files changed, 163 insertions(+), 109 deletions(-)
22
23 diff --git a/man/color.map.5 b/man/color.map.5
24 index 175729a..5543628 100644
25 --- a/man/color.map.5
26 +++ b/man/color.map.5
27 @@ -9,9 +9,11 @@ Portage will check this file first for color classes settings. If no setting
28 of given color class is found in /etc/portage/color.map, Portage uses default
29 value defined internally.
30 .SH "SYNTAX"
31 -\fBVARIABLE\fR = \fI[space delimited list of attributes or ansi code pattern]\fR
32 +\fBVARIABLE\fR = \fI[space delimited list of attributes or ansi code
33 +pattern]\fR
34 .TP
35 -\fBATTRIBUTE\fR = \fI[space delimited list of attributes or ansi code pattern]\fR
36 +\fBATTRIBUTE\fR = \fI[space delimited list of attributes or ansi code \
37 +pattern]\fR
38 .SH "VARIABLES"
39 .TP
40 \fBNORMAL\fR = \fI"normal"\fR
41 @@ -54,10 +56,12 @@ Defines color used for world packages planned to be merged.
42 Defines color used for packages planned to be merged using a binary package.
43 .TP
44 \fBPKG_BINARY_MERGE_SYSTEM\fR = \fI"purple"\fR
45 -Defines color used for system packages planned to be merged using a binary package.
46 +Defines color used for system packages planned to be merged using a binary
47 +package.
48 .TP
49 \fBPKG_BINARY_MERGE_WORLD\fR = \fI"fuchsia"\fR
50 -Defines color used for world packages planned to be merged using a binary package.
51 +Defines color used for world packages planned to be merged using a binary
52 +package.
53 .TP
54 \fBPKG_NOMERGE\fR = \fI"darkblue"\fR
55 Defines color used for packages not planned to be merged.
56
57 diff --git a/man/ebuild.5 b/man/ebuild.5
58 index cca87e8..10ef4ee 100644
59 --- a/man/ebuild.5
60 +++ b/man/ebuild.5
61 @@ -12,9 +12,9 @@ contain pre/post install/remove commands, as required. All ebuild scripts are
62 written in bash.
63
64 .SS "Dependencies"
65 -A \fIdepend atom\fR is simply a dependency that is used by portage when calculating
66 -relationships between packages. Please note that if the atom has not already
67 -been emerged, then the latest version available is matched.
68 +A \fIdepend atom\fR is simply a dependency that is used by portage when
69 +calculating relationships between packages. Please note that if the atom has
70 +not already been emerged, then the latest version available is matched.
71 .TP
72 .B Atom Bases
73 The base atom is just a full category/packagename.
74 @@ -38,17 +38,18 @@ Examples:
75 net\-misc/dhcp\fI\-3.0_p2\fR
76 .fi
77
78 -Versions are normally made up of two or three numbers separated by periods, such
79 -as 1.2 or 4.5.2. This string may be followed by a character such as 1.2a or
80 -4.5.2z. Note that this letter is \fInot\fR meant to indicate alpha, beta,
81 +Versions are normally made up of two or three numbers separated by periods,
82 +such as 1.2 or 4.5.2. This string may be followed by a character such as 1.2a
83 +or 4.5.2z. Note that this letter is \fInot\fR meant to indicate alpha, beta,
84 etc... status. For that, use the optional suffix; either _alpha, _beta, _pre
85 (pre\-release), _rc (release candidate), or _p (patch). This means for the
86 3rd pre\-release of a package, you would use something like 1.2_pre3. The
87 suffixes here can be arbitrarily chained without limitation.
88 .TP
89 .B Atom Prefix Operators [> >= = <= <]
90 -Sometimes you want to be able to depend on general versions rather than specifying
91 -exact versions all the time. Hence we provide standard boolean operators:
92 +Sometimes you want to be able to depend on general versions rather than
93 +specifying exact versions all the time. Hence we provide standard boolean
94 +operators:
95
96 Examples:
97 .nf
98 @@ -261,13 +262,13 @@ following syntax:
99 jpeg? ( media\-libs/jpeg )
100 .TP
101 .B !usevar? ( Atom )
102 -If you want to include a package only if the user does not have a certain option
103 -in their \fBUSE\fR variable, then use the following syntax:
104 +If you want to include a package only if the user does not have a certain
105 +option in their \fBUSE\fR variable, then use the following syntax:
106
107 !nophysfs? ( dev\-games/physfs )
108
109 -This is often useful for those times when you want to want to add optional support
110 -for a feature and have it enabled by default.
111 +This is often useful for those times when you want to want to add optional
112 +support for a feature and have it enabled by default.
113 .TP
114 .B usevar? ( Atom if true ) !usevar? ( Atom if false )
115 For functionality like the tertiary operator found in C you must use
116 @@ -769,7 +770,8 @@ The paths may contain fnmatch patterns.
117 .B QA_FLAGS_IGNORED
118 This should contain a list of file paths, relative to the image directory, of
119 files that do not contain .GCC.command.line sections or contain .hash sections.
120 -The paths may contain regular expressions with escape\-quoted special characters.
121 +The paths may contain regular expressions with escape\-quoted special
122 +characters.
123
124 This variable is intended to be used on files of binary packages which ignore
125 CFLAGS, CXXFLAGS, FFLAGS, FCFLAGS, and LDFLAGS variables.
126 @@ -777,7 +779,8 @@ CFLAGS, CXXFLAGS, FFLAGS, FCFLAGS, and LDFLAGS variables.
127 .B QA_MULTILIB_PATHS
128 This should contain a list of file paths, relative to the image directory, of
129 files that should be ignored for the multilib\-strict checks.
130 -The paths may contain regular expressions with escape\-quoted special characters.
131 +The paths may contain regular expressions with escape\-quoted special
132 +characters.
133 .TP
134 .B QA_PRESTRIPPED
135 This should contain a list of file paths, relative to the image directory, of
136 @@ -999,7 +1002,8 @@ fi
137 .fi
138 .RE
139 .TP
140 -.B usex\fR \fI<USE flag>\fR \fI[true output]\fR \fI[false output]\fR \fI[true suffix]\fR \fI[false suffix]
141 +.B usex\fR \fI<USE flag>\fR \fI[true output]\fR \fI[false output]\fR \fI[true \
142 +suffix]\fR \fI[false suffix]
143 If USE flag is set, echo [true output][true suffix] (defaults to
144 "yes"), otherwise echo [false output][false suffix] (defaults to
145 "no"). The usex helper is available beginning with \fBEAPI 5\fR.
146 @@ -1007,14 +1011,14 @@ If USE flag is set, echo [true output][true suffix] (defaults to
147 .B use_with\fR \fI<USE item>\fR \fI[configure name]\fR \fI[configure opt]
148 Useful for creating custom options to pass to a configure script. If \fIUSE
149 item\fR is in the \fBUSE\fR variable and a \fIconfigure opt\fR is specified,
150 -then the string \fI\-\-with\-[configure name]=[configure opt]\fR will be echoed.
151 -If \fIconfigure opt\fR is not specified, then just \fI\-\-with\-[configure
152 -name]\fR will be echoed. If \fIUSE item\fR is not in the \fBUSE\fR variable,
153 -then the string \fI\-\-without\-[configure name]\fR will be echoed. If
154 -\fIconfigure name\fR is not specified, then \fIUSE item\fR will be used in
155 -its place. Beginning with \fBEAPI 4\fR, an empty \fIconfigure opt\fR argument
156 -is recognized. In \fBEAPI 3\fR and earlier, an empty \fIconfigure opt\fR
157 -argument is treated as if it weren't provided.
158 +then the string \fI\-\-with\-[configure name]=[configure opt]\fR will be
159 +echoed. If \fIconfigure opt\fR is not specified, then just
160 +\fI\-\-with\-[configure name]\fR will be echoed. If \fIUSE item\fR is not in
161 +the \fBUSE\fR variable, then the string \fI\-\-without\-[configure name]\fR
162 +will be echoed. If \fIconfigure name\fR is not specified, then \fIUSE item\fR
163 +will be used in its place. Beginning with \fBEAPI 4\fR, an empty \fIconfigure
164 +opt\fR argument is recognized. In \fBEAPI 3\fR and earlier, an empty
165 +\fIconfigure opt\fR argument is treated as if it weren't provided.
166 .RS
167 .TP
168 .I Examples:
169 @@ -1039,9 +1043,9 @@ myconf=$(use_with sdl SDL all\-plugins)
170 .TP
171 .B use_enable\fR \fI<USE item>\fR \fI[configure name]\fR \fI[configure opt]
172 Same as \fBuse_with\fR above, except that the configure options are
173 -\fI\-\-enable\-\fR instead of \fI\-\-with\-\fR and \fI\-\-disable\-\fR instead of
174 -\fI\-\-without\-\fR. Beginning with \fBEAPI 4\fR, an empty \fIconfigure opt\fR
175 -argument is recognized. In \fBEAPI 3\fR and earlier, an empty
176 +\fI\-\-enable\-\fR instead of \fI\-\-with\-\fR and \fI\-\-disable\-\fR instead
177 +of \fI\-\-without\-\fR. Beginning with \fBEAPI 4\fR, an empty \fIconfigure
178 +opt\fR argument is recognized. In \fBEAPI 3\fR and earlier, an empty
179 \fIconfigure opt\fR argument is treated as if it weren't provided.
180 .TP
181 .B hasv\fR \fI<item>\fR \fI<item list>
182 @@ -1071,7 +1075,8 @@ to apply to the host root instead of ${ROOT}.
183 Example:
184 .nf
185 VERINS="$(best_version net\-ftp/glftpd)"
186 - (VERINS now has the value "net\-ftp/glftpd\-1.27" if glftpd\-1.27 is installed)
187 + (VERINS now has the value "net\-ftp/glftpd\-1.27" if glftpd\-1.27 is \
188 + installed)
189 .fi
190
191 .SS "Hooks:"
192 @@ -1391,12 +1396,15 @@ with file mode \fI0644\fR (this can be overridden with the
193 \fBinsopts\fR function). Setting \-r sets recursive. The
194 \fBdoheader\fR helper is available beginning with \fBEAPI 5\fR.
195 .TP
196 -.B dohtml\fR \fI [\-a filetypes] [\-r] [\-x list\-of\-dirs\-to\-ignore] [list\-of\-files\-and\-dirs]
197 +.B dohtml\fR \fI [\-a filetypes] [\-r] [\-x list\-of\-dirs\-to\-ignore] \
198 +[list\-of\-files\-and\-dirs]
199 Installs the files in the list of files (space\-separated list) into
200 -/usr/share/doc/${PF}/html provided the file ends in .htm, .html, .css, .js, .gif, .jpeg, .jpg, or .png.
201 +/usr/share/doc/${PF}/html provided the file ends in .htm, .html, .css, .js, \
202 +.gif, .jpeg, .jpg, or .png.
203 Setting \fI\-a\fR limits what types of files will be included,
204 \fI\-A\fR appends to the default list, setting \fI\-x\fR sets which dirs to
205 -exclude (CVS excluded by default), \fI\-p\fR sets a document prefix, \fI\-r\fR sets recursive.
206 +exclude (CVS excluded by default), \fI\-p\fR sets a document prefix,
207 +\fI\-r\fR sets recursive.
208 .TP
209 .B doinfo\fR \fI<info\-file> [list of more info\-files]
210 Installs info\-pages into \fIDESTDIR\fR/info. Files are automatically
211 @@ -1450,7 +1458,8 @@ when installing into the document tree
212 (based in /usr/share/doc/${PF}/). Default is no subdir, or just "".
213 .TP
214 .B dodoc\fR \fI[-r] <document> [list of more documents]
215 -Installs a document or a list of documents into /usr/share/doc/${PF}/\fI<docinto path>\fR.
216 +Installs a document or a list of documents into
217 +/usr/share/doc/${PF}/\fI<docinto path>\fR.
218 Documents are marked for compression. Creates all necessary dirs.
219 Beginning with \fBEAPI 4\fR, there is support for recursion, enabled by the
220 new \fI\-r\fR option.
221 @@ -1528,7 +1537,8 @@ The \fI/usr/lib/portage/bin/ebuild.sh\fR script.
222 The helper apps in \fI/usr/lib/portage/bin\fR.
223 .TP
224 .B /etc/portage/make.conf
225 -Contains variables for the build\-process and overwrites those in make.defaults.
226 +Contains variables for the build\-process and overwrites those in
227 +make.defaults.
228 .TP
229 .B /usr/share/portage/config/make.globals
230 Contains the default variables for the build\-process, you should edit
231
232 diff --git a/man/egencache.1 b/man/egencache.1
233 index 92af347..f71feb3 100644
234 --- a/man/egencache.1
235 +++ b/man/egencache.1
236 @@ -11,7 +11,8 @@ itself, for distribution.
237 .SH ACTIONS
238 .TP
239 .BR "\-\-update [ATOM] ... "
240 -Update the \fImetadata/md5\-cache/\fR directory (generate metadata as necessary).
241 +Update the \fImetadata/md5\-cache/\fR directory (generate metadata as
242 +necessary).
243 If no package atoms are specified then all will be updated. See ebuild(5)
244 for the details on package atom syntax.
245 .TP
246
247 diff --git a/man/emaint.1 b/man/emaint.1
248 index c588a0b..3fae5c2 100644
249 --- a/man/emaint.1
250 +++ b/man/emaint.1
251 @@ -26,9 +26,10 @@ Discard no longer installed config tracker entries.
252 Discard merge lists saved for the \fBemerge\fR(1) \fB--resume\fR action.
253 .TP
254 .BR logs
255 -Clean out old logs from the \fBPORT_LOGDIR\fR using the command \fBPORT_LOGDIR_CLEAN\fR
256 -See the \fBmake.conf\fR(5) man page for additional information as well as enabling the
257 -\fB'clean-logs'\fR feature in emerge to do this automatically.
258 +Clean out old logs from the \fBPORT_LOGDIR\fR using the command
259 +\fBPORT_LOGDIR_CLEAN\fR
260 +See the \fBmake.conf\fR(5) man page for additional information as well as
261 +enabling the \fB'clean-logs'\fR feature in emerge to do this automatically.
262 .TP
263 .BR movebin
264 Perform package move updates for binary packages located in \fBPKGDIR\fR.
265 @@ -51,10 +52,12 @@ Fix any problems that may exist. (not all commands)
266 Cleans the logs from \fBPORT_LOGDIR\fR (logs command only)
267 .TP
268 .B \-p, \-\-pretend
269 -Sets pretend mode (same as \-c, \-\-check) for use with the \-C, \-\-clean OPTION (logs command only)
270 +Sets pretend mode (same as \-c, \-\-check) for use with the \-C, \-\-clean
271 +OPTION (logs command only)
272 .TP
273 .B \-t NUM, \-\-time NUM
274 -Changes the minimum age \fBNUM\fR (in days) of the logs to be listed or deleted. (logs command only)
275 +Changes the minimum age \fBNUM\fR (in days) of the logs to be listed or
276 +deleted. (logs command only)
277 .SH "REPORTING BUGS"
278 Please report bugs via http://bugs.gentoo.org/
279 .SH AUTHORS
280
281 diff --git a/man/emerge.1 b/man/emerge.1
282 index ac4651f..66f4360 100644
283 --- a/man/emerge.1
284 +++ b/man/emerge.1
285 @@ -4,7 +4,8 @@ emerge \- Command\-line interface to the Portage system
286 .SH "SYNOPSIS"
287 .TP
288 .BR emerge
289 -[\fIoptions\fR] [\fIaction\fR] [\fIebuild\fR | \fItbz2file\fR | \fIfile\fR | \fI@set\fR | \fIatom\fR] ...
290 +[\fIoptions\fR] [\fIaction\fR] [\fIebuild\fR | \fItbz2file\fR | \fIfile\fR |
291 +\fI@set\fR | \fIatom\fR] ...
292 .TP
293 .BR emerge
294 \fB\-\-sync\fR | \fB\-\-version\fR
295 @@ -100,14 +101,16 @@ later updating.
296 .TP
297 .BR \-\-check\-news
298 Scan all repositories for relevant unread GLEP 42 news items, and display
299 -how many are found. See \fIhttp://www.gentoo.org/proj/en/glep/glep-0042.html\fR.
300 +how many are found. See
301 +\fIhttp://www.gentoo.org/proj/en/glep/glep-0042.html\fR.
302 .TP
303 .BR \-\-clean
304 Cleans up the system by examining the installed packages and removing older
305 -packages. This is accomplished by looking at each installed package and separating
306 -the installed versions by \fBslot\fR. Clean will \fBremove all but the most recently
307 -installed version in each \fbslot\fR. Clean should not remove unslotted packages.
308 -Note: Most recently installed means most \fBrecent\fR, not highest version.
309 +packages. This is accomplished by looking at each installed package and
310 +separating the installed versions by \fBslot\fR. Clean will \fBremove all but
311 +the most recently installed version in each \fbslot\fR. Clean should not
312 +remove unslotted packages. Note: Most recently installed means most
313 +\fBrecent\fR, not highest version.
314 .TP
315 .BR "\-\-config "
316 Run package specific actions needed to be executed after the emerge process
317 @@ -301,9 +304,10 @@ Before performing the action, display what will take place (server info for
318 \fB\-\-sync\fR, \fB\-\-pretend\fR output for merge, and so forth), then ask
319 whether to proceed with the action or abort. Using \fB\-\-ask\fR is more
320 efficient than using \fB\-\-pretend\fR and then executing the same command
321 -without \fB\-\-pretend\fR, as dependencies will only need to be calculated once.
322 -\fBWARNING: If the "Enter" key is pressed at the prompt (with no other input),
323 -it is interpreted as acceptance of the first choice. Note that the input
324 +without \fB\-\-pretend\fR, as dependencies will only need to be calculated
325 +once. \fBWARNING: If the "Enter" key is pressed at the prompt (with no other
326 +input), it is interpreted as acceptance of the first choice. Note that the
327 +input
328 buffer is not cleared prior to the prompt, so an accidental press of the
329 "Enter" key at any time prior to the prompt will be interpreted as a choice!
330 Use the \-\-ask\-enter\-invalid option if you want a single "Enter" key
331 @@ -811,7 +815,8 @@ matching binary packages over newer unbuilt packages.
332 Tells emerge to use binary packages (from $PKGDIR) if they are available, thus
333 possibly avoiding some time\-consuming compiles. This option is useful for CD
334 installs; you can export PKGDIR=/mnt/cdrom/packages and then use this option to
335 -have emerge "pull" binary packages from the CD in order to satisfy dependencies.
336 +have emerge "pull" binary packages from the CD in order to satisfy
337 +dependencies.
338 .TP
339 .BR "\-\-usepkgonly [ y | n ] (\-K short option)"
340 Tells emerge to only use binary packages (from $PKGDIR). All the binary
341 @@ -877,7 +882,8 @@ When utilizing \fBemerge\fR with the \fB\-\-pretend\fR and \fB\-\-verbose\fR
342 flags, the output may be a little hard to understand at first. This section
343 explains the abbreviations.
344 .TP
345 -.B [blocks B ] app\-text/dos2unix ("app\-text/dos2unix" is blocking app\-text/hd2u\-0.8.0)
346 +.B [blocks B ] app\-text/dos2unix ("app\-text/dos2unix" is blocking \
347 +app\-text/hd2u\-0.8.0)
348 Dos2unix is Blocking hd2u from being emerged. Blockers are defined when
349 two packages will clobber each others files, or otherwise cause some form
350 of breakage in your system. However, blockers usually do not need to be
351 @@ -1087,8 +1093,8 @@ and the KDE configuration dirs; more may be added in the future.
352 .LP
353 When Portage installs a file into a protected directory tree like /etc, any
354 existing files will not be overwritten. If a file of the same name already
355 -exists, Portage will change the name of the to\-be\-installed file from 'foo' to
356 -\'._cfg0000_foo\'. If \'._cfg0000_foo\' already exists, this name becomes
357 +exists, Portage will change the name of the to\-be\-installed file from 'foo'
358 +to \'._cfg0000_foo\'. If \'._cfg0000_foo\' already exists, this name becomes
359 \'._cfg0001_foo\', etc. In this way, existing files are not overwritten,
360 allowing the administrator to manually merge the new config files and avoid any
361 unexpected changes.
362 @@ -1100,10 +1106,12 @@ deleted, which is of paramount importance.
363 .LP
364 Protected directories are set using the \fICONFIG_PROTECT\fR variable, normally
365 defined in make.globals. Directory exceptions to the CONFIG_PROTECTed
366 -directories can be specified using the \fICONFIG_PROTECT_MASK\fR variable. To find
367 -files that need to be updated in /etc, type \fBfind /etc \-iname \'._cfg????_*\'\fR.
368 +directories can be specified using the \fICONFIG_PROTECT_MASK\fR variable.
369 +To find files that need to be updated in /etc, type \fBfind /etc \-iname \'.
370 +cfg????_*\'\fR.
371 .LP
372 -You can disable this feature by setting \fICONFIG_PROTECT="\-*"\fR in \fBmake.conf\fR(5).
373 +You can disable this feature by setting \fICONFIG_PROTECT="\-*"\fR in
374 +\fBmake.conf\fR(5).
375 Then, Portage will mercilessly auto\-update your config files. Alternatively,
376 you can leave Config File Protection on but tell Portage that it can overwrite
377 files in certain specific /etc subdirectories. For example, if you wanted
378 @@ -1113,8 +1121,8 @@ add this to \fBmake.conf\fR(5):
379 .LP
380 .I CONFIG_PROTECT_MASK="/etc/wget /etc/rc.d"
381 .LP
382 -Tools such as dispatch\-conf, cfg\-update, and etc\-update are also available to
383 -aid in the merging of these files. They provide interactive merging and can
384 +Tools such as dispatch\-conf, cfg\-update, and etc\-update are also available
385 +to aid in the merging of these files. They provide interactive merging and can
386 auto\-merge trivial changes.
387 .SH "REPORTING BUGS"
388 Please report any bugs you encounter through our website:
389
390 diff --git a/man/env-update.1 b/man/env-update.1
391 index c0503ce..5051524 100644
392 --- a/man/env-update.1
393 +++ b/man/env-update.1
394 @@ -17,7 +17,8 @@ first.
395 .SH "OPTIONS"
396 .TP
397 .B \-\-no\-ldconfig
398 -Do not run \fBldconfig\fR (and thus skip rebuilding the \fIld.so.cache\fR, etc...).
399 +Do not run \fBldconfig\fR (and thus skip rebuilding the \fIld.so.cache\fR,
400 +etc...).
401 .SH "REPORTING BUGS"
402 Please report bugs via http://bugs.gentoo.org/
403 .SH "AUTHORS"
404
405 diff --git a/man/make.conf.5 b/man/make.conf.5
406 index 451dba9..f75e277 100644
407 --- a/man/make.conf.5
408 +++ b/man/make.conf.5
409 @@ -154,13 +154,14 @@ automatically have /* appended to them.
410 Defaults to "/lib/modules/* *.py[co]".
411 .TP
412 \fBCONFIG_PROTECT\fR = \fI[space delimited list of files and/or directories]\fR
413 -All files and/or directories that are defined here will have "config file protection"
414 -enabled for them. See the \fBCONFIGURATION FILES\fR section
415 +All files and/or directories that are defined here will have "config file
416 +protection" enabled for them. See the \fBCONFIGURATION FILES\fR section
417 of \fBemerge\fR(1) for more information.
418 .TP
419 -\fBCONFIG_PROTECT_MASK\fR = \fI[space delimited list of files and/or directories]\fR
420 -All files and/or directories that are defined here will have "config file protection"
421 -disabled for them. See the \fBCONFIGURATION FILES\fR section
422 +\fBCONFIG_PROTECT_MASK\fR = \fI[space delimited list of files and/or \
423 +directories]\fR
424 +All files and/or directories that are defined here will have "config file
425 +protection" disabled for them. See the \fBCONFIGURATION FILES\fR section
426 of \fBemerge\fR(1) for more information.
427 .TP
428 .B CTARGET
429 @@ -196,9 +197,9 @@ Defines whether or not to ignore audible beeps when displaying important
430 informational messages. This variable is unset by default.
431 .TP
432 .B EMERGE_DEFAULT_OPTS
433 -Options to append to the end of the \fBemerge\fR(1) command line on every invocation.
434 -These options will not be appended to the command line if \-\-ignore\-default\-opts
435 -is specified.
436 +Options to append to the end of the \fBemerge\fR(1) command line on every
437 +invocation. These options will not be appended to the command line if
438 +\-\-ignore\-default\-opts is specified.
439 .TP
440 .B EMERGE_LOG_DIR
441 Controls the location of emerge.log and emerge-fetch.log.
442 @@ -495,7 +496,8 @@ See also \fIsuidctl\fR below.
443 .TP
444 .B sign
445 When commiting work to cvs with \fBrepoman\fR(1), sign the Manifest with
446 -a GPG key. Read about the \fIPORTAGE_GPG_KEY\fR variable in \fBmake.conf\fR(5).
447 +a GPG key. Read about the \fIPORTAGE_GPG_KEY\fR variable in
448 +\fBmake.conf\fR(5).
449 .TP
450 .B skiprocheck
451 Skip write access checks on \fBDISTDIR\fR when fetching files. This is
452 @@ -579,7 +581,8 @@ Allow portage to drop root privileges and compile packages as
453 portage:portage without a sandbox (unless \fIusersandbox\fR is also used).
454 .TP
455 .B usersandbox
456 -Enable the sandbox in the compile phase, when running without root privs (\fIuserpriv\fR).
457 +Enable the sandbox in the compile phase, when running without root privs
458 +(\fIuserpriv\fR).
459 .TP
460 .B usersync
461 Drop privileges to the owner of \fBPORTDIR\fR for \fBemerge(1) --sync\fR
462 @@ -679,9 +682,9 @@ Defaults to /usr/portage/packages.
463 This variable defines the directory in which per\-ebuild logs are kept.
464 Logs are created only when this is set. They are stored as
465 ${CATEGORY}:${PF}:YYYYMMDD\-HHMMSS.log in the directory specified. If the
466 -directory does not exist, it will be created automatically and group permissions
467 -will be applied to it. If the directory already exists, portage will not
468 -modify it's permissions.
469 +directory does not exist, it will be created automatically and group
470 +permissions will be applied to it. If the directory already exists, portage
471 +will not modify it's permissions.
472 .TP
473 .B PORT_LOGDIR_CLEAN
474 This variable should contain a command for portage to call in order
475 @@ -698,7 +701,8 @@ file). This is only used when running with
476 the get binary pkg options are given to \fBemerge\fR. Review \fBemerge\fR(1)
477 for more information.
478 .TP
479 -\fBPORTAGE_BINHOST_HEADER_URI\fR = \fI"ftp://login:pass@××××××××××.site/pub/grp/i686/athlon\-xp/"\fR
480 +\fBPORTAGE_BINHOST_HEADER_URI\fR = \
481 +\fI"ftp://login:pass@××××××××××.site/pub/grp/i686/athlon\-xp/"\fR
482 This variable only makes sense on a system that will serve as a binhost and
483 build packages for clients. It defines the URI header field for the package
484 index file which is located at ${PKGDIR}/Packages. Clients that have
485 @@ -1060,10 +1064,12 @@ Arfrever Frehtes Taifersar Arahesis <arfrever@××××××.org>
486 .SH "FILES"
487 .TP
488 \fB/etc/make.conf\fR and \fB/etc/portage/make.conf\fR
489 -Contains variables for the build\-process and overwrites those in make.defaults.
490 +Contains variables for the build\-process and overwrites those in
491 +make.defaults.
492 .TP
493 .B /usr/share/portage/config/make.globals
494 -Contains the default variables for the build\-process, you should edit \fI/etc/portage/make.conf\fR instead.
495 +Contains the default variables for the build\-process, you should edit
496 +\fI/etc/portage/make.conf\fR instead.
497 .TP
498 .B /etc/portage/color.map
499 Contains variables customizing colors.
500
501 diff --git a/man/portage.5 b/man/portage.5
502 index 796047f..827c504 100644
503 --- a/man/portage.5
504 +++ b/man/portage.5
505 @@ -240,7 +240,8 @@ explaining how they can upgrade.
506 default-linux/x86/2005.0
507 # emerge -n '>=sys-apps/portage-2.0.51'
508 # rm -f /etc/portage/make.profile
509 -# ln -s /usr/portage/profiles/default-linux/alpha/2005.0 /etc/portage/make.profile
510 +# ln -s /usr/portage/profiles/default-linux/alpha/2005.0 \
511 +/etc/portage/make.profile
512 .fi
513 .TP
514 .BR eapi
515 @@ -281,8 +282,8 @@ for every value in that variable, so USE_EXPAND="FOO" and FOO="bar bla" results
516 in USE="foo_bar foo_bla".
517 .TP
518 \fBUSE_EXPAND_HIDDEN\fR = \fI[space delimited list of variable names]\fR
519 -Names of \fBUSE_EXPAND\fR variables that should not be shown in the verbose merge
520 -list output of the \fBemerge\fR(1) command.
521 +Names of \fBUSE_EXPAND\fR variables that should not be shown in the verbose
522 +merge list output of the \fBemerge\fR(1) command.
523 .TP
524 \fBUSE_EXPAND_IMPLICIT\fR = \fI[space delimited list of variable names]\fR
525 Defines \fBUSE_EXPAND\fR and \fBUSE_EXPAND_UNPREFIXED\fR
526 @@ -307,7 +308,8 @@ Defines ELIBC values used to generate implicit
527 Defines KERNEL values used to generate implicit
528 \fBIUSE\fR for ebuilds using \fBEAPI 5\fR or later.
529 .TP
530 -\fBUSE_EXPAND_VALUES_USERLAND\fR = \fI[space delimited list of USERLAND values]\fR
531 +\fBUSE_EXPAND_VALUES_USERLAND\fR = \fI[space delimited list of USERLAND \
532 +values]\fR
533 Defines USERLAND values used to generate implicit
534 \fBIUSE\fR for ebuilds using \fBEAPI 5\fR or later.
535 .TP
536 @@ -615,9 +617,9 @@ to keep all metadata in that format alone (useful for querying), enable
537 FEATURES="metadata-transfer" in \fBmake.conf\fR(5).
538 .TP
539 \fBpackage.accept_keywords\fR and \fBpackage.keywords\fR
540 -Per\-package ACCEPT_KEYWORDS. Useful for mixing unstable packages in with a normally
541 -stable system or vice versa. This will allow ACCEPT_KEYWORDS to be augmented
542 -for a single package. If both \fBpackage.accept_keywords\fR and
543 +Per\-package ACCEPT_KEYWORDS. Useful for mixing unstable packages in with a
544 +normally stable system or vice versa. This will allow ACCEPT_KEYWORDS to be
545 +augmented for a single package. If both \fBpackage.accept_keywords\fR and
546 \fBpackage.keywords\fR are present, both of them will be used, and values
547 from \fBpackage.accept_keywords\fR will override values from
548 \fBpackage.keywords\fR. The \fBpackage.accept_keywords\fR file is
549 @@ -658,8 +660,8 @@ example, a binary only package which is built for x86 will look like:
550
551 games-fps/quake3-demo-1.11.ebuild:KEYWORDS="-* x86"
552
553 -If you wish to accept this package anyways, then use one of the other keywords in your
554 -package.accept_keywords like this:
555 +If you wish to accept this package anyways, then use one of the other keywords
556 +in your package.accept_keywords like this:
557
558 games-fps/quake3-demo x86
559
560 @@ -687,7 +689,8 @@ directory and have the same format as \fBmake.conf\fR(5).
561
562 .I Example:
563 .nf
564 -# use environment variables from /etc/portage/env/glibc.conf for the glibc package
565 +# use environment variables from /etc/portage/env/glibc.conf for the glibc \
566 +package
567 sys\-libs/glibc glibc.conf
568 .fi
569
570 @@ -722,8 +725,8 @@ versions earlier than 1.0.4496. No problem!
571 .fi
572 .TP
573 .BR package.properties
574 -This will allow ACCEPT_PROPERTIES (see \fBmake.conf\fR(5)) to be augmented for a
575 -single package.
576 +This will allow ACCEPT_PROPERTIES (see \fBmake.conf\fR(5)) to be augmented for
577 +a single package.
578
579 .I Format:
580 .nf
581 @@ -763,7 +766,8 @@ Specifies \fIsite\-specific\fR repository configuration information.
582 .I Format:
583 .nf
584 \- comments begin with # (no inline comments)
585 -\- configuration of each repository is specified in a section starting with "[${repository_name}]"
586 +\- configuration of each repository is specified in a section starting with \
587 +"[${repository_name}]"
588 \- attributes are specified in "${attribute} = ${value}" format
589 .fi
590
591 @@ -853,7 +857,8 @@ Specifies type of synchronization.
592 Valid values: cvs, git, rsync
593 .TP
594 .B sync\-uri
595 -Specifies URI of repository used for synchronization performed by `emerge \-\-sync`.
596 +Specifies URI of repository used for synchronization performed by `emerge
597 +\-\-sync`.
598 .RS
599 .TP
600 Syntax:
601 @@ -1185,9 +1190,11 @@ mirrors. Keeps us from overloading a single server.
602
603 .I Example:
604 .nf
605 -sourceforge http://aleron.dl.sourceforge.net/sourceforge http://unc.dl.sourceforge.net/sourceforge
606 +sourceforge http://aleron.dl.sourceforge.net/sourceforge \
607 +http://unc.dl.sourceforge.net/sourceforge
608
609 -gentoo http://distro.ibiblio.org/pub/linux/distributions/gentoo/distfiles/ ftp://ftp.gtlib.cc.gatech.edu/pub/gentoo/distfiles
610 +gentoo http://distro.ibiblio.org/pub/linux/distributions/gentoo/distfiles/ \
611 +ftp://ftp.gtlib.cc.gatech.edu/pub/gentoo/distfiles
612
613 kernel http://www.kernel.org/pub http://www.us.kernel.org/pub
614 .fi
615
616 diff --git a/man/repoman.1 b/man/repoman.1
617 index bf498d4..a025350 100644
618 --- a/man/repoman.1
619 +++ b/man/repoman.1
620 @@ -1,6 +1,7 @@
621 .TH "REPOMAN" "1" "May 2013" "Portage VERSION" "Portage"
622 .SH NAME
623 -repoman \- Gentoo's program to enforce a minimal level of quality assurance in packages added to the portage tree
624 +repoman \- Gentoo's program to enforce a minimal level of quality assurance in
625 +packages added to the portage tree
626 .SH SYNOPSIS
627 \fBrepoman\fR [\fIoption\fR] [\fImode\fR]
628 .SH DESCRIPTION
629 @@ -9,7 +10,8 @@ repoman \- Gentoo's program to enforce a minimal level of quality assurance in p
630 .BR repoman
631 checks the quality of ebuild repositories.
632
633 -Note: \fBrepoman commit\fR only works \fIinside local\fR cvs, git, or subversion repositories.
634 +Note: \fBrepoman commit\fR only works \fIinside local\fR cvs, git, or
635 +subversion repositories.
636 .SH OPTIONS
637 .TP
638 \fB-a\fR, \fB--ask\fR
639 @@ -151,16 +153,19 @@ Ebuilds that have a missing or empty HOMEPAGE variable
640 Virtuals that have a non-empty HOMEPAGE variable
641 .TP
642 .B IUSE.invalid
643 -This ebuild has a variable in IUSE that is not in the use.desc or its metadata.xml file
644 +This ebuild has a variable in IUSE that is not in the use.desc or its
645 +metadata.xml file
646 .TP
647 .B IUSE.missing
648 -This ebuild has a USE conditional which references a flag that is not listed in IUSE
649 +This ebuild has a USE conditional which references a flag that is not listed in
650 +IUSE
651 .TP
652 .B KEYWORDS.dropped
653 Ebuilds that appear to have dropped KEYWORDS for some arch
654 .TP
655 .B KEYWORDS.invalid
656 -This ebuild contains KEYWORDS that are not listed in profiles/arch.list or for which no valid profile was found
657 +This ebuild contains KEYWORDS that are not listed in profiles/arch.list or for
658 +which no valid profile was found
659 .TP
660 .B KEYWORDS.missing
661 Ebuilds that have a missing or empty KEYWORDS variable
662 @@ -187,7 +192,8 @@ Syntax error in LICENSE (usually an extra/missing space/parenthesis)
663 Virtuals that have a non-empty LICENSE variable
664 .TP
665 .B LIVEVCS.stable
666 -Ebuild is a live ebuild (cvs, git, darcs, svn, etc) checkout with stable keywords.
667 +Ebuild is a live ebuild (cvs, git, darcs, svn, etc) checkout with stable
668 +keywords.
669 .TP
670 .B LIVEVCS.unmasked
671 Ebuild is a live ebuild (cvs, git, darcs, svn, etc) checkout but has keywords
672 @@ -227,19 +233,23 @@ Missing ChangeLog files
673 ChangeLogs that exist but have not been added to cvs
674 .TP
675 .B dependency.bad
676 -User-visible ebuilds with unsatisfied dependencies (matched against *visible* ebuilds)
677 +User-visible ebuilds with unsatisfied dependencies (matched against *visible*
678 +ebuilds)
679 .TP
680 .B dependency.badindev
681 -User-visible ebuilds with unsatisfied dependencies (matched against *visible* ebuilds) in developing arch
682 +User-visible ebuilds with unsatisfied dependencies (matched against *visible*
683 +ebuilds) in developing arch
684 .TP
685 .B dependency.badmasked
686 Masked ebuilds with unsatisfied dependencies (matched against *all* ebuilds)
687 .TP
688 .B dependency.badmaskedindev
689 -Masked ebuilds with unsatisfied dependencies (matched against *all* ebuilds) in developing arch
690 +Masked ebuilds with unsatisfied dependencies (matched against *all* ebuilds) in
691 +developing arch
692 .TP
693 .B dependency.badtilde
694 -Uses the ~ dep operator with a non-zero revision part, which is useless (the revision is ignored)
695 +Uses the ~ dep operator with a non-zero revision part, which is useless (the
696 +revision is ignored)
697 .TP
698 .B dependency.syntax
699 Syntax error in dependency string (usually an extra/missing space/parenthesis)
700 @@ -262,10 +272,12 @@ Some files listed in the Manifest aren't referenced in SRC_URI
701 This ebuild has a malformed header
702 .TP
703 .B ebuild.invalidname
704 -Ebuild files with a non-parseable or syntactically incorrect name (or using 2.1 versioning extensions)
705 +Ebuild files with a non-parseable or syntactically incorrect name (or using 2.1
706 +versioning extensions)
707 .TP
708 .B ebuild.majorsyn
709 -This ebuild has a major syntax error that may cause the ebuild to fail partially or fully
710 +This ebuild has a major syntax error that may cause the ebuild to fail
711 +partially or fully
712 .TP
713 .B ebuild.minorsyn
714 This ebuild has a minor syntax error that contravenes gentoo coding style
715 @@ -286,14 +298,15 @@ A simple sourcing of the ebuild produces output; this breaks ebuild policy.
716 PATCHES variable should be a bash array to ensure white space safety
717 .TP
718 .B ebuild.syntax
719 -Error generating cache entry for ebuild; typically caused by ebuild syntax error
720 -or digest verification failure.
721 +Error generating cache entry for ebuild; typically caused by ebuild syntax
722 +error or digest verification failure.
723 .TP
724 .B file.UTF8
725 File is not UTF8 compliant
726 .TP
727 .B file.executable
728 -Ebuilds, digests, metadata.xml, Manifest, and ChangeLog do not need the executable bit
729 +Ebuilds, digests, metadata.xml, Manifest, and ChangeLog do not need the
730 +executable bit
731 .TP
732 .B file.name
733 File/dir name must be composed of only the following chars: a-zA-Z0-9._-+:
734
735 diff --git a/man/xpak.5 b/man/xpak.5
736 index 0b5b874..6e3d03d 100644
737 --- a/man/xpak.5
738 +++ b/man/xpak.5
739 @@ -11,7 +11,8 @@ The following conventions cover all occurrences in this documentation
740 .IP Integer
741 All offsets/lengths are big endian unsigned 32bit integers
742 .IP String
743 -All strings are ASCII encoded, and not NUL terminated (quotes are for illustration only)
744 +All strings are ASCII encoded, and not NUL terminated (quotes are for
745 +illustration only)
746 .IP Values
747 The actual values of the individual xpak entries are stored as Strings
748 .P