Do not depend on old man-db versions but instead block on newer ones. Add patch from Debian to address issues with newer man-db, bug #541446.

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0x2324E7B566DF2611!)

4 files changed, 94 insertions, 3 deletions

diff --git a/x11-apps/xman/ChangeLog b/x11-apps/xman/ChangeLog
index cea0c05ef90b..fd3fa89dac39 100644
--- a/x11-apps/xman/ChangeLog
+++ b/x11-apps/xman/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-apps/xman
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xman/ChangeLog,v 1.66 2015/03/04 09:32:57 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xman/ChangeLog,v 1.67 2015/03/05 12:50:30 chithanh Exp $
+
+*xman-1.1.3-r1 (05 Mar 2015)
+
+  05 Mar 2015; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +files/xman-1.1.3-mandb-2.7.patch, +xman-1.1.3-r1.ebuild, xman-1.1.3.ebuild:
+  Do not depend on old man-db versions but instead block on newer ones. Add
+  patch from Debian to address issues with newer man-db, bug #541446.
 
   04 Mar 2015; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
   -xman-1.1.2.ebuild, xman-1.1.3.ebuild:
diff --git a/x11-apps/xman/files/xman-1.1.3-mandb-2.7.patch b/x11-apps/xman/files/xman-1.1.3-mandb-2.7.patch
new file mode 100644
index 000000000000..f42ce577c2be
--- /dev/null
+++ b/x11-apps/xman/files/xman-1.1.3-mandb-2.7.patch
@@ -0,0 +1,60 @@
+From 438763b6e231410b95b5e352feb65c63cd54de6a Mon Sep 17 00:00:00 2001
+From: Julien Cristau <jcristau@debian.org>
+Date: Fri, 7 Nov 2014 16:19:57 +0000
+Subject: [PATCH] If we have man-db, don't try and emulate man's pipeline
+
+Just let man itself do the formatting / zsoelim / ... dance.
+
+Debian bug#764792 <https://bugs.debian.org/764792>
+
+Signed-off-by: Julien Cristau <jcristau@debian.org>
+---
+ xman/configure.ac | 5 +++++
+ xman/misc.c       | 8 ++++++++
+ 2 files changed, 13 insertions(+)
+
+diff --git a/xman/configure.ac b/xman/configure.ac
+index 9a80cbb..8bb44f2 100644
+--- a/xman/configure.ac
++++ b/xman/configure.ac
+@@ -44,6 +44,11 @@ if test "x$GROFF" = "xfound" ; then
+    AC_DEFINE([HAS_GROFF], 1, [Define to 1 if you have the groff package.])
+ fi
+ 
++AC_CHECK_PROG([MANDB], [mandb], [yes], [no])
++if test x"$MANDB" = xyes; then
++	AC_DEFINE([HAVE_MANDB], 1, [Define if the man implementation is man-db])
++fi
++
+ AC_CHECK_FUNCS([mkstemp])
+ 
+ AC_ARG_WITH(helpdir,
+diff --git a/xman/misc.c b/xman/misc.c
+index 06891cd..da8744a 100644
+--- a/xman/misc.c
++++ b/xman/misc.c
+@@ -661,6 +661,13 @@ static Boolean
+ ConstructCommand(char *cmdbuf, const char *path,
+                  const char *filename, const char *tempfile)
+ {
++#ifdef HAVE_MANDB
++    int used = snprintf(cmdbuf, BUFSIZ, "man -l %s > %s 2>/dev/null",
++                        filename, tempfile);
++    if (used >= BUFSIZ - 1)
++	return FALSE;
++    return TRUE;
++#else
+     /* The original code did the following to produce a command line:
+      *   sprintf(cmdbuf,"cd %s ; %s %s %s > %s %s", path, TBL,
+      *      filename, FORMAT, man_globals->tempfile, "2> /dev/null");
+@@ -783,6 +790,7 @@ ConstructCommand(char *cmdbuf, const char *path,
+         return (FALSE);
+ 
+     return (TRUE);
++#endif /* man-db */
+ }
+ #endif                          /* HANDLE_ROFFSEQ */
+ 
+-- 
+2.1.1
+
diff --git a/x11-apps/xman/xman-1.1.3-r1.ebuild b/x11-apps/xman/xman-1.1.3-r1.ebuild
new file mode 100644
index 000000000000..f1a0e188fe37
--- /dev/null
+++ b/x11-apps/xman/xman-1.1.3-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xman/xman-1.1.3-r1.ebuild,v 1.1 2015/03/05 12:50:30 chithanh Exp $
+
+EAPI=5
+XORG_EAUTORECONF=yes
+inherit xorg-2
+
+DESCRIPTION="Manual page display program for the X Window System"
+
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+DEPEND="x11-libs/libXaw
+	x11-libs/libXt
+	x11-libs/libXmu
+	x11-proto/xproto"
+RDEPEND="${DEPEND}
+	virtual/man"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1.3-mandb-2.7.patch
+)
diff --git a/x11-apps/xman/xman-1.1.3.ebuild b/x11-apps/xman/xman-1.1.3.ebuild
index 8150b5270b28..165a776f3f83 100644
--- a/x11-apps/xman/xman-1.1.3.ebuild
+++ b/x11-apps/xman/xman-1.1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xman/xman-1.1.3.ebuild,v 1.9 2015/03/04 09:32:57 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xman/xman-1.1.3.ebuild,v 1.10 2015/03/05 12:50:30 chithanh Exp $
 
 EAPI=5
 inherit xorg-2
@@ -15,4 +15,5 @@ DEPEND="x11-libs/libXaw
 	x11-libs/libXmu
 	x11-proto/xproto"
 RDEPEND="${DEPEND}
-	<sys-apps/man-db-2.7"
+	virtual/man
+	!>=sys-apps/man-db-2.7"