[gentoo-commits] repo/proj/prefix:master commit in: sys-apps/man/files/, sys-apps/man/

[Fabian Groffen]

commit:     1828deec2f8fb741b9a1f6abf1fcec756387eafd
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 22 21:04:26 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Dec 22 21:04:26 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=1828deec

sys-apps/man: drop ~ppc-aix

Bug: https://bugs.gentoo.org/760057
Package-Manager: Portage-3.0.12-prefix, Repoman-3.0.2
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 sys-apps/man/files/man-1.5m-groff-1.18.patch       |  31 ----
 .../man/files/man-1.5p-defmanpath-symlinks.patch   |  26 ---
 sys-apps/man/files/man-1.5p-search-order.patch     |  19 ---
 sys-apps/man/files/man-1.6b-more-sections.patch    |  13 --
 sys-apps/man/files/man-1.6d-fbsd.patch             |  15 --
 sys-apps/man/files/man-1.6e-bsdish.patch           |  15 --
 .../man/files/man-1.6e-dont-kill-shebangs.patch    |  25 ---
 sys-apps/man/files/man-1.6e-hpux.patch             |  11 --
 sys-apps/man/files/man-1.6e-man2html-bzip2.patch   |  53 ------
 sys-apps/man/files/man-1.6e-prefix-path.patch      |  41 -----
 sys-apps/man/files/man-1.6e-readonly-whatis.patch  |  56 ------
 sys-apps/man/files/man-1.6e-readonly-whatis2.patch |  47 ------
 sys-apps/man/files/man-1.6f-compress.patch         |  42 -----
 sys-apps/man/files/man-1.6f-echo.patch             |  30 ----
 .../man/files/man-1.6f-interix-all_source.patch    |  12 --
 sys-apps/man/files/man-1.6f-irix.patch             |  22 ---
 .../man/files/man-1.6f-man2html-compression.patch  |  54 ------
 sys-apps/man/files/man-1.6f-so-search.patch        |  34 ----
 sys-apps/man/files/man-1.6f-xz.patch               | 128 --------------
 sys-apps/man/man-1.6g-r1.ebuild                    |   8 +-
 sys-apps/man/man-1.6g.ebuild                       | 188 ---------------------
 21 files changed, 2 insertions(+), 868 deletions(-)

diff --git a/sys-apps/man/files/man-1.5m-groff-1.18.patch b/sys-apps/man/files/man-1.5m-groff-1.18.patch
deleted file mode 100644
index 08dff37503..0000000000
--- a/sys-apps/man/files/man-1.5m-groff-1.18.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-With newer versions of groff (1.18+), we need to use -c 
-so as to filter color output.
-
-Also, change the -Tlatin1 to -Tascii to get rid of '<B7>' 
-gremlins and output the normal bullets 'o'.
-http://bugs.gentoo.org/show_bug.cgi?id=44201
-
---- man-1.5k/configure.orig	2002-12-26 06:23:53.000000000 +0200
-+++ man-1.5k/configure	2002-12-26 06:25:14.000000000 +0200
-@@ -473,9 +473,9 @@
-   then
-     if test $Fnroff = "missing"
-     then
--      nroff="nroff -Tlatin1 -mandoc"
-+      nroff="nroff -Tascii -c -mandoc"
-     else
--      nroff="$Fnroff -Tlatin1 -mandoc"
-+      nroff="$Fnroff -Tascii -c -mandoc"
-     fi
-     troff="troff -mandoc"
-     echo "Warning: could not find groff"
-@@ -484,7 +484,7 @@
-     then
-       nroff="$Fgroff -Tlatin1 -mandoc"
-     else
--      nroff="$Fnroff -Tlatin1 -mandoc"
-+      nroff="$Fnroff -Tascii -c -mandoc"
-     fi
-     troff="$Fgroff -Tps -mandoc"
-     jnroff="$Fgroff -Tnippon -mandocj"
-

diff --git a/sys-apps/man/files/man-1.5p-defmanpath-symlinks.patch b/sys-apps/man/files/man-1.5p-defmanpath-symlinks.patch
deleted file mode 100644
index f8ff4f4459..0000000000
--- a/sys-apps/man/files/man-1.5p-defmanpath-symlinks.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-makewhatis traverses manpages twice, as default manpath contains two
-directories that are symlinked together ... this isn't a real fix, just
-a workaround that should be OK for the way Gentoo does things.  a real
-fix would be to filter out any directories which resolv to the same
-directory ...
-
---- man-1.5o2/src/makewhatis.sh
-+++ man-1.5o2/src/makewhatis.sh
-@@ -41,7 +41,7 @@
- # and should be first.
- # It is a bug to add /var/cache/man to DEFCATPATH.
- dm=
--for d in /usr/man /usr/share/man /usr/X11R6/man /usr/local/man
-+for d in /usr/local/man /usr/share/man
- do
-     if [ -d $d ]; then
- 	if [ x$dm = x ]; then dm=$d; else dm=$dm:$d; fi
-@@ -49,7 +49,7 @@
- done
- DEFMANPATH=$dm
- dc=
--for d in /usr/man/preformat /usr/man /usr/share/man/preformat /usr/share/man
-+for d in /usr/local/man /usr/share/man
- do
-     if [ -d $d ]; then
- 	if [ x$dc = x ]; then dc=$d; else dc=$dc:$d; fi

