7 files changed, 701 insertions, 44 deletions
diff --git a/app-arch/tar/ChangeLog b/app-arch/tar/ChangeLog
index 2ba6e0e32bfa..97ec2c0002ba 100644
--- a/app-arch/tar/ChangeLog
+++ b/app-arch/tar/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-arch/tar
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/ChangeLog,v 1.97 2007/07/07 07:36:09 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/ChangeLog,v 1.98 2007/07/07 12:26:40 ulm Exp $
+
+*tar-1.18-r1 (07 Jul 2007)
+
+  07 Jul 2007; Ulrich Mueller <ulm@gentoo.org> +files/tar.1-1.15.1,
+  files/tar.1, tar-1.15.1-r1.ebuild, -tar-1.18.ebuild, +tar-1.18-r1.ebuild:
+  Update man page on "-l" option, fixes bug #168555. Fix some typos, #170691.
 
   07 Jul 2007; Markus Rothe <corsair@gentoo.org> tar-1.17.ebuild:
   Stable on ppc64; bug #184453
diff --git a/app-arch/tar/Manifest b/app-arch/tar/Manifest
index 4d257b830414..914730c8d3c5 100644
--- a/app-arch/tar/Manifest
+++ b/app-arch/tar/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 1.15.1-flex-arg.patch 519 RMD160 7859cef187a2bb7a85ee74d310d8d9f9e25e411b SHA1 79ca8610fdb1cc4b4bbb00f00ff32a3d56cf94e6 SHA256 c594e45633cf45306060c6fa2649a1033b8955e8d86bca349dadbd686c505f93
 MD5 a1433bcc25f8f63d8ee96bddbf877962 files/1.15.1-flex-arg.patch 519
 RMD160 7859cef187a2bb7a85ee74d310d8d9f9e25e411b files/1.15.1-flex-arg.patch 519
@@ -34,18 +37,22 @@ AUX tar-CVE-2006-0300.patch 3677 RMD160 924b5e6aa64df7cb6ba3314ae114b12e26db3210
 MD5 2e0f6c79abe0ead888d78dfeca151ff0 files/tar-CVE-2006-0300.patch 3677
 RMD160 924b5e6aa64df7cb6ba3314ae114b12e26db3210 files/tar-CVE-2006-0300.patch 3677
 SHA256 1eb197a54ef561c2e5589663bf7cc75dbb641907dec295210003bfe990699e90 files/tar-CVE-2006-0300.patch 3677
-AUX tar.1 13001 RMD160 33d0ff5ff0cabf5fc1cbaeeede00707a587d468b SHA1 b8d4a9221310e357c46de56c5cdd834f1f93e6a4 SHA256 e6f61b5bf89be062246221ef932b205a0881a4d23fa7ea29a2ea5dbd9ae05769
-MD5 8ef48cb5d54b98e72766d1dd016ffa91 files/tar.1 13001
-RMD160 33d0ff5ff0cabf5fc1cbaeeede00707a587d468b files/tar.1 13001
-SHA256 e6f61b5bf89be062246221ef932b205a0881a4d23fa7ea29a2ea5dbd9ae05769 files/tar.1 13001
+AUX tar.1 13004 RMD160 c0afe404edbb6e11c2b4be51458056f115df30bd SHA1 ddd9670245e2026f26d7338cf0d0f1713f00b774 SHA256 9525814c05657180e309ee5fdf592cc61edbc92911921ed21fefc34bbe1dc36c
+MD5 e4f5b9d8a64483a12eb0cae5428f7cc7 files/tar.1 13004
+RMD160 c0afe404edbb6e11c2b4be51458056f115df30bd files/tar.1 13004
+SHA256 9525814c05657180e309ee5fdf592cc61edbc92911921ed21fefc34bbe1dc36c files/tar.1 13004
+AUX tar.1-1.15.1 13001 RMD160 33d0ff5ff0cabf5fc1cbaeeede00707a587d468b SHA1 b8d4a9221310e357c46de56c5cdd834f1f93e6a4 SHA256 e6f61b5bf89be062246221ef932b205a0881a4d23fa7ea29a2ea5dbd9ae05769
+MD5 8ef48cb5d54b98e72766d1dd016ffa91 files/tar.1-1.15.1 13001
+RMD160 33d0ff5ff0cabf5fc1cbaeeede00707a587d468b files/tar.1-1.15.1 13001
+SHA256 e6f61b5bf89be062246221ef932b205a0881a4d23fa7ea29a2ea5dbd9ae05769 files/tar.1-1.15.1 13001
 DIST tar-1.15.1.tar.bz2 1611489 RMD160 8de6b53b67294a942faec7638fb2cb2b4cccdac1 SHA1 f861b7524a0867833056dc382e68085234cae6ff SHA256 cc9a67d0bcdd6fd9f454893537799f98a4fd96e49e693e5b75b0604b9e3d2267
 DIST tar-1.16.1.tar.bz2 1793624 RMD160 27134a0c5512f37a8e063843ba6175a39e2da21b SHA1 ab3ccbc09da1dc040fb92a0de85ae34fc70b03a9 SHA256 5c843004934142cc85decf4ae0f5f8b8b568834d3e23f1568193b3836422d2bb
 DIST tar-1.17.tar.bz2 1882911 RMD160 f4671e909c1ff8fac531d438b50a4a197049bc45 SHA1 97f4b67bf88dba1d451a1ec375f18cfaa3c9f36f SHA256 19f9021dda51a16295e4706e80870e71f87107675e51c176a491eba0fc4ca492
 DIST tar-1.18.tar.bz2 1877207 RMD160 129e1a53ed3b580f5efc582622a90fdfc9d105f5 SHA1 5b5078cb291492ffeb4fb134179fc6ffd2121c66 SHA256 44944ee0427c8e0d8dbaa0b8f900073a7456819610cc521c53630c3eb117cf5e
