touchup the way we display options

Package-Manager: portage-2.0.53_rc7

2 files changed, 200 insertions, 202 deletions

diff --git a/app-arch/tar/Manifest b/app-arch/tar/Manifest
index 04a1ff0402a1..f4aad89fb1a1 100644
--- a/app-arch/tar/Manifest
+++ b/app-arch/tar/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA1
 
 MD5 9f329eaebb848a7d0232c5127b9d2773 ChangeLog 10668
-MD5 e9fe7de46eb4b1aa489fc8a619e1f042 tar-1.15.1.ebuild 2046
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 d4f800ee8a2c5ddd00931249e680def8 tar-1.14.ebuild 1329
-MD5 e7c9ac5824e453f73a56032123c46f97 files/digest-tar-1.14 62
-MD5 71aa7eea494a25b07f4ea14a7f8a7a99 files/tar-1.15.1-less-verbose-newer.patch 770
 MD5 a1433bcc25f8f63d8ee96bddbf877962 files/1.15.1-flex-arg.patch 519
-MD5 6c645ac1da5d382a9f7ca85729b7e9e9 files/tar-1.15.1-dont-abort-long-names.patch 1586
-MD5 c6222f8e6644e897361b0426c753fc8d files/tar-1.15.1-lseek.patch 5270
+MD5 9873b609521d574ae1f98d1c092c80e4 files/append.at 1065
+MD5 e7c9ac5824e453f73a56032123c46f97 files/digest-tar-1.14 62
 MD5 1ce0c7df0ad9ec0c279340132692d7d4 files/digest-tar-1.15.1 64
+MD5 6c645ac1da5d382a9f7ca85729b7e9e9 files/tar-1.15.1-dont-abort-long-names.patch 1586
 MD5 971970980dc4f15a093acfe810dae560 files/tar-1.15.1-gcc4-test.patch 637
-MD5 9873b609521d574ae1f98d1c092c80e4 files/append.at 1065
-MD5 c94df05539a43d66c055452ef5acfb3b files/tar.1 12154
+MD5 71aa7eea494a25b07f4ea14a7f8a7a99 files/tar-1.15.1-less-verbose-newer.patch 770
+MD5 c6222f8e6644e897361b0426c753fc8d files/tar-1.15.1-lseek.patch 5270
+MD5 faf9e0ee102b11c24ce1645ec3847643 files/tar.1 12886
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 d4f800ee8a2c5ddd00931249e680def8 tar-1.14.ebuild 1329
+MD5 e9fe7de46eb4b1aa489fc8a619e1f042 tar-1.15.1.ebuild 2046
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFC/GBgj5H05b2HAEkRAsxqAJkBp3ld+Pr5MMZ+V78nbAhUcdvLzACcCwXP
-LeSFEv8caSYeBoMc4tzbgnE=
-=JDIQ
+iD8DBQFDhWG2gIKl8Uu19MoRAsZ9AJ9XpYnum84eZd6owo/l2yACFijj0gCfcARl
+s+GuDqzm8pc2acQFDnij4Sk=
+=6IQL
 -----END PGP SIGNATURE-----
diff --git a/app-arch/tar/files/tar.1 b/app-arch/tar/files/tar.1
index 1434c81c7079..402c74dbe843 100644
--- a/app-arch/tar/files/tar.1
+++ b/app-arch/tar/files/tar.1
@@ -19,264 +19,264 @@ tar \- The GNU version of the tar archiving utility
 
 .I Common Options:
 .nf