diff --git a/sys-apps/man/files/man-1.5p-search-order.patch b/sys-apps/man/files/man-1.5p-search-order.patch
deleted file mode 100644
index b6603b6cf0..0000000000
--- a/sys-apps/man/files/man-1.5p-search-order.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Fix search order in man.conf so that system installed manpages
-will be found first ...
-
---- man-1.5p/src/man.conf.in
-+++ man-1.5p/src/man.conf.in
-@@ -36,11 +36,11 @@
- #
- # Every automatically generated MANPATH includes these fields
- #
--MANPATH	/usr/man
- MANPATH	/usr/share/man
--MANPATH	/usr/local/man
- MANPATH	/usr/local/share/man
- MANPATH	/usr/X11R6/man
-+MANPATH	/usr/local/man
-+MANPATH	/usr/man
- #
- # Uncomment if you want to include one of these by default
- #

diff --git a/sys-apps/man/files/man-1.6b-more-sections.patch b/sys-apps/man/files/man-1.6b-more-sections.patch
deleted file mode 100644
index 9e13c09e8f..0000000000
--- a/sys-apps/man/files/man-1.6b-more-sections.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-[1-8]x are for xorg man-pages
-
---- configure
-+++ configure
-@@ -949,7 +949,7 @@
- 
- # What sections do we anticipate?
- 
--tmpsections="1 1p 8 2 3 3p 4 5 6 7 9 0p tcl n l p o"
-+tmpsections="1 1p 8 2 3 3p 4 5 6 7 9 0p tcl n l p o 1x 2x 3x 4x 5x 6x 7x 8x"
- 
- if [ x$default = x ]; then
-   echo ""

diff --git a/sys-apps/man/files/man-1.6d-fbsd.patch b/sys-apps/man/files/man-1.6d-fbsd.patch
deleted file mode 100644
index 62189e0e85..0000000000
--- a/sys-apps/man/files/man-1.6d-fbsd.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Fixes compilation in FreeBSD
-
-http://bugs.gentoo.org/138123
-
---- man-1.6d/gencat/genlib.c
-+++ man-1.6d/gencat/genlib.c
-@@ -54,7 +54,7 @@
- #include <unistd.h>
- #endif
- 
--#ifndef __linux__
-+#if !defined(__linux__) && !defined(__FreeBSD__)
- #include <memory.h>
- static int bcopy(src, dst, length)
- char *src, *dst;

diff --git a/sys-apps/man/files/man-1.6e-bsdish.patch b/sys-apps/man/files/man-1.6e-bsdish.patch
deleted file mode 100644
index d79ea1a723..0000000000
--- a/sys-apps/man/files/man-1.6e-bsdish.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-This patch could be easily merged with the FreeBSD one, but we don't
-because the files have no CVS header and then auto syncing overwrites
-the local difference we make.  <grobian@g.o>
-
---- gencat/genlib.c
-+++ gencat/genlib.c
-@@ -54,7 +54,7 @@
- #include <unistd.h>
- #endif
- 
--#if !defined(__linux__) && !defined(__FreeBSD__)
-+#if !defined(__linux__) && !defined(__FreeBSD__) && !defined(__APPLE__) && !defined(__NetBSD__)
- #include <memory.h>
- static int bcopy(src, dst, length)
- char *src, *dst;

diff --git a/sys-apps/man/files/man-1.6e-dont-kill-shebangs.patch b/sys-apps/man/files/man-1.6e-dont-kill-shebangs.patch
deleted file mode 100644
index dbbc243b56..0000000000
--- a/sys-apps/man/files/man-1.6e-dont-kill-shebangs.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-http://bugs.gentoo.org/159192
-
---- configure
-+++ configure
-@@ -1250,6 +1250,7 @@
- allargs='$@'
- infiles='$infiles'
- infile='$infile'
-+shebang='`sed -n -e 1p $infile.in`'
- cb='$cb'
- cs='$cs'
- ce='$ce'
-@@ -1273,7 +1274,11 @@
-   *.1|*.5|*.8|*.man)
-     cb=$mancomment; cs=$mancomment; ce=$mancomment;;
-   *)
--    cb="#"; cs="#"; ce="#";;
-+    case "$shebang" in
-+    '#!'*) cb="$shebang";;
-+    *)     cb="#";;
-+    esac
-+    cs="#"; ce="#";;
-   esac
-   echo "$cb"                                                    > $infile
-   echo "$cs Generated automatically from $infile.in by the"     >> $infile

