fixing #21018

4 files changed, 119 insertions, 3 deletions

diff --git a/sys-apps/man/Manifest b/sys-apps/man/Manifest
index 249db528798a..538a2a78bda7 100644
--- a/sys-apps/man/Manifest
+++ b/sys-apps/man/Manifest
@@ -3,8 +3,8 @@ MD5 e451f5410b1871afa0ed7796b92d0ba1 man-1.5k-r1.ebuild 2556
 MD5 2e7bf826bd7121f9ca44c7f576f7442b man-1.5l-r5.ebuild 2406
 MD5 44dbc5da4d1a1d867dd624988563a8c9 man-1.5l-r4.ebuild 2353
 MD5 5fab5adb6ab180e1c26c782966ff9e7c man-1.5i-r3.ebuild 1716
-MD5 3c889d79ab569ea7b5908a119ee68101 man-1.5l-r6.ebuild 2491
-MD5 3ef57608d3501584bc62aa1a69d20aba ChangeLog 5317
+MD5 fdea74fb9d951dee6229a48d81dbd98b man-1.5l-r6.ebuild 2592
+MD5 604286a825d98651a63d8f695fae6660 ChangeLog 5493
 MD5 cbbd4de51a8359a1ae81f46f2dad6bd8 files/man-1.5k-search-order.patch 489
 MD5 7de4684156992ffd479e773a4abc79d7 files/man-1.5l-locale-debug-info.patch 2128
 MD5 cbbd4de51a8359a1ae81f46f2dad6bd8 files/man-1.5l-search-order.patch 489
@@ -17,7 +17,7 @@ MD5 d8990b0dc5c9670156737c7012de3e9e files/man-1.5l-wrong-quotes.patch 411
 MD5 df6ae39cf3544b31e1d9e11b74b43d13 files/man-1.5k-groff-1.18.patch 634
 MD5 34fd8ac346c17188a9eb54e64276feee files/makewhatis.cron 155
 MD5 cb6f4195874e0c7bd39bc6ccc26611b7 files/man-1.5l-security.patch 781
-MD5 963a9363ab4bdb32e5fccaf0edc48d19 files/man-1.5l-LL-linewidth.patch 475
+MD5 963a9363ab4bdb32e5fccaf0edc48d19 files/man-1.5l-LL-linelength.patch 475
 MD5 c40cc9207adc44cb98bf59a1e9e90766 files/digest-man-1.5i-r3 61
 MD5 00f30e0e111b386b879a36f64180026c files/digest-man-1.5k-r1 60
 MD5 a63bfea0511bb4ea9292d63dc11348b3 files/digest-man-1.5l-r3 60