-.B -C, --directory DIR
-.B -f, --file F
-.B -j, --bzip2
-.B -p, --preserve-permissions
-.B -v, --verbose
-.B -z, --gzip
+.BR -C ", " --directory " DIR"
+.BR -f ", " --file " F"
+.BR -j ", " --bzip2
+.BR -p ", " --preserve-permissions
+.BR -v ", " --verbose
+.BR -z ", " --gzip
 .fi
 
 .I All Options:
 .br
 [
-.B --atime-preserve
+.BR --atime-preserve
 ]
 [
-.B -b, --blocking-factor N
+.BR -b ", " --blocking-factor " N"
 ]
 [
-.B -B, --read-full-records
+.BR -B ", " --read-full-records
 ]
 [
-.B --backup BACKUP-TYPE
+.BR --backup " BACKUP-TYPE"
 ]
 [
-.B --block-compress
+.BR --block-compress
 ]
 [
-.B -C, --directory DIR
+.BR -C ", " --directory " DIR"
 ]
 [
-.B --check-links
+.BR --check-links
 ]
 [
-.B --checkpoint
+.BR --checkpoint
 ]
 [
-.B -f, --file [HOSTNAME:]F
+.BR -f ", " --file " [HOSTNAME:]F"
 ]
 [
-.B -F, --info-script F --new-volume-script F
+.BR -F ", " --info-script " F, " --new-volume-script " F"
 ]
 [
-.B --force-local	
+.BR --force-local
 ]
 [
-.B --format FORMAT
+.BR --format " FORMAT"
 ]
 [
-.B -g, --listed-incremental F
+.BR -g ", " --listed-incremental " F"
 ]
 [
-.B -G, --incremental
+.BR -G ", " --incremental
 ]
 [
-.B --group GROUP
+.BR --group " GROUP"
 ]
 [
-.B -h, --dereference
+.BR -h ", " --dereference
 ]
 [
-.B --help
+.BR --help
 ]
 [
-.B -i, --ignore-zeros
+.BR -i ", " --ignore-zeros
 ]
 [
-.B --ignore-case
+.BR --ignore-case
 ]
 [
-.B --ignore-failed-read
+.BR --ignore-failed-read
 ]
 [
-.B --index-file FILE
+.BR --index-file " FILE"
 ]
 [
-.B -j, --bzip2
+.BR -j ", " --bzip2
 ]
 [
-.B -k, --keep-old-files
+.BR -k ", " --keep-old-files
 ]
 [
-.B -K, --starting-file F
+.BR -K ", " --starting-file " FILE"
 ]
 [
-.B --keep-newer-files
+.BR --keep-newer-files
 ]
 [
-.B -l, --one-file-system
+.BR -l ", " --one-file-system
 ]
 [
-.B -L, --tape-length N
+.BR -L ", " --tape-length " N"
 ]
 [
-.B -m, --touch, --modification-time
+.BR -m ", " --touch ", " --modification-time
 ]
 [
-.B -M, --multi-volume
+.BR -M ", " --multi-volume
 ]
 [
-.B --mode PERMISSIONS
+.BR --mode " PERMISSIONS"
 ]
 [
-.B -N, --after-date DATE, --newer DATE
+.BR -N ", " --after-date " DATE, " --newer " DATE"
 ]
 [
-.B --newer-mtime DATE
+.BR --newer-mtime " DATE"
 ]
 [
-.B --no-anchored
+.BR --no-anchored
 ]
 [
-.B --no-ignore-case
+.BR --no-ignore-case
 ]
 [
-.B --no-recursion
+.BR --no-recursion
 ]
 [
-.B --no-same-permissions
+.BR --no-same-permissions
 ]
 [
-.B --no-wildcards
+.BR --no-wildcards
 ]
 [
-.B --no-wildcards-match-slash
+.BR --no-wildcards-match-slash
 ]
 [
-.B --null	
+.BR --null
 ]
 [
-.B --numeric-owner
+.BR --numeric-owner
 ]
 [
-.B -o, --old-archive, --portability, --no-same-owner
+.BR -o ", " --old-archive ", " --portability ", " --no-same-owner
 ]
 [
-.B -O, --to-stdout
+.BR -O ", " --to-stdout
 ]
 [
-.B --occurrence NUM
+.BR --occurrence " NUM"
 ]
 [
-.B --overwrite
+.BR --overwrite
 ]
 [
-.B --overwrite-dir
+.BR --overwrite-dir
 ]
 [
-.B --owner USER
+.BR --owner " USER"
 ]
 [
-.B -p, --same-permissions, --preserve-permissions
+.BR -p ", " --same-permissions ", " --preserve-permissions
 ]
 [
-.B -P, --absolute-names
+.BR -P ", " --absolute-names
 ]
 [
-.B --pax-option KEYWORD-LIST
+.BR --pax-option " KEYWORD-LIST"
 ]
 [
-.B --posix
+.BR --posix
 ]
 [
-.B --preserve
+.BR --preserve
 ]
 [
-.B -R, --block-number
+.BR -R ", " --block-number
 ]
 [
-.B --record-size SIZE
+.BR --record-size " SIZE"
 ]
 [
-.B --recursion
+.BR --recursion
 ]
 [
-.B --recursive-unlink
+.BR --recursive-unlink
 ]
 [
-.B --remove-files
+.BR --remove-files
 ]
 [
-.B --rmt-command CMD
+.BR --rmt-command " CMD"
 ]
 [
-.B --rsh-command CMD
+.BR --rsh-command " CMD"
 ]
 [
-.B -s, --same-order, --preserve-order
+.BR -s ", " --same-order ", " --preserve-order
 ]
 [
-.B -S, --sparse
+.BR -S ", " --sparse
 ]
 [
-.B --same-owner
+.BR --same-owner
 ]
 [
-.B --show-defaults
+.BR --show-defaults
 ]
 [
-.B --show-omitted-dirs
+.BR --show-omitted-dirs
 ]
 [
-.B --strip-components NUMBER, --strip-path NUMBER (1)
+.BR --strip-components " NUMBER, " --strip-path " NUMBER (1)"
 ]
 [
-.B --suffix SUFFIX
+.BR --suffix " SUFFIX"
 ]
 [
-.B -T, --files-from F
+.BR -T ", " --files-from " FILE"
 ]
 [
-.B --totals	
+.BR --totals	
 ]
 [
-.B -U, --unlink-first
+.BR -U ", " --unlink-first
 ]
 [
-.B --use-compress-program PROG
+.BR --use-compress-program " PROG"
 ]
 [
-.B --utc
+.BR --utc
 ]
 [
-.B -v, --verbose
+.BR -v ", " --verbose
 ]
 [
-.B -V, --label NAME
+.BR -V ", " --label " NAME"
 ]
 [
-.B --version	
+.BR --version	
 ]
 [
-.B --volno-file F
+.BR --volno-file " FILE"
 ]
 [
-.B -w, --interactive, --confirmation
+.BR -w ", " --interactive ", " --confirmation
 ]
 [
-.B -W, --verify
+.BR -W ", " --verify
 ]
 [
-.B --wildcards
+.BR --wildcards
 ]
 [
-.B --wildcards-match-slash
+.BR --wildcards-match-slash
 ]
 [
-.B --exclude PATTERN
+.BR --exclude " PATTERN"
 ]
 [
-.B -X, --exclude-from FILE
+.BR -X ", " --exclude-from " FILE"
 ]
 [
-.B -Z, --compress, --uncompress
+.BR -Z ", " --compress ", " --uncompress
 ]
 [
-.B -z, --gzip, --gunzip, --ungzip
+.BR -z ", " --gzip ", " --gunzip ", " --ungzip
 ]
 [
-.B -[0-7][lmh]
+.BR -[0-7][lmh]
 ]
 
 (1) tar-1.14 uses --strip-path, tar-1.14.90+ uses --strip-components
