1 |
commit: ce370f012e25ad2eb756cbcaf768bf053161d067 |
2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Mar 7 21:54:44 2020 +0000 |
4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Mar 7 21:59:07 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce370f01 |
7 |
|
8 |
sys-apps/man: remove package |
9 |
|
10 |
Closes: https://bugs.gentoo.org/468428 |
11 |
Closes: https://bugs.gentoo.org/515534 |
12 |
Closes: https://bugs.gentoo.org/524588 |
13 |
Closes: https://bugs.gentoo.org/589738 |
14 |
Closes: https://bugs.gentoo.org/605352 |
15 |
Closes: https://bugs.gentoo.org/651038 |
16 |
Closes: https://bugs.gentoo.org/683494 |
17 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
18 |
|
19 |
profiles/package.mask | 6 - |
20 |
sys-apps/man/Manifest | 1 - |
21 |
sys-apps/man/files/makewhatis.cron | 5 - |
22 |
sys-apps/man/files/man-1.5m2-apropos.patch | 16 --- |
23 |
sys-apps/man/files/man-1.6-cross-compile.patch | 61 ---------- |
24 |
.../files/man-1.6c-cut-duplicate-manpaths.patch | 83 ------------- |
25 |
sys-apps/man/files/man-1.6e-headers.patch | 13 -- |
26 |
.../man-1.6f-makewhatis-compression-cleanup.patch | 69 ----------- |
27 |
.../files/man-1.6f-man2html-compression-2.patch | 61 ---------- |
28 |
sys-apps/man/files/man-1.6f-parallel-build.patch | 78 ------------ |
29 |
sys-apps/man/files/man-1.6f-so-search-2.patch | 34 ------ |
30 |
sys-apps/man/files/man-1.6f-unicode.patch | 28 ----- |
31 |
sys-apps/man/files/man-1.6g-compress.patch | 17 --- |
32 |
sys-apps/man/files/man-1.6g-echo-escape.patch | 15 --- |
33 |
sys-apps/man/files/man-1.6g-fbsd.patch | 15 --- |
34 |
sys-apps/man/files/man-1.6g-xz.patch | 53 --------- |
35 |
sys-apps/man/man-1.6g-r1.ebuild | 131 --------------------- |
36 |
sys-apps/man/metadata.xml | 8 -- |
37 |
18 files changed, 694 deletions(-) |
38 |
|
39 |
diff --git a/profiles/package.mask b/profiles/package.mask |
40 |
index c581bbf3ad5..d87653cd27c 100644 |
41 |
--- a/profiles/package.mask |
42 |
+++ b/profiles/package.mask |
43 |
@@ -706,12 +706,6 @@ dev-java/eclipse-ecj:4.13 |
44 |
# Masked for removal in a year. |
45 |
dev-libs/gmp:3 |
46 |
|
47 |
-# Mike Gilbert <floppym@g.o> (2019-10-11) |
48 |
-# Inactive upstream for many years. |
49 |
-# Several open bugs. |
50 |
-# Please migrate to sys-apps/man-db. |
51 |
-sys-apps/man |
52 |
- |
53 |
# Stefan Strogin <steils@g.o> (2019-09-27) |
54 |
# Requires >=dev-lang/lua-5.3 which is masked |
55 |
>=dev-util/bam-0.5.0 |
56 |
|
57 |
diff --git a/sys-apps/man/Manifest b/sys-apps/man/Manifest |
58 |
deleted file mode 100644 |
59 |
index 94943bb28af..00000000000 |
60 |
--- a/sys-apps/man/Manifest |
61 |
+++ /dev/null |
62 |
@@ -1 +0,0 @@ |
63 |
-DIST man-1.6g.tar.gz 256906 BLAKE2B f13e21400aecd41a5f001b37bf3c6f9fd8463ff627f761cfd0a6846c7b8dac48a6dc87ff2cf4786b55800a558141cffcc0d66420943e46f708292f5653b42d51 SHA512 c786fa2201aed92293e5590dc3ad5d550cf14e5059fa274ef7719af86ee4c892e747576495b6dc0a09286e73e2f0f0caf860216e0c8032d9ef13e5d26853048b |
64 |
|
65 |
diff --git a/sys-apps/man/files/makewhatis.cron b/sys-apps/man/files/makewhatis.cron |
66 |
deleted file mode 100644 |
67 |
index bef5ea6d1e2..00000000000 |
68 |
--- a/sys-apps/man/files/makewhatis.cron |
69 |
+++ /dev/null |
70 |
@@ -1,5 +0,0 @@ |
71 |
-#!/bin/sh |
72 |
-# this is part of the man package |
73 |
-# it updates the search database for manpages |
74 |
- |
75 |
-exec nice makewhatis -u |
76 |
|
77 |
diff --git a/sys-apps/man/files/man-1.5m2-apropos.patch b/sys-apps/man/files/man-1.5m2-apropos.patch |
78 |
deleted file mode 100644 |
79 |
index 9735a5330e8..00000000000 |
80 |
--- a/sys-apps/man/files/man-1.5m2-apropos.patch |
81 |
+++ /dev/null |
82 |
@@ -1,16 +0,0 @@ |
83 |
-Ripped from Fedora |
84 |
- |
85 |
---- man-1.5m2/src/apropos.sh |
86 |
-+++ man-1.5m2/src/apropos.sh |
87 |
-@@ -19,9 +19,9 @@ |
88 |
- |
89 |
- # When man pages in your favorite locale look to grep like binary files |
90 |
- # (and you use GNU grep) you may want to add the 'a' option to *grepopt1. |
91 |
--aproposgrepopt1='i' |
92 |
-+aproposgrepopt1='ai' |
93 |
- aproposgrepopt2='' |
94 |
--whatisgrepopt1='iw' |
95 |
-+whatisgrepopt1='aiw' |
96 |
- whatisgrepopt2='^' |
97 |
- grepopt1=$%apropos_or_whatis%grepopt1 |
98 |
- grepopt2=$%apropos_or_whatis%grepopt2 |
99 |
|
100 |
diff --git a/sys-apps/man/files/man-1.6-cross-compile.patch b/sys-apps/man/files/man-1.6-cross-compile.patch |
101 |
deleted file mode 100644 |
102 |
index 184236918b9..00000000000 |
103 |
--- a/sys-apps/man/files/man-1.6-cross-compile.patch |
104 |
+++ /dev/null |
105 |
@@ -1,61 +0,0 @@ |
106 |
-Fix up to work with cross-compiling ... most of these tests only |
107 |
-need to see if the example compiled, not whether it runs ... |
108 |
- |
109 |
---- configure |
110 |
-+++ configure |
111 |
-@@ -232,15 +232,13 @@ |
112 |
- |
113 |
- echo checking for POSIX.1 header files |
114 |
- echo "#include <unistd.h> |
115 |
--main() { |
116 |
- #ifdef _POSIX_VERSION |
117 |
--exit(0); |
118 |
-+main() { exit(0); } |
119 |
- #else |
120 |
--exit(1); |
121 |
--#endif |
122 |
--}" > conftest.c |
123 |
-+# error no _POSIX_VERSION |
124 |
-+#endif" > conftest.c |
125 |
- eval $compile |
126 |
--if test -s conftest && ./conftest 2>/dev/null; then |
127 |
-+if test -s conftest ; then |
128 |
- DEFS="$DEFS -DPOSIX" |
129 |
- fi |
130 |
- rm -f conftest conftest.c |
131 |
-@@ -249,7 +247,7 @@ |
132 |
- echo "#include <strings.h> |
133 |
- main() { exit(0); rindex(0, 0); bzero(0, 0); }" > conftest.c |
134 |
- eval $compile |
135 |
--if test -s conftest && ./conftest 2>/dev/null; then : |
136 |
-+if test -s conftest ; then : |
137 |
- else DEFS="$DEFS -DUSG" |
138 |
- fi |
139 |
- rm -f conftest conftest.c |
140 |
-@@ -258,7 +256,7 @@ |
141 |
- echo '#include <sys/types.h> |
142 |
- main() { uid_t x; exit(0); }' > conftest.c |
143 |
- eval $compile |
144 |
--if test -s conftest && ./conftest 2>/dev/null; then : |
145 |
-+if test -s conftest ; then : |
146 |
- else |
147 |
- uid_t=`awk '/pw_uid;/ {print $1}' $INCLUDEDIR/pwd.h` |
148 |
- DEFS="$DEFS -Duid_t=${uid_t} -Dgid_t=${uid_t}" |
149 |
-@@ -291,7 +289,7 @@ |
150 |
- #endif |
151 |
- main() { char *p = (char *) alloca(1); exit(0); }' > conftest.c |
152 |
- eval $compile |
153 |
--if test -s conftest && ./conftest 2>/dev/null; then : |
154 |
-+if test -s conftest ; then : |
155 |
- elif test -d /usr/ucblib; then LIBS="$LIBS -L/usr/ucblib -lucb" |
156 |
- elif test -f /usr/lib/libPW.a; then LIBS="$LIBS -lPW" |
157 |
- else DEFS="$DEFS -DALLOCA_MISSING" |
158 |
-@@ -321,7 +319,7 @@ |
159 |
- struct option long_opts[] = { { "", no_argument, NULL, 0 } }; |
160 |
- main() { exit(0); }' > conftest.c |
161 |
- eval $compile |
162 |
--if test -s conftest && ./conftest 2>/dev/null; then |
163 |
-+if test -s conftest ; then |
164 |
- manpathoption="--path" |
165 |
- else |
166 |
- manpathoption="-w" |
167 |
|
168 |
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 |
169 |
deleted file mode 100644 |
170 |
index 9ecaeb70e16..00000000000 |
171 |
--- a/sys-apps/man/files/man-1.6c-cut-duplicate-manpaths.patch |
172 |
+++ /dev/null |
173 |
@@ -1,83 +0,0 @@ |
174 |
-http://bugs.gentoo.org/90186 |
175 |
- |
176 |
-If we have entries in MANPATH that are really symlinks to other entries, |
177 |
-then many man functions will yield duplicate entries. |
178 |
- |
179 |
-Without this patch, we see this behavior: |
180 |
-$ echo $MANPATH |
181 |
-/usr/share/man:/usr/man |
182 |
-$ man --path |
183 |
-/usr/share/man:/usr/man |
184 |
-$ ls -ld /usr/share/man /usr/man |
185 |
-lrwxrwxrwx 1 /usr/man -> /usr/share/man |
186 |
-drwxr-xr-x 36 /usr/share/man |
187 |
-$ man -k passwd |
188 |
-passwd (1) - change user password |
189 |
-passwd (1) - change user password |
190 |
- |
191 |
-With this patch, we get: |
192 |
-$ echo $MANPATH |
193 |
-/usr/share/man:/usr/man |
194 |
-$ man --path |
195 |
-/usr/share/man |
196 |
-$ ls -ld /usr/share/man /usr/man |
197 |
-lrwxrwxrwx 1 /usr/man -> /usr/share/man |
198 |
-drwxr-xr-x 36 /usr/share/man |
199 |
-$ man -k passwd |
200 |
-passwd (1) - change user password |
201 |
- |
202 |
---- man-1.6c/src/manpath.c |
203 |
-+++ man-1.6c/src/manpath.c |
204 |
-@@ -380,6 +380,44 @@ |
205 |
- } |
206 |
- } |
207 |
- |
208 |
-+void trim_symlinked_manpaths (void); |
209 |
-+void |
210 |
-+trim_symlinked_manpaths () { |
211 |
-+ /* |
212 |
-+ * Skip symlinks to other entries in path. |
213 |
-+ * Do this after we've built the entire list. |
214 |
-+ */ |
215 |
-+ struct stat *stat_cache; |
216 |
-+ size_t i, j, size; |
217 |
-+ |
218 |
-+ if (!mandirlist) |
219 |
-+ return; |
220 |
-+ |
221 |
-+ for (size = 0; mandirlist[size]; ++size) |
222 |
-+ /* count # of elements */; |
223 |
-+ if (size == 0) |
224 |
-+ return; |
225 |
-+ /* cache stat information for every element */ |
226 |
-+ stat_cache = (struct stat *) my_malloc (size * sizeof(*stat_cache)); |
227 |
-+ for (i = 0; i < size; ++i) |
228 |
-+ stat(mandirlist[i], &stat_cache[i]); |
229 |
-+ |
230 |
-+#define EQU_STAT(s,d) ((s).st_dev == (d).st_dev && (s).st_ino == (d).st_ino) |
231 |
-+ for (i = 0; i < size; ++i) { |
232 |
-+ for (j = i+1; j < size; ++j) { |
233 |
-+ if (EQU_STAT(stat_cache[i], stat_cache[j])) { |
234 |
-+ /* these two entries are the same, so cut out the second one */ |
235 |
-+ memmove(mandirlist+j, mandirlist+j+1, (size-j)*sizeof(*mandirlist)); |
236 |
-+ memmove(stat_cache+j, stat_cache+j+1, (size-j)*sizeof(*stat_cache)); |
237 |
-+ mandirlist[--size] = NULL; |
238 |
-+ --j; |
239 |
-+ } |
240 |
-+ } |
241 |
-+ } |
242 |
-+ |
243 |
-+ free(stat_cache); |
244 |
-+} |
245 |
-+ |
246 |
- void |
247 |
- init_manpath () { |
248 |
- static int done = 0; |
249 |
-@@ -391,6 +431,7 @@ |
250 |
- (manp = getenv ("MANPATH")) == NULL) |
251 |
- manp = ""; /* default path */ |
252 |
- split (manp, to_mandirlist, 0); |
253 |
-+ trim_symlinked_manpaths (); |
254 |
- done = 1; |
255 |
- } |
256 |
- } |
257 |
|
258 |
diff --git a/sys-apps/man/files/man-1.6e-headers.patch b/sys-apps/man/files/man-1.6e-headers.patch |
259 |
deleted file mode 100644 |
260 |
index 9c6fd6f4351..00000000000 |
261 |
--- a/sys-apps/man/files/man-1.6e-headers.patch |
262 |
+++ /dev/null |
263 |
@@ -1,13 +0,0 @@ |
264 |
---- gencat/genlib.c |
265 |
-+++ gencat/genlib.c |
266 |
-@@ -49,10 +49,8 @@ |
267 |
- |
268 |
- #include <stdio.h> |
269 |
- #include <stdlib.h> |
270 |
--#ifdef SYSV |
271 |
- #include <sys/types.h> |
272 |
- #include <unistd.h> |
273 |
--#endif |
274 |
- |
275 |
- #if !defined(__linux__) && !defined(__FreeBSD__) |
276 |
- #include <memory.h> |
277 |
|
278 |
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 |
279 |
deleted file mode 100644 |
280 |
index a7d74c32be3..00000000000 |
281 |
--- a/sys-apps/man/files/man-1.6f-makewhatis-compression-cleanup.patch |
282 |
+++ /dev/null |
283 |
@@ -1,69 +0,0 @@ |
284 |
-http://bugs.gentoo.org/331979 |
285 |
- |
286 |
-patch by William Throwe <wthrowe@×××.edu> |
287 |
- |
288 |
-The problem is that a failed match() resets the RSTART variable used to |
289 |
-extract filename_no_gz (visible in the trailing context of the patch), |
290 |
-so it is important that no more match() commands are attempted after the |
291 |
-successful one. Without the scoping, if (for example) the test for .bz2 |
292 |
-succeeds, it prevents testing for .lzma, but doesn't prevent testing for |
293 |
-.xz. The failing .xz test causes RSTART to be set to zero so |
294 |
-filename_no_gz becomes the empty string. |
295 |
- |
296 |
---- man-1.6f/src/makewhatis.sh |
297 |
-+++ man-1.6f/src/makewhatis.sh |
298 |
-@@ -234,7 +234,7 @@ |
299 |
- find $mandir/${pages}$i/. -name '*' $findarg0 $findarg -print | $AWK ' |
300 |
- |
301 |
- function readline() { |
302 |
-- if (use_zcat || use_bzcat || use_lzcat || use_xzcat) { |
303 |
-+ if (use_compression) { |
304 |
- result = (pipe_cmd | getline); |
305 |
- if (result < 0) { |
306 |
- print "Pipe error: " pipe_cmd " " ERRNO > "/dev/stderr"; |
307 |
-@@ -249,7 +249,7 @@ |
308 |
- } |
309 |
- |
310 |
- function closeline() { |
311 |
-- if (use_zcat || use_bzcat || use_lzcat || use_xzcat) { |
312 |
-+ if (use_compression) { |
313 |
- return close(pipe_cmd); |
314 |
- } else { |
315 |
- return close(filename); |
316 |
-@@ -263,16 +263,20 @@ |
317 |
- if (verbose) { |
318 |
- print "adding " filename > "/dev/stderr" |
319 |
- } |
320 |
-- |
321 |
-+ |
322 |
- use_zcat = match(filename,"\\.Z$") || |
323 |
- match(filename,"\\.z$") || match(filename,"\\.gz$"); |
324 |
-- if (!use_zcat) |
325 |
-+ if (!use_zcat) { |
326 |
- use_bzcat = match(filename,"\\.bz2"); |
327 |
-- if(!use_bzcat) |
328 |
-- use_lzcat = match(filename,"\\.lzma"); |
329 |
-- if(!use_lzcat) |
330 |
-- use_xzcat = match(filename,"\\.xz"); |
331 |
-- if (use_zcat || use_bzcat || use_lzcat || use_xzcat) { |
332 |
-+ if (!use_bzcat) { |
333 |
-+ use_lzcat = match(filename,"\\.lzma"); |
334 |
-+ if (!use_lzcat) { |
335 |
-+ use_xzcat = match(filename,"\\.xz"); |
336 |
-+ } |
337 |
-+ } |
338 |
-+ } |
339 |
-+ use_compression = (use_zcat || use_bzcat || use_lzcat || use_xzcat); |
340 |
-+ if (use_compression) { |
341 |
- filename_no_gz = substr(filename, 0, RSTART - 1); |
342 |
- } else { |
343 |
- filename_no_gz = filename; |
344 |
-@@ -285,7 +289,7 @@ |
345 |
- actual_section = section; |
346 |
- } |
347 |
- sub(/\..*/, "", progname); |
348 |
-- if (use_zcat || use_bzcat || use_lzcat || use_xzcat) { |
349 |
-+ if (use_compression) { |
350 |
- if (use_zcat) { |
351 |
- pipe_cmd = "zcat \"" filename "\""; |
352 |
- } else if (use_bzcat) { |
353 |
|
354 |
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 |
355 |
deleted file mode 100644 |
356 |
index b79b3a1872f..00000000000 |
357 |
--- a/sys-apps/man/files/man-1.6f-man2html-compression-2.patch |
358 |
+++ /dev/null |
359 |
@@ -1,61 +0,0 @@ |
360 |
-add support for bzip2/lzma to man2html and friends |
361 |
- |
362 |
---- man2html/glimpse_filters |
363 |
-+++ man2html/glimpse_filters |
364 |
-@@ -1,3 +1,6 @@ |
365 |
-+*.bz2 bzip2 -d -c |
366 |
-+*.lzma lzma -d -c |
367 |
-+*.xz xz -d -c |
368 |
- *.gz gzip -d -c |
369 |
- *.Z gzip -d -c |
370 |
- |
371 |
---- man2html/scripts/cgi-bin/man/man2html |
372 |
-+++ man2html/scripts/cgi-bin/man/man2html |
373 |
-@@ -93,6 +93,12 @@ |
374 |
- *.bz2) |
375 |
- bzcat "$PAGE" | "$MAN2HTML" "$LL" -D "$PAGE" |
376 |
- ;; |
377 |
-+ *.lzma) |
378 |
-+ lzcat "$PAGE" | "$MAN2HTML" "$LL" -D "$PAGE" |
379 |
-+ ;; |
380 |
-+ *.xz) |
381 |
-+ xzcat "$PAGE" | "$MAN2HTML" "$LL" -D "$PAGE" |
382 |
-+ ;; |
383 |
- *) |
384 |
- "$MAN2HTML" "$LL" "$PAGE" |
385 |
- ;; |
386 |
-@@ -103,6 +106,12 @@ |
387 |
- elif [ -r "$PAGE".bz2 ] |
388 |
- then |
389 |
- bzcat "$PAGE".bz2 | "$MAN2HTML" "$LL" -D "$PAGE" |
390 |
-+elif [ -r "$PAGE".lzma ] |
391 |
-+then |
392 |
-+ lzcat "$PAGE".lzma | "$MAN2HTML" "$LL" -D "$PAGE" |
393 |
-+elif [ -r "$PAGE".xz ] |
394 |
-+then |
395 |
-+ xzcat "$PAGE".xz | "$MAN2HTML" "$LL" -D "$PAGE" |
396 |
- else |
397 |
- "$MAN2HTML" -E "Strange... Cannot find (or read) $PAGE." |
398 |
- fi |
399 |
---- man2html/scripts/cgi-bin/man/mansearch |
400 |
-+++ man2html/scripts/cgi-bin/man/mansearch |
401 |
-@@ -153,7 +153,7 @@ |
402 |
- } |
403 |
- print "<DT> <a href=\"" cgipath "/man2html?" fullname "\">"; |
404 |
- textname = filename; |
405 |
-- sub(/\.(gz)|Z|z$/, "", textname); |
406 |
-+ sub(/\.([zZ]|gz|bz2|lzma|xz)$/, "", textname); |
407 |
- sub(/\./, "(", textname); |
408 |
- textname = textname ")"; |
409 |
- print textname; |
410 |
---- man2html/scripts/cgi-bin/man/mansec |
411 |
-+++ man2html/scripts/cgi-bin/man/mansec |
412 |
-@@ -128,7 +128,7 @@ |
413 |
- # Print out alphabetic quick index and other links |
414 |
- } |
415 |
- # Split page.n into "page" and "n" and generate an entry |
416 |
-- sub(/[.]([zZ]|(gz))$/, "", manpage); |
417 |
-+ sub(/[.]([zZ]|gz|bz2|lzma|xz)$/, "", manpage); |
418 |
- match(manpage, /[.][^.]+$/); |
419 |
- title = substr(manpage, 1, RSTART - 1); |
420 |
- if (section != "all") { |
421 |
|
422 |
diff --git a/sys-apps/man/files/man-1.6f-parallel-build.patch b/sys-apps/man/files/man-1.6f-parallel-build.patch |
423 |
deleted file mode 100644 |
424 |
index 41918d9244d..00000000000 |
425 |
--- a/sys-apps/man/files/man-1.6f-parallel-build.patch |
426 |
+++ /dev/null |
427 |
@@ -1,78 +0,0 @@ |
428 |
-http://bugs.gentoo.org/207148 |
429 |
- |
430 |
-patch by Kevin Pyle to fix parallel build issues |
431 |
- |
432 |
---- a/src/Makefile.in |
433 |
-+++ b/src/Makefile.in |
434 |
-@@ -42,9 +42,12 @@ |
435 |
- makemsg: |
436 |
- $(BUILD_CC) -o makemsg makemsg.c |
437 |
- |
438 |
--msg.c gripedefs.h: ../msgs/mess.en makemsg |
439 |
-+gripedefs.h: ../msgs/mess.en makemsg |
440 |
- ./makemsg ../msgs/mess.en gripedefs.h msg.c |
441 |
- |
442 |
-+# avoid parallel build issues with makemsg |
443 |
-+msg.c: gripedefs.h |
444 |
-+ |
445 |
- # glob.c does not have prototypes |
446 |
- glob.o: glob.c ndir.h |
447 |
- $(CC) -c $(CWARNNP) $(CFLAGS) -I. $(DEFS) glob.c |
448 |
- |
449 |
-http://bugs.gentoo.org/258916 |
450 |
- |
451 |
-avoid: |
452 |
- make[2]: warning: jobserver unavailable: using -j1. Add `+' to parent make rule. |
453 |
- |
454 |
---- a/man/Makefile.in |
455 |
-+++ b/man/Makefile.in |
456 |
-@@ -3,7 +3,7 @@ |
457 |
- MAN5 = man.conf |
458 |
- MAN8 = makewhatis |
459 |
- ALL = man.1 whatis.1 apropos.1 man.conf.5 |
460 |
--MAYBE8 = makewhatis |
461 |
-+MAYBE8 = $(wildcard makewhatis.man) |
462 |
- |
463 |
- .SUFFIXES: .man .1 .5 .8 |
464 |
- |
465 |
-@@ -21,9 +21,7 @@ |
466 |
- # Where to put the manual pages. |
467 |
- mandir = $(DESTDIR)$(PREFIX)@mandir@$(SLANG) |
468 |
- |
469 |
--all: $(ALL) |
470 |
-- for i in $(MAYBE8); \ |
471 |
-- do if test -f $$i.man; then make -f ../Makefile $$i.8; fi; done |
472 |
-+all: $(ALL) $(MAYBE8:.man=.8) |
473 |
- |
474 |
- install: $(ALL) |
475 |
- mkdir -p $(mandir)/man1 $(mandir)/man5 $(mandir)/man8 |
476 |
-@@ -39,18 +37,17 @@ |
477 |
- |
478 |
- spotless: |
479 |
- |
480 |
--subdirs: |
481 |
-- @for i in @languages@; do if test -d $$i; then echo; \ |
482 |
-- echo "==== Making the `cat $$i.txt` man pages. ===="; \ |
483 |
-- cd $$i; make -f ../Makefile; cd ..; \ |
484 |
-- else echo "==== No $$i man pages found. ===="; fi; done |
485 |
-- |
486 |
--installsubdirs: |
487 |
-- @for i in @languages@; do if test -d $$i; then echo; \ |
488 |
-- echo "==== Installing the `cat $$i.txt` man pages. ===="; \ |
489 |
-- cd $$i; SLANG=/$$i; if test $$SLANG = /en; then SLANG= ; fi; \ |
490 |
-- export SLANG; make -f ../Makefile install; cd ..; \ |
491 |
-- else echo "==== No $$i man pages found. ===="; fi; done |
492 |
-+MAN_LANGS = $(wildcard @languages@) |
493 |
-+subdirs: $(MAN_LANGS:=_lang_subdir) |
494 |
-+%_lang_subdir: |
495 |
-+ @echo "==== Making the `cat $(@:_lang_subdir=).txt` man pages. ====" |
496 |
-+ $(MAKE) -f ../Makefile -C $(@:_lang_subdir=) |
497 |
-+ |
498 |
-+installsubdirs: $(MAN_LANGS:=_lang_installsubdir) |
499 |
-+%_lang_installsubdir: |
500 |
-+ @echo "==== Making the `cat $(@:_lang_installsubdir=).txt` man pages. ====" |
501 |
-+ $(MAKE) -f ../Makefile -C $(@:_lang_installsubdir=) install \ |
502 |
-+ SLANG=`s=$(@:_lang_installsubdir=); test $$s = en || echo /$$s` |
503 |
- |
504 |
- cleansubdirs: |
505 |
- @for i in ??; do cd $$i; make -f ../Makefile clean; cd ..; done |
506 |
|
507 |
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 |
508 |
deleted file mode 100644 |
509 |
index ac42c8df7b3..00000000000 |
510 |
--- a/sys-apps/man/files/man-1.6f-so-search-2.patch |
511 |
+++ /dev/null |
512 |
@@ -1,34 +0,0 @@ |
513 |
-improve the uncompressed .so search |
514 |
- |
515 |
---- a/src/man.c |
516 |
-+++ b/src/man.c |
517 |
-@@ -381,13 +381,23 @@ again: |
518 |
- } |
519 |
- /* |
520 |
- * Some people have compressed man pages, but uncompressed |
521 |
-- * .so files - we could glob for all possible extensions, |
522 |
-- * for now: only try .gz |
523 |
-+ * .so files - we should discover this list dynamically, but |
524 |
-+ * for now just hardcode it. |
525 |
- */ |
526 |
-- else if (fp == NULL && get_expander(".gz") && |
527 |
-- strlen(name)+strlen(".gz") < BUFSIZE) { |
528 |
-- strcat(name, ".gz"); |
529 |
-- fp = fopen (name, "r"); |
530 |
-+ else if (fp == NULL) { |
531 |
-+#define ARRAY_SIZE(a) (sizeof(a) / sizeof(*(a))) |
532 |
-+ size_t i, name_len = strlen(name); |
533 |
-+ const char *extensions[] = { ".gz", ".bz2", ".lzma", ".xz", ".z", ".Z" }; |
534 |
-+ for (i = 0; i < ARRAY_SIZE(extensions); ++i) { |
535 |
-+ const char *comp = extensions[i]; |
536 |
-+ name[name_len] = '\0'; |
537 |
-+ if (get_expander(comp) && name_len+strlen(comp) < BUFSIZE) { |
538 |
-+ strcat(name, comp); |
539 |
-+ fp = fopen(name, "r"); |
540 |
-+ if (fp) |
541 |
-+ break; |
542 |
-+ } |
543 |
-+ } |
544 |
- } |
545 |
- |
546 |
- if (fp == NULL) { |
547 |
|
548 |
diff --git a/sys-apps/man/files/man-1.6f-unicode.patch b/sys-apps/man/files/man-1.6f-unicode.patch |
549 |
deleted file mode 100644 |
550 |
index 89d3821df3c..00000000000 |
551 |
--- a/sys-apps/man/files/man-1.6f-unicode.patch |
552 |
+++ /dev/null |
553 |
@@ -1,28 +0,0 @@ |
554 |
-let the active locale work its magic |
555 |
- |
556 |
-http://bugs.gentoo.org/146315 |
557 |
- |
558 |
---- man-1.6f/configure |
559 |
-+++ man-1.6f/configure |
560 |
-@@ -473,9 +473,9 @@ |
561 |
- then |
562 |
- if test $Fnroff = "missing" |
563 |
- then |
564 |
-- nroff="nroff -Tlatin1 -mandoc" |
565 |
-+ nroff="nroff -Tascii -c -mandoc" |
566 |
- else |
567 |
-- nroff="$Fnroff -Tlatin1 -mandoc" |
568 |
-+ nroff="$Fnroff -mandoc" |
569 |
- fi |
570 |
- troff="troff -mandoc" |
571 |
- echo "Warning: could not find groff" |
572 |
-@@ -484,7 +484,7 @@ |
573 |
- then |
574 |
- nroff="$Fgroff -Tlatin1 -mandoc" |
575 |
- else |
576 |
-- nroff="$Fnroff -Tlatin1 -mandoc" |
577 |
-+ nroff="$Fnroff -mandoc" |
578 |
- fi |
579 |
- troff="$Fgroff -Tps -mandoc" |
580 |
- jnroff="$Fgroff -Tnippon -mandocj" |
581 |
- |
582 |
|
583 |
diff --git a/sys-apps/man/files/man-1.6g-compress.patch b/sys-apps/man/files/man-1.6g-compress.patch |
584 |
deleted file mode 100644 |
585 |
index 374d8073007..00000000000 |
586 |
--- a/sys-apps/man/files/man-1.6g-compress.patch |
587 |
+++ /dev/null |
588 |
@@ -1,17 +0,0 @@ |
589 |
-allow selection of default cache compressor |
590 |
- |
591 |
-http://bugs.gentoo.org/205147 |
592 |
- |
593 |
---- configure |
594 |
-+++ configure |
595 |
-@@ -1012,6 +1012,10 @@ |
596 |
- done |
597 |
- done |
598 |
- |
599 |
-+ if [ x$COMPRESS != x ]; then |
600 |
-+ compress=$COMPRESS |
601 |
-+ fi |
602 |
-+ |
603 |
- if [ x$default = x ]; then |
604 |
- echo "" |
605 |
- echo "What program should be used to compress the formatted pages?" |
606 |
|
607 |
diff --git a/sys-apps/man/files/man-1.6g-echo-escape.patch b/sys-apps/man/files/man-1.6g-echo-escape.patch |
608 |
deleted file mode 100644 |
609 |
index 96e950a51e8..00000000000 |
610 |
--- a/sys-apps/man/files/man-1.6g-echo-escape.patch |
611 |
+++ /dev/null |
612 |
@@ -1,15 +0,0 @@ |
613 |
-avoid using escape sequences in echo as they're not portable |
614 |
- |
615 |
-https://bugs.gentoo.org/523874 |
616 |
- |
617 |
---- a/src/man.c |
618 |
-+++ b/src/man.c |
619 |
-@@ -626,7 +626,7 @@ make_roff_command (const char *path, const char *file) { |
620 |
- the current position plus 10 lines. This plus setpl() |
621 |
- gives us a single page that just contains the whole |
622 |
- man page. (William Webber, wew@×××××××××××.au) */ |
623 |
-- strcat(buft, "; echo \".\\\\\\\"\"; echo \".pl \\n(nlu+10\""); |
624 |
-+ strcat(buft, "; echo \".\\\\\\\"\"; echo \".pl \"; echo \"(nlu+10\""); |
625 |
- #if 0 |
626 |
- /* In case this doesnt work for some reason, |
627 |
- michaelkjohnson suggests: I've got a simple |
628 |
|
629 |
diff --git a/sys-apps/man/files/man-1.6g-fbsd.patch b/sys-apps/man/files/man-1.6g-fbsd.patch |
630 |
deleted file mode 100644 |
631 |
index ef01a6e01fc..00000000000 |
632 |
--- a/sys-apps/man/files/man-1.6g-fbsd.patch |
633 |
+++ /dev/null |
634 |
@@ -1,15 +0,0 @@ |
635 |
-Fixes compilation in FreeBSD |
636 |
- |
637 |
-http://bugs.gentoo.org/138123 |
638 |
- |
639 |
---- man-1.6g/gencat/genlib.c |
640 |
-+++ man-1.6g/gencat/genlib.c |
641 |
-@@ -54,7 +54,7 @@ |
642 |
- #include <unistd.h> |
643 |
- #endif |
644 |
- |
645 |
--#if !defined(__linux__) && !defined(__CYGWIN__) |
646 |
-+#if !defined(__linux__) && !defined(__CYGWIN__) && !defined(__FreeBSD__) |
647 |
- #include <memory.h> |
648 |
- static int bcopy(src, dst, length) |
649 |
- char *src, *dst; |
650 |
|
651 |
diff --git a/sys-apps/man/files/man-1.6g-xz.patch b/sys-apps/man/files/man-1.6g-xz.patch |
652 |
deleted file mode 100644 |
653 |
index fcf91f71d37..00000000000 |
654 |
--- a/sys-apps/man/files/man-1.6g-xz.patch |
655 |
+++ /dev/null |
656 |
@@ -1,53 +0,0 @@ |
657 |
-add support for xz |
658 |
- |
659 |
-http://bugs.gentoo.org/302380 |
660 |
- |
661 |
---- a/src/makewhatis.sh |
662 |
-+++ b/src/makewhatis.sh |
663 |
-@@ -230,7 +230,7 @@ |
664 |
- find $mandir/${pages}$i/. -name '*' $findarg0 $findarg -print | $AWK ' |
665 |
- |
666 |
- function readline() { |
667 |
-- if (use_zcat || use_bzcat || use_lzcat) { |
668 |
-+ if (use_zcat || use_bzcat || use_lzcat || use_xzcat) { |
669 |
- result = (pipe_cmd | getline); |
670 |
- if (result < 0) { |
671 |
- print "Pipe error: " pipe_cmd " " ERRNO > "/dev/stderr"; |
672 |
-@@ -245,7 +245,7 @@ |
673 |
- } |
674 |
- |
675 |
- function closeline() { |
676 |
-- if (use_zcat || use_bzcat || use_lzcat) { |
677 |
-+ if (use_zcat || use_bzcat || use_lzcat || use_xzcat) { |
678 |
- return close(pipe_cmd); |
679 |
- } else { |
680 |
- return close(filename); |
681 |
-@@ -266,7 +266,9 @@ |
682 |
- use_bzcat = match(filename,"\\.bz2"); |
683 |
- if(!use_bzcat) |
684 |
- use_lzcat = match(filename,"\\.lzma"); |
685 |
-- if (use_zcat || use_bzcat || use_lzcat ) { |
686 |
-+ if(!use_lzcat) |
687 |
-+ use_xzcat = match(filename,"\\.xz"); |
688 |
-+ if (use_zcat || use_bzcat || use_lzcat || use_xzcat) { |
689 |
- filename_no_gz = substr(filename, 0, RSTART - 1); |
690 |
- } else { |
691 |
- filename_no_gz = filename; |
692 |
-@@ -279,13 +281,15 @@ |
693 |
- actual_section = section; |
694 |
- } |
695 |
- sub(/\..*/, "", progname); |
696 |
-- if (use_zcat || use_bzcat || use_lzcat) { |
697 |
-+ if (use_zcat || use_bzcat || use_lzcat || use_xzcat) { |
698 |
- if (use_zcat) { |
699 |
- pipe_cmd = "zcat \"" filename "\""; |
700 |
- } else if (use_bzcat) { |
701 |
- pipe_cmd = "bzcat \"" filename "\""; |
702 |
-- } else { |
703 |
-+ } else if (use_lzcat) { |
704 |
- pipe_cmd = "lzcat \"" filename "\""; |
705 |
-+ } else { |
706 |
-+ pipe_cmd = "xzcat \"" filename "\""; |
707 |
- } |
708 |
- # try to avoid suspicious stuff |
709 |
- if (filename ~ /[;&|`$(]/) { |
710 |
|
711 |
diff --git a/sys-apps/man/man-1.6g-r1.ebuild b/sys-apps/man/man-1.6g-r1.ebuild |
712 |
deleted file mode 100644 |
713 |
index f5e27dee943..00000000000 |
714 |
--- a/sys-apps/man/man-1.6g-r1.ebuild |
715 |
+++ /dev/null |
716 |
@@ -1,131 +0,0 @@ |
717 |
-# Copyright 1999-2020 Gentoo Authors |
718 |
-# Distributed under the terms of the GNU General Public License v2 |
719 |
- |
720 |
-EAPI="4" |
721 |
- |
722 |
-inherit eutils prefix toolchain-funcs user |
723 |
- |
724 |
-DESCRIPTION="Standard commands to read man pages" |
725 |
-HOMEPAGE="http://primates.ximian.com/~flucifredi/man/" |
726 |
-SRC_URI="http://primates.ximian.com/~flucifredi/man/${P}.tar.gz" |
727 |
- |
728 |
-LICENSE="GPL-2" |
729 |
-SLOT="0" |
730 |
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86" |
731 |
-IUSE="+lzma nls selinux" |
732 |
- |
733 |
-DEPEND="nls? ( sys-devel/gettext )" |
734 |
-RDEPEND=">=sys-apps/groff-1.19.2-r1 |
735 |
- !sys-apps/man-db |
736 |
- !<app-arch/lzma-4.63 |
737 |
- lzma? ( app-arch/xz-utils ) |
738 |
- selinux? ( sec-policy/selinux-makewhatis )" |
739 |
- |
740 |
-pkg_setup() { |
741 |
- enewgroup man 15 |
742 |
- enewuser man 13 -1 /usr/share/man man |
743 |
-} |
744 |
- |
745 |
-src_prepare() { |
746 |
- epatch "${FILESDIR}"/man-1.6f-man2html-compression-2.patch |
747 |
- epatch "${FILESDIR}"/man-1.6-cross-compile.patch |
748 |
- epatch "${FILESDIR}"/man-1.6f-unicode.patch #146315 |
749 |
- epatch "${FILESDIR}"/man-1.6c-cut-duplicate-manpaths.patch |
750 |
- epatch "${FILESDIR}"/man-1.5m2-apropos.patch |
751 |
- epatch "${FILESDIR}"/man-1.6g-fbsd.patch #138123 |
752 |
- epatch "${FILESDIR}"/man-1.6e-headers.patch |
753 |
- epatch "${FILESDIR}"/man-1.6f-so-search-2.patch |
754 |
- epatch "${FILESDIR}"/man-1.6g-compress.patch #205147 |
755 |
- epatch "${FILESDIR}"/man-1.6f-parallel-build.patch #207148 #258916 |
756 |
- epatch "${FILESDIR}"/man-1.6g-xz.patch #302380 |
757 |
- epatch "${FILESDIR}"/man-1.6f-makewhatis-compression-cleanup.patch #331979 |
758 |
- epatch "${FILESDIR}"/man-1.6g-echo-escape.patch #523874 |
759 |
- # make sure `less` handles escape sequences #287183 |
760 |
- sed -i -e '/^DEFAULTLESSOPT=/s:"$:R":' configure |
761 |
-} |
762 |
- |
763 |
-echoit() { echo "$@" ; "$@" ; } |
764 |
-src_configure() { |
765 |
- strip-linguas $(eval $(grep ^LANGUAGES= configure) ; echo ${LANGUAGES//,/ }) |
766 |
- |
767 |
- unset NLSPATH #175258 |
768 |
- |
769 |
- tc-export CC BUILD_CC |
770 |
- |
771 |
- local mylang= |
772 |
- if use nls ; then |
773 |
- if [[ -z ${LINGUAS} ]] ; then |
774 |
- mylang="all" |
775 |
- else |
776 |
- mylang="${LINGUAS// /,}" |
777 |
- fi |
778 |
- else |
779 |
- mylang="none" |
780 |
- fi |
781 |
- export COMPRESS |
782 |
- if use lzma ; then |
783 |
- COMPRESS="${EPREFIX}"/usr/bin/xz |
784 |
- else |
785 |
- COMPRESS="${EPREFIX}"/bin/bzip2 |
786 |
- fi |
787 |
- |
788 |
- if [[ -n ${EPREFIX} ]]; then |
789 |
- hprefixify configure || die |
790 |
- sed -i \ |
791 |
- -e "s/man_user=root/man_user=$(id -u)/" \ |
792 |
- -e "s/man_group=man/man_group=$(id -g)/" \ |
793 |
- configure || die "Failed to disable suid/sgid options for man" |
794 |
- sed -i -e 's:/usr/bin:@bindir@:' man2html/Makefile.in || die |
795 |
- fi |
796 |
- |
797 |
- echoit \ |
798 |
- ./configure \ |
799 |
- -bindir="${EPREFIX}"/usr/bin \ |
800 |
- -confdir="${EPREFIX}"/etc \ |
801 |
- +sgid +fhs \ |
802 |
- +lang ${mylang} \ |
803 |
- || die "configure failed" |
804 |
-} |
805 |
- |
806 |
-src_install() { |
807 |
- unset NLSPATH #175258 |
808 |
- |
809 |
- emake PREFIX="${D}" install |
810 |
- dosym man /usr/bin/manpath |
811 |
- |
812 |
- dodoc LSM README* TODO |
813 |
- |
814 |
- # makewhatis only adds man-pages from the last 24hrs |
815 |
- exeinto /etc/cron.daily |
816 |
- newexe "${FILESDIR}"/makewhatis.cron makewhatis |
817 |
- |
818 |
- keepdir /var/cache/man |
819 |
- [[ -z ${EPREFIX} ]] && diropts -m0775 -g man |
820 |
- local mansects=$(grep ^MANSECT "${ED}"/etc/man.conf | cut -f2-) |
821 |
- for x in ${mansects//:/ } ; do |
822 |
- keepdir /var/cache/man/cat${x} |
823 |
- done |
824 |
-} |
825 |
- |
826 |
-pkg_postinst() { |
827 |
- einfo "Forcing sane permissions onto ${ROOT}var/cache/man (Bug #40322)" |
828 |
- chown -R root:man "${ROOT}"/var/cache/man |
829 |
- chmod -R g+w "${ROOT}"/var/cache/man |
830 |
- [[ -e ${ROOT}/var/cache/man/whatis ]] \ |
831 |
- && chown root:0 "${ROOT}"/var/cache/man/whatis |
832 |
- |
833 |
- echo |
834 |
- |
835 |
- local f files=$(ls "${ROOT}"/etc/cron.{daily,weekly}/makewhatis{,.cron} 2>/dev/null) |
836 |
- for f in ${files} ; do |
837 |
- [[ ${f} == */etc/cron.daily/makewhatis ]] && continue |
838 |
- [[ $(md5sum "${f}") == "8b2016cc778ed4e2570b912c0f420266 "* ]] \ |
839 |
- && rm -f "${f}" |
840 |
- done |
841 |
- files=$(ls "${ROOT}"etc/cron.{daily,weekly}/makewhatis{,.cron} 2>/dev/null) |
842 |
- if [[ ${files/$'\n'} != ${files} ]] ; then |
843 |
- ewarn "You have multiple makewhatis cron files installed." |
844 |
- ewarn "You might want to delete all but one of these:" |
845 |
- ewarn ${files} |
846 |
- fi |
847 |
-} |
848 |
|
849 |
diff --git a/sys-apps/man/metadata.xml b/sys-apps/man/metadata.xml |
850 |
deleted file mode 100644 |
851 |
index 56c12441305..00000000000 |
852 |
--- a/sys-apps/man/metadata.xml |
853 |
+++ /dev/null |
854 |
@@ -1,8 +0,0 @@ |
855 |
-<?xml version="1.0" encoding="UTF-8"?> |
856 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
857 |
-<pkgmetadata> |
858 |
-<maintainer type="project"> |
859 |
- <email>base-system@g.o</email> |
860 |
- <name>Gentoo Base System</name> |
861 |
-</maintainer> |
862 |
-</pkgmetadata> |