diff --git a/sys-apps/man/files/digest-man-1.5l-r6 b/sys-apps/man/files/digest-man-1.5l-r6
new file mode 100644
index 000000000000..1d4a35da11da
--- /dev/null
+++ b/sys-apps/man/files/digest-man-1.5l-r6
@@ -0,0 +1 @@
+MD5 07fa5ab41c39afcd59cdef5139ef563b man-1.5l.tar.gz 218249
diff --git a/sys-apps/man/files/man-1.5l-LL-linelength.patch b/sys-apps/man/files/man-1.5l-LL-linelength.patch
new file mode 100644
index 000000000000..10fcd0603a71
--- /dev/null
+++ b/sys-apps/man/files/man-1.5l-LL-linelength.patch
@@ -0,0 +1,10 @@
+--- man-1.5l/src/man.c.orig	2003-06-10 16:40:16.000000000 +0100
++++ man-1.5l/src/man.c	2003-06-10 16:40:57.000000000 +0100
+@@ -550,6 +550,7 @@
+ 	       /* however, a .lt command here fails, only
+ 		  .ev 1; .lt ...; .ev helps for my version of groff */
+ 	       sprintf(eos(bufh), "echo \".ll %d.%di\"; ", ll/10, ll%10);
++	       sprintf(eos(bufh), "echo \".nr LL %d.%di\"; ", ll/10, ll%10);
+ #if 0
+ 	       sprintf(eos(bufh), "echo \".lt %d.%di\"; ", ll/10, ll%10);
+ #endif
diff --git a/sys-apps/man/man-1.5l-r6.ebuild b/sys-apps/man/man-1.5l-r6.ebuild
new file mode 100644
index 000000000000..4be8836dcf97
--- /dev/null
+++ b/sys-apps/man/man-1.5l-r6.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/man-1.5l-r6.ebuild,v 1.1 2003/06/10 18:47:58 taviso Exp $
+
+IUSE="nls"
+
+inherit eutils
+
+NV="${PV}"
+S="${WORKDIR}/${PN}-${NV}"
+DESCRIPTION="Standard commands to read man pages"
+SRC_URI="mirror://kernel/linux/utils/man/man-${NV}.tar.gz"
+HOMEPAGE="http://freshmeat.net/projects/man/"
+
+DEPEND="virtual/glibc
+	>=sys-apps/sed-4"
+
+RDEPEND="sys-apps/cronbase
+	>=sys-apps/groff-1.18"
+
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~arm ~mips"
+LICENSE="GPL-2"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S} && \
+	sed -i \
+		-e 's:/usr/lib/locale:$(prefix)/usr/lib/locale:g' \
+		-e 's!/usr/bin:/usr/ucb:!/usr/bin:!' \
+		configure || die "configure sed failed"
+
+	sed -i -e 's:cc -o:$(CC) -o:' gencat/Makefile \
+		|| die "gencat/Makefile sed failed"
+
+	# security fix
+	epatch ${FILESDIR}/${P}-security.patch
+
+	# Fix search order in man.conf so that system installed manpages
+	# will be found first ...
+	epatch ${FILESDIR}/${P}-search-order.patch
+
+	# For groff-1.18 or later we need to call nroff with '-c'
+	epatch ${FILESDIR}/${P}-groff-1.18.patch
+
+	# Fix wierd failing in rare cases
+	epatch ${FILESDIR}/${P}-wrong-quotes-v2.patch
+
+	# Fix a crash when calling man with:  man -k "foo bar" (bug #9761).
+	# <azarah@gentoo.org> (26 Dec 2002).
+	epatch ${FILESDIR}/${P}-util_c-segfault.patch
+
+	# Various fixes from Redhat
+	epatch ${FILESDIR}/${P}-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)
+	# <azarah@gentoo.org> (26 Dec 2002).
+	epatch ${FILESDIR}/${P}-locale-debug-info.patch
+
+	# Line length overidden by noff macros, thanks to 
+	# <grant.mcdorman@sympatico.ca> for the patch, (bug #21018). 
+	# 	-taviso@gentoo.org
+	epatch ${FILESDIR}/${P}-LL-linelength.patch
+}
+
+src_compile() {
+	local myconf=
+
+	use nls && myconf="+lang all"
+
+	./configure -confdir=/etc \
+		+sgid +fhs \
+		${myconf} || die "configure failed"
+
+	emake -j1 || die "emake failed"
+}
+
+src_install() {
+	dodir /usr/{bin,sbin}
+	cd ${S}
+	make PREFIX=${D} install || die "make install failed"
+
+	insinto /etc
+	doins src/man.conf
+
+	dodoc COPYING LSM README* TODO
+
+	if [ -n "`use nls`" ]
+	then
+		cd ${S}/msgs
+		./inst.sh ?? ${D}/usr/share/locale/%L/%N
+	fi
+
+	chown root.man ${D}/usr/bin/man
+	chmod 2555 ${D}/usr/bin/man
+
+	# Needed for makewhatis
+	keepdir /var/cache/man
+
+	exeinto /etc/cron.daily
+	doexe ${FILESDIR}/makewhatis.cron
+}