@@ -310,86 +310,86 @@ extract the file blah.txt from foo.tar.bz2
 .TP
 .B One of the following options must be used:
 .TP
-.B -A, --catenate, --concatenate
+.BR -A ", " --catenate ", " --concatenate
 append tar files to an archive
 .TP
-.B -c, --create
+.BR -c ", " --create
 create a new archive
 .TP
-.B -d, --diff, --compare
+.BR -d ", " --diff ", " --compare
 find differences between archive and file system
 .TP
-.B -r, --append
+.BR -r ", " --append
 append files to the end of an archive
 .TP
-.B -t, --list
+.BR -t ", " --list
 list the contents of an archive
 .TP
-.B -u, --update
+.BR -u ", " --update
 only append files that are newer than the existing in archive
 .TP
-.B -x, --extract, --get
+.BR -x ", " --extract ", " --get
 extract files from an archive
 .TP
-.B --delete
+.BR --delete
 delete from the archive (not for use on mag tapes!)
 .SH "COMMON OPTIONS"
 .TP
-.B -C, --directory DIR
+.BR -C ", " --directory " DIR"
 change to directory DIR
 .TP
-.B -f, --file [HOSTNAME:]F
+.BR -f ", " --file " [HOSTNAME:]F"
 use archive file or device F (default "-", meaning stdin/stdout)
 .TP