-EBUILD tar-1.15.1-r1.ebuild 2094 RMD160 a14ed9e1f5384020f4012802407fe91fb549ed1d SHA1 dd682dbcbef482005c35bebf81b5f79a6fd8fcb1 SHA256 78b08063af2c1eb28d0cf304354574e2cd0ae2ec9e3e190a808f4c0c8fb2fcd7
-MD5 38a7572f6d97b2dc85520da201c86d94 tar-1.15.1-r1.ebuild 2094
-RMD160 a14ed9e1f5384020f4012802407fe91fb549ed1d tar-1.15.1-r1.ebuild 2094
-SHA256 78b08063af2c1eb28d0cf304354574e2cd0ae2ec9e3e190a808f4c0c8fb2fcd7 tar-1.15.1-r1.ebuild 2094
+EBUILD tar-1.15.1-r1.ebuild 2098 RMD160 8e0e5e2903693ffe8b7041be995091782aa7a124 SHA1 0668b929c5492339967a504b56a2ebf5c2b5bfc3 SHA256 aef8f436fc22e134289281f948ff2d57e17ed13fee436d60e7ac996ca45eaf7c
+MD5 4102e152bc9ded87a76ec55d390e7bd0 tar-1.15.1-r1.ebuild 2098
+RMD160 8e0e5e2903693ffe8b7041be995091782aa7a124 tar-1.15.1-r1.ebuild 2098
+SHA256 aef8f436fc22e134289281f948ff2d57e17ed13fee436d60e7ac996ca45eaf7c tar-1.15.1-r1.ebuild 2098
 EBUILD tar-1.16.1.ebuild 1647 RMD160 037df97a39b885f8a54fcc922e86a1270b2f8d69 SHA1 edd0ff10b992142be472a2fed6df56f8233a7b1a SHA256 56656c80be0193290c67d4d7464247e79bc5b096212ce849796ba5cf4beea4dd
 MD5 56680a1691fde6784cb08cedb7c0f99a tar-1.16.1.ebuild 1647
 RMD160 037df97a39b885f8a54fcc922e86a1270b2f8d69 tar-1.16.1.ebuild 1647
@@ -54,14 +61,14 @@ EBUILD tar-1.17.ebuild 1702 RMD160 0c70e72b4d534236461ec07070e97855dea61ffc SHA1
 MD5 2ade093e4376668a7484237996c9c669 tar-1.17.ebuild 1702
 RMD160 0c70e72b4d534236461ec07070e97855dea61ffc tar-1.17.ebuild 1702
 SHA256 2c1de76eb3ff68562d196438e62e1e437f56a36d102051d732b3e358f37c6e4d tar-1.17.ebuild 1702
