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.

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x2324E7B566DF2611!

5 files changed, 112 insertions, 19 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/Manifest b/x11-apps/xman/Manifest
index 9aa37e170b84..076112011aa0 100644
--- a/x11-apps/xman/Manifest
+++ b/x11-apps/xman/Manifest
@@ -1,26 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX xman-1.1.3-mandb-2.7.patch 1843 SHA256 c5342c47ca4d9149c75d4ba2e325e4616d7ac2ef1991d40e462357d70499cf9e SHA512 74d4467ea8a2904cc4adfa02a92d57020ec045bc72ca1571451511080227a9031c0e5fb0d7b97c8a6625755f611a4bf4a352a751f420da18985a86289d0a0f5f WHIRLPOOL cd8080b6f030c8ec93b7ac7a294a437aa97f363a5216fd01a64cf940ada8867fc0b25481833a1c701030d95f8562e60f47b36dba17d9567c1c6fe21f03e3791e
 DIST xman-1.1.3.tar.bz2 184340 SHA256 405211b606a7fa420029897f099dc107791bb4c29bc88481c6efac9c4590bb1a SHA512 7c6475434984205f359ff3cb47a41282536be6aefe7bc6e970736c4372b23b5de01a26864d7f5b2cae2f770eeef6d254ebbdf6db717b5efab0042a47cb7497be WHIRLPOOL bb3870840c627ac12122dbf038c2488e9c6e7dbf243d3efa74c8fa26f5bb07c261aa5550ccf36cb37314b4344b2e96a3b862b58b8d1dac1f6e78d2519cb86f0d