-.B -j, --bzip2
+.BR -j ", " --bzip2
 filter archive through bzip2, use to decompress .bz2 files
 .TP
-.B -p, --preserve-permissions
+.BR -p ", " --preserve-permissions
 extract all protection information
 .TP
-.B -v, --verbose
+.BR -v ", " --verbose
 verbosely list files processed
 .TP
-.B -z, --gzip, --ungzip
+.BR -z ", " --gzip ", " --ungzip
 filter the archive through gzip
 .SH "ALL OPTIONS"
 .TP
-.B --atime-preserve
+.BR --atime-preserve
 don't change access times on dumped files
 .TP
-.B -b, --blocking-factor N
+.BR -b ", " --blocking-factor " N"
 block size of Nx512 bytes (default N=20)
 .TP
-.B -B, --read-full-blocks
+.BR -B ", " --read-full-blocks
 reblock as we read (for reading 4.2BSD pipes)
 .TP
-.B --backup BACKUP-TYPE
+.BR --backup " BACKUP-TYPE"
 backup files instead of deleting them using BACKUP-TYPE simple or 
 numbered
 .TP
-.B --block-compress
+.BR --block-compress
 block the output of compression program for tapes
 .TP
-.B -C, --directory DIR
+.BR -C ", " --directory " DIR"
 change to directory DIR
 .TP
-.B --check-links
+.BR --check-links
 warn if number of hard links to the file on the filesystem mismatch the 
 number of links recorded in the archive
 .TP
-.B --checkpoint
+.BR --checkpoint
 print directory names while reading the archive
 .TP
-.B -f, --file [HOSTNAME:]F
+.BR -f ", " --file " [HOSTNAME:]F"
 use archive file or device F (default "-", meaning stdin/stdout)
 .TP
-.B -F, --info-script F --new-volume-script F
+.BR -F ", " --info-script " FILE, " --new-volume-script " FILE"
 run script at end of each tape (implies \fI--multi-volume\fR)
 .TP
-.B --force-local
+.BR --force-local
 archive file is local even if has a colon
 .TP
-.B --format FORMAT
+.BR --format " FORMAT"
 selects output archive format
 .nf
 \fIv7\fR - Unix V7
@@ -399,227 +399,227 @@ selects output archive format
 \fIposix\fR - POSIX.1-2001
 .fi
 .TP
-.B -g, --listed-incremental F
+.BR -g ", " --listed-incremental " F"
 create/list/extract new GNU-format incremental backup
 .TP
-.B -G, --incremental
+.BR -G ", " --incremental
 create/list/extract old GNU-format incremental backup
 .TP
-.B -h, --dereference
+.BR -h ", " --dereference
 don't dump symlinks; dump the files they point to
 .TP
-.B --help
+.BR --help
 like this manpage, but not as cool
 .TP
-.B -i, --ignore-zeros
+.BR -i ", " --ignore-zeros
 ignore blocks of zeros in archive (normally mean EOF)
 .TP
-.B --ignore-case
+.BR --ignore-case
 ignore case when excluding files
 .TP
-.B --ignore-failed-read
+.BR --ignore-failed-read
 don't exit with non-zero status on unreadable files
 .TP
-.B --index-file FILE
+.BR --index-file " FILE"
 send verbose output to FILE instead of stdout
 .TP
-.B -j, --bzip2
+.BR -j ", " --bzip2
 filter archive through bzip2, use to decompress .bz2 files
 .TP
-.B -k, --keep-old-files
+.BR -k ", " --keep-old-files
 keep existing files; don't overwrite them from archive
 .TP
-.B -K, --starting-file F
+.BR -K ", " --starting-file " FILE"
 begin at file F in the archive
 .TP
-.B --keep-newer-files
+.BR --keep-newer-files
 do not overwrite files which are newer than the archive
 .TP
-.B -l, --one-file-system
+.BR -l ", " --one-file-system
 stay in local file system when creating an archive
 .TP