diff --git a/sys-apps/man/files/man-1.6e-hpux.patch b/sys-apps/man/files/man-1.6e-hpux.patch
deleted file mode 100644
index 4af30bf85f..0000000000
--- a/sys-apps/man/files/man-1.6e-hpux.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/man-getopt.c.orig	2007-11-20 14:52:24 +0100
-+++ src/man-getopt.c	2007-11-20 14:52:38 +0100
-@@ -233,7 +233,7 @@
- 
- static void 
- mysetenv(const char *name, const char *value) {
--#if defined(__sgi__) || defined(__sun__) || defined(sun)
-+#if defined(__sgi__) || defined(__sun__) || defined(sun) || defined(__hpux)
-     int len = strlen(value)+1+strlen(value)+1;
-     char *str = my_malloc(len);
-     sprintf(str, "%s=%s", name, value);

diff --git a/sys-apps/man/files/man-1.6e-man2html-bzip2.patch b/sys-apps/man/files/man-1.6e-man2html-bzip2.patch
deleted file mode 100644
index 091d4bdecc..0000000000
--- a/sys-apps/man/files/man-1.6e-man2html-bzip2.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-add support for bzip2 compression to man2html and friends
-
---- man2html/glimpse_filters
-+++ man2html/glimpse_filters
-@@ -1,3 +1,4 @@
-+*.bz2	bzip2 -d -c
- *.gz	gzip -d -c
- *.Z	gzip -d -c
- 
---- man2html/scripts/cgi-bin/man/man2html
-+++ man2html/scripts/cgi-bin/man/man2html
-@@ -87,6 +87,9 @@
- if [ -r "$PAGE" ]
- then
-     case "$PAGE" in
-+    *.bz2)
-+	bzcat "$PAGE" | "$MAN2HTML" "$LL" -D "$PAGE"
-+	;;
-     *.gz)
- 	zcat "$PAGE" | "$MAN2HTML" "$LL" -D "$PAGE"
- 	;;
-@@ -94,6 +97,9 @@
- 	"$MAN2HTML" "$LL" "$PAGE"
- 	;;
-     esac
-+elif [ -r "$PAGE".bz2 ]
-+then
-+	bzcat "$PAGE".bz2 | "$MAN2HTML" "$LL" -D "$PAGE"
- elif [ -r "$PAGE".gz ]
- then
- 	zcat "$PAGE".gz | "$MAN2HTML" "$LL" -D "$PAGE"
---- man2html/scripts/cgi-bin/man/mansearch
-+++ man2html/scripts/cgi-bin/man/mansearch
-@@ -153,7 +153,7 @@
-       }
-       print "<DT> <a href=\"" cgipath "/man2html?" fullname "\">";
-       textname = filename;
--      sub(/\.(gz)|Z|z$/, "", textname);
-+      sub(/\.(gz)|(bz2)|Z|z$/, "", textname);
-       sub(/\./, "(", textname);
-       textname = textname ")";
-       print textname;
---- man2html/scripts/cgi-bin/man/mansec
-+++ man2html/scripts/cgi-bin/man/mansec
-@@ -128,7 +128,7 @@
- 				# Print out alphabetic quick index and other links
-       }
- 				# Split page.n into "page" and "n" and generate an entry
--      sub(/[.]([zZ]|(gz))$/, "", manpage);
-+      sub(/[.]([zZ]|(gz)|(bz2))$/, "", manpage);
-       match(manpage, /[.][^.]+$/);      
-       title = substr(manpage, 1, RSTART - 1);
-       if (section != "all") {

diff --git a/sys-apps/man/files/man-1.6e-prefix-path.patch b/sys-apps/man/files/man-1.6e-prefix-path.patch
deleted file mode 100644
index 823704a17e..0000000000
--- a/sys-apps/man/files/man-1.6e-prefix-path.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- configure
-+++ configure
-@@ -360,7 +360,8 @@
- #   for i in /bin:/usr/bin:$PATH
- # does not work everywhere.)
- # Some people might prefer having $PATH first in PREPATH
--PREPATH=/bin:/usr/bin:/usr/ucb:/usr/local/bin:$PATH
-+# => Yes we do in prefix
-+PREPATH=$PATH:/bin:/usr/bin:/usr/ucb:/usr/local/bin
- IFS0="$IFS"
- IFS=":$IFS"
- for i in $PREPATH
-@@ -824,7 +824,7 @@
- 
- if [ "x$languages" != x -a "x$languages" != xen ]
- then
--  DEF_NLSPATH="/usr/share/locale/%L/%N:/usr/lib/locale/%N/%L"
-+  DEF_NLSPATH="${prefix}/share/locale/%L/%N:${prefix}/lib/locale/%N/%L"
-   deflocalepath=`echo $NLSPATH:$DEF_NLSPATH | sed 's/:/ /g'`
-   for i in $deflocalepath; do
-     if [ x$deflocale = x ]; then
-@@ -840,7 +840,7 @@
-     fi
-   done
-   if [ x$deflocale = x ]; then
--    deflocale="/usr/lib/locale/%N/%L"
-+    deflocale="${prefix}/lib/locale/%N/%L"
-   fi
-   if [ x$default = x ]; then
-     echo ""
---- man2html/Makefile.in
-+++ man2html/Makefile.in
-@@ -1,7 +1,7 @@
- CC = @CC@
- CFLAGS += -Wall -Wstrict-prototypes -Wmissing-prototypes
- OBJECTS = man2html.o cgibase.o abbrev.o strdefs.o
--bindir = $(DESTDIR)$(PREFIX)/usr/bin
-+bindir = $(DESTDIR)$(PREFIX)@bindir@
- mandir = $(DESTDIR)$(PREFIX)@mandir@
- vardir = $(DESTDIR)$(PREFIX)/var
- httpdir = $(DESTDIR)$(PREFIX)/home/httpd

diff --git a/sys-apps/man/files/man-1.6e-readonly-whatis.patch b/sys-apps/man/files/man-1.6e-readonly-whatis.patch
deleted file mode 100644
index d0f8ce1aab..0000000000
--- a/sys-apps/man/files/man-1.6e-readonly-whatis.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-Dont update makewhatis files if they're on readonly filesystems
-
-http://bugs.gentoo.org/163932
-
---- src/makewhatis.sh
-+++ src/makewhatis.sh
-@@ -184,6 +188,34 @@
-      if [ x$verbose != x ]; then
- 	echo "about to enter $mandir" > /dev/stderr
-      fi
-+
-+     # kludge for Slackware's /usr/man/preformat
-+     if [ $mandir = /usr/man/preformat ]
-+     then
-+	mandir1=/usr/man
-+     else
-+	mandir1=$mandir
-+     fi
-+
-+     # if $mandir is on a readonly partition, and the whatis file
-+     # is not a symlink, then let's skip trying to update it
-+     if [ ! -L ${mandir1}/whatis ]
-+     then
-+	if [ -e ${mandir1}/whatis ] && [ ! -w ${mandir1}/whatis ]
-+	then
-+	   if [ x$verbose != x ]; then
-+	      echo skipping $mandir - whatis file is readonly > /dev/stderr
-+	   fi
-+	   continue
-+	elif [ ! -e ${mandir1}/whatis ] && [ ! -w ${mandir1} ]
-+	then
-+	   if [ x$verbose != x ]; then
-+	      echo skipping $mandir - directory is readonly > /dev/stderr
-+	   fi
-+	   continue
-+	fi
-+     fi
-+
-      if [ -s ${mandir}/whatis -a $pages = man -a x$update = x ]; then
- 	if [ x$verbose != x ]; then
- 	   echo skipping $mandir - we did it already > /dev/stderr
-@@ -407,14 +439,6 @@
- 
-        cd $here
- 
--       # kludge for Slackware's /usr/man/preformat
--       if [ $mandir = /usr/man/preformat ]
--       then
--	 mandir1=/usr/man
--       else
--	 mandir1=$mandir
--       fi
--
-        if [ -f ${mandir1}/whatis ]
-        then
- 	 cat ${mandir1}/whatis >> $TMPFILE

diff --git a/sys-apps/man/files/man-1.6e-readonly-whatis2.patch b/sys-apps/man/files/man-1.6e-readonly-whatis2.patch
deleted file mode 100644
index 92e37d0df1..0000000000
--- a/sys-apps/man/files/man-1.6e-readonly-whatis2.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Dont update makewhatis files if they're on readonly filesystems
-
-http://bugs.gentoo.org/163932
-
---- src/makewhatis.sh
-+++ src/makewhatis.sh
-@@ -184,6 +188,25 @@
-      if [ x$verbose != x ]; then
- 	echo "about to enter $mandir" > /dev/stderr
-      fi
-+
-+     # kludge for Slackware's /usr/man/preformat
-+     if [ $mandir = /usr/man/preformat ]
-+     then
-+	mandir1=/usr/man
-+     else
-+	mandir1=$mandir
-+     fi
-+
-+     # if $mandir is on a readonly partition and we cannot update the whatis
-+     # file, then let's simply skip it
-+     if ! touch ${mandir1}/whatis 2> /dev/null
-+     then
-+	if [ x$verbose != x ]; then
-+	   echo skipping $mandir - whatis file is readonly > /dev/stderr
-+	fi
-+	continue
-+     fi
-+
-      if [ -s ${mandir}/whatis -a $pages = man -a x$update = x ]; then
- 	if [ x$verbose != x ]; then
- 	   echo skipping $mandir - we did it already > /dev/stderr
-@@ -407,14 +430,6 @@
- 
-        cd $here
- 
--       # kludge for Slackware's /usr/man/preformat
--       if [ $mandir = /usr/man/preformat ]
--       then
--	 mandir1=/usr/man
--       else
--	 mandir1=$mandir
--       fi
--
-        if [ -f ${mandir1}/whatis ]
-        then
- 	 cat ${mandir1}/whatis >> $TMPFILE

diff --git a/sys-apps/man/files/man-1.6f-compress.patch b/sys-apps/man/files/man-1.6f-compress.patch
deleted file mode 100644
index f110acd806..0000000000
--- a/sys-apps/man/files/man-1.6f-compress.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- configure.orig	2008-12-26 23:59:40.779042906 -0600
-+++ configure	2008-12-27 00:13:15.265256215 -0600
-@@ -1012,20 +1012,25 @@
-   if test "$ans" = "true"
-   then
-     DO_COMPRESSION=true
--    compress=
--    for i in lzma bzip2 gzip bzip tzip pack compress freeze yabba
--    do
--      eval F$i=missing
--      for j in $DEFPATH
--      do
--        if test -f $j/$i
--        then
--	  eval F$i=$j/$i
--	  if [ x$compress = x ]; then compress=$j/$i; fi
--	  break
--        fi
--      done
--    done
-+	if [ x$COMPRESS != x ]; then
-+		compress=$COMPRESS
-+		echo $compress
-+	else
-+	    compress=
-+	    for i in lzma bzip2 gzip bzip tzip pack compress freeze yabba
-+	    do
-+	      eval F$i=missing
-+	      for j in $DEFPATH
-+	      do
-+	        if test -f $j/$i
-+	        then
-+		  eval F$i=$j/$i
-+		  if [ x$compress = x ]; then compress=$j/$i; fi
-+		  break
-+	        fi
-+	      done
-+	    done
-+	fi
- 
-     if [ x$default = x ]; then
-       echo ""

diff --git a/sys-apps/man/files/man-1.6f-echo.patch b/sys-apps/man/files/man-1.6f-echo.patch
deleted file mode 100644
index 1da8f4472b..0000000000
--- a/sys-apps/man/files/man-1.6f-echo.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- src/man.c
-+++ src/man.c
-@@ -598,14 +598,14 @@
- 		*  .ev 1; .lt ...; .ev helps for my version of groff.
- 		* The LL assignment is needed by the mandoc macros.
- 		*/
--	       sprintf(eos(bufh), "echo \".ll %d.%di\"; ", ll/10, ll%10);
--	       sprintf(eos(bufh), "echo \".nr LL %d.%di\"; ", ll/10, ll%10);
-+	       sprintf(eos(bufh), "@GENTOO_PORTAGE_EPREFIX@/bin/echo \".ll %d.%di\"; ", ll/10, ll%10);
-+	       sprintf(eos(bufh), "@GENTOO_PORTAGE_EPREFIX@/bin/echo \".nr LL %d.%di\"; ", ll/10, ll%10);
- #if 0
--	       sprintf(eos(bufh), "echo \".lt %d.%di\"; ", ll/10, ll%10);
-+	       sprintf(eos(bufh), "@GENTOO_PORTAGE_EPREFIX@/bin/echo \".lt %d.%di\"; ", ll/10, ll%10);
- #endif
- 	  }
- 	  if (pl)
--	       sprintf(eos(bufh), "echo \".pl %.128s\"; ", pl);
-+	       sprintf(eos(bufh), "@GENTOO_PORTAGE_EPREFIX@/bin/echo \".pl %.128s\"; ", pl);
-      }
- 
-      /* tail */
-@@ -616,7 +616,7 @@
- 		 the current position plus 10 lines.  This plus setpl()
- 		 gives us a single page that just contains the whole
- 		 man page. (William Webber, wew@×××××××××××.au) */
--	      strcat(buft, "; echo \".\\\\\\\"\"; echo \".pl \\n(nlu+10\"");
-+	      strcat(buft, "; @GENTOO_PORTAGE_EPREFIX@/bin/echo \".\\\\\\\"\"; @GENTOO_PORTAGE_EPREFIX@/bin/echo \".pl \\n(nlu+10\"");
- #if 0
- 	      /* In case this doesnt work for some reason,
- 		 michaelkjohnson suggests: I've got a simple

diff --git a/sys-apps/man/files/man-1.6f-interix-all_source.patch b/sys-apps/man/files/man-1.6f-interix-all_source.patch
deleted file mode 100644
index 2b75b4c372..0000000000
--- a/sys-apps/man/files/man-1.6f-interix-all_source.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru man-1.6f.orig/gencat/genlib.c man-1.6f/gencat/genlib.c
---- man-1.6f.orig/gencat/genlib.c	2008-07-21 10:53:16 +0200
-+++ man-1.6f/gencat/genlib.c	2008-07-21 10:55:18 +0200
-@@ -52,7 +52,7 @@
- #include <sys/types.h>
- #include <unistd.h>
- 
--#if !defined(__linux__) && !defined(__FreeBSD__) && !defined(__APPLE__) && !defined(__NetBSD__)
-+#if !defined(__linux__) && !defined(__FreeBSD__) && !defined(__APPLE__) && !defined(__NetBSD__) && !( defined(__INTERIX) && defined(_ALL_SOURCE))
- #include <memory.h>
- static int bcopy(src, dst, length)
- char *src, *dst;

diff --git a/sys-apps/man/files/man-1.6f-irix.patch b/sys-apps/man/files/man-1.6f-irix.patch
deleted file mode 100644
index ec43d9ce08..0000000000
--- a/sys-apps/man/files/man-1.6f-irix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/man-getopt.c
-+++ src/man-getopt.c
-@@ -233,7 +233,7 @@ get_options_from_string(const char *s) {
-
- static void 
- mysetenv(const char *name, const char *value) {
--#if defined(__sgi__) || defined(__sun__) || defined(sun) || defined(__hpux)
-+#if defined(__sgi) || defined(__sun__) || defined(sun) || defined(__hpux)
-     int len = strlen(value)+1+strlen(value)+1;
-     char *str = my_malloc(len);
-     sprintf(str, "%s=%s", name, value);
---- catopen/catopen.c
-+++ catopen/catopen.c
-@@ -49,7 +49,7 @@ my_catopen(char *name, int oflag) {
-      * "If `name' contains a `/', then `name' specifies a pathname"
-      */
-     if (index(name, '/')) {
--#ifdef __GLIBC__
-+#if defined __GLIBC__ || defined __sgi
-       /* glibc uses a pointer type for nl_catd, not a fd */
-       return fd;
- #else

diff --git a/sys-apps/man/files/man-1.6f-man2html-compression.patch b/sys-apps/man/files/man-1.6f-man2html-compression.patch
deleted file mode 100644
index ae059d3aed..0000000000
--- a/sys-apps/man/files/man-1.6f-man2html-compression.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-add support for bzip2/lzma to man2html and friends
-
---- man2html/glimpse_filters
-+++ man2html/glimpse_filters
-@@ -1,3 +1,5 @@
-+*.bz2	bzip2 -d -c
-+*.lzma	lzma -d -c
- *.gz	gzip -d -c
- *.Z	gzip -d -c
- 
---- man2html/scripts/cgi-bin/man/man2html
-+++ man2html/scripts/cgi-bin/man/man2html
-@@ -93,6 +93,9 @@
-     *.bz2)
- 	bzcat "$PAGE" | "$MAN2HTML" "$LL" -D "$PAGE"
- 	;;
-+    *.lzma)
-+	lzcat "$PAGE" | "$MAN2HTML" "$LL" -D "$PAGE"
-+	;;
-     *)
- 	"$MAN2HTML" "$LL" "$PAGE"
- 	;;
-@@ -103,6 +106,9 @@
- elif [ -r "$PAGE".bz2 ]
- then
- 	bzcat "$PAGE".bz2 | "$MAN2HTML" "$LL" -D "$PAGE"
-+elif [ -r "$PAGE".lzma ]
-+then
-+	lzcat "$PAGE".lzma | "$MAN2HTML" "$LL" -D "$PAGE"
- else
- 	"$MAN2HTML" -E "Strange... Cannot find (or read) $PAGE."
- fi
---- man2html/scripts/cgi-bin/man/mansearch
-+++ man2html/scripts/cgi-bin/man/mansearch
-@@ -153,7 +153,7 @@
-       }
-       print "<DT> <a href=\"" cgipath "/man2html?" fullname "\">";
-       textname = filename;
--      sub(/\.(gz)|Z|z$/, "", textname);
-+      sub(/\.([zZ]|gz|bz2|lzma)$/, "", textname);
-       sub(/\./, "(", textname);
-       textname = textname ")";
-       print textname;
---- man2html/scripts/cgi-bin/man/mansec
-+++ man2html/scripts/cgi-bin/man/mansec
-@@ -128,7 +128,7 @@
- 				# Print out alphabetic quick index and other links
-       }
- 				# Split page.n into "page" and "n" and generate an entry
--      sub(/[.]([zZ]|(gz))$/, "", manpage);
-+      sub(/[.]([zZ]|gz|bz2|lzma)$/, "", manpage);
-       match(manpage, /[.][^.]+$/);      
-       title = substr(manpage, 1, RSTART - 1);
-       if (section != "all") {

diff --git a/sys-apps/man/files/man-1.6f-so-search.patch b/sys-apps/man/files/man-1.6f-so-search.patch
deleted file mode 100644
index d9d4af4fe3..0000000000
--- a/sys-apps/man/files/man-1.6f-so-search.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-improve the uncompressed .so search
-
---- a/src/man.c
-+++ b/src/man.c
-@@ -381,13 +381,23 @@ again:
- 	  }
- 	  /*
- 	   * Some people have compressed man pages, but uncompressed
--	   * .so files - we could glob for all possible extensions,
--	   * for now: only try .gz
-+	   * .so files - we should discover this list dynamically, but
-+	   * for now just hardcode it.
- 	   */
--	  else if (fp == NULL && get_expander(".gz") &&
--		   strlen(name)+strlen(".gz") < BUFSIZE) {
--	       strcat(name, ".gz");
--	       fp = fopen (name, "r");
-+	  else if (fp == NULL) {
-+#define ARRAY_SIZE(a) (sizeof(a) / sizeof(*(a)))
-+	       size_t i, name_len = strlen(name);
-+	       const char *extensions[] = { ".gz", ".bz2", ".lzma", ".z", ".Z" };
-+	       for (i = 0; i < ARRAY_SIZE(extensions); ++i) {
-+		    const char *comp = extensions[i];
-+		    name[name_len] = '\0';
-+		    if (get_expander(comp) && name_len+strlen(comp) < BUFSIZE) {
-+			 strcat(name, comp);
-+			 fp = fopen(name, "r");
-+			 if (fp)
-+			      break;
-+		    }
-+	       }
- 	  }
- 
- 	  if (fp == NULL) {

diff --git a/sys-apps/man/files/man-1.6f-xz.patch b/sys-apps/man/files/man-1.6f-xz.patch
deleted file mode 100644
index 7b2ed90857..0000000000
--- a/sys-apps/man/files/man-1.6f-xz.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-add support for xz
-
-http://bugs.gentoo.org/302380
-
---- a/configure
-+++ b/configure
-@@ -1017,7 +1017,7 @@
- 		echo $compress
- 	else
- 	    compress=
--	    for i in lzma bzip2 gzip bzip tzip pack compress freeze yabba
-+	    for i in xz lzma bzip2 gzip bzip tzip pack compress freeze yabba
- 	    do
- 	      eval F$i=missing
- 	      for j in $DEFPATH
-@@ -1076,6 +1076,7 @@
-       *gzip*) ext=".gz" ;;
-       *bzip*) ext=".bz" ;;
-       *tzip*) ext=".tz" ;;
-+      *xz*) ext=".xz" ;;
-       *pack*) ext=".z" ;;
-       *compress*) ext=".Z" ;;
-       *freeze*) ext=".F" ;;
-@@ -1114,7 +1115,7 @@
- fi
- 
- # unconditionally handle uncompression
--UNCOMPRESSORS="unlzma gunzip bzip2 pcat zcat fcat unyabba"
-+UNCOMPRESSORS="unxz unlzma gunzip bzip2 pcat zcat fcat unyabba"
- for i in $UNCOMPRESSORS
- do
-   eval F$i=missing
-@@ -1139,6 +1140,10 @@
- if [ $Funlzma != missing ]; then
-   unlzma="$Funlzma -c -d"
- fi
-+unxz=missing
-+if [ $Funxz != missing ]; then
-+  unxz="$Funxz -c -d"
-+fi
- pcat="$Fpcat"
- zcat="$Fzcat"
- fcat="$Ffcat"
-@@ -1170,6 +1175,9 @@
- 	lzma)
- 	  echo "Command to use for .lzma files (standard lzma)"
- 	  echo $n "[`eval echo \\$$filter`] $c" ;;
-+	xz)
-+	  echo "Command to use for .xz files (standard xz)"
-+	  echo $n "[`eval echo \\$$filter`] $c" ;;
-         pcat)
-           echo "Command to use for .z files (pack/unpack)"
-           echo $n "[`eval echo \\$$filter`] $c" ;;
-@@ -1232,6 +1240,7 @@
-   .gz) decompress=$gunzip ;;
-   .bz2) decompress=$bzip2 ;;
-   .lzma) decompress=$unlzma ;;
-+  .xz) decompress=$unxz ;;
-   .z) decompress=$pcat ;;
-   .Z) decompress=$zcat ;;
-   .F) decompress=$fcat ;;
-@@ -1325,6 +1334,7 @@
- s,@gunzip@,$gunzip,
- s,@bzip2@,$bzip2,
- s,@unlzma@,$unlzma,
-+s,@unxz@,$unxz,
- s,@unyabba@,$unyabba,
- s,@compress@,$compress,
- s,@compress_ext@,$compress_ext,
---- a/src/makewhatis.sh
-+++ b/src/makewhatis.sh
-@@ -230,7 +230,7 @@
- 	    find $mandir/${pages}$i/. -name '*' $findarg0 $findarg -print | $AWK '
- 
- 	    function readline() {
--              if (use_zcat || use_bzcat || use_lzcat) {
-+              if (use_zcat || use_bzcat || use_lzcat || use_xzcat) {
- 		result = (pipe_cmd | getline);
- 		if (result < 0) {
- 		  print "Pipe error: " pipe_cmd " " ERRNO > "/dev/stderr";
-@@ -245,7 +245,7 @@
- 	    }
- 	    
- 	    function closeline() {
--              if (use_zcat || use_bzcat || use_lzcat) {
-+              if (use_zcat || use_bzcat || use_lzcat || use_xzcat) {
- 		return close(pipe_cmd);
- 	      } else {
- 		return close(filename);
-@@ -266,7 +266,9 @@
- 		use_bzcat = match(filename,"\\.bz2");
-               if(!use_bzcat)
-                 use_lzcat = match(filename,"\\.lzma");
--              if (use_zcat || use_bzcat || use_lzcat ) {
-+              if(!use_lzcat)
-+                use_xzcat = match(filename,"\\.xz");
-+              if (use_zcat || use_bzcat || use_lzcat || use_xzcat) {
- 		filename_no_gz = substr(filename, 0, RSTART - 1);
- 	      } else {
- 		filename_no_gz = filename;
-@@ -279,13 +281,15 @@
- 		actual_section = section;
- 	      }
- 	      sub(/\..*/, "", progname);
--              if (use_zcat || use_bzcat || use_lzcat) {
-+              if (use_zcat || use_bzcat || use_lzcat || use_xzcat) {
- 		if (use_zcat) {
- 		  pipe_cmd = "zcat \"" filename "\"";
-                 } else if (use_bzcat) {
- 		  pipe_cmd = "bzcat \"" filename "\"";
--                } else {
-+                } else if (use_lzcat) {
-                   pipe_cmd = "lzcat \"" filename "\"";
-+                } else {
-+                  pipe_cmd = "xzcat \"" filename "\"";
-                 }
- 		# try to avoid suspicious stuff
- 		if (filename ~ /[;&|`$(]/) {
---- a/src/man.conf.in
-+++ b/src/man.conf.in
-@@ -133,6 +133,7 @@
- .gz		@gunzip@
- .bz2		@bzip2@
- .lzma		@unlzma@
-+.xz		@unxz@
- .z		@pcat@
- .Z		@zcat@
- .F		@fcat@

diff --git a/sys-apps/man/man-1.6g-r1.ebuild b/sys-apps/man/man-1.6g-r1.ebuild
index 57c84bfa75..36f594f1e6 100644
--- a/sys-apps/man/man-1.6g-r1.ebuild
+++ b/sys-apps/man/man-1.6g-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/sys-apps/man/man-1.6g-r1.ebuild,v 1.1 2015/05/08 03:22:04 vapier Exp $
 
@@ -12,7 +12,7 @@ SRC_URI="http://primates.ximian.com/~flucifredi/man/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+lzma nls selinux"
 
 DEPEND="nls? ( sys-devel/gettext )"
@@ -50,10 +50,6 @@ src_prepare() {
 	epatch "${FILESDIR}"/man-1.6g-bsdish.patch
 	# Solaris needs fcntl.h included for O_CREAT etc, like SYSV
 	epatch "${FILESDIR}"/man-1.6e-solaris.patch
-	# hpux does not have setenv()
-	epatch "${FILESDIR}"/man-1.6e-hpux.patch
-	# irix support is a bit messed up in defines
-	epatch "${FILESDIR}"/man-1.6f-irix.patch
 	# Results in grabbing as much tools from the prefix, instead of main
 	# system in a prefixed environment
 	epatch "${FILESDIR}"/man-1.6g-prefix-path.patch

diff --git a/sys-apps/man/man-1.6g.ebuild b/sys-apps/man/man-1.6g.ebuild
deleted file mode 100644
index e453b933a5..0000000000
--- a/sys-apps/man/man-1.6g.ebuild
+++ /dev/null
@@ -1,188 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/man-1.6g.ebuild,v 1.14 2014/11/02 09:47:12 swift Exp $
-
-EAPI="2"
-
-inherit eutils toolchain-funcs user flag-o-matic prefix
-
-DESCRIPTION="Standard commands to read man pages"
-HOMEPAGE="http://primates.ximian.com/~flucifredi/man/"
-SRC_URI="http://primates.ximian.com/~flucifredi/man/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+lzma nls selinux"
-
-DEPEND="nls? ( sys-devel/gettext )"
-RDEPEND="|| ( >=sys-apps/groff-1.19.2-r1 app-doc/heirloom-doctools )
-	!sys-apps/man-db
-	!<app-arch/lzma-4.63
-	lzma? ( app-arch/xz-utils )
-	selinux? ( sec-policy/selinux-makewhatis )"
-
-pkg_setup() {
-	enewgroup man 15
-	enewuser man 13 -1 ${EPREFIX}/usr/share/man man
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/man-1.6f-man2html-compression-2.patch
-	epatch "${FILESDIR}"/man-1.6-cross-compile.patch
-	epatch "${FILESDIR}"/man-1.6f-unicode.patch #146315
-	epatch "${FILESDIR}"/man-1.6c-cut-duplicate-manpaths.patch
-	epatch "${FILESDIR}"/man-1.5m2-apropos.patch
-	epatch "${FILESDIR}"/man-1.6g-fbsd.patch #138123
-	epatch "${FILESDIR}"/man-1.6e-headers.patch
-	epatch "${FILESDIR}"/man-1.6f-so-search-2.patch
-	epatch "${FILESDIR}"/man-1.6g-compress.patch #205147
-	epatch "${FILESDIR}"/man-1.6f-parallel-build.patch #207148 #258916
-	epatch "${FILESDIR}"/man-1.6g-xz.patch #302380
-	epatch "${FILESDIR}"/man-1.6f-makewhatis-compression-cleanup.patch #331979
-	# make sure `less` handles escape sequences #287183
-	sed -i -e '/^DEFAULTLESSOPT=/s:"$:R":' configure
-
-	# This patch could be easily merged with the FreeBSD one, but we don't
-	# because the files have no CVS header and then auto syncing overwrites the
-	# local difference we make.  <grobian@g.o>
-	epatch "${FILESDIR}"/man-1.6g-bsdish.patch
-	# Solaris needs fcntl.h included for O_CREAT etc, like SYSV
-	epatch "${FILESDIR}"/man-1.6e-solaris.patch
-	# hpux does not have setenv()
-	epatch "${FILESDIR}"/man-1.6e-hpux.patch
-	# irix support is a bit messed up in defines
-	epatch "${FILESDIR}"/man-1.6f-irix.patch
-	# Results in grabbing as much tools from the prefix, instead of main
-	# system in a prefixed environment
-	epatch "${FILESDIR}"/man-1.6g-prefix-path.patch
-
-	# Fix the makewhatis script for prefix.
-	cp "${FILESDIR}"/makewhatis.cron "${T}"/
-	pushd "${T}" > /dev/null
-	epatch "${FILESDIR}"/makewhatis.cron-prefix.patch
-	popd > /dev/null
-	eprefixify "${T}"/makewhatis.cron
-	# Hardcode path to echo(1), to keep some shells (e.g. zsh, mksh) from
-	# expanding "\n".
-	epatch "${FILESDIR}"/man-1.6f-echo.patch
-	eprefixify "${S}"/src/man.c
-
-	# fix man.conf file, bug #351245
-	sed -i \
-		-e "/^MANPATH\t/s:\t/:\t${EPREFIX}/:" \
-		-e "/^MANPATH_MAP\t/s:\t/:\t${EPREFIX}/:g" \
-		src/man.conf.in || die
-
-	if use prefix ; then
-		ebegin "Allowing unpriviliged install"
-		sed -i \
-			-e 's/@man_install_flags@//g' \
-			"${S}"/src/Makefile.in
-		eend $?
-	fi
-
-}
-
-echoit() { echo "$@" ; "$@" ; }
-src_configure() {
-	strip-linguas $(eval $(grep ^LANGUAGES= configure) ; echo ${LANGUAGES//,/ })
-
-	unset NLSPATH #175258
-
-	tc-export CC BUILD_CC
-
-	local mylang=
-	if use nls ; then
-		if [[ -z ${LINGUAS} ]] ; then
-			mylang="all"
-		else
-			mylang="${LINGUAS// /,}"
-		fi
-	else
-		mylang="none"
-	fi
-
-	local myconf=
-	use prefix || myconf="${myconf} +sgid"
-
-	[[ ${CHOST} == *-interix* ]] && append-flags "-D_POSIX_SOURCE"
-
-	export COMPRESS
-	if use lzma ; then
-		COMPRESS="${EPREFIX}"/usr/bin/xz
-	else
-		COMPRESS="${EPREFIX}"/bin/bzip2
-	fi
-	echoit \
-	./configure \
-		-prefix="${EPREFIX}/usr" \
-		-confdir="${EPREFIX}"/etc \
-		${myconf} \
-		+fhs \
-		+lang ${mylang} \
-		|| die "configure failed"
-}
-
-src_install() {
-	unset NLSPATH #175258
-
-	emake DESTDIR="${D}" install || die "make install failed"
-	dosym man /usr/bin/manpath
-
-	dodoc LSM README* TODO
-
-	# Make all Solaris man-pages available
-	if [[ ${CHOST} == *-solaris* && -e /usr/share/man/man.cf ]] ; then
-		source /usr/share/man/man.cf
-		sed -i -e 's/^\(MANSECT.*\)$/\1:'"${MANSECTS//,/:}"'/' \
-			"${ED}"/etc/man.conf || die "failed to adapt to Solaris"
-	fi
-
-	# makewhatis only adds man-pages from the last 24hrs
-	exeinto /etc/cron.daily
-	newexe "${T}"/makewhatis.cron makewhatis
-
-	keepdir /var/cache/man
-	use prefix || diropts -m0775 -g man && diropts -m0775
-	local mansects=$(grep ^MANSECT "${ED}"/etc/man.conf | cut -f2-)
-	for x in ${mansects//:/ } ; do
-		keepdir /var/cache/man/cat${x}
-	done
-}
-
-pkg_postinst() {
-	if use !prefix ; then
-
-	einfo "Forcing sane permissions onto ${EROOT}var/cache/man (Bug #40322)"
-	chown -R root:man "${EROOT}"/var/cache/man
-	[[ -e ${EROOT}/var/cache/man/whatis ]] \
-		&& chown root:0 "${EROOT}"/var/cache/man/whatis
-
-	fi # end lame indenting
-
-	chmod -R g+w "${EROOT}"/var/cache/man
-
-	echo
-
-	local f files=$(ls "${EROOT}"/etc/cron.{daily,weekly}/makewhatis{,.cron} 2>/dev/null)
-	for f in ${files} ; do
-		[[ ${f} == */etc/cron.daily/makewhatis ]] && continue
-		[[ $(md5sum "${f}") == "8b2016cc778ed4e2570b912c0f420266 "* ]] \
-			&& rm -f "${f}"
-	done
-	files=$(ls "${EROOT}"etc/cron.{daily,weekly}/makewhatis{,.cron} 2>/dev/null)
-	if [[ ${files/$'\n'} != ${files} ]] ; then
-		ewarn "You have multiple makewhatis cron files installed."
-		ewarn "You might want to delete all but one of these:"
-		ewarn ${files}
-	fi
-
-	if has_version app-doc/heirloom-doctools; then
-		ewarn "Please note that the /etc/man.conf file installed will not"
-		ewarn "work with heirloom's nroff by default (yet)."
-		ewarn ""
-		ewarn "Check app-doc/heirloom-doctools elog messages for the proper"
-		ewarn "configuration."
-	fi
-}