-EBUILD tar-1.18.ebuild 1656 RMD160 c878afa3dfac2e2a480deb67d7f5f2b594e15b77 SHA1 bd8acce1e12ed1ad65c2517fca5e7862e0f0995f SHA256 11ea15163dac15a71cddf6ac7cd9eda2f4f57d15154b06a784645b930288d03a
-MD5 5caa683a1844ef223cd072a1c26c9f2b tar-1.18.ebuild 1656
-RMD160 c878afa3dfac2e2a480deb67d7f5f2b594e15b77 tar-1.18.ebuild 1656
-SHA256 11ea15163dac15a71cddf6ac7cd9eda2f4f57d15154b06a784645b930288d03a tar-1.18.ebuild 1656
-MISC ChangeLog 15820 RMD160 860e72fccf06d17deae3b7ea44a3ec47271b5762 SHA1 74a48980f3180e747a87fa9502c1303e1c3539c6 SHA256 fdca1b7977a79835ae6f0cc0bc38ad958834164d43d8017b4e928c33fe2b1201
-MD5 44b010de751552ac2e72eb7185baf4c3 ChangeLog 15820
-RMD160 860e72fccf06d17deae3b7ea44a3ec47271b5762 ChangeLog 15820
-SHA256 fdca1b7977a79835ae6f0cc0bc38ad958834164d43d8017b4e928c33fe2b1201 ChangeLog 15820
+EBUILD tar-1.18-r1.ebuild 1656 RMD160 e701d1f0f3237048feac460f106c5d9f4df6b397 SHA1 3596d8ec2addac71aab88e4e1b2251defad8271c SHA256 f27599628736ff02dc82eead583b30f595e9ae3e4ec3fda88843770cb8f8a2c4
+MD5 2ae71302222910ea829b4255f2bbd38c tar-1.18-r1.ebuild 1656
+RMD160 e701d1f0f3237048feac460f106c5d9f4df6b397 tar-1.18-r1.ebuild 1656
+SHA256 f27599628736ff02dc82eead583b30f595e9ae3e4ec3fda88843770cb8f8a2c4 tar-1.18-r1.ebuild 1656
+MISC ChangeLog 16067 RMD160 afbf8240c07c2e51793c24c1ad5fcee31ffe0cf5 SHA1 8f9107d570f0c03a75c1ba345bee2ca0a785437c SHA256 55ce12a22d5dd6108bff77029bd3d5fb24b29170d6fac334da2029b087de66a1
+MD5 0208ff90b302de64055e19dbd9178721 ChangeLog 16067
+RMD160 afbf8240c07c2e51793c24c1ad5fcee31ffe0cf5 ChangeLog 16067
+SHA256 55ce12a22d5dd6108bff77029bd3d5fb24b29170d6fac334da2029b087de66a1 ChangeLog 16067
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -75,6 +82,13 @@ SHA256 779d91a741a2e1e16f26de90c2c25b1c38aeb9132ca71b2a7ab974a436163bc2 files/di
 MD5 76fd4387f46d6edc1f7e4771411354af files/digest-tar-1.17 232
 RMD160 9369888ef973870b88e47e67102ecdf01e2a18d6 files/digest-tar-1.17 232
 SHA256 f569c6950e4c0779c8ae9499a1023460a561e61b1f6531a7462448b3d6487186 files/digest-tar-1.17 232
-MD5 2a4c2cef33202b7c83c4a87f32512b5b files/digest-tar-1.18 232
-RMD160 59528176381f24905dedc2f69cd1bf0cebfcb765 files/digest-tar-1.18 232
-SHA256 a51da4b71a4e3ead5181f8d00573d01e876cc22461033318932e9462ce85fc9a files/digest-tar-1.18 232
+MD5 2a4c2cef33202b7c83c4a87f32512b5b files/digest-tar-1.18-r1 232
+RMD160 59528176381f24905dedc2f69cd1bf0cebfcb765 files/digest-tar-1.18-r1 232
+SHA256 a51da4b71a4e3ead5181f8d00573d01e876cc22461033318932e9462ce85fc9a files/digest-tar-1.18-r1 232
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.7 (GNU/Linux)
+
+iD8DBQFGj4aEOeoy/oIi7uwRAgMCAJ9Lx/WjjjNIRtkHy+k8hdAWlJuC+ACeKd0x
+Ykm6SknGTGUSQitwriTk4k4=
+=tfgm
+-----END PGP SIGNATURE-----
diff --git a/app-arch/tar/files/digest-tar-1.18 b/app-arch/tar/files/digest-tar-1.18-r1
index 1e3df17e14e6..1e3df17e14e6 100644
--- a/app-arch/tar/files/digest-tar-1.18
+++ b/app-arch/tar/files/digest-tar-1.18-r1
diff --git a/app-arch/tar/files/tar.1 b/app-arch/tar/files/tar.1
index d79cad400d4d..177e2fe3b6db 100644
--- a/app-arch/tar/files/tar.1
+++ b/app-arch/tar/files/tar.1
@@ -1,4 +1,4 @@
-.TH TAR 1 "Oct 2004" "GNU" "tar"
+.TH TAR 1 "Jul 2007" "GNU" "tar"
 .SH NAME
 tar \- The GNU version of the tar archiving utility
 .SH SYNOPSIS