-.B -L, --tape-length N
+.BR -L ", " --tape-length " N"
 change tapes after writing N*1024 bytes
 .TP
-.B -m, --touch, --modification-time
+.BR -m ", " --touch ", " --modification-time
 don't extract file modified time
 .TP
-.B -M, --multi-volume
+.BR -M ", " --multi-volume
 create/list/extract multi-volume archive
 .TP
-.B --mode PERMISSIONS
+.BR --mode " PERMISSIONS"
 apply PERMISSIONS while adding files (see \fBchmod\fR(1))
 .TP
-.B -N, --after-date DATE, --newer DATE
+.BR -N ", " --after-date DATE ", " --newer " DATE"
 only store files newer than DATE
 .TP
-.B --newer-mtime DATE
+.BR --newer-mtime " DATE"
 like \fI--newer\fR, but with a DATE
 .TP
-.B --no-anchored
+.BR --no-anchored
 match any subsequenceof the name's components with \fI--exclude\fR
 .TP
-.B --no-ignore-case
+.BR --no-ignore-case
 use case-sensitive matching with \fI--exclude\fR
 .TP
-.B --no-recursion
+.BR --no-recursion
 don't recurse into directories
 .TP
-.B --no-same-permissions
+.BR --no-same-permissions
 apply user's umask when extracting files instead of recorded permissions
 .TP
-.B --no-wildcards
+.BR --no-wildcards
 don't use wildcards with \fI--exclude\fR
 .TP
-.B --no-wildcards-match-slash
+.BR --no-wildcards-match-slash
 wildcards do not match slashes (/) with \fI--exclude\fR
 .TP
-.B --null
+.BR --null
 \fI--files-from\fR reads null-terminated names, disable \fI--directory\fR
 .TP
-.B --numeric-owner
+.BR --numeric-owner
 always use numbers for user/group names
 .TP
-.B -o, --old-archive, --portability
+.BR -o ", " --old-archive ", " --portability
 like \fI--format=v7\fR; \fI-o\fR exhibits this behavior when creating an 
 archive (deprecated behavior)
 .TP
-.B -o, --no-same-owner
+.BR -o ", " --no-same-owner
 do not attempt to restore ownership when extracting; \fI-o\fR exhibits 
 this behavior when extracting an archive
 .TP
-.B -O, --to-stdout
+.BR -O ", " --to-stdout
 extract files to standard output
 .TP
-.B --occurrence NUM
+.BR --occurrence " NUM"
 process only NUM occurrences of each named file; used with 
 \fI--delete\fR, \fI--diff\fR, \fI--extract\fR, or \fI--list\fR
 .TP
-.B --overwrite
+.BR --overwrite
 overwrite existing files and directory metadata when extracting
 .TP
-.B --overwrite-dir
+.BR --overwrite-dir
 overwrite directory metadata when extracting
 .TP
-.B --owner USER
+.BR --owner " USER"
 change owner of extraced files to USER
 .TP
-.B -p, --same-permissions, --preserve-permissions
+.BR -p ", " --same-permissions ", " --preserve-permissions
 extract all protection information
 .TP
-.B -P, --absolute-names
+.BR -P ", " --absolute-names
 don't strip leading `/'s from file names
 .TP
-.B --pax-option KEYWORD-LIST
+.BR --pax-option " KEYWORD-LIST"
 used only with POSIX.1-2001 archives to modify the way \fBtar\fR handles 
 extended header keywords
 .TP
-.B --posix
+.BR --posix
 like \fI--format=posix\fR
 .TP
-.B --preserve
+.BR --preserve
 like \fI--preserve-permissions\fR \fI--same-order\fR
 .TP
-.B -R, --record-number
+.BR -R ", " --record-number
 show record number within archive with each message
 .TP
-.B --record-size SIZE
+.BR --record-size " SIZE"
 use SIZE bytes per record when accessing archives
 .TP
-.B --recursion
+.BR --recursion
 recurse into directories
 .TP
-.B --recursive-unlink
+.BR --recursive-unlink
 remove existing directories before extracting directories of the same name
 .TP
-.B --remove-files
+.BR --remove-files
 remove files after adding them to the archive
 .TP
