Version bump. Also fix the <B7> gremlins #44201 by Chris Smith.

7 files changed, 34 insertions, 32 deletions

diff --git a/sys-apps/man/ChangeLog b/sys-apps/man/ChangeLog
index daa939d1bdb0..23dc502fc9c2 100644
--- a/sys-apps/man/ChangeLog
+++ b/sys-apps/man/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/man
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/ChangeLog,v 1.62 2004/12/13 20:26:58 vapier Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/ChangeLog,v 1.63 2005/01/08 02:10:18 vapier Exp $
+
+  07 Jan 2005; Mike Frysinger <vapier@gentoo.org>
+  files/man-1.5m-groff-1.18.patch, -man-1.5o_p1.ebuild:
+  Version bump.  Also fix the <B7> gremlins #44201 by Chris Smith.
 
 *man-1.5o_p1 (13 Dec 2004)
 
diff --git a/sys-apps/man/Manifest b/sys-apps/man/Manifest
index c7f784d56ae4..4b72ae4fb122 100644
--- a/sys-apps/man/Manifest
+++ b/sys-apps/man/Manifest
@@ -1,11 +1,11 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 1cd8da05f06456fb0af357ec6718ac4a ChangeLog 9219
-MD5 485a10aeed356a8deac997826eb12900 man-1.5o_p1.ebuild 4108
-MD5 0d992f673099cf324661d15b1d6a4578 man-1.5m-r2.ebuild 4277
+MD5 e2f1142fa676706a9eae956f9b1c0b20 ChangeLog 9393
+MD5 f7dab9ad0480c91649fa31517fbe300c man-1.5m-r2.ebuild 4277
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 295a1076025b39ae76d9113ee9b785a2 files/digest-man-1.5o_p1 61
+MD5 73fd5978afaa01ad5f69c1cdb0afde71 man-1.5o_p2.ebuild 3924
+MD5 e3918eca44e629c29e3f5adb66299d14 files/digest-man-1.5o_p2 61
 MD5 7e4bd368680d1c95bdaa6c6d5ee556f1 files/man-1.5m-locale-order.patch 454
 MD5 a1fe892ffb27e5e044ed342b611d2db1 files/makewhatis.cron 126
 MD5 9feb57fe5fbc4c123a42c7cf0314e628 files/digest-man-1.5m-r2 61
@@ -13,7 +13,7 @@ MD5 932c883a826094eb89ed6683b6f61338 files/man-1.5m-cross-compile.patch 1043
 MD5 43a67f127cf7051e3399773c5e8d56f6 files/man-1.5o_p1-man2html-CFLAGS.patch 343
 MD5 963a9363ab4bdb32e5fccaf0edc48d19 files/man-1.5m-LL-linelength.patch 475
 MD5 fc750a4d956da7cb889e89722fe8f4e2 files/man-1.5m-defmanpath-symlinks.patch 750
-MD5 3fd69820a5978ad926d9f3583b485e1a files/man-1.5m-groff-1.18.patch 689
+MD5 80f2a25fb0b5692f39a1990527a93271 files/man-1.5m-groff-1.18.patch 923
 MD5 7de4684156992ffd479e773a4abc79d7 files/man-1.5m-locale-debug-info.patch 2128
 MD5 2a6b1a91ea6e3e46866a2a2f02ca9c70 files/man-1.5m-redhat-patches.patch 6782
 MD5 cbbd4de51a8359a1ae81f46f2dad6bd8 files/man-1.5m-search-order.patch 489
@@ -21,9 +21,9 @@ MD5 4169bba88b07f0a81c8e5598e1d8c758 files/man-1.5m-security.patch 833
 MD5 fe9f5db8b8b6feaaac25563cb294c901 files/man-1.5m-util_c-segfault.patch 2276
 MD5 de02d99d60fb0e923c37e9130989b324 files/man-1.5m-wrong-quotes-v2.patch 328
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
+Version: GnuPG v1.9.14 (GNU/Linux)
 