@@ -48,9 +48,6 @@ tar \- The GNU version of the tar archiving utility
 .BR -C ", " --directory " DIR"
 ]
 [
-.BR --check-links
-]
-[
 .BR --checkpoint
 ]
 [
@@ -105,7 +102,7 @@ tar \- The GNU version of the tar archiving utility
 .BR --keep-newer-files
 ]
 [
-.BR -l ", " --one-file-system
+.BR -l ", " --check-links
 ]
 [
 .BR -L ", " --tape-length " N"
@@ -159,6 +156,9 @@ tar \- The GNU version of the tar archiving utility
 .BR --occurrence " NUM"
 ]
 [
+.BR --one-file-system
+]
+[
 .BR --overwrite
 ]
 [
@@ -270,10 +270,10 @@ tar \- The GNU version of the tar archiving utility
 .BR -X ", " --exclude-from " FILE"
 ]
 [
-.BR -Z ", " --compress ", " --uncompress
+.BR -z ", " --gzip ", " --gunzip ", " --ungzip
 ]
 [
-.BR -z ", " --gzip ", " --gunzip ", " --ungzip
+.BR -Z ", " --compress ", " --uncompress
 ]
 [
 .BR -[0-7][lmh]
@@ -373,10 +373,6 @@ block the output of compression program for tapes
 .BR -C ", " --directory " DIR"
 change to directory DIR
 .TP
-.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
 .BR --checkpoint
 print directory names while reading the archive
 .TP
@@ -435,8 +431,9 @@ begin at file F in the archive
 .BR --keep-newer-files
 do not overwrite files which are newer than the archive
 .TP
-.BR -l ", " --one-file-system
-stay in local file system when creating an archive
+.BR -l ", " --check-links
+warn if number of hard links to the file on the filesystem mismatch the 
+number of links recorded in the archive
 .TP
 .BR -L ", " --tape-length " N"
 change tapes after writing N*1024 bytes
@@ -496,6 +493,9 @@ extract files to standard output
 process only NUM occurrences of each named file; used with 
 \fI--delete\fR, \fI--diff\fR, \fI--extract\fR, or \fI--list\fR
 .TP
+.BR --one-file-system
+stay in local file system when creating an archive
+.TP
 .BR --overwrite
 overwrite existing files and directory metadata when extracting
 .TP
@@ -611,23 +611,23 @@ exclude files based upon PATTERN
 .BR -X ", " --exclude-from " FILE"
 exclude files listed in FILE
 .TP
-.BR -Z ", " --compress ", " --uncompress
-filter the archive through compress
-.TP
 .BR -z ", " --gzip ", " --gunzip ", " --ungzip
 filter the archive through gzip
 .TP
+.BR -Z ", " --compress ", " --uncompress
+filter the archive through compress
+.TP
 .BR --use-compress-program " PROG"
 filter the archive through PROG (which must accept -d)
 .TP
 .BR -[0-7][lmh]
 specify drive and density
 .SH BUGS
-The GNU folks, in general, abhor man pages, and create info documents instead.
-The maintainer of \fBtar\fR falls into this category.  Thus this man page may 
-not be complete, nor current, and was included in the Gentoo portage tree 
+The GNU folks, in general, abhor man pages and create info documents instead.
+The maintainer of \fBtar\fR falls into this category.  Thus, this man page may 
+not be complete nor current, and it is included in the Gentoo portage tree 
 because man is a great tool :).  This man page was first taken from Debian 
-Linux and has since been loving updated here.
+Linux and has since been lovingly updated here.
 .SH "REPORTING BUGS"
 Please report bugs via http://bugs.gentoo.org/
 .SH "AUTHORS"
