Remove the DEPEND on util-linux, fixing bug #20314.

4 files changed, 16 insertions, 6 deletions

diff --git a/sys-apps/man/Manifest b/sys-apps/man/Manifest
index e6853bf01396..a26248f45588 100644
--- a/sys-apps/man/Manifest
+++ b/sys-apps/man/Manifest
@@ -1,7 +1,7 @@
-MD5 e33b0a07df2fbb95a056374a53a39144 ChangeLog 4736
+MD5 d7aa9ed86e7f1d8c7810669299be5fdb ChangeLog 4736
 MD5 3d04d5c091ec8b1358696ed898e3f6ee man-1.5i-r3.ebuild 1725
 MD5 091d6b4d81d001f815f18f86ed7f2cde man-1.5k-r1.ebuild 2566
-MD5 ba34f9ed615bc5bc1b9f5df90f7d6ea8 man-1.5l-r3.ebuild 2313
+MD5 a1c48739df2695ad7f6e51bafe628ab9 man-1.5l-r3.ebuild 2313
 MD5 c40cc9207adc44cb98bf59a1e9e90766 files/digest-man-1.5i-r3 61
 MD5 34fd8ac346c17188a9eb54e64276feee files/makewhatis.cron 155
 MD5 c5192bd8b69dea5e3b281950a427d025 files/man-1.5k-wrong-quotes.patch 340
diff --git a/sys-apps/man/files/digest-man-1.5l-r2 b/sys-apps/man/files/digest-man-1.5l-r3
index 1d4a35da11da..1d4a35da11da 100644
--- a/sys-apps/man/files/digest-man-1.5l-r2
+++ b/sys-apps/man/files/digest-man-1.5l-r3
diff --git a/sys-apps/man/files/man-1.5l-wrong-quotes-v2.patch b/sys-apps/man/files/man-1.5l-wrong-quotes-v2.patch
new file mode 100644
index 000000000000..aa514c2ceca3
--- /dev/null
+++ b/sys-apps/man/files/man-1.5l-wrong-quotes-v2.patch
@@ -0,0 +1,11 @@
+--- man-1.5k/src/Makefile.in.orig	2002-12-26 06:43:39.000000000 +0200
++++ man-1.5k/src/Makefile.in	2002-12-26 06:48:18.000000000 +0200
+@@ -16,7 +16,7 @@
+ 
+ pager = @pager@
+ 
+-GS = -DGREPSILENT=\'@grepsilent@\'
++GS = -DGREPSILENT=0x71
+ DEFS = @DEFS@ $(GS)
+ CWARN = -Wall -Wstrict-prototypes -Wmissing-prototypes
+ CWARNNP = -Wall
diff --git a/sys-apps/man/man-1.5l-r2.ebuild b/sys-apps/man/man-1.5l-r3.ebuild
index cdfeca71e65a..402156d42068 100644
--- a/sys-apps/man/man-1.5l-r2.ebuild
+++ b/sys-apps/man/man-1.5l-r3.ebuild
@@ -1,6 +1,6 @@
 # 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-r2.ebuild,v 1.5 2003/04/28 20:35:04 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/man-1.5l-r3.ebuild,v 1.1 2003/05/03 08:55:11 azarah Exp $
 
 IUSE=""
 
@@ -12,8 +12,7 @@ DESCRIPTION="Standard commands to read man pages"
 SRC_URI="http://www.kernel.org/pub/linux/utils/man/man-${NV}.tar.gz"
 HOMEPAGE="http://freshmeat.net/projects/man/"
 
-DEPEND="virtual/glibc
-	sys-apps/util-linux"
+DEPEND="virtual/glibc"
 
 RDEPEND="sys-apps/cronbase
 	>=sys-apps/groff-1.18"
@@ -44,7 +43,7 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}-groff-1.18.patch
 
 	# Fix wierd failing in rare cases
-	epatch ${FILESDIR}/${P}-wrong-quotes.patch
+	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).