Gentoo Archives: gentoo-commits

From: Fabian Groffen <grobian@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/prefix:master commit in: sys-apps/man/, sys-apps/man/files/
Date: Fri, 05 Feb 2021 17:48:59
Message-Id: 1612547282.889b295172b643e1d7547d979f1138386ef82ea2.grobian@gentoo
1 commit: 889b295172b643e1d7547d979f1138386ef82ea2
2 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
3 AuthorDate: Fri Feb 5 17:48:02 2021 +0000
4 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
5 CommitDate: Fri Feb 5 17:48:02 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=889b2951
7
8 sys-apps/man: drop package
9
10 it has been removed from gx86 too, man-db is a worthy replacement now
11
12 Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
13
14 sys-apps/man/Manifest | 1 -
15 sys-apps/man/files/makewhatis.cron | 5 -
16 sys-apps/man/files/makewhatis.cron-prefix.patch | 8 -
17 sys-apps/man/files/man-1.5m2-apropos.patch | 16 --
18 sys-apps/man/files/man-1.6-cross-compile.patch | 61 -------
19 .../files/man-1.6c-cut-duplicate-manpaths.patch | 83 ---------
20 sys-apps/man/files/man-1.6e-headers.patch | 13 --
21 sys-apps/man/files/man-1.6e-solaris.patch | 11 --
22 .../man-1.6f-makewhatis-compression-cleanup.patch | 69 --------
23 .../files/man-1.6f-man2html-compression-2.patch | 61 -------
24 sys-apps/man/files/man-1.6f-parallel-build.patch | 78 ---------
25 sys-apps/man/files/man-1.6f-so-search-2.patch | 34 ----
26 sys-apps/man/files/man-1.6f-unicode.patch | 28 ---
27 sys-apps/man/files/man-1.6g-bsdish.patch | 15 --
28 sys-apps/man/files/man-1.6g-compress.patch | 17 --
29 sys-apps/man/files/man-1.6g-echo-escape.patch | 15 --
30 sys-apps/man/files/man-1.6g-fbsd.patch | 15 --
31 sys-apps/man/files/man-1.6g-prefix-path.patch | 41 -----
32 sys-apps/man/files/man-1.6g-xz.patch | 53 ------
33 sys-apps/man/man-1.6g-r1.ebuild | 194 ---------------------
34 sys-apps/man/metadata.xml | 8 -
35 21 files changed, 826 deletions(-)
36
37 diff --git a/sys-apps/man/Manifest b/sys-apps/man/Manifest
38 deleted file mode 100644
39 index 94943bb28a..0000000000
40 --- a/sys-apps/man/Manifest
41 +++ /dev/null
42 @@ -1 +0,0 @@
43 -DIST man-1.6g.tar.gz 256906 BLAKE2B f13e21400aecd41a5f001b37bf3c6f9fd8463ff627f761cfd0a6846c7b8dac48a6dc87ff2cf4786b55800a558141cffcc0d66420943e46f708292f5653b42d51 SHA512 c786fa2201aed92293e5590dc3ad5d550cf14e5059fa274ef7719af86ee4c892e747576495b6dc0a09286e73e2f0f0caf860216e0c8032d9ef13e5d26853048b
44
45 diff --git a/sys-apps/man/files/makewhatis.cron b/sys-apps/man/files/makewhatis.cron
46 deleted file mode 100755
47 index bef5ea6d1e..0000000000
48 --- a/sys-apps/man/files/makewhatis.cron
49 +++ /dev/null
50 @@ -1,5 +0,0 @@
51 -#!/bin/sh
52 -# this is part of the man package
53 -# it updates the search database for manpages
54 -
55 -exec nice makewhatis -u
56
57 diff --git a/sys-apps/man/files/makewhatis.cron-prefix.patch b/sys-apps/man/files/makewhatis.cron-prefix.patch
58 deleted file mode 100644
59 index 949622f273..0000000000
60 --- a/sys-apps/man/files/makewhatis.cron-prefix.patch
61 +++ /dev/null
62 @@ -1,8 +0,0 @@
63 ---- makewhatis.cron.orig 2006-12-03 13:33:31 +0100
64 -+++ makewhatis.cron 2006-12-03 13:33:59 +0100
65 -@@ -1,4 +1,4 @@
66 --#!/bin/sh
67 -+#!@GENTOO_PORTAGE_EPREFIX@/bin/sh
68 - # this is part of the man package
69 - # it updates the search database for manpages
70 -
71
72 diff --git a/sys-apps/man/files/man-1.5m2-apropos.patch b/sys-apps/man/files/man-1.5m2-apropos.patch
73 deleted file mode 100644
74 index 9735a5330e..0000000000
75 --- a/sys-apps/man/files/man-1.5m2-apropos.patch
76 +++ /dev/null
77 @@ -1,16 +0,0 @@
78 -Ripped from Fedora
79 -
80 ---- man-1.5m2/src/apropos.sh
81 -+++ man-1.5m2/src/apropos.sh
82 -@@ -19,9 +19,9 @@
83 -
84 - # When man pages in your favorite locale look to grep like binary files
85 - # (and you use GNU grep) you may want to add the 'a' option to *grepopt1.
86 --aproposgrepopt1='i'
87 -+aproposgrepopt1='ai'
88 - aproposgrepopt2=''
89 --whatisgrepopt1='iw'
90 -+whatisgrepopt1='aiw'
91 - whatisgrepopt2='^'
92 - grepopt1=$%apropos_or_whatis%grepopt1
93 - grepopt2=$%apropos_or_whatis%grepopt2
94
95 diff --git a/sys-apps/man/files/man-1.6-cross-compile.patch b/sys-apps/man/files/man-1.6-cross-compile.patch
96 deleted file mode 100644
97 index 184236918b..0000000000
98 --- a/sys-apps/man/files/man-1.6-cross-compile.patch
99 +++ /dev/null
100 @@ -1,61 +0,0 @@
101 -Fix up to work with cross-compiling ... most of these tests only
102 -need to see if the example compiled, not whether it runs ...
103 -
104 ---- configure
105 -+++ configure
106 -@@ -232,15 +232,13 @@
107 -
108 - echo checking for POSIX.1 header files
109 - echo "#include <unistd.h>
110 --main() {
111 - #ifdef _POSIX_VERSION
112 --exit(0);
113 -+main() { exit(0); }
114 - #else
115 --exit(1);
116 --#endif
117 --}" > conftest.c
118 -+# error no _POSIX_VERSION
119 -+#endif" > conftest.c
120 - eval $compile
121 --if test -s conftest && ./conftest 2>/dev/null; then
122 -+if test -s conftest ; then
123 - DEFS="$DEFS -DPOSIX"
124 - fi
125 - rm -f conftest conftest.c
126 -@@ -249,7 +247,7 @@
127 - echo "#include <strings.h>
128 - main() { exit(0); rindex(0, 0); bzero(0, 0); }" > conftest.c
129 - eval $compile
130 --if test -s conftest && ./conftest 2>/dev/null; then :
131 -+if test -s conftest ; then :
132 - else DEFS="$DEFS -DUSG"
133 - fi
134 - rm -f conftest conftest.c
135 -@@ -258,7 +256,7 @@
136 - echo '#include <sys/types.h>
137 - main() { uid_t x; exit(0); }' > conftest.c
138 - eval $compile
139 --if test -s conftest && ./conftest 2>/dev/null; then :
140 -+if test -s conftest ; then :
141 - else
142 - uid_t=`awk '/pw_uid;/ {print $1}' $INCLUDEDIR/pwd.h`
143 - DEFS="$DEFS -Duid_t=${uid_t} -Dgid_t=${uid_t}"
144 -@@ -291,7 +289,7 @@
145 - #endif
146 - main() { char *p = (char *) alloca(1); exit(0); }' > conftest.c
147 - eval $compile
148 --if test -s conftest && ./conftest 2>/dev/null; then :
149 -+if test -s conftest ; then :
150 - elif test -d /usr/ucblib; then LIBS="$LIBS -L/usr/ucblib -lucb"
151 - elif test -f /usr/lib/libPW.a; then LIBS="$LIBS -lPW"
152 - else DEFS="$DEFS -DALLOCA_MISSING"
153 -@@ -321,7 +319,7 @@
154 - struct option long_opts[] = { { "", no_argument, NULL, 0 } };
155 - main() { exit(0); }' > conftest.c
156 - eval $compile
157 --if test -s conftest && ./conftest 2>/dev/null; then
158 -+if test -s conftest ; then
159 - manpathoption="--path"
160 - else
161 - manpathoption="-w"
162
163 diff --git a/sys-apps/man/files/man-1.6c-cut-duplicate-manpaths.patch b/sys-apps/man/files/man-1.6c-cut-duplicate-manpaths.patch
164 deleted file mode 100644
165 index 9ecaeb70e1..0000000000
166 --- a/sys-apps/man/files/man-1.6c-cut-duplicate-manpaths.patch
167 +++ /dev/null
168 @@ -1,83 +0,0 @@
169 -http://bugs.gentoo.org/90186
170 -
171 -If we have entries in MANPATH that are really symlinks to other entries,
172 -then many man functions will yield duplicate entries.
173 -
174 -Without this patch, we see this behavior:
175 -$ echo $MANPATH
176 -/usr/share/man:/usr/man
177 -$ man --path
178 -/usr/share/man:/usr/man
179 -$ ls -ld /usr/share/man /usr/man
180 -lrwxrwxrwx 1 /usr/man -> /usr/share/man
181 -drwxr-xr-x 36 /usr/share/man
182 -$ man -k passwd
183 -passwd (1) - change user password
184 -passwd (1) - change user password
185 -
186 -With this patch, we get:
187 -$ echo $MANPATH
188 -/usr/share/man:/usr/man
189 -$ man --path
190 -/usr/share/man
191 -$ ls -ld /usr/share/man /usr/man
192 -lrwxrwxrwx 1 /usr/man -> /usr/share/man
193 -drwxr-xr-x 36 /usr/share/man
194 -$ man -k passwd
195 -passwd (1) - change user password
196 -
197 ---- man-1.6c/src/manpath.c
198 -+++ man-1.6c/src/manpath.c
199 -@@ -380,6 +380,44 @@
200 - }
201 - }
202 -
203 -+void trim_symlinked_manpaths (void);
204 -+void
205 -+trim_symlinked_manpaths () {
206 -+ /*
207 -+ * Skip symlinks to other entries in path.
208 -+ * Do this after we've built the entire list.
209 -+ */
210 -+ struct stat *stat_cache;
211 -+ size_t i, j, size;
212 -+
213 -+ if (!mandirlist)
214 -+ return;
215 -+
216 -+ for (size = 0; mandirlist[size]; ++size)
217 -+ /* count # of elements */;
218 -+ if (size == 0)
219 -+ return;
220 -+ /* cache stat information for every element */
221 -+ stat_cache = (struct stat *) my_malloc (size * sizeof(*stat_cache));
222 -+ for (i = 0; i < size; ++i)
223 -+ stat(mandirlist[i], &stat_cache[i]);
224 -+
225 -+#define EQU_STAT(s,d) ((s).st_dev == (d).st_dev && (s).st_ino == (d).st_ino)
226 -+ for (i = 0; i < size; ++i) {
227 -+ for (j = i+1; j < size; ++j) {
228 -+ if (EQU_STAT(stat_cache[i], stat_cache[j])) {
229 -+ /* these two entries are the same, so cut out the second one */
230 -+ memmove(mandirlist+j, mandirlist+j+1, (size-j)*sizeof(*mandirlist));
231 -+ memmove(stat_cache+j, stat_cache+j+1, (size-j)*sizeof(*stat_cache));
232 -+ mandirlist[--size] = NULL;
233 -+ --j;
234 -+ }
235 -+ }
236 -+ }
237 -+
238 -+ free(stat_cache);
239 -+}
240 -+
241 - void
242 - init_manpath () {
243 - static int done = 0;
244 -@@ -391,6 +431,7 @@
245 - (manp = getenv ("MANPATH")) == NULL)
246 - manp = ""; /* default path */
247 - split (manp, to_mandirlist, 0);
248 -+ trim_symlinked_manpaths ();
249 - done = 1;
250 - }
251 - }
252
253 diff --git a/sys-apps/man/files/man-1.6e-headers.patch b/sys-apps/man/files/man-1.6e-headers.patch
254 deleted file mode 100644
255 index 9c6fd6f435..0000000000
256 --- a/sys-apps/man/files/man-1.6e-headers.patch
257 +++ /dev/null
258 @@ -1,13 +0,0 @@
259 ---- gencat/genlib.c
260 -+++ gencat/genlib.c
261 -@@ -49,10 +49,8 @@
262 -
263 - #include <stdio.h>
264 - #include <stdlib.h>
265 --#ifdef SYSV
266 - #include <sys/types.h>
267 - #include <unistd.h>
268 --#endif
269 -
270 - #if !defined(__linux__) && !defined(__FreeBSD__)
271 - #include <memory.h>
272
273 diff --git a/sys-apps/man/files/man-1.6e-solaris.patch b/sys-apps/man/files/man-1.6e-solaris.patch
274 deleted file mode 100644
275 index 3fa7b34633..0000000000
276 --- a/sys-apps/man/files/man-1.6e-solaris.patch
277 +++ /dev/null
278 @@ -1,11 +0,0 @@
279 ---- gencat/gencat.c
280 -+++ gencat/gencat.c
281 -@@ -43,7 +43,7 @@
282 - #include <stdio.h>
283 - #include <stdlib.h>
284 - #include <sys/types.h>
285 --#ifdef SYSV
286 -+#if defined(SYSV) || ( defined (__SVR4) && defined (__sun) )
287 - #include <sys/fcntl.h>
288 - #include <string.h>
289 - #else
290
291 diff --git a/sys-apps/man/files/man-1.6f-makewhatis-compression-cleanup.patch b/sys-apps/man/files/man-1.6f-makewhatis-compression-cleanup.patch
292 deleted file mode 100644
293 index a7d74c32be..0000000000
294 --- a/sys-apps/man/files/man-1.6f-makewhatis-compression-cleanup.patch
295 +++ /dev/null
296 @@ -1,69 +0,0 @@
297 -http://bugs.gentoo.org/331979
298 -
299 -patch by William Throwe <wthrowe@×××.edu>
300 -
301 -The problem is that a failed match() resets the RSTART variable used to
302 -extract filename_no_gz (visible in the trailing context of the patch),
303 -so it is important that no more match() commands are attempted after the
304 -successful one. Without the scoping, if (for example) the test for .bz2
305 -succeeds, it prevents testing for .lzma, but doesn't prevent testing for
306 -.xz. The failing .xz test causes RSTART to be set to zero so
307 -filename_no_gz becomes the empty string.
308 -
309 ---- man-1.6f/src/makewhatis.sh
310 -+++ man-1.6f/src/makewhatis.sh
311 -@@ -234,7 +234,7 @@
312 - find $mandir/${pages}$i/. -name '*' $findarg0 $findarg -print | $AWK '
313 -
314 - function readline() {
315 -- if (use_zcat || use_bzcat || use_lzcat || use_xzcat) {
316 -+ if (use_compression) {
317 - result = (pipe_cmd | getline);
318 - if (result < 0) {
319 - print "Pipe error: " pipe_cmd " " ERRNO > "/dev/stderr";
320 -@@ -249,7 +249,7 @@
321 - }
322 -
323 - function closeline() {
324 -- if (use_zcat || use_bzcat || use_lzcat || use_xzcat) {
325 -+ if (use_compression) {
326 - return close(pipe_cmd);
327 - } else {
328 - return close(filename);
329 -@@ -263,16 +263,20 @@
330 - if (verbose) {
331 - print "adding " filename > "/dev/stderr"
332 - }
333 --
334 -+
335 - use_zcat = match(filename,"\\.Z$") ||
336 - match(filename,"\\.z$") || match(filename,"\\.gz$");
337 -- if (!use_zcat)
338 -+ if (!use_zcat) {
339 - use_bzcat = match(filename,"\\.bz2");
340 -- if(!use_bzcat)
341 -- use_lzcat = match(filename,"\\.lzma");
342 -- if(!use_lzcat)
343 -- use_xzcat = match(filename,"\\.xz");
344 -- if (use_zcat || use_bzcat || use_lzcat || use_xzcat) {
345 -+ if (!use_bzcat) {
346 -+ use_lzcat = match(filename,"\\.lzma");
347 -+ if (!use_lzcat) {
348 -+ use_xzcat = match(filename,"\\.xz");
349 -+ }
350 -+ }
351 -+ }
352 -+ use_compression = (use_zcat || use_bzcat || use_lzcat || use_xzcat);
353 -+ if (use_compression) {
354 - filename_no_gz = substr(filename, 0, RSTART - 1);
355 - } else {
356 - filename_no_gz = filename;
357 -@@ -285,7 +289,7 @@
358 - actual_section = section;
359 - }
360 - sub(/\..*/, "", progname);
361 -- if (use_zcat || use_bzcat || use_lzcat || use_xzcat) {
362 -+ if (use_compression) {
363 - if (use_zcat) {
364 - pipe_cmd = "zcat \"" filename "\"";
365 - } else if (use_bzcat) {
366
367 diff --git a/sys-apps/man/files/man-1.6f-man2html-compression-2.patch b/sys-apps/man/files/man-1.6f-man2html-compression-2.patch
368 deleted file mode 100644
369 index b79b3a1872..0000000000
370 --- a/sys-apps/man/files/man-1.6f-man2html-compression-2.patch
371 +++ /dev/null
372 @@ -1,61 +0,0 @@
373 -add support for bzip2/lzma to man2html and friends
374 -
375 ---- man2html/glimpse_filters
376 -+++ man2html/glimpse_filters
377 -@@ -1,3 +1,6 @@
378 -+*.bz2 bzip2 -d -c
379 -+*.lzma lzma -d -c
380 -+*.xz xz -d -c
381 - *.gz gzip -d -c
382 - *.Z gzip -d -c
383 -
384 ---- man2html/scripts/cgi-bin/man/man2html
385 -+++ man2html/scripts/cgi-bin/man/man2html
386 -@@ -93,6 +93,12 @@
387 - *.bz2)
388 - bzcat "$PAGE" | "$MAN2HTML" "$LL" -D "$PAGE"
389 - ;;
390 -+ *.lzma)
391 -+ lzcat "$PAGE" | "$MAN2HTML" "$LL" -D "$PAGE"
392 -+ ;;
393 -+ *.xz)
394 -+ xzcat "$PAGE" | "$MAN2HTML" "$LL" -D "$PAGE"
395 -+ ;;
396 - *)
397 - "$MAN2HTML" "$LL" "$PAGE"
398 - ;;
399 -@@ -103,6 +106,12 @@
400 - elif [ -r "$PAGE".bz2 ]
401 - then
402 - bzcat "$PAGE".bz2 | "$MAN2HTML" "$LL" -D "$PAGE"
403 -+elif [ -r "$PAGE".lzma ]
404 -+then
405 -+ lzcat "$PAGE".lzma | "$MAN2HTML" "$LL" -D "$PAGE"
406 -+elif [ -r "$PAGE".xz ]
407 -+then
408 -+ xzcat "$PAGE".xz | "$MAN2HTML" "$LL" -D "$PAGE"
409 - else
410 - "$MAN2HTML" -E "Strange... Cannot find (or read) $PAGE."
411 - fi
412 ---- man2html/scripts/cgi-bin/man/mansearch
413 -+++ man2html/scripts/cgi-bin/man/mansearch
414 -@@ -153,7 +153,7 @@
415 - }
416 - print "<DT> <a href=\"" cgipath "/man2html?" fullname "\">";
417 - textname = filename;
418 -- sub(/\.(gz)|Z|z$/, "", textname);
419 -+ sub(/\.([zZ]|gz|bz2|lzma|xz)$/, "", textname);
420 - sub(/\./, "(", textname);
421 - textname = textname ")";
422 - print textname;
423 ---- man2html/scripts/cgi-bin/man/mansec
424 -+++ man2html/scripts/cgi-bin/man/mansec
425 -@@ -128,7 +128,7 @@
426 - # Print out alphabetic quick index and other links
427 - }
428 - # Split page.n into "page" and "n" and generate an entry
429 -- sub(/[.]([zZ]|(gz))$/, "", manpage);
430 -+ sub(/[.]([zZ]|gz|bz2|lzma|xz)$/, "", manpage);
431 - match(manpage, /[.][^.]+$/);
432 - title = substr(manpage, 1, RSTART - 1);
433 - if (section != "all") {
434
435 diff --git a/sys-apps/man/files/man-1.6f-parallel-build.patch b/sys-apps/man/files/man-1.6f-parallel-build.patch
436 deleted file mode 100644
437 index 41918d9244..0000000000
438 --- a/sys-apps/man/files/man-1.6f-parallel-build.patch
439 +++ /dev/null
440 @@ -1,78 +0,0 @@
441 -http://bugs.gentoo.org/207148
442 -
443 -patch by Kevin Pyle to fix parallel build issues
444 -
445 ---- a/src/Makefile.in
446 -+++ b/src/Makefile.in
447 -@@ -42,9 +42,12 @@
448 - makemsg:
449 - $(BUILD_CC) -o makemsg makemsg.c
450 -
451 --msg.c gripedefs.h: ../msgs/mess.en makemsg
452 -+gripedefs.h: ../msgs/mess.en makemsg
453 - ./makemsg ../msgs/mess.en gripedefs.h msg.c
454 -
455 -+# avoid parallel build issues with makemsg
456 -+msg.c: gripedefs.h
457 -+
458 - # glob.c does not have prototypes
459 - glob.o: glob.c ndir.h
460 - $(CC) -c $(CWARNNP) $(CFLAGS) -I. $(DEFS) glob.c
461 -
462 -http://bugs.gentoo.org/258916
463 -
464 -avoid:
465 - make[2]: warning: jobserver unavailable: using -j1. Add `+' to parent make rule.
466 -
467 ---- a/man/Makefile.in
468 -+++ b/man/Makefile.in
469 -@@ -3,7 +3,7 @@
470 - MAN5 = man.conf
471 - MAN8 = makewhatis
472 - ALL = man.1 whatis.1 apropos.1 man.conf.5
473 --MAYBE8 = makewhatis
474 -+MAYBE8 = $(wildcard makewhatis.man)
475 -
476 - .SUFFIXES: .man .1 .5 .8
477 -
478 -@@ -21,9 +21,7 @@
479 - # Where to put the manual pages.
480 - mandir = $(DESTDIR)$(PREFIX)@mandir@$(SLANG)
481 -
482 --all: $(ALL)
483 -- for i in $(MAYBE8); \
484 -- do if test -f $$i.man; then make -f ../Makefile $$i.8; fi; done
485 -+all: $(ALL) $(MAYBE8:.man=.8)
486 -
487 - install: $(ALL)
488 - mkdir -p $(mandir)/man1 $(mandir)/man5 $(mandir)/man8
489 -@@ -39,18 +37,17 @@
490 -
491 - spotless:
492 -
493 --subdirs:
494 -- @for i in @languages@; do if test -d $$i; then echo; \
495 -- echo "==== Making the `cat $$i.txt` man pages. ===="; \
496 -- cd $$i; make -f ../Makefile; cd ..; \
497 -- else echo "==== No $$i man pages found. ===="; fi; done
498 --
499 --installsubdirs:
500 -- @for i in @languages@; do if test -d $$i; then echo; \
501 -- echo "==== Installing the `cat $$i.txt` man pages. ===="; \
502 -- cd $$i; SLANG=/$$i; if test $$SLANG = /en; then SLANG= ; fi; \
503 -- export SLANG; make -f ../Makefile install; cd ..; \
504 -- else echo "==== No $$i man pages found. ===="; fi; done
505 -+MAN_LANGS = $(wildcard @languages@)
506 -+subdirs: $(MAN_LANGS:=_lang_subdir)
507 -+%_lang_subdir:
508 -+ @echo "==== Making the `cat $(@:_lang_subdir=).txt` man pages. ===="
509 -+ $(MAKE) -f ../Makefile -C $(@:_lang_subdir=)
510 -+
511 -+installsubdirs: $(MAN_LANGS:=_lang_installsubdir)
512 -+%_lang_installsubdir:
513 -+ @echo "==== Making the `cat $(@:_lang_installsubdir=).txt` man pages. ===="
514 -+ $(MAKE) -f ../Makefile -C $(@:_lang_installsubdir=) install \
515 -+ SLANG=`s=$(@:_lang_installsubdir=); test $$s = en || echo /$$s`
516 -
517 - cleansubdirs:
518 - @for i in ??; do cd $$i; make -f ../Makefile clean; cd ..; done
519
520 diff --git a/sys-apps/man/files/man-1.6f-so-search-2.patch b/sys-apps/man/files/man-1.6f-so-search-2.patch
521 deleted file mode 100644
522 index ac42c8df7b..0000000000
523 --- a/sys-apps/man/files/man-1.6f-so-search-2.patch
524 +++ /dev/null
525 @@ -1,34 +0,0 @@
526 -improve the uncompressed .so search
527 -
528 ---- a/src/man.c
529 -+++ b/src/man.c
530 -@@ -381,13 +381,23 @@ again:
531 - }
532 - /*
533 - * Some people have compressed man pages, but uncompressed
534 -- * .so files - we could glob for all possible extensions,
535 -- * for now: only try .gz
536 -+ * .so files - we should discover this list dynamically, but
537 -+ * for now just hardcode it.
538 - */
539 -- else if (fp == NULL && get_expander(".gz") &&
540 -- strlen(name)+strlen(".gz") < BUFSIZE) {
541 -- strcat(name, ".gz");
542 -- fp = fopen (name, "r");
543 -+ else if (fp == NULL) {
544 -+#define ARRAY_SIZE(a) (sizeof(a) / sizeof(*(a)))
545 -+ size_t i, name_len = strlen(name);
546 -+ const char *extensions[] = { ".gz", ".bz2", ".lzma", ".xz", ".z", ".Z" };
547 -+ for (i = 0; i < ARRAY_SIZE(extensions); ++i) {
548 -+ const char *comp = extensions[i];
549 -+ name[name_len] = '\0';
550 -+ if (get_expander(comp) && name_len+strlen(comp) < BUFSIZE) {
551 -+ strcat(name, comp);
552 -+ fp = fopen(name, "r");
553 -+ if (fp)
554 -+ break;
555 -+ }
556 -+ }
557 - }
558 -
559 - if (fp == NULL) {
560
561 diff --git a/sys-apps/man/files/man-1.6f-unicode.patch b/sys-apps/man/files/man-1.6f-unicode.patch
562 deleted file mode 100644
563 index 89d3821df3..0000000000
564 --- a/sys-apps/man/files/man-1.6f-unicode.patch
565 +++ /dev/null
566 @@ -1,28 +0,0 @@
567 -let the active locale work its magic
568 -
569 -http://bugs.gentoo.org/146315
570 -
571 ---- man-1.6f/configure
572 -+++ man-1.6f/configure
573 -@@ -473,9 +473,9 @@
574 - then
575 - if test $Fnroff = "missing"
576 - then
577 -- nroff="nroff -Tlatin1 -mandoc"
578 -+ nroff="nroff -Tascii -c -mandoc"
579 - else
580 -- nroff="$Fnroff -Tlatin1 -mandoc"
581 -+ nroff="$Fnroff -mandoc"
582 - fi
583 - troff="troff -mandoc"
584 - echo "Warning: could not find groff"
585 -@@ -484,7 +484,7 @@
586 - then
587 - nroff="$Fgroff -Tlatin1 -mandoc"
588 - else
589 -- nroff="$Fnroff -Tlatin1 -mandoc"
590 -+ nroff="$Fnroff -mandoc"
591 - fi
592 - troff="$Fgroff -Tps -mandoc"
593 - jnroff="$Fgroff -Tnippon -mandocj"
594 -
595
596 diff --git a/sys-apps/man/files/man-1.6g-bsdish.patch b/sys-apps/man/files/man-1.6g-bsdish.patch
597 deleted file mode 100644
598 index 6dc59bf7da..0000000000
599 --- a/sys-apps/man/files/man-1.6g-bsdish.patch
600 +++ /dev/null
601 @@ -1,15 +0,0 @@
602 -This patch could be easily merged with the FreeBSD one, but we don't
603 -because the files have no CVS header and then auto syncing overwrites
604 -the local difference we make. <grobian@g.o>
605 -
606 ---- gencat/genlib.c
607 -+++ gencat/genlib.c
608 -@@ -54,7 +54,7 @@
609 - #include <unistd.h>
610 - #endif
611 -
612 --#if !defined(__linux__) && !defined(__CYGWIN__) && !defined(__FreeBSD__)
613 -+#if !defined(__linux__) && !defined(__CYGWIN__) && !defined(__FreeBSD__) && !defined(__APPLE__) && !defined(__NetBSD__) && !( defined(__INTERIX) && defined(_ALL_SOURCE))
614 - #include <memory.h>
615 - static int bcopy(src, dst, length)
616 - char *src, *dst;
617
618 diff --git a/sys-apps/man/files/man-1.6g-compress.patch b/sys-apps/man/files/man-1.6g-compress.patch
619 deleted file mode 100644
620 index 374d807300..0000000000
621 --- a/sys-apps/man/files/man-1.6g-compress.patch
622 +++ /dev/null
623 @@ -1,17 +0,0 @@
624 -allow selection of default cache compressor
625 -
626 -http://bugs.gentoo.org/205147
627 -
628 ---- configure
629 -+++ configure
630 -@@ -1012,6 +1012,10 @@
631 - done
632 - done
633 -
634 -+ if [ x$COMPRESS != x ]; then
635 -+ compress=$COMPRESS
636 -+ fi
637 -+
638 - if [ x$default = x ]; then
639 - echo ""
640 - echo "What program should be used to compress the formatted pages?"
641
642 diff --git a/sys-apps/man/files/man-1.6g-echo-escape.patch b/sys-apps/man/files/man-1.6g-echo-escape.patch
643 deleted file mode 100644
644 index 96e950a51e..0000000000
645 --- a/sys-apps/man/files/man-1.6g-echo-escape.patch
646 +++ /dev/null
647 @@ -1,15 +0,0 @@
648 -avoid using escape sequences in echo as they're not portable
649 -
650 -https://bugs.gentoo.org/523874
651 -
652 ---- a/src/man.c
653 -+++ b/src/man.c
654 -@@ -626,7 +626,7 @@ make_roff_command (const char *path, const char *file) {
655 - the current position plus 10 lines. This plus setpl()
656 - gives us a single page that just contains the whole
657 - man page. (William Webber, wew@×××××××××××.au) */
658 -- strcat(buft, "; echo \".\\\\\\\"\"; echo \".pl \\n(nlu+10\"");
659 -+ strcat(buft, "; echo \".\\\\\\\"\"; echo \".pl \"; echo \"(nlu+10\"");
660 - #if 0
661 - /* In case this doesnt work for some reason,
662 - michaelkjohnson suggests: I've got a simple
663
664 diff --git a/sys-apps/man/files/man-1.6g-fbsd.patch b/sys-apps/man/files/man-1.6g-fbsd.patch
665 deleted file mode 100644
666 index ef01a6e01f..0000000000
667 --- a/sys-apps/man/files/man-1.6g-fbsd.patch
668 +++ /dev/null
669 @@ -1,15 +0,0 @@
670 -Fixes compilation in FreeBSD
671 -
672 -http://bugs.gentoo.org/138123
673 -
674 ---- man-1.6g/gencat/genlib.c
675 -+++ man-1.6g/gencat/genlib.c
676 -@@ -54,7 +54,7 @@
677 - #include <unistd.h>
678 - #endif
679 -
680 --#if !defined(__linux__) && !defined(__CYGWIN__)
681 -+#if !defined(__linux__) && !defined(__CYGWIN__) && !defined(__FreeBSD__)
682 - #include <memory.h>
683 - static int bcopy(src, dst, length)
684 - char *src, *dst;
685
686 diff --git a/sys-apps/man/files/man-1.6g-prefix-path.patch b/sys-apps/man/files/man-1.6g-prefix-path.patch
687 deleted file mode 100644
688 index a107a63020..0000000000
689 --- a/sys-apps/man/files/man-1.6g-prefix-path.patch
690 +++ /dev/null
691 @@ -1,41 +0,0 @@
692 ---- configure
693 -+++ configure
694 -@@ -360,7 +360,8 @@
695 - # for i in /bin:/usr/bin:$PATH
696 - # does not work everywhere.)
697 - # Some people might prefer having $PATH first in PREPATH
698 --PREPATH=/bin:/usr/bin:/usr/ucb:/usr/local/bin:$PATH
699 -+# => Yes we do in prefix
700 -+PREPATH=$PATH:/bin:/usr/bin:/usr/ucb:/usr/local/bin
701 - IFS0="$IFS"
702 - IFS=":$IFS"
703 - for i in $PREPATH
704 -@@ -824,7 +824,7 @@
705 -
706 - if [ "x$languages" != x -a "x$languages" != xen ]
707 - then
708 -- DEF_NLSPATH="/usr/share/locale/%L/%N:/usr/lib/locale/%N/%L"
709 -+ DEF_NLSPATH="${prefix}/share/locale/%L/%N:${prefix}/lib/locale/%N/%L"
710 - deflocalepath=`echo $NLSPATH:$DEF_NLSPATH | sed 's/:/ /g'`
711 - for i in $deflocalepath; do
712 - if [ x$deflocale = x ]; then
713 -@@ -840,7 +840,7 @@
714 - fi
715 - done
716 - if [ x$deflocale = x ]; then
717 -- deflocale="/usr/lib/locale/%N/%L"
718 -+ deflocale="${prefix}/lib/locale/%N/%L"
719 - fi
720 - if [ x$default = x ]; then
721 - echo ""
722 ---- man2html/Makefile.in
723 -+++ man2html/Makefile.in
724 -@@ -1,7 +1,7 @@
725 - CFLAGS += -Wall -Wstrict-prototypes -Wmissing-prototypes
726 - OBJECTS = man2html.o cgibase.o abbrev.o strdefs.o
727 - EXEEXT = @EXEEXT@
728 --bindir = $(DESTDIR)$(PREFIX)/usr/bin
729 -+bindir = $(DESTDIR)$(PREFIX)@bindir@
730 - mandir = $(DESTDIR)$(PREFIX)@mandir@
731 - vardir = $(DESTDIR)$(PREFIX)/var
732 - httpdir = $(DESTDIR)$(PREFIX)/home/httpd
733
734 diff --git a/sys-apps/man/files/man-1.6g-xz.patch b/sys-apps/man/files/man-1.6g-xz.patch
735 deleted file mode 100644
736 index fcf91f71d3..0000000000
737 --- a/sys-apps/man/files/man-1.6g-xz.patch
738 +++ /dev/null
739 @@ -1,53 +0,0 @@
740 -add support for xz
741 -
742 -http://bugs.gentoo.org/302380
743 -
744 ---- a/src/makewhatis.sh
745 -+++ b/src/makewhatis.sh
746 -@@ -230,7 +230,7 @@
747 - find $mandir/${pages}$i/. -name '*' $findarg0 $findarg -print | $AWK '
748 -
749 - function readline() {
750 -- if (use_zcat || use_bzcat || use_lzcat) {
751 -+ if (use_zcat || use_bzcat || use_lzcat || use_xzcat) {
752 - result = (pipe_cmd | getline);
753 - if (result < 0) {
754 - print "Pipe error: " pipe_cmd " " ERRNO > "/dev/stderr";
755 -@@ -245,7 +245,7 @@
756 - }
757 -
758 - function closeline() {
759 -- if (use_zcat || use_bzcat || use_lzcat) {
760 -+ if (use_zcat || use_bzcat || use_lzcat || use_xzcat) {
761 - return close(pipe_cmd);
762 - } else {
763 - return close(filename);
764 -@@ -266,7 +266,9 @@
765 - use_bzcat = match(filename,"\\.bz2");
766 - if(!use_bzcat)
767 - use_lzcat = match(filename,"\\.lzma");
768 -- if (use_zcat || use_bzcat || use_lzcat ) {
769 -+ if(!use_lzcat)
770 -+ use_xzcat = match(filename,"\\.xz");
771 -+ if (use_zcat || use_bzcat || use_lzcat || use_xzcat) {
772 - filename_no_gz = substr(filename, 0, RSTART - 1);
773 - } else {
774 - filename_no_gz = filename;
775 -@@ -279,13 +281,15 @@
776 - actual_section = section;
777 - }
778 - sub(/\..*/, "", progname);
779 -- if (use_zcat || use_bzcat || use_lzcat) {
780 -+ if (use_zcat || use_bzcat || use_lzcat || use_xzcat) {
781 - if (use_zcat) {
782 - pipe_cmd = "zcat \"" filename "\"";
783 - } else if (use_bzcat) {
784 - pipe_cmd = "bzcat \"" filename "\"";
785 -- } else {
786 -+ } else if (use_lzcat) {
787 - pipe_cmd = "lzcat \"" filename "\"";
788 -+ } else {
789 -+ pipe_cmd = "xzcat \"" filename "\"";
790 - }
791 - # try to avoid suspicious stuff
792 - if (filename ~ /[;&|`$(]/) {
793
794 diff --git a/sys-apps/man/man-1.6g-r1.ebuild b/sys-apps/man/man-1.6g-r1.ebuild
795 deleted file mode 100644
796 index c7a1dadf8a..0000000000
797 --- a/sys-apps/man/man-1.6g-r1.ebuild
798 +++ /dev/null
799 @@ -1,194 +0,0 @@
800 -# Copyright 1999-2021 Gentoo Authors
801 -# Distributed under the terms of the GNU General Public License v2
802 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/man-1.6g-r1.ebuild,v 1.1 2015/05/08 03:22:04 vapier Exp $
803 -
804 -EAPI="4"
805 -
806 -inherit eutils toolchain-funcs user flag-o-matic prefix
807 -
808 -DESCRIPTION="Standard commands to read man pages"
809 -HOMEPAGE="http://primates.ximian.com/~flucifredi/man/"
810 -SRC_URI="http://primates.ximian.com/~flucifredi/man/${P}.tar.gz"
811 -
812 -LICENSE="GPL-2"
813 -SLOT="0"
814 -KEYWORDS="~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
815 -IUSE="+lzma nls selinux"
816 -
817 -DEPEND="nls? ( sys-devel/gettext )"
818 -RDEPEND="|| ( >=sys-apps/groff-1.19.2-r1 app-doc/heirloom-doctools )
819 - !sys-apps/man-db
820 - !<app-arch/lzma-4.63
821 - lzma? ( app-arch/xz-utils )
822 - selinux? ( sec-policy/selinux-makewhatis )"
823 -
824 -pkg_setup() {
825 - enewgroup man 15
826 - enewuser man 13 -1 ${EPREFIX}/usr/share/man man
827 -}
828 -
829 -src_prepare() {
830 - epatch "${FILESDIR}"/man-1.6f-man2html-compression-2.patch
831 - epatch "${FILESDIR}"/man-1.6-cross-compile.patch
832 - epatch "${FILESDIR}"/man-1.6f-unicode.patch #146315
833 - epatch "${FILESDIR}"/man-1.6c-cut-duplicate-manpaths.patch
834 - epatch "${FILESDIR}"/man-1.5m2-apropos.patch
835 - epatch "${FILESDIR}"/man-1.6g-fbsd.patch #138123
836 - epatch "${FILESDIR}"/man-1.6e-headers.patch
837 - epatch "${FILESDIR}"/man-1.6f-so-search-2.patch
838 - epatch "${FILESDIR}"/man-1.6g-compress.patch #205147
839 - epatch "${FILESDIR}"/man-1.6f-parallel-build.patch #207148 #258916
840 - epatch "${FILESDIR}"/man-1.6g-xz.patch #302380
841 - epatch "${FILESDIR}"/man-1.6f-makewhatis-compression-cleanup.patch #331979
842 - epatch "${FILESDIR}"/man-1.6g-echo-escape.patch #523874
843 - # make sure `less` handles escape sequences #287183
844 - sed -i -e '/^DEFAULTLESSOPT=/s:"$:R":' configure
845 -
846 - # This patch could be easily merged with the FreeBSD one, but we don't
847 - # because the files have no CVS header and then auto syncing overwrites the
848 - # local difference we make. <grobian@g.o>
849 - epatch "${FILESDIR}"/man-1.6g-bsdish.patch
850 - # Solaris needs fcntl.h included for O_CREAT etc, like SYSV
851 - epatch "${FILESDIR}"/man-1.6e-solaris.patch
852 - # Results in grabbing as much tools from the prefix, instead of main
853 - # system in a prefixed environment
854 - epatch "${FILESDIR}"/man-1.6g-prefix-path.patch
855 -
856 - # Fix the makewhatis script for prefix.
857 - cp "${FILESDIR}"/makewhatis.cron "${T}"/
858 - pushd "${T}" > /dev/null
859 - epatch "${FILESDIR}"/makewhatis.cron-prefix.patch
860 - popd > /dev/null
861 - eprefixify "${T}"/makewhatis.cron
862 -
863 - # fix man.conf file, bug #351245
864 - sed -i \
865 - -e "/^MANPATH\t/s:\t/:\t${EPREFIX}/:" \
866 - -e "/^MANPATH_MAP\t/s:\t/:\t${EPREFIX}/:g" \
867 - src/man.conf.in || die
868 -
869 - if use prefix ; then
870 - ebegin "Allowing unpriviliged install"
871 - sed -i \
872 - -e 's/@man_install_flags@//g' \
873 - "${S}"/src/Makefile.in
874 - eend $?
875 - (
876 - local d cat=() dflt
877 - dflt=( $(sed -n '/^tmpsections=/s/^[^"]\+"\([^"]\+\)".*$/\1/p' \
878 - configure) )
879 - IFS=:
880 - for d in /usr/share/man/man* ; do
881 - [[ -d ${d} ]] || continue
882 - [[ ":${dflt[*]}:" == *":${d##*man}:"* ]] \
883 - || cat+=( ${d##*man} )
884 - done
885 - if [[ ${#cat[@]} -gt 0 ]] ; then
886 - einfo "Adding host manpage sections: ${cat[*]}"
887 - sed -i -e "/^MANSECT\t/s/\$/:${cat[*]}/" src/man.conf.in || die
888 - fi
889 - )
890 - fi
891 -
892 -}
893 -
894 -echoit() { echo "$@" ; "$@" ; }
895 -src_configure() {
896 - strip-linguas $(eval $(grep ^LANGUAGES= configure) ; echo ${LANGUAGES//,/ })
897 -
898 - unset NLSPATH #175258
899 -
900 - tc-export CC BUILD_CC
901 -
902 - local mylang=
903 - if use nls ; then
904 - if [[ -z ${LINGUAS} ]] ; then
905 - mylang="all"
906 - else
907 - mylang="${LINGUAS// /,}"
908 - fi
909 - else
910 - mylang="none"
911 - fi
912 -
913 - local myconf=
914 - use prefix || myconf="${myconf} +sgid"
915 -
916 - export COMPRESS
917 - if use lzma ; then
918 - COMPRESS="${EPREFIX}"/usr/bin/xz
919 - else
920 - COMPRESS="${EPREFIX}"/bin/bzip2
921 - fi
922 - echoit \
923 - ./configure \
924 - -prefix="${EPREFIX}/usr" \
925 - -confdir="${EPREFIX}"/etc \
926 - ${myconf} \
927 - +fhs \
928 - +lang ${mylang} \
929 - || die "configure failed"
930 -}
931 -
932 -src_install() {
933 - unset NLSPATH #175258
934 -
935 - emake DESTDIR="${D}" install || die "make install failed"
936 - dosym man /usr/bin/manpath
937 -
938 - dodoc LSM README* TODO
939 -
940 - # Make all Solaris man-pages available
941 - if [[ ${CHOST} == *-solaris* && -e /usr/share/man/man.cf ]] ; then
942 - source /usr/share/man/man.cf
943 - sed -i -e 's/^\(MANSECT.*\)$/\1:'"${MANSECTS//,/:}"'/' \
944 - "${ED}"/etc/man.conf || die "failed to adapt to Solaris"
945 - fi
946 -
947 - # makewhatis only adds man-pages from the last 24hrs
948 - exeinto /etc/cron.daily
949 - newexe "${T}"/makewhatis.cron makewhatis
950 -
951 - keepdir /var/cache/man
952 - use prefix || diropts -m0775 -g man && diropts -m0775
953 - local mansects=$(grep ^MANSECT "${ED}"/etc/man.conf | cut -f2-)
954 - for x in ${mansects//:/ } ; do
955 - keepdir /var/cache/man/cat${x}
956 - done
957 -}
958 -
959 -pkg_postinst() {
960 - if use !prefix ; then
961 -
962 - einfo "Forcing sane permissions onto ${EROOT}var/cache/man (Bug #40322)"
963 - chown -R root:man "${EROOT}"/var/cache/man
964 - [[ -e ${EROOT}/var/cache/man/whatis ]] \
965 - && chown root:0 "${EROOT}"/var/cache/man/whatis
966 -
967 - fi # end lame indenting
968 -
969 - chmod -R g+w "${EROOT}"/var/cache/man
970 -
971 - echo
972 -
973 - local f files=$(ls "${EROOT}"/etc/cron.{daily,weekly}/makewhatis{,.cron} 2>/dev/null)
974 - for f in ${files} ; do
975 - [[ ${f} == */etc/cron.daily/makewhatis ]] && continue
976 - [[ $(md5sum "${f}") == "8b2016cc778ed4e2570b912c0f420266 "* ]] \
977 - && rm -f "${f}"
978 - done
979 - files=$(ls "${EROOT}"etc/cron.{daily,weekly}/makewhatis{,.cron} 2>/dev/null)
980 - if [[ ${files/$'\n'} != ${files} ]] ; then
981 - ewarn "You have multiple makewhatis cron files installed."
982 - ewarn "You might want to delete all but one of these:"
983 - ewarn ${files}
984 - fi
985 -
986 - if has_version app-doc/heirloom-doctools; then
987 - ewarn "Please note that the /etc/man.conf file installed will not"
988 - ewarn "work with heirloom's nroff by default (yet)."
989 - ewarn ""
990 - ewarn "Check app-doc/heirloom-doctools elog messages for the proper"
991 - ewarn "configuration."
992 - fi
993 -}
994
995 diff --git a/sys-apps/man/metadata.xml b/sys-apps/man/metadata.xml
996 deleted file mode 100644
997 index 56c1244130..0000000000
998 --- a/sys-apps/man/metadata.xml
999 +++ /dev/null
1000 @@ -1,8 +0,0 @@
1001 -<?xml version="1.0" encoding="UTF-8"?>
1002 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
1003 -<pkgmetadata>
1004 -<maintainer type="project">
1005 - <email>base-system@g.o</email>
1006 - <name>Gentoo Base System</name>
1007 -</maintainer>
1008 -</pkgmetadata>