diff --git a/app-arch/tar/files/tar.1-1.15.1 b/app-arch/tar/files/tar.1-1.15.1
new file mode 100644
index 000000000000..d79cad400d4d
--- /dev/null
+++ b/app-arch/tar/files/tar.1-1.15.1
@@ -0,0 +1,637 @@
+.TH TAR 1 "Oct 2004" "GNU" "tar"
+.SH NAME
+tar \- The GNU version of the tar archiving utility
+.SH SYNOPSIS
+.B tar
+.I <operation> [options]
+
+.I Operations:
+.nf
+.B [-]A --catenate --concatenate
+.B [-]c --create
+.B [-]d --diff --compare
+.B [-]r --append
+.B [-]t --list
+.B [-]u --update
+.B [-]x --extract --get
+.B --delete
+.fi
+
+.I Common Options:
+.nf
+.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
+[
+.BR --atime-preserve
+]
+[
+.BR -b ", " --blocking-factor " N"
+]
+[
+.BR -B ", " --read-full-records
+]
+[
+.BR --backup " BACKUP-TYPE"
+]
+[
+.BR --block-compress
+]
+[
+.BR -C ", " --directory " DIR"
+]
+[
+.BR --check-links
+]
+[
+.BR --checkpoint
+]
+[
+.BR -f ", " --file " [HOSTNAME:]F"
+]
+[
+.BR -F ", " --info-script " F, " --new-volume-script " F"
+]
+[
+.BR --force-local
+]
+[
+.BR --format " FORMAT"
+]
+[
+.BR -g ", " --listed-incremental " F"
+]
+[
+.BR -G ", " --incremental
+]
+[
+.BR --group " GROUP"
+]
+[
+.BR -h ", " --dereference
+]
+[
+.BR --help
+]
+[
+.BR -i ", " --ignore-zeros
+]
+[
+.BR --ignore-case
+]
+[
+.BR --ignore-failed-read
+]
+[
+.BR --index-file " FILE"
+]
+[
+.BR -j ", " --bzip2
+]
+[
+.BR -k ", " --keep-old-files
+]
+[
+.BR -K ", " --starting-file " FILE"
+]
+[
+.BR --keep-newer-files
+]
+[
+.BR -l ", " --one-file-system
+]
+[
+.BR -L ", " --tape-length " N"
+]
+[
+.BR -m ", " --touch ", " --modification-time
+]
+[
+.BR -M ", " --multi-volume
+]
+[
+.BR --mode " PERMISSIONS"
+]
+[
+.BR -N ", " --after-date " DATE, " --newer " DATE"
+]
+[
+.BR --newer-mtime " DATE"
+]
+[
+.BR --no-anchored
+]
+[
+.BR --no-ignore-case
+]
+[
+.BR --no-recursion
+]
+[
+.BR --no-same-permissions
+]
+[
+.BR --no-wildcards
+]
+[
+.BR --no-wildcards-match-slash
+]
+[
+.BR --null
+]
+[
+.BR --numeric-owner
+]
+[
+.BR -o ", " --old-archive ", " --portability ", " --no-same-owner
+]
+[
+.BR -O ", " --to-stdout
+]
+[
+.BR --occurrence " NUM"
+]
+[
+.BR --overwrite
+]
+[
+.BR --overwrite-dir
+]
+[
+.BR --owner " USER"
+]
+[
+.BR -p ", " --same-permissions ", " --preserve-permissions
+]
+[
+.BR -P ", " --absolute-names
+]
+[
+.BR --pax-option " KEYWORD-LIST"
+]
+[
+.BR --posix
+]
+[
+.BR --preserve
+]
+[
+.BR -R ", " --block-number
+]
+[
+.BR --record-size " SIZE"
+]
+[
+.BR --recursion
+]
+[
+.BR --recursive-unlink
+]
+[
+.BR --remove-files
+]
+[
+.BR --rmt-command " CMD"
+]
+[
+.BR --rsh-command " CMD"
+]
+[
+.BR -s ", " --same-order ", " --preserve-order
+]
+[
+.BR -S ", " --sparse
+]
+[
+.BR --same-owner
+]
+[
+.BR --show-defaults
+]
+[
+.BR --show-omitted-dirs
+]
+[
+.BR --strip-components " NUMBER, " --strip-path " NUMBER (1)"
+]
+[
+.BR --suffix " SUFFIX"
+]
+[
+.BR -T ", " --files-from " FILE"
+]
+[
+.BR --totals	
+]
+[
+.BR -U ", " --unlink-first
+]
+[
+.BR --use-compress-program " PROG"
+]
+[
+.BR --utc
+]
+[
+.BR -v ", " --verbose
+]
+[
+.BR -V ", " --label " NAME"
+]
+[
+.BR --version	
+]
+[
+.BR --volno-file " FILE"
+]
+[
+.BR -w ", " --interactive ", " --confirmation
+]
+[
+.BR -W ", " --verify
+]
+[
+.BR --wildcards
+]
+[
+.BR --wildcards-match-slash
+]
+[
+.BR --exclude " PATTERN"
+]
+[
+.BR -X ", " --exclude-from " FILE"
+]
+[
+.BR -Z ", " --compress ", " --uncompress
+]
+[
+.BR -z ", " --gzip ", " --gunzip ", " --ungzip
+]
+[
+.BR -[0-7][lmh]
+]
+
+(1) tar-1.14 uses --strip-path, tar-1.14.90+ uses --strip-components
+.SH DESCRIPTION
+This manual page documents the GNU version of \fBtar\fR, an archiving 
+program designed to store and extract files from an archive file known 
+as a \fItarfile\fR.  A \fItarfile\fR may be made on a tape drive, 
+however, it is also common to write a \fItarfile\fR to a normal file.  
+The first argument to \fBtar\fR must be one of the options \fBAcdrtux\fR, 
+followed by any optional functions.  The final arguments to \fBtar\fR 
+are the names of the files or directories which should be archived.  The 
+use of a directory name always implies that the subdirectories below 
+should be included in the archive.
+.SH EXAMPLES
+.TP
+.B tar -xvf foo.tar
+verbosely extract foo.tar
+.TP
+.B tar -xzf foo.tar.gz
+extract gzipped foo.tar.gz
+.TP
+.B tar -cjf foo.tar.bz2 bar/
+create bzipped tar archive of the directory bar called foo.tar.bz2
+.TP
+.B tar -xjf foo.tar.bz2 -C bar/
+extract bzipped foo.tar.bz2 after changing directory to bar
+.TP
+.B tar -xzf foo.tar.gz blah.txt
+extract the file blah.txt from foo.tar.gz
+.SH "FUNCTION LETTERS"
+.TP
+.B One of the following options must be used:
+.TP
+.BR -A ", " --catenate ", " --concatenate
+append tar files to an archive
+.TP
+.BR -c ", " --create
+create a new archive
+.TP
+.BR -d ", " --diff ", " --compare
+find differences between archive and file system
+.TP
+.BR -r ", " --append
+append files to the end of an archive
+.TP
+.BR -t ", " --list
+list the contents of an archive
+.TP
+.BR -u ", " --update
+only append files that are newer than the existing in archive
+.TP
+.BR -x ", " --extract ", " --get
+extract files from an archive
+.TP
+.BR --delete
+delete from the archive (not for use on mag tapes!)
+.SH "COMMON OPTIONS"
+.TP
+.BR -C ", " --directory " DIR"
+change to directory DIR
+.TP
+.BR -f ", " --file " [HOSTNAME:]F"
+use archive file or device F (default "-", meaning stdin/stdout)
+.TP
+.BR -j ", " --bzip2
+filter archive through bzip2, use to decompress .bz2 files
+.TP
+.BR -p ", " --preserve-permissions
+extract all protection information
+.TP
+.BR -v ", " --verbose
+verbosely list files processed
+.TP
+.BR -z ", " --gzip ", " --ungzip
+filter the archive through gzip
+.SH "ALL OPTIONS"
+.TP
+.BR --atime-preserve
+don't change access times on dumped files
+.TP
+.BR -b ", " --blocking-factor " N"
+block size of Nx512 bytes (default N=20)
+.TP
+.BR -B ", " --read-full-blocks
+reblock as we read (for reading 4.2BSD pipes)
+.TP
+.BR --backup " BACKUP-TYPE"
+backup files instead of deleting them using BACKUP-TYPE simple or 
+numbered
+.TP
+.BR --block-compress
+block the output of compression program for tapes
+.TP
+.BR -C ", " --directory " DIR"
+change to directory DIR
+.TP
+.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
+.BR --checkpoint
+print directory names while reading the archive
+.TP
+.BR -f ", " --file " [HOSTNAME:]F"
+use archive file or device F (default "-", meaning stdin/stdout)
+.TP
+.BR -F ", " --info-script " FILE, " --new-volume-script " FILE"
+run script at end of each tape (implies \fI--multi-volume\fR)
+.TP
+.BR --force-local
+archive file is local even if has a colon
+.TP
+.BR --format " FORMAT"
+selects output archive format
+.nf
+\fIv7\fR - Unix V7
+\fIoldgnu\fR - GNU tar <=1.12
+\fIgnu\fR - GNU tar 1.13
+\fIustar\fR - POSIX.1-1988
+\fIposix\fR - POSIX.1-2001
+.fi
+.TP
+.BR -g ", " --listed-incremental " F"
+create/list/extract new GNU-format incremental backup
+.TP
+.BR -G ", " --incremental
+create/list/extract old GNU-format incremental backup
+.TP
+.BR -h ", " --dereference
+don't dump symlinks; dump the files they point to
+.TP
+.BR --help
+like this manpage, but not as cool
+.TP
+.BR -i ", " --ignore-zeros
+ignore blocks of zeros in archive (normally mean EOF)
+.TP
+.BR --ignore-case
+ignore case when excluding files
+.TP
+.BR --ignore-failed-read
+don't exit with non-zero status on unreadable files
+.TP
+.BR --index-file " FILE"
+send verbose output to FILE instead of stdout
+.TP
+.BR -j ", " --bzip2
+filter archive through bzip2, use to decompress .bz2 files
+.TP
+.BR -k ", " --keep-old-files
+keep existing files; don't overwrite them from archive
+.TP
+.BR -K ", " --starting-file " FILE"
+begin at file F in the archive
+.TP
+.BR --keep-newer-files
+do not overwrite files which are newer than the archive
+.TP
+.BR -l ", " --one-file-system
+stay in local file system when creating an archive
+.TP
+.BR -L ", " --tape-length " N"
+change tapes after writing N*1024 bytes
+.TP
+.BR -m ", " --touch ", " --modification-time
+don't extract file modified time
+.TP
+.BR -M ", " --multi-volume
+create/list/extract multi-volume archive
+.TP
+.BR --mode " PERMISSIONS"
+apply PERMISSIONS while adding files (see \fBchmod\fR(1))
+.TP
+.BR -N ", " --after-date " DATE, " --newer " DATE"
+only store files that were modified or had status updates (permissions,
+ACLs, extended attributes,...) since DATE
+.TP
+.BR --newer-mtime " DATE"
+like \fI--newer\fR, but only store files that were modified since DATE
+.TP
+.BR --no-anchored
+match any subsequenceof the name's components with \fI--exclude\fR
+.TP
+.BR --no-ignore-case
+use case-sensitive matching with \fI--exclude\fR
+.TP
+.BR --no-recursion
+don't recurse into directories
+.TP
+.BR --no-same-permissions
+apply user's umask when extracting files instead of recorded permissions
+.TP
+.BR --no-wildcards
+don't use wildcards with \fI--exclude\fR
+.TP
+.BR --no-wildcards-match-slash
+wildcards do not match slashes (/) with \fI--exclude\fR
+.TP
+.BR --null
+\fI--files-from\fR reads null-terminated names, disable \fI--directory\fR
+.TP
+.BR --numeric-owner
+always use numbers for user/group names
+.TP
+.BR -o ", " --old-archive ", " --portability
+like \fI--format=v7\fR; \fI-o\fR exhibits this behavior when creating an 
+archive (deprecated behavior)
+.TP
+.BR -o ", " --no-same-owner
+do not attempt to restore ownership when extracting; \fI-o\fR exhibits 
+this behavior when extracting an archive
+.TP
+.BR -O ", " --to-stdout
+extract files to standard output
+.TP
+.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
+.BR --overwrite
+overwrite existing files and directory metadata when extracting
+.TP
+.BR --overwrite-dir
+overwrite directory metadata when extracting
+.TP
+.BR --owner " USER"
+change owner of extraced files to USER
+.TP
+.BR -p ", " --same-permissions ", " --preserve-permissions
+extract all protection information
+.TP
+.BR -P ", " --absolute-names
+don't strip leading `/'s from file names
+.TP
+.BR --pax-option " KEYWORD-LIST"
+used only with POSIX.1-2001 archives to modify the way \fBtar\fR handles 
+extended header keywords
+.TP
+.BR --posix
+like \fI--format=posix\fR
+.TP
+.BR --preserve
+like \fI--preserve-permissions\fR \fI--same-order\fR
+.TP
+.BR -R ", " --record-number
+show record number within archive with each message
+.TP
+.BR --record-size " SIZE"
+use SIZE bytes per record when accessing archives
+.TP
+.BR --recursion
+recurse into directories
+.TP
+.BR --recursive-unlink
+remove existing directories before extracting directories of the same name
+.TP
+.BR --remove-files
+remove files after adding them to the archive
+.TP
+.BR --rmt-command " CMD"
+use CMD instead of the default /usr/sbin/rmt
+.TP
+.BR --rsh-command " CMD"
+use remote CMD instead of \fBrsh\fR(1)
+.TP
+.BR -s ", " --same-order ", " --preserve-order
+list of names to extract is sorted to match archive
+.TP
+.BR -S ", " --sparse
+handle sparse files efficiently
+.TP
+.BR --same-owner
+create extracted files with the same ownership 
+.TP
+.BR --show-defaults
+display the default options used by \fBtar\fR
+.TP
+.BR --show-omitted-dirs
+print directories \fBtar\fR skips while operating on an archive
+.TP
+.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
+.BR --suffix " SUFFIX"
+use SUFFIX instead of default '~' when backing up files
+.TP
+.BR -T ", " --files-from " FILE"
+get names to extract or create from file FILE
+.TP
+.BR --totals
+print total bytes written with --create
+.TP
+.BR -U ", " --unlink-first
+remove existing files before extracting files of the same name
+.TP
+.BR --use-compress-program " PROG"
+access the archive through PROG which is generally a compression program
+.TP
+.BR --utc
+display file modification dates in UTC
+.TP
+.BR -v ", " --verbose
+verbosely list files processed
+.TP
+.BR -V ", " --label " NAME"
+create archive with volume name NAME
+.TP
+.BR --version
+print \fBtar\fR program version number
+.TP
+.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
+.BR -w ", " --interactive ", " --confirmation
+ask for confirmation for every action
+.TP
+.BR -W ", " --verify
+attempt to verify the archive after writing it
+.TP
+.BR --wildcards
+use wildcards with \fI--exclude\fR
+.TP
+.BR --wildcards-match-slash
+wildcards match slashes (/) with \fI--exclude\fR
+.TP
+.BR --exclude " PATTERN"
+exclude files based upon PATTERN
+.TP
+.BR -X ", " --exclude-from " FILE"
+exclude files listed in FILE
+.TP
+.BR -Z ", " --compress ", " --uncompress
+filter the archive through compress
+.TP
+.BR -z ", " --gzip ", " --gunzip ", " --ungzip
+filter the archive through gzip
+.TP
+.BR --use-compress-program " PROG"
+filter the archive through PROG (which must accept -d)
+.TP
+.BR -[0-7][lmh]
+specify drive and density
+.SH BUGS
+The GNU folks, in general, abhor man pages, and create info documents instead.
+The maintainer of \fBtar\fR falls into this category.  Thus this man page may 
+not be complete, nor current, and was included in the Gentoo portage tree 
+because man is a great tool :).  This man page was first taken from Debian 
+Linux and has since been loving updated here.
+.SH "REPORTING BUGS"
+Please report bugs via http://bugs.gentoo.org/
+.SH "AUTHORS"
+.nf
+Debian Linux http://www.debian.org/
+Mike Frysinger <vapier@gentoo.org>
+.fi
diff --git a/app-arch/tar/tar-1.15.1-r1.ebuild b/app-arch/tar/tar-1.15.1-r1.ebuild
index 52866d5195ec..15b0dd5e0b47 100644
--- a/app-arch/tar/tar-1.15.1-r1.ebuild
+++ b/app-arch/tar/tar-1.15.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/tar-1.15.1-r1.ebuild,v 1.11 2006/04/23 16:43:28 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/tar-1.15.1-r1.ebuild,v 1.12 2007/07/07 12:26:40 ulm Exp $
 
 inherit flag-o-matic eutils
 
@@ -68,7 +68,7 @@ src_install() {
 		dodir /usr/bin
 		dosym /bin/${p}tar /usr/bin/${p}tar
 		dodoc AUTHORS ChangeLog* NEWS README* PORTS THANKS
-		newman "${FILESDIR}"/tar.1 ${p}tar.1
+		newman "${FILESDIR}"/tar.1-${PV} ${p}tar.1
 		mv "${D}"/usr/sbin/${p}backup{,-tar}
 		mv "${D}"/usr/sbin/${p}restore{,-tar}
 	fi
diff --git a/app-arch/tar/tar-1.18.ebuild b/app-arch/tar/tar-1.18-r1.ebuild
index 091cfbff0a4b..2579bbf0063b 100644
--- a/app-arch/tar/tar-1.18.ebuild
+++ b/app-arch/tar/tar-1.18-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/tar-1.18.ebuild,v 1.1 2007/06/29 17:52:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/tar-1.18-r1.ebuild,v 1.1 2007/07/07 12:26:40 ulm Exp $
 
 inherit flag-o-matic eutils