-EBUILD xman-1.1.3.ebuild 495 SHA256 3982357d5b6e2b3e43b0f21b113113df0697d0de885eecf0868f8ae76e4279a5 SHA512 98753e4de9f3c9b595383c9119467b9ca3ac642edcbcd08c2c85f8805a31c404f8ed5e697d003c994fb2bee7fc036daeb7049cec41e2214d4de7b74bb4354517 WHIRLPOOL 35c075377219aea626ff12bfe12f6162fe7208540201b2bfacb7a31bd142c4bda554e3108e41080ed5a485bc9e2b0f609cd947847fa65107bd9256b565430148
-MISC ChangeLog 7527 SHA256 4a4bde9ffc53c841014df6dc1fa72b5b5c0760ccc7e6ab7c602681b8091c71b6 SHA512 a8e54d66ffdc0a5d5ed7f631b2bc2580d781b2bc36a728ea1b6fdda0d4f9694ae218231e1f00aab1e3f0826b9bbbce00d89adc586e17c747283c8870618ff974 WHIRLPOOL 90671e38a224414bad7fc00b8d130051f9a4bfc9044c293f72c9a8204fa2e867c5d85074320b3f8ea76ac8f66b9f12300969e30b17e07832f061bb55973144fe
+EBUILD xman-1.1.3-r1.ebuild 573 SHA256 12b681d49f2b72f98e2099979fea9bd2a1d37cbbb5386f8b48bc12e035ae1801 SHA512 65d45ca51682a1d9acd83c2768176f255228bc47bf064331db44465942e45b94e5ea45395f612d42d50a8998f01afec621b27b817cccd6456405233b019547b6 WHIRLPOOL fed7fef63779ece00c18d10faf30167529fab71b120af3b2446e31dd3b5282957ceb76c8004564088045f2b5cc4d4226f90622dff857c9905dfcb6ebac967fc3
+EBUILD xman-1.1.3.ebuild 511 SHA256 389a695783ba74585cd50c5bfd19f82407e3e1d0271cc2a182cdde6adccd34ff SHA512 b354b089fcb3b93f9f81ab6261c0d85b9882ce89375419ea6e30e91df7ca8a2ecced6bdf226aead998e5828aa2aa58faae13fc1f54412bc74064486e9a5a0621 WHIRLPOOL ef6670aa99af9242143f4f07614f8050909ca6d8b8099879afbff7d40e5367b6dcc0113bd99fd61d677aee5c2d29733437a35b39837470a3dbc5b15f893c3fe6
+MISC ChangeLog 7852 SHA256 044dad394d3dfd5d057243c886beac6717fa271f61ff676efef14e27222908ee SHA512 4ff90e2b7544faa85af8f44dea5df5bbed4d59c32b09a6c3cc23d7b84a465f597b05006f8094540a5200490def61fcce1d162e40e5f3ba0711ca9f53d110e602 WHIRLPOOL bcb456444c81166fd63f8cc6a4a3cbc71dce3d8b33d73c5c169a9cef169b9b01a64f799974efa7a6f06c1a3f9e8aeff49eb9190181b311dcd48b67177a79a584
 MISC metadata.xml 156 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 SHA512 daa9bb2a9b1a16220327bc394f10d93a1a8a427bfbed8808cd247c1dfd5a5b87a4945d55d8243e07fede2c8182a208c618ebd483773d77e9d23862ec77016019 WHIRLPOOL 691e028648bb8b60771d74ef718c51fdb0f4a587e984f6ac4c13d7796415ecf770df2e0fd766399091771924bb65995e9bb290baa35971c56e07d76f2bbf6d93
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJU9tFgXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJU+FEzXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RDFCODdDQUUxMkUwNkJCNjUyMDMxOEIy
-MzI0RTdCNTY2REYyNjExAAoJECMk57Vm3yYRQS8QAImZwguXqsBu/gpOfExo6p8W
-TwlbDrYGS95Aeq4opFCxsJ4376MH3mBHPMVOPec2vVLhALATbXSOxMxEtFHPjG59
-w0tj0bKazunhjY9aAKRj5GIoyQfW6Ok19s4hyinB5zY+df2NTAayeA0pnT70gvsC
-WC2y5U1R9FhwGNMtysMmiE9g/2Rk2hS2ix1RA5bwaNyjaInPCJK3IUbjMupZCAYr
-8qhmjt16cD5FTDevBae0q+PXF6wY4el9lNcuCmy/EDo63p4GBETtxnwz2rrcP51+
-mBZMNYbeqezgzWpWWtBVH28BdQsTyn3UPOK7ECeVC9McRrUzh2NK1zvr05eMcx5u
-ThdYgEzwxWSRZfhYzihYwv1wv60d4Wze/94mDhodwexS61KdCvWqS0as1vk317gv
-S8fX9uq+GtYctX8RanRsxgtgDPy2d9qTNVfzdyYlzVqMGx3HokFLLTmON3WesrP7
-E4KIlKavolsYm1YSrWJ/JpbwysnlgnSa0nnu31WjTVDJOg7DgQft/+OmLlFSCKAj
-lNXaJtO3K9NCULCLuq+OxSjARp9hHf0QQqfONiz1e9bJA3/yVA5LcVn+I7SzVFzL
-uuSv29dOW6iJWiQKTFIxzirerSeX9xzXH0HUnCkxJYvImt13+SHQIaqjaaFuKVDH
-oEB7K7W9TjLMzMwpfyom
-=5B1H
+MzI0RTdCNTY2REYyNjExAAoJECMk57Vm3yYRxGoP/ApFLCbCCQ+x2u7pZTTwq9Wp
+mlVVIxr8ZpbRJ299yVWS/c2nrF1w0poxbtk7Sgx7RgBwc9FBhnUf2cSyBaCCBnrE
+nK4NhQ+UmU1tf2hAiJHnUiQw+kAml09UP/zJK8+xwGQqjRjvyjCXTqQ3SPxJrDeI
+jHvyiBqweYPsE/kfKtdlE/Sea/4uJBWiJ9dZXf8I37Yoc6JlBjt2kar8P6Wp9f1j
+SGRj38+7w6jU2cy+2hIvHREux9Dupkc0qJTlZ46hJ1IXv5qsYPs8mXV2GnF3Zs5d
+Ar7K2o7t3Fe2GfKunt71Fi8D3SOvW9HVmziMvlYCv6gOZrb3pnlFsX7DUOo2gbRN
+vvg5dOMb/W4j7IgBB09goXlh8lOOeuN3yU8zS6jXah+/6Ba1lfpBtPatbCOt9U2Y
+yu11UZHZicQiqJAfzZ2Sp2AGRUPbHUnoyLiNXFeIwRVBeOvwWir4hjU9nynGD99G
+BdZYNzDBVuWvryEfwLO+mQwtFWqnIri22aYdVuejUVc0JM14J8BSn1i97f829u47
+AJxQFmsdHuM8DelAN2POyIIXS1RWkS9RywZ3vmm8uzqzx4mkCuXn5HEIasnQn3Q2
+10RxMGzLTsZ7ApOCas5/j6r41c8av2p4fUgaD/jTsRh5dURpLYVPHGtu+0SF4adY
+i4oLedIbuAszXHhxDxPV
+=d/kN
 -----END PGP SIGNATURE-----
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"