-.B --rmt-command CMD
+.BR --rmt-command " CMD"
 use CMD instead of the default /usr/sbin/rmt
 .TP
-.B --rsh-command CMD
+.BR --rsh-command " CMD"
 use remote CMD instead of \fBrsh\fR(1)
 .TP
-.B -s, --same-order, --preserve-order
+.BR -s ", " --same-order ", " --preserve-order
 list of names to extract is sorted to match archive
 .TP
-.B -S, --sparse
+.BR -S ", " --sparse
 handle sparse files efficiently
 .TP
-.B --same-owner
+.BR --same-owner
 create extracted files with the same ownership 
 .TP
-.B --show-defaults
+.BR --show-defaults
 display the default options used by \fBtar\fR
 .TP
-.B --show-omitted-dirs
+.BR --show-omitted-dirs
 print directories \fBtar\fR skips while operating on an archive
 .TP
-.B --strip-components NUMBER, --strip-path NUMBER
+.BR --strip-components " NUMBER, " --strip-path " NUMBER"
 strip NUMBER of leading components from file names before extraction
 
 (1) tar-1.14 uses --strip-path, tar-1.14.90+ uses --strip-components
 .TP
-.B --suffix SUFFIX
+.BR --suffix " SUFFIX"
 use SUFFIX instead of default '~' when backing up files
 .TP
-.B -T, --files-from F
-get names to extract or create from file F
+.BR -T ", " --files-from " FILE"
+get names to extract or create from file FILE
 .TP
-.B --totals
+.BR --totals
 print total bytes written with --create
 .TP
-.B -U, --unlink-first
+.BR -U ", " --unlink-first
 remove existing files before extracting files of the same name
 .TP
-.B --use-compress-program PROG
+.BR --use-compress-program " PROG"
 access the archive through PROG which is generally a compression program
 .TP
-.B --utc
+.BR --utc
 display file modification dates in UTC
 .TP
-.B -v, --verbose
+.BR -v ", " --verbose
 verbosely list files processed
 .TP
-.B -V, --label NAME
+.BR -V ", " --label " NAME"
 create archive with volume name NAME
 .TP
-.B --version
+.BR --version
 print \fBtar\fR program version number
 .TP
-.B --volno-file F
+.BR --volno-file " FILE"
 keep track of which volume of a multi-volume archive its working in 
 FILE; used with \fI--multi-volume\fR
 .TP
-.B -w, --interactive, --confirmation
+.BR -w ", " --interactive ", " --confirmation
 ask for confirmation for every action
 .TP
-.B -W, --verify
+.BR -W ", " --verify
 attempt to verify the archive after writing it
 .TP
-.B --wildcards
+.BR --wildcards
 use wildcards with \fI--exclude\fR
 .TP
-.B --wildcards-match-slash
+.BR --wildcards-match-slash
 wildcards match slashes (/) with \fI--exclude\fR
 .TP
-.B --exclude PATTERN
+.BR --exclude " PATTERN"
 exclude files based upon PATTERN
 .TP
-.B -X, --exclude-from FILE
+.BR -X ", " --exclude-from " FILE"
 exclude files listed in FILE
 .TP
-.B -Z, --compress, --uncompress
+.BR -Z ", " --compress ", " --uncompress
 filter the archive through compress
 .TP
-.B -z, --gzip, --gunzip, --ungzip
+.BR -z ", " --gzip ", " --gunzip ", " --ungzip
 filter the archive through gzip
 .TP
-.B --use-compress-program PROG
+.BR --use-compress-program " PROG"
 filter the archive through PROG (which must accept -d)
 .TP
-.B -[0-7][lmh]
+.BR -[0-7][lmh]
 specify drive and density
 .SH BUGS
 The GNU folks, in general, abhor man pages, and create info documents instead.
@@ -634,5 +634,3 @@ Please report bugs via http://bugs.gentoo.org/
 Debian Linux http://www.debian.org/
 Mike Frysinger <vapier@gentoo.org>
 .fi
-.SH "CVS HEADER"
-$Header: /var/cvsroot/gentoo-x86/app-arch/tar/files/tar.1,v 1.5 2005/03/20 19:25:10 vapier Exp $