-iD8DBQFBvkXEroRuSHgZdywRAsw/AJsGBPeuAnNVKUYiK2QgFv52OgiOsACghR5N
-pGo9uOkrHkRJCh21HaIhW3I=
-=6xrn
+iD8DBQFB30EZroRuSHgZdywRAssCAJ48GU3+3/TJozjnkVrKrA8aphdfvQCdHOoG
+iDAnQjj+953xf9nyv5lOlrQ=
+=mpMz
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/man/files/digest-man-1.5o_p1 b/sys-apps/man/files/digest-man-1.5o_p1
deleted file mode 100644
index 2ba0fbbab59b..000000000000
--- a/sys-apps/man/files/digest-man-1.5o_p1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ff60906ee864be0fbf96cb023d113104 man-1.5o1.tar.gz 228844
diff --git a/sys-apps/man/files/digest-man-1.5o_p2 b/sys-apps/man/files/digest-man-1.5o_p2
new file mode 100644
index 000000000000..7d06a77e063e
--- /dev/null
+++ b/sys-apps/man/files/digest-man-1.5o_p2
@@ -0,0 +1 @@
+MD5 57698044c2864c70f0332fc38ee461b9 man-1.5o2.tar.gz 229373
diff --git a/sys-apps/man/files/man-1.5m-groff-1.18.patch b/sys-apps/man/files/man-1.5m-groff-1.18.patch
index 26a65b8dd8c8..08dff37503bf 100644
--- a/sys-apps/man/files/man-1.5m-groff-1.18.patch
+++ b/sys-apps/man/files/man-1.5m-groff-1.18.patch
@@ -1,3 +1,10 @@
+With newer versions of groff (1.18+), we need to use -c 
+so as to filter color output.
+
+Also, change the -Tlatin1 to -Tascii to get rid of '<B7>' 
+gremlins and output the normal bullets 'o'.
+http://bugs.gentoo.org/show_bug.cgi?id=44201
+
 --- man-1.5k/configure.orig	2002-12-26 06:23:53.000000000 +0200
 +++ man-1.5k/configure	2002-12-26 06:25:14.000000000 +0200
 @@ -473,9 +473,9 @@
@@ -5,10 +12,10 @@
      if test $Fnroff = "missing"
      then
 -      nroff="nroff -Tlatin1 -mandoc"
-+      nroff="nroff -Tlatin1 -c -mandoc"
++      nroff="nroff -Tascii -c -mandoc"
      else
 -      nroff="$Fnroff -Tlatin1 -mandoc"
-+      nroff="$Fnroff -Tlatin1 -c -mandoc"
++      nroff="$Fnroff -Tascii -c -mandoc"
      fi
      troff="troff -mandoc"
      echo "Warning: could not find groff"
@@ -17,7 +24,7 @@
        nroff="$Fgroff -Tlatin1 -mandoc"
      else
 -      nroff="$Fnroff -Tlatin1 -mandoc"
-+      nroff="$Fnroff -Tlatin1 -c -mandoc"
++      nroff="$Fnroff -Tascii -c -mandoc"
      fi
      troff="$Fgroff -Tps -mandoc"
      jnroff="$Fgroff -Tnippon -mandocj"
diff --git a/sys-apps/man/man-1.5m-r2.ebuild b/sys-apps/man/man-1.5m-r2.ebuild
index 7bcf09ae5b4e..591727ec02f8 100644
--- a/sys-apps/man/man-1.5m-r2.ebuild
+++ b/sys-apps/man/man-1.5m-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/man-1.5m-r2.ebuild,v 1.5 2004/12/13 19:53:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/man-1.5m-r2.ebuild,v 1.6 2005/01/08 02:10:18 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
diff --git a/sys-apps/man/man-1.5o_p1.ebuild b/sys-apps/man/man-1.5o_p2.ebuild
index bcf61bcb76a3..6482b8c4c0be 100644
--- a/sys-apps/man/man-1.5o_p1.ebuild
+++ b/sys-apps/man/man-1.5o_p2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/man-1.5o_p1.ebuild,v 1.1 2004/12/13 20:26:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/man-1.5o_p2.ebuild,v 1.1 2005/01/08 02:10:18 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -32,7 +32,7 @@ src_unpack() {
 		configure || die "configure sed failed"
 
 	# Make sure man2html respects our CFLAGS
-	epatch ${FILESDIR}/${P}-man2html-CFLAGS.patch
+	epatch ${FILESDIR}/man-1.5o_p1-man2html-CFLAGS.patch
 
 	# security fix
 	epatch ${FILESDIR}/man-1.5m-security.patch
@@ -44,10 +44,6 @@ src_unpack() {
 	# For groff-1.18 or later we need to call nroff with '-c'
 	epatch ${FILESDIR}/man-1.5m-groff-1.18.patch
 
-	# Fix a crash when calling man with:  man -k "foo bar" (bug #9761).
-	# <azarah@gentoo.org> (26 Dec 2002).
-	epatch ${FILESDIR}/man-1.5m-util_c-segfault.patch
-
 	# Various fixes from Redhat
 	epatch ${FILESDIR}/man-1.5m-redhat-patches.patch
 
@@ -120,14 +116,9 @@ src_install() {
 	fperms 2555 /usr/bin/man
 
 	diropts -m0775 -g man
-	for x in $(awk '
-		/^MANSECT/ {
-			split($2, sects, ":")
-			for (x in sects)
-				print "cat" sects[x]
-		}' ${D}/etc/man.conf)
-	do
-		keepdir /var/cache/man/${x}
+	local mansects=$(grep ^MANSECT "${D}"/etc/man.conf | cut -f2-)
+	for x in ${mansects//:/ } ; do
+		keepdir /var/cache/man/cat${x}
 	done
 }