Punt redhat fixes since they are outdated and not really useful anymore.

4 files changed, 33 insertions, 14 deletions

diff --git a/sys-apps/man/ChangeLog b/sys-apps/man/ChangeLog
index 23dc502fc9c2..359deaade9a3 100644
--- a/sys-apps/man/ChangeLog
+++ b/sys-apps/man/ChangeLog
@@ -1,10 +1,13 @@
 # ChangeLog for sys-apps/man
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/ChangeLog,v 1.64 2005/01/08 02:23:44 vapier Exp $
+
+*man-1.5o_p2 (07 Jan 2005)
 
   07 Jan 2005; Mike Frysinger <vapier@gentoo.org>
-  files/man-1.5m-groff-1.18.patch, -man-1.5o_p1.ebuild:
+  files/man-1.5m-groff-1.18.patch, +man-1.5o_p2.ebuild:
   Version bump.  Also fix the <B7> gremlins #44201 by Chris Smith.
+  Punt redhat fixes since they are outdated and not really useful anymore.
 
 *man-1.5o_p1 (13 Dec 2004)
 
diff --git a/sys-apps/man/Manifest b/sys-apps/man/Manifest
index 4b72ae4fb122..a268a48526c3 100644
--- a/sys-apps/man/Manifest
+++ b/sys-apps/man/Manifest
@@ -1,16 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 e2f1142fa676706a9eae956f9b1c0b20 ChangeLog 9393
+MD5 8ea9dc1513a2048d1125518dd045b9df ChangeLog 9496
 MD5 f7dab9ad0480c91649fa31517fbe300c man-1.5m-r2.ebuild 4277
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 73fd5978afaa01ad5f69c1cdb0afde71 man-1.5o_p2.ebuild 3924
+MD5 e7327fedbe8071ba4ff5cf6393bcbe4e man-1.5o_p2.ebuild 3809
 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
 MD5 932c883a826094eb89ed6683b6f61338 files/man-1.5m-cross-compile.patch 1043
 MD5 43a67f127cf7051e3399773c5e8d56f6 files/man-1.5o_p1-man2html-CFLAGS.patch 343
+MD5 c5d1c89a45091b6f6dacac697d7ce2e7 files/man-1.5o_p2-defmanpath-symlinks.patch 633
 MD5 963a9363ab4bdb32e5fccaf0edc48d19 files/man-1.5m-LL-linelength.patch 475
 MD5 fc750a4d956da7cb889e89722fe8f4e2 files/man-1.5m-defmanpath-symlinks.patch 750
 MD5 80f2a25fb0b5692f39a1990527a93271 files/man-1.5m-groff-1.18.patch 923
@@ -23,7 +24,7 @@ MD5 de02d99d60fb0e923c37e9130989b324 files/man-1.5m-wrong-quotes-v2.patch 328
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.9.14 (GNU/Linux)
 
-iD8DBQFB30EZroRuSHgZdywRAssCAJ48GU3+3/TJozjnkVrKrA8aphdfvQCdHOoG
-iDAnQjj+953xf9nyv5lOlrQ=
-=mpMz
+iD8DBQFB30REroRuSHgZdywRAiOsAJ4gtns7wSbKtFBwcHl95Ee6m75OXACeMbea
+p9kToyH2qJDspLCZQg4EtSM=
+=Ghzw
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/man/files/man-1.5o_p2-defmanpath-symlinks.patch b/sys-apps/man/files/man-1.5o_p2-defmanpath-symlinks.patch
new file mode 100644
index 000000000000..9261fb6aca4a
--- /dev/null
+++ b/sys-apps/man/files/man-1.5o_p2-defmanpath-symlinks.patch
@@ -0,0 +1,20 @@
+--- man-1.5o2/src/makewhatis.sh.orig	2005-01-07 21:19:37.812163552 -0500
++++ man-1.5o2/src/makewhatis.sh	2005-01-07 21:20:43.023249960 -0500
+@@ -41,7 +41,7 @@
+ # and should be first.
+ # It is a bug to add /var/cache/man to DEFCATPATH.
+ dm=
+-for d in /usr/man /usr/share/man
++for d in /usr/local/man /usr/share/man
+ do
+     if [ -d $d ]; then
+ 	if [ x$dm = x ]; then dm=$d; else dm=$dm:$d; fi
+@@ -49,7 +49,7 @@
+ done
+ DEFMANPATH=$dm
+ dc=
+-for d in /usr/man/preformat /usr/man /usr/share/man/preformat /usr/share/man
++for d in /usr/local/man /usr/share/man
+ do
+     if [ -d $d ]; then
+ 	if [ x$dc = x ]; then dc=$d; else dc=$dc:$d; fi
diff --git a/sys-apps/man/man-1.5o_p2.ebuild b/sys-apps/man/man-1.5o_p2.ebuild
index 6482b8c4c0be..75c082b4b4d5 100644
--- a/sys-apps/man/man-1.5o_p2.ebuild
+++ b/sys-apps/man/man-1.5o_p2.ebuild
@@ -1,6 +1,6 @@
 # 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_p2.ebuild,v 1.1 2005/01/08 02:10:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/man-1.5o_p2.ebuild,v 1.2 2005/01/08 02:23:44 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -44,9 +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
 
-	# Various fixes from Redhat
-	epatch ${FILESDIR}/man-1.5m-redhat-patches.patch
-
 	# Do not print the 'man: No such file or directory' error if
 	# 'man -d' was called and the NLS catalogue was not found, as
 	# it confuses people, and be more informative  ... (bug #6360)
@@ -60,9 +57,7 @@ src_unpack() {
 
 	# makewhatis traverses manpages twice, as default manpath
 	# contains two directories that are symlinked together
-	# (bug 23848)
-	#  -taviso@gentoo.org
-	epatch ${FILESDIR}/man-1.5m-defmanpath-symlinks.patch
+	epatch ${FILESDIR}/man-1.5o_p2-defmanpath-symlinks.patch
 
 	# Make sure the locale is searched in the right order #37778
 	epatch ${FILESDIR}/man-1.5m-locale-order.patch