4 files changed, 2 insertions, 85 deletions
diff --git a/x11-apps/xman/Manifest b/x11-apps/xman/Manifest
index 7ba80f1059ff..a1f5de6e3111 100644
--- a/x11-apps/xman/Manifest
+++ b/x11-apps/xman/Manifest
@@ -1,6 +1,3 @@
-AUX xman-1.1.3-mandb-2.7.patch 1843 BLAKE2B 471ec7f63c69e4bb4febbe49bbde9164b579371168caa763a6af58d71c65e248e6d58531d7dc1d50cd0d3240b881b2cd94fb22e1aeb6a0978a1c1578024b034a SHA512 74d4467ea8a2904cc4adfa02a92d57020ec045bc72ca1571451511080227a9031c0e5fb0d7b97c8a6625755f611a4bf4a352a751f420da18985a86289d0a0f5f
-DIST xman-1.1.4.tar.bz2 188259 BLAKE2B 3be982bfc9cad53b47dfe87e85d2fdafca4d0e9336c05eaf80665a79a1c420941226da9a3acfbdf7eb7c9d299085d78cb392d67c6859e28f07a304c6f935931b SHA512 785e973eb15b0300de08aace24f3604dfee61421c7f64ea4cde2e280480bf5d3ad797ab8208668dc023a375494f8db7534fbcaa1c1ef16e79464fdd017b5da68
 DIST xman-1.1.5.tar.bz2 193676 BLAKE2B b49e78b0127844e2ee8c0343392af940e592ee6958b4f1af217696da9ab1cd880331dec2af2f7eb5084cf44d40a041c730f571e5fb476e74924552e1316614ae SHA512 f6b2be424a79f298bf1a81edce4172572195c9efc9454e5b7b7046f344ed08154c77ccaa763ccdf3f1a30b64aa4802783bf813ee637437ccb1fba434fc5d4400
-EBUILD xman-1.1.4-r1.ebuild 435 BLAKE2B d16cfc7ddcba89dc732158918b8c10108f2b43a68bbd745040587204f1930b305a6695f3fc20b1ef6dc4eab5b20e0bf5b95231a7977ea27ece64ba21b4c56b3b SHA512 8dd3c27aea8b18973a8b595e0f004497d55f23241e0f4c1f1b728c71b33d95009bbca969e0539c3e600c9fdfe23d104e80a523a78745c8326ba489823eeeb228
-EBUILD xman-1.1.5.ebuild 387 BLAKE2B ec60dac4eaea49c45e47607269d67709342b71d4e9701b65e22634a596e242c0464bda62f5286c15e346b311cf6ce86d95e97eeff92adb3920e53b2384edfa6a SHA512 06240cf317a47ff3cfa22f27f3896e2feeca550d148476d27ff1343a8c392bae4aa37d5b65841888fb757e5f8e601a76727bebef006cbae60420f6f15faebed7
+EBUILD xman-1.1.5.ebuild 378 BLAKE2B ef1754258c86c0d1475954decfcc3ab9e7d85c09df4adeb9bc882d7d07791d8e9a05e7981504dd6398c7660316045dbe76d1209fb51371c285b658749e3e0d68 SHA512 af1561cfb362fdeb463222cec0a3cd6fe3f5510ee31808d7e6047aca521ca371fb63a534e5930bbb1e7b4f37ebc302267e810172c7af8270944a95f47ee55ce2
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
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
deleted file mode 100644
index f42ce577c2be..000000000000
--- a/x11-apps/xman/files/xman-1.1.3-mandb-2.7.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-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.4-r1.ebuild b/x11-apps/xman/xman-1.1.4-r1.ebuild
deleted file mode 100644
index e4fd534b0ac9..000000000000
--- a/x11-apps/xman/xman-1.1.4-r1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-XORG_EAUTORECONF=yes
-inherit xorg-2
-
-DESCRIPTION="Manual page display program for the X Window System"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
-IUSE=""
-
-DEPEND="x11-libs/libXaw
-	x11-libs/libXt
-	x11-libs/libXmu"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1.3-mandb-2.7.patch
-)
diff --git a/x11-apps/xman/xman-1.1.5.ebuild b/x11-apps/xman/xman-1.1.5.ebuild
index 699bcab04ade..1187ae3c09ca 100644
--- a/x11-apps/xman/xman-1.1.5.ebuild
+++ b/x11-apps/xman/xman-1.1.5.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="Manual page display program for the X Window System"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE=""
 
 RDEPEND="x11-libs/libXaw