1 |
commit: 1a932d2c13888ba8c221a108f004dd000fb4c812 |
2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun May 31 17:14:04 2020 +0000 |
4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun May 31 17:14:04 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=1a932d2c |
7 |
|
8 |
sys-apps/texinfo-6.7: sync with gx86 |
9 |
|
10 |
Package-Manager: Portage-2.3.84-prefix, Repoman-2.3.22 |
11 |
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> |
12 |
|
13 |
sys-apps/texinfo/Manifest | 3 +- |
14 |
sys-apps/texinfo/files/mkinfodir | 233 --------------------- |
15 |
sys-apps/texinfo/files/texinfo-4.11-aix.patch | 25 --- |
16 |
.../texinfo/files/texinfo-4.11-dir-entry.patch | 24 --- |
17 |
.../files/texinfo-4.11-high-precision.patch | 43 ---- |
18 |
.../files/texinfo-4.11-parallel-build.patch | 21 -- |
19 |
sys-apps/texinfo/files/texinfo-4.11-prefix.patch | 16 -- |
20 |
sys-apps/texinfo/files/texinfo-4.11-test-tex.patch | 24 --- |
21 |
sys-apps/texinfo/files/texinfo-4.11-test.patch | 14 -- |
22 |
sys-apps/texinfo/files/texinfo-4.12-utilpath.patch | 34 --- |
23 |
.../files/texinfo-4.13-accentenc-test.patch | 17 -- |
24 |
sys-apps/texinfo/files/texinfo-4.13-docbook.patch | 66 ------ |
25 |
.../files/texinfo-4.13-texi2dvi-regexp-range.patch | 23 -- |
26 |
sys-apps/texinfo/files/texinfo-4.13-tinfo.patch | 24 --- |
27 |
sys-apps/texinfo/files/texinfo-4.13-xz.patch | 130 ------------ |
28 |
.../texinfo/files/texinfo-4.8-bounds-check.patch | 32 --- |
29 |
.../texinfo-4.8-buf-overflow-CVE-2006-4810.patch | 15 -- |
30 |
sys-apps/texinfo/files/texinfo-4.8-freebsd.patch | 114 ---------- |
31 |
.../texinfo/files/texinfo-4.8-tempfile-owl.patch | 111 ---------- |
32 |
sys-apps/texinfo/metadata.xml | 10 + |
33 |
sys-apps/texinfo/texinfo-4.13-r2.ebuild | 61 ------ |
34 |
sys-apps/texinfo/texinfo-5.2.ebuild | 48 ----- |
35 |
sys-apps/texinfo/texinfo-6.7.ebuild | 68 ++++++ |
36 |
23 files changed, 79 insertions(+), 1077 deletions(-) |
37 |
|
38 |
diff --git a/sys-apps/texinfo/Manifest b/sys-apps/texinfo/Manifest |
39 |
index f65820dd02..85e5d79e69 100644 |
40 |
--- a/sys-apps/texinfo/Manifest |
41 |
+++ b/sys-apps/texinfo/Manifest |
42 |
@@ -1,3 +1,2 @@ |
43 |
-DIST texinfo-4.13.tar.lzma 1563777 BLAKE2B 8cc316979c681fd0587e01ac48b3ec00f6a128bf643c8ef5329d93944f55cba70c8c3820df17bee5402b6ced374e3f0cc5b4f686ea62a1ae2d63c22849eb7421 SHA512 bded399ed5fcf97dfa72d9486df91ecfc501301d83929b09b230aee2b8ad6994b7d7b5965b04d43de729cee30575b2334cf75879ad0a61c4b781ccc16d6c12db |
44 |
-DIST texinfo-5.2.tar.xz 3812944 BLAKE2B 31f46ca94901ac67f75e7d2876ace9e15d6dc65529ffcf2bec75f0141b977394a3e44799d2d651f01e1a98a96bf4c5caecc091055a0a456508a3e241a1deac3b SHA512 6f9c5142db3b155bd601149b5632807b3c20dcfa7006ce5f7e120e6fc4b2174a3f4671c18232c040ffd69ebfb5950be5c563ac5cc08b88d03eb5a9f1b0f96c04 |
45 |
DIST texinfo-6.0.tar.xz 4086712 BLAKE2B e13ef2fff8b0d94396565b093f81a42dab35dcd43be96337f5fce2df884b59108f9e68e0762b059ff1e8f5294b2daf6164ca61a9e9888da39d32c75ffe103620 SHA512 36f82288dfb7c2385630043faf75ccef5af625952d792c669c5eea673ae5b3474c148041bf1935f87ddeaae7114103731277e715d0d510c6fb41e0211ab12494 |
46 |
+DIST texinfo-6.7.tar.gz 9027808 BLAKE2B ac9a47ae98f27ae55ea1844c74ead6fba256635a56e7a226a1bbdd9ee9ab33565ff8cc7a874410afe6463741285c8fcfd8ff835ae2802009e2d0758405559140 SHA512 a52aaa2f0113c6f14b3cb94fbf7191770017ff6ce2016292770831279cfbb898c2f7f720adee620e08d9d80a9505df89a689ba0c25e92f6579b28b075f7b8ee2 |
47 |
|
48 |
diff --git a/sys-apps/texinfo/files/mkinfodir b/sys-apps/texinfo/files/mkinfodir |
49 |
deleted file mode 100755 |
50 |
index db825de097..0000000000 |
51 |
--- a/sys-apps/texinfo/files/mkinfodir |
52 |
+++ /dev/null |
53 |
@@ -1,233 +0,0 @@ |
54 |
-#!/bin/bash |
55 |
-# $Id: mkinfodir,v 1.1 2000/08/03 16:16:11 achim Exp $ |
56 |
-# Generate the top-level Info node, given a directory of Info files |
57 |
-# and (optionally) a skeleton file. The output will be suitable for a |
58 |
-# top-level dir file. The skeleton file contains info topic names in the |
59 |
-# order they should appear in the output. There are three special |
60 |
-# lines that alter the behavior: a line consisting of just "--" causes |
61 |
-# the next line to be echoed verbatim to the output. A line |
62 |
-# containing just "%%" causes all the remaining filenames (wildcards |
63 |
-# allowed) in the rest of the file to be ignored. A line containing |
64 |
-# just "!!" exits the script when reached (unless preceded by a line |
65 |
-# containing just "--"). Once the script reaches the end of the |
66 |
-# skeleton file, it goes through the remaining files in the directory |
67 |
-# in order, putting their entries at the end. The script will use the |
68 |
-# ENTRY information in each info file if it exists. Otherwise it will |
69 |
-# make a minimal entry. |
70 |
- |
71 |
-# sent by Jeffrey Osier <jeffrey@××××××.com>, who thinks it came from |
72 |
-# zoo@×××××××××.com (david d `zoo' zuhn) |
73 |
- |
74 |
-# modified 7 April 1995 by Joe Harrington <jh@××××××××××××××××.gov> to |
75 |
-# take special flags |
76 |
- |
77 |
-INFODIR=$1 |
78 |
-if [ $# = 2 ] ; then |
79 |
- SKELETON=$2 |
80 |
-else |
81 |
- SKELETON=/dev/null |
82 |
-fi |
83 |
- |
84 |
-skip= |
85 |
- |
86 |
-if [ $# -gt 2 ] ; then |
87 |
- echo usage: $0 info-directory [ skeleton-file ] 1>&2 |
88 |
- exit 1 |
89 |
-elif [ -z "${INFODIR}" ] ; then |
90 |
- INFODIR="%%DEFAULT_INFO_DIR%%" |
91 |
-else |
92 |
- true |
93 |
-fi |
94 |
- |
95 |
-if [ ! -d ${INFODIR} ] ; then |
96 |
- echo "$0: first argument must specify a directory" |
97 |
- exit 1 |
98 |
-fi |
99 |
- |
100 |
-### output the dir header |
101 |
-echo "-*- Text -*-" |
102 |
-echo "This file was generated automatically by $0." |
103 |
-echo "This version was generated on `date`" |
104 |
-echo "by `whoami`@`hostname` for `(cd ${INFODIR}; pwd)`" |
105 |
- |
106 |
-cat << moobler |
107 |
-\$Id: mkinfodir,v 1.1 2000/08/03 16:16:11 achim Exp $ |
108 |
-This is the file .../info/dir, which contains the topmost node of the |
109 |
-Info hierarchy. The first time you invoke Info you start off |
110 |
-looking at that node, which is (dir)Top. |
111 |
- |
112 |
-File: dir Node: Top This is the top of the INFO tree |
113 |
- |
114 |
- This (the Directory node) gives a menu of major topics. |
115 |
- Typing "q" exits, "?" lists all Info commands, "d" returns here, |
116 |
- "h" gives a primer for first-timers, |
117 |
- "mEmacs<Return>" visits the Emacs topic, etc. |
118 |
- |
119 |
- In Emacs, you can click mouse button 2 on a menu item or cross reference |
120 |
- to select it. |
121 |
- |
122 |
-* Menu: The list of major topics begins on the next line. |
123 |
- |
124 |
-moobler |
125 |
- |
126 |
-### go through the list of files in the skeleton. If an info file |
127 |
-### exists, grab the ENTRY information from it. If an entry exists |
128 |
-### use it, otherwise create a minimal dir entry. |
129 |
-### |
130 |
-### Then remove that file from the list of existing files. If any |
131 |
-### additional files remain (ones that don't have a skeleton entry), |
132 |
-### then generate entries for those in the same way, putting the info for |
133 |
-### those at the end.... |
134 |
- |
135 |
-infofiles=`(cd ${INFODIR}; /bin/ls | grep -v '\-[0-9]*\.gz$' | grep -v '\-[0-9]*$' | egrep -v '^dir$|^dir\.info$|^dir\.orig$')` |
136 |
- |
137 |
-# echoing gets clobbered by backquotes; we do it the hard way... |
138 |
-lines=`wc $SKELETON | awk '{print $1}'` |
139 |
-line=1 |
140 |
-while [ $lines -ge $line ] ; do |
141 |
- # Read one line from the file. This is so that we can echo lines with |
142 |
- # whitespace and quoted characters in them. |
143 |
- fileline=`awk NR==$line $SKELETON` |
144 |
- |
145 |
- # flag fancy features |
146 |
- if [ ! -z "$echoline" ] ; then # echo line |
147 |
- echo "$fileline" |
148 |
- fileline= |
149 |
- echoline= |
150 |
- elif [ "${fileline}" = "--" ] ; then # should we echo the next line? |
151 |
- echoline=1 |
152 |
- elif [ "${fileline}" = "%%" ] ; then # eliminate remaining files from dir? |
153 |
- skip=1 |
154 |
- elif [ "${fileline}" = "!!" ] ; then # quit now |
155 |
- exit 0 |
156 |
- fi |
157 |
- |
158 |
- # handle files if they exist |
159 |
- for file in $fileline"" ; do # expand wildcards ("" handles blank lines) |
160 |
- |
161 |
- fname= |
162 |
- |
163 |
- if [ -z "$echoline" -a ! -z "$file" ] ; then |
164 |
- |
165 |
- # Find the file to operate upon. Check both possible names. |
166 |
- infoname=`echo $file | sed 's/\.gz$//'` |
167 |
- infoname=`echo $infoname | sed 's/\.info$//'` |
168 |
- noext= |
169 |
- ext= |
170 |
- if [ -f ${INFODIR}/$infoname ] ; then |
171 |
- noext=$infoname |
172 |
- fi |
173 |
- if [ -f ${INFODIR}/${infoname}.info ] ; then |
174 |
- ext=${infoname}.info |
175 |
- fi |
176 |
- if [ -f ${INFODIR}/${infoname}.info.gz ] ; then |
177 |
- ext=${infoname}.info.gz |
178 |
- fi |
179 |
- # If it exists with both names take what was said in the file. |
180 |
- if [ ! -z "$ext" -a ! -z "$noext" ]; then |
181 |
- fname=$file |
182 |
- warn="### Warning: $ext and $noext both exist! Using ${file}. ###" |
183 |
- elif [ ! \( -z "$ext" -a -z "$noext" \) ]; then |
184 |
- # just take the name if it exists only once |
185 |
- fname=${noext}${ext} |
186 |
- fi |
187 |
- |
188 |
- # if we found something and aren't skipping, do the entry |
189 |
- if [ ! -z "$fname" ] ; then |
190 |
- if [ -z "$skip" ] ; then |
191 |
- |
192 |
- if [ ! -z "$warn" ] ; then # issue any warning |
193 |
- echo $warn |
194 |
- warn= |
195 |
- fi |
196 |
- if [ "${fname##*.}" = "gz" ] ; then |
197 |
- entry=`zcat ${INFODIR}/${fname} | sed -e '1,/START-INFO-DIR-ENTRY/d' \ |
198 |
- -e '/END-INFO-DIR-ENTRY/,$d' ` |
199 |
- else |
200 |
- entry=`sed -e '1,/START-INFO-DIR-ENTRY/d' \ |
201 |
- -e '/END-INFO-DIR-ENTRY/,$d' ${INFODIR}/$fname` |
202 |
- fi |
203 |
- if [ ! -z "${entry}" ] ; then |
204 |
- echo "${entry}" |
205 |
- else |
206 |
- echo "* ${infoname}: (${infoname})." |
207 |
- fi |
208 |
- fi |
209 |
- |
210 |
- # remove the name from the directory listing |
211 |
- infofiles=`echo "" ${infofiles} "" | sed -e "s/ ${fname} / /" -e "s/ / /g"` |
212 |
- |
213 |
- fi |
214 |
- |
215 |
- fi |
216 |
- |
217 |
- done |
218 |
- |
219 |
- line=`expr $line + 1` |
220 |
-done |
221 |
- |
222 |
-if [ -z "${infofiles}" ] ; then |
223 |
- exit 0 |
224 |
-elif [ $lines -gt 0 ]; then |
225 |
- echo |
226 |
-fi |
227 |
- |
228 |
-# Sort remaining files by INFO-DIR-SECTION. |
229 |
-prevsect= |
230 |
-filesectdata=`(cd ${INFODIR}; fgrep INFO-DIR-SECTION /dev/null ${infofiles} | \ |
231 |
- fgrep -v 'INFO-DIR-SECTION Miscellaneous' | \ |
232 |
- sort -t: -k2 -k1 | tr ' ' '_')` |
233 |
-for sectdata in ${filesectdata}; do |
234 |
- file=`echo ${sectdata} | cut -d: -f1` |
235 |
- section=`sed -n -e 's/^INFO-DIR-SECTION //p' ${INFODIR}/${file}` |
236 |
- infofiles=`echo "" ${infofiles} "" | sed -e "s/ ${file} / /" -e "s/ / /g"` |
237 |
- |
238 |
- if [ "${prevsect}" != "${section}" ] ; then |
239 |
- if [ ! -z "${prevsect}" ] ; then |
240 |
- echo "" |
241 |
- fi |
242 |
- echo "${section}" |
243 |
- prevsect="${section}" |
244 |
- fi |
245 |
- infoname=`echo $file | sed 's/\.gz$//'` |
246 |
- infoname=`echo $infoname | sed 's/\.info$//'` |
247 |
- if [ "${file##*.}" = "gz" ] ; then |
248 |
- entry=`zcat ${INFODIR}/$file | sed -e '1,/START-INFO-DIR-ENTRY/d' \ |
249 |
- -e '/END-INFO-DIR-ENTRY/,$d' ` |
250 |
- else |
251 |
- entry=`sed -e '1,/START-INFO-DIR-ENTRY/d' \ |
252 |
- -e '/END-INFO-DIR-ENTRY/,$d' ${INFODIR}/$file` |
253 |
- fi |
254 |
- if [ ! -z "${entry}" ] ; then |
255 |
- echo "${entry}" |
256 |
- elif [ ! -d "${INFODIR}/${file}" ] ; then |
257 |
- echo "* ${infoname}: (${infoname})." |
258 |
- fi |
259 |
-done |
260 |
- |
261 |
-# Process miscellaneous files. |
262 |
-for file in ${infofiles}; do |
263 |
- if [ ! -z "${prevsect}" ] ; then |
264 |
- echo "" |
265 |
- echo "Miscellaneous" |
266 |
- prevsect="" |
267 |
- fi |
268 |
- |
269 |
- infoname=`echo $file | sed 's/\.gz$//'` |
270 |
- infoname=`echo $infoname | sed 's/\.info$//'` |
271 |
- if [ "${file##*.}" = "gz" ] ; then |
272 |
- entry=`zcat ${INFODIR}/${file} | sed -e '1,/START-INFO-DIR-ENTRY/d' \ |
273 |
- -e '/END-INFO-DIR-ENTRY/,$d'` |
274 |
- else |
275 |
- entry=`sed -e '1,/START-INFO-DIR-ENTRY/d' \ |
276 |
- -e '/END-INFO-DIR-ENTRY/,$d' ${INFODIR}/$file` |
277 |
- fi |
278 |
- |
279 |
- |
280 |
- if [ ! -z "${entry}" ] ; then |
281 |
- echo "${entry}" |
282 |
- elif [ ! -d "${INFODIR}/${file}" ] ; then |
283 |
- echo "* ${infoname}: (${infoname})." |
284 |
- fi |
285 |
-done |
286 |
- |
287 |
|
288 |
diff --git a/sys-apps/texinfo/files/texinfo-4.11-aix.patch b/sys-apps/texinfo/files/texinfo-4.11-aix.patch |
289 |
deleted file mode 100644 |
290 |
index 3f0c1d222c..0000000000 |
291 |
--- a/sys-apps/texinfo/files/texinfo-4.11-aix.patch |
292 |
+++ /dev/null |
293 |
@@ -1,25 +0,0 @@ |
294 |
---- makeinfo/lang.h.orig 2007-12-01 23:21:02 +0100 |
295 |
-+++ makeinfo/lang.h 2007-12-01 23:22:18 +0100 |
296 |
-@@ -26,6 +26,10 @@ |
297 |
- * Actually we don't currently support this (may be in the future) ;-) |
298 |
- * These code are the ISO-639 two letter codes. |
299 |
- */ |
300 |
-+#ifdef hz /* AIX defines this in <sys/m_param.h> */ |
301 |
-+#undef hz |
302 |
-+#endif |
303 |
-+ |
304 |
- typedef enum |
305 |
- { |
306 |
- aa, ab, ae, af, ak, am, an, ar, as, av, ay, az, ba, be, bg, bh, bi, |
307 |
---- gnulib/lib/stdlib_.h.orig 2007-12-01 23:32:27 +0100 |
308 |
-+++ gnulib/lib/stdlib_.h 2007-12-01 23:33:05 +0100 |
309 |
-@@ -108,6 +108,9 @@ |
310 |
- implementation. |
311 |
- Returns the open file descriptor if successful, otherwise -1 and errno |
312 |
- set. */ |
313 |
-+# ifdef mkstemp |
314 |
-+# undef mkstemp /* aix might have defined this to mkstemp64 */ |
315 |
-+# endif |
316 |
- # define mkstemp rpl_mkstemp |
317 |
- extern int mkstemp (char * /*template*/); |
318 |
- # else |
319 |
|
320 |
diff --git a/sys-apps/texinfo/files/texinfo-4.11-dir-entry.patch b/sys-apps/texinfo/files/texinfo-4.11-dir-entry.patch |
321 |
deleted file mode 100644 |
322 |
index 3a621d4909..0000000000 |
323 |
--- a/sys-apps/texinfo/files/texinfo-4.11-dir-entry.patch |
324 |
+++ /dev/null |
325 |
@@ -1,24 +0,0 @@ |
326 |
-fix from upstream |
327 |
- |
328 |
-http://bugs.gentoo.org/198545 |
329 |
- |
330 |
---- texinfo/makeinfo/cmds.c 2007/09/26 20:53:39 1.76 |
331 |
-+++ texinfo/makeinfo/cmds.c 2007/10/13 23:44:34 1.77 |
332 |
-@@ -1631,10 +1631,14 @@ |
333 |
- |
334 |
- if (!no_headers && !html) |
335 |
- { |
336 |
-+ /* use add_* instead of insert_* because otherwise the |
337 |
-+ file header ("This is ...") will end up inside the |
338 |
-+ dir section markers. */ |
339 |
- kill_self_indent (-1); /* make sure there's no indentation */ |
340 |
-- insert_string ("INFO-DIR-SECTION "); |
341 |
-- insert_string (line); |
342 |
-- insert ('\n'); |
343 |
-+ cm_noindent (); /* make sure again */ |
344 |
-+ add_word ("INFO-DIR-SECTION "); |
345 |
-+ add_word (line); |
346 |
-+ add_char ('\n'); |
347 |
- } |
348 |
- |
349 |
- free (line); |
350 |
|
351 |
diff --git a/sys-apps/texinfo/files/texinfo-4.11-high-precision.patch b/sys-apps/texinfo/files/texinfo-4.11-high-precision.patch |
352 |
deleted file mode 100644 |
353 |
index fc78bd14c8..0000000000 |
354 |
--- a/sys-apps/texinfo/files/texinfo-4.11-high-precision.patch |
355 |
+++ /dev/null |
356 |
@@ -1,43 +0,0 @@ |
357 |
-* http://bugs.gentoo.org/show_bug.cgi?id=200662 |
358 |
- |
359 |
-diff -ru texinfo-4.11.orig/info/makedoc.c texinfo-4.11/info/makedoc.c |
360 |
---- texinfo-4.11.orig/info/makedoc.c 2007-07-01 23:20:30.000000000 +0200 |
361 |
-+++ texinfo-4.11/info/makedoc.c 2007-12-03 17:40:18.241898334 +0100 |
362 |
-@@ -144,9 +144,11 @@ |
363 |
- key_filename = NULL_DEVICE; |
364 |
- } |
365 |
- |
366 |
-+ /* the order of these files depends exactly on the order in the |
367 |
-+ * Makefile.{in,am}, see also the fclose calls below */ |
368 |
- funs_stream = must_fopen (funs_filename, "w"); |
369 |
-- doc_stream = must_fopen (doc_filename, "w"); |
370 |
- key_stream = must_fopen (key_filename, "w"); |
371 |
-+ doc_stream = must_fopen (doc_filename, "w"); |
372 |
- |
373 |
- fprintf (funs_stream, |
374 |
- "/* %s -- Generated declarations for Info commands. */\n\n\ |
375 |
-@@ -225,9 +227,11 @@ |
376 |
- fprintf (key_stream, " { (char *)NULL, 0 }\n};\n"); |
377 |
- fprintf (funs_stream, "\n#define A_NCOMMANDS %u\n", next_func_key()); |
378 |
- |
379 |
-+ /* the order of these files depends exactly on the order in the |
380 |
-+ * Makefile.{in,am}, see also the must_fopen calls above */ |
381 |
- fclose (funs_stream); |
382 |
-- fclose (doc_stream); |
383 |
- fclose (key_stream); |
384 |
-+ fclose (doc_stream); |
385 |
- |
386 |
- if (tags_only) |
387 |
- maybe_dump_tags (stdout); |
388 |
-diff -ru texinfo-4.11.orig/info/Makefile.am texinfo-4.11/info/Makefile.am |
389 |
---- texinfo-4.11.orig/info/Makefile.am 2006-06-29 09:58:26.000000000 +0200 |
390 |
-+++ texinfo-4.11/info/Makefile.am 2007-12-03 17:41:21.644483827 +0100 |
391 |
-@@ -54,6 +54,8 @@ |
392 |
- |
393 |
- # We need a linear ordering to prevent race condition in parallel make. |
394 |
- # See the node ``(automake)Multiple Outputs'' for an explanation. |
395 |
-+# Make sure this matches with order in which makedoc.c creates these |
396 |
-+# files. |
397 |
- doc.c: key.c |
398 |
- key.c: funs.h |
399 |
- |
400 |
|
401 |
diff --git a/sys-apps/texinfo/files/texinfo-4.11-parallel-build.patch b/sys-apps/texinfo/files/texinfo-4.11-parallel-build.patch |
402 |
deleted file mode 100644 |
403 |
index ef8ad7deeb..0000000000 |
404 |
--- a/sys-apps/texinfo/files/texinfo-4.11-parallel-build.patch |
405 |
+++ /dev/null |
406 |
@@ -1,21 +0,0 @@ |
407 |
-Index: info/Makefile.am |
408 |
-=================================================================== |
409 |
-RCS file: /cvsroot/texinfo/texinfo/info/Makefile.am,v |
410 |
-retrieving revision 1.14 |
411 |
-retrieving revision 1.15 |
412 |
-diff -u -p -r1.14 -r1.15 |
413 |
---- info/Makefile.in 15 Dec 2007 14:32:51 -0000 1.14 |
414 |
-+++ info/Makefile.in 28 Mar 2008 23:39:20 -0000 1.15 |
415 |
-@@ -70,8 +70,10 @@ cmd_sources = $(srcdir)/session.c $(srcd |
416 |
- $(srcdir)/m-x.c $(srcdir)/indices.c $(srcdir)/nodemenu.c \ |
417 |
- $(srcdir)/footnotes.c $(srcdir)/variables.c |
418 |
- |
419 |
--# The $(EXEEXT) should be added by Automake, but isn't. Fine. |
420 |
--$(generated_sources): makedoc$(EXEEXT) $(cmd_sources) |
421 |
-+# Make the target only funs.h even though we create all the |
422 |
-+# $(generated_sources) so that parallel makes won't do the rm && makedoc |
423 |
-+# more than once. |
424 |
-+funs.h: makedoc$(EXEEXT) $(cmd_sources) |
425 |
- rm -f $(generated_sources) |
426 |
- $(top_builddir)/$(native_tools)/info/makedoc $(cmd_sources) |
427 |
- |
428 |
|
429 |
diff --git a/sys-apps/texinfo/files/texinfo-4.11-prefix.patch b/sys-apps/texinfo/files/texinfo-4.11-prefix.patch |
430 |
deleted file mode 100644 |
431 |
index 90c697f539..0000000000 |
432 |
--- a/sys-apps/texinfo/files/texinfo-4.11-prefix.patch |
433 |
+++ /dev/null |
434 |
@@ -1,16 +0,0 @@ |
435 |
---- util/texi2dvi |
436 |
-+++ util/texi2dvi |
437 |
-@@ -1,4 +1,4 @@ |
438 |
--#! /bin/sh |
439 |
-+#!/usr/bin/env bash |
440 |
- # texi2dvi --- produce DVI (or PDF) files from Texinfo (or (La)TeX) sources. |
441 |
- # $Id: texi2dvi,v 1.104 2007/09/10 00:36:30 karl Exp $ |
442 |
- # |
443 |
---- util/texi2pdf |
444 |
-+++ util/texi2pdf |
445 |
-@@ -1,4 +1,4 @@ |
446 |
--#!/bin/sh |
447 |
-+#!/usr/bin/env bash |
448 |
- # $Id: texi2pdf,v 1.2 2005/01/28 01:52:04 karl Exp $ |
449 |
- # Written by Thomas Esser. Public domain. |
450 |
- # Execute texi2dvi --pdf. |
451 |
|
452 |
diff --git a/sys-apps/texinfo/files/texinfo-4.11-test-tex.patch b/sys-apps/texinfo/files/texinfo-4.11-test-tex.patch |
453 |
deleted file mode 100644 |
454 |
index 7357971202..0000000000 |
455 |
--- a/sys-apps/texinfo/files/texinfo-4.11-test-tex.patch |
456 |
+++ /dev/null |
457 |
@@ -1,24 +0,0 @@ |
458 |
-http://bugs.gentoo.org/195313 |
459 |
- |
460 |
---- texinfo-4.11/util/dvipdf.test |
461 |
-+++ texinfo-4.11/util/dvipdf.test |
462 |
-@@ -16,6 +16,8 @@ |
463 |
- # You should have received a copy of the GNU General Public License |
464 |
- # along with this program. If not, see <http://www.gnu.org/licenses/>. |
465 |
- |
466 |
-+required='tex' |
467 |
-+ |
468 |
- . ./defs || exit 1 |
469 |
- |
470 |
- set -e |
471 |
---- texinfo-4.11/util/texi2dvi.test |
472 |
-+++ texinfo-4.11/util/texi2dvi.test |
473 |
-@@ -16,6 +16,8 @@ |
474 |
- # You should have received a copy of the GNU General Public License |
475 |
- # along with this program. If not, see <http://www.gnu.org/licenses/>. |
476 |
- |
477 |
-+required='tex' |
478 |
-+ |
479 |
- . ./defs || exit 1 |
480 |
- |
481 |
- set -e |
482 |
|
483 |
diff --git a/sys-apps/texinfo/files/texinfo-4.11-test.patch b/sys-apps/texinfo/files/texinfo-4.11-test.patch |
484 |
deleted file mode 100644 |
485 |
index 68cc188cb2..0000000000 |
486 |
--- a/sys-apps/texinfo/files/texinfo-4.11-test.patch |
487 |
+++ /dev/null |
488 |
@@ -1,14 +0,0 @@ |
489 |
-test the local compiled version, not the system installed version |
490 |
- |
491 |
-http://bugs.gentoo.org/215359 |
492 |
- |
493 |
---- util/defs.in |
494 |
-+++ util/defs.in |
495 |
-@@ -67,6 +67,7 @@ |
496 |
- export SHELL |
497 |
- test -z "$TEXI2DVI" && TEXI2DVI=`cd $srcdir && pwd`/texi2dvi |
498 |
- |
499 |
-+PATH=$PWD:$PATH |
500 |
- echo $PATH |
501 |
- # Some shells forget to export modified environment variables. |
502 |
- # (See note about `export' in the Autoconf manual.) |
503 |
|
504 |
diff --git a/sys-apps/texinfo/files/texinfo-4.12-utilpath.patch b/sys-apps/texinfo/files/texinfo-4.12-utilpath.patch |
505 |
deleted file mode 100644 |
506 |
index 1b4202ccdc..0000000000 |
507 |
--- a/sys-apps/texinfo/files/texinfo-4.12-utilpath.patch |
508 |
+++ /dev/null |
509 |
@@ -1,34 +0,0 @@ |
510 |
-http://lists.gnu.org/archive/html/bug-texinfo/2008-07/msg00000.html |
511 |
- |
512 |
-diff -ru texinfo-4.12.orig/doc/Makefile.am texinfo-4.12/doc/Makefile.am |
513 |
---- texinfo-4.12.orig/doc/Makefile.am 2008-03-25 16:31:36.000000000 +0100 |
514 |
-+++ texinfo-4.12/doc/Makefile.am 2008-07-01 13:18:19.000000000 +0200 |
515 |
-@@ -115,10 +115,10 @@ |
516 |
- $(unset_envvars); $(HELP2MAN) --name="convert Texinfo documents to DVI" $(util_srcdir)/texi2dvi >$@ |
517 |
- |
518 |
- $(srcdir)/texi2pdf.1: $(common_texi2dvi_deps) |
519 |
-- $(unset_envvars); $(HELP2MAN) --name="convert Texinfo documents to PDF" $(util_srcdir)/texi2pdf >$@ |
520 |
-+ $(unset_envvars); PATH=$(util_srcdir):${PATH} $(HELP2MAN) --name="convert Texinfo documents to PDF" $(util_srcdir)/texi2pdf >$@ |
521 |
- |
522 |
- $(srcdir)/pdftexi2dvi.1: $(common_texi2dvi_deps) |
523 |
-- $(unset_envvars); $(HELP2MAN) --name="convert Texinfo documents to PDF" $(util_srcdir)/pdftexi2dvi >$@ |
524 |
-+ $(unset_envvars); PATH=$(util_srcdir):${PATH} $(HELP2MAN) --name="convert Texinfo documents to PDF" $(util_srcdir)/pdftexi2dvi >$@ |
525 |
- |
526 |
- # Do not create info files for distribution. |
527 |
- dist-info: |
528 |
-diff -ru texinfo-4.12.orig/doc/Makefile.in texinfo-4.12/doc/Makefile.in |
529 |
---- texinfo-4.12.orig/doc/Makefile.in 2008-04-18 09:34:57.000000000 +0200 |
530 |
-+++ texinfo-4.12/doc/Makefile.in 2008-07-01 13:18:47.000000000 +0200 |
531 |
-@@ -1101,10 +1101,10 @@ |
532 |
- $(unset_envvars); $(HELP2MAN) --name="convert Texinfo documents to DVI" $(util_srcdir)/texi2dvi >$@ |
533 |
- |
534 |
- $(srcdir)/texi2pdf.1: $(common_texi2dvi_deps) |
535 |
-- $(unset_envvars); $(HELP2MAN) --name="convert Texinfo documents to PDF" $(util_srcdir)/texi2pdf >$@ |
536 |
-+ $(unset_envvars); PATH=$(util_srcdir):${PATH} $(HELP2MAN) --name="convert Texinfo documents to PDF" $(util_srcdir)/texi2pdf >$@ |
537 |
- |
538 |
- $(srcdir)/pdftexi2dvi.1: $(common_texi2dvi_deps) |
539 |
-- $(unset_envvars); $(HELP2MAN) --name="convert Texinfo documents to PDF" $(util_srcdir)/pdftexi2dvi >$@ |
540 |
-+ $(unset_envvars); PATH=$(util_srcdir):${PATH} $(HELP2MAN) --name="convert Texinfo documents to PDF" $(util_srcdir)/pdftexi2dvi >$@ |
541 |
- |
542 |
- # Do not create info files for distribution. |
543 |
- dist-info: |
544 |
|
545 |
diff --git a/sys-apps/texinfo/files/texinfo-4.13-accentenc-test.patch b/sys-apps/texinfo/files/texinfo-4.13-accentenc-test.patch |
546 |
deleted file mode 100644 |
547 |
index ad470faf0d..0000000000 |
548 |
--- a/sys-apps/texinfo/files/texinfo-4.13-accentenc-test.patch |
549 |
+++ /dev/null |
550 |
@@ -1,17 +0,0 @@ |
551 |
-Fails in UTF-8 locales with grep-2.6 |
552 |
- |
553 |
-https://bugs.gentoo.org/322151 |
554 |
-https://savannah.gnu.org/bugs/index.php?31068 |
555 |
- |
556 |
---- a/makeinfo/tests/accentenc |
557 |
-+++ b/makeinfo/tests/accentenc |
558 |
-@@ -1,7 +1,8 @@ |
559 |
- #!/bin/sh |
560 |
- # Test encoded accent info output. |
561 |
- |
562 |
--unset TEXINFO_OUTPUT |
563 |
-+unset TEXINFO_OUTPUT LANG LANGUAGE |
564 |
-+LC_ALL=POSIX; export LC_ALL |
565 |
- : ${srcdir=.} |
566 |
- input=`basename $0`.txi |
567 |
- output=`basename $0`.info |
568 |
|
569 |
diff --git a/sys-apps/texinfo/files/texinfo-4.13-docbook.patch b/sys-apps/texinfo/files/texinfo-4.13-docbook.patch |
570 |
deleted file mode 100644 |
571 |
index 0622b94f98..0000000000 |
572 |
--- a/sys-apps/texinfo/files/texinfo-4.13-docbook.patch |
573 |
+++ /dev/null |
574 |
@@ -1,66 +0,0 @@ |
575 |
---- texinfo-4.13.orig/makeinfo/cmds.c 2008-05-22 05:11:34.000000000 -0700 |
576 |
-+++ texinfo-4.13/makeinfo/cmds.c 2012-05-23 18:31:57.108264307 -0700 |
577 |
-@@ -1560,7 +1560,7 @@ cm_setfilename (void) |
578 |
- char *filename; |
579 |
- get_rest_of_line (1, &filename); |
580 |
- /* warning ("`@%s %s' encountered and ignored", command, filename); */ |
581 |
-- if (xml) |
582 |
-+ if (xml && !docbook) |
583 |
- add_word_args ("<setfilename>%s</setfilename>", filename); |
584 |
- free (filename); |
585 |
- } |
586 |
---- texinfo-4.13.orig/makeinfo/node.c 2008-07-05 16:59:47.000000000 -0700 |
587 |
-+++ texinfo-4.13/makeinfo/node.c 2012-05-23 17:02:46.517345024 -0700 |
588 |
-@@ -1233,10 +1233,12 @@ cm_anchor (int arg) |
589 |
- } |
590 |
- else if (xml || docbook) |
591 |
- { |
592 |
-+ char *id = xml_id(anchor); |
593 |
- xml_insert_element_with_attribute (ANCHOR, START, |
594 |
- docbook ? "id=\"%s\"" : "name=\"%s\"", |
595 |
-- anchor); |
596 |
-+ id); |
597 |
- xml_insert_element (ANCHOR, END); |
598 |
-+ free(id); |
599 |
- } |
600 |
- |
601 |
- /* Save it in the tag table. */ |
602 |
---- texinfo-4.13.orig/makeinfo/xml.c 2008-02-12 17:00:55.000000000 -0800 |
603 |
-+++ texinfo-4.13/makeinfo/xml.c 2012-05-23 17:20:13.698858895 -0700 |
604 |
-@@ -586,21 +586,27 @@ static int in_indexterm = 0; |
605 |
- char * |
606 |
- xml_id (char *id) |
607 |
- { |
608 |
-- char *tem = xmalloc (strlen (id) + 1); |
609 |
-+ /* Get an extra space to accomodate adding an i-prefix. */ |
610 |
-+ char *tem = xmalloc (strlen (id) + 2); |
611 |
- char *p = tem; |
612 |
-- strcpy (tem, id); |
613 |
-+ |
614 |
-+ /* First character cannot be a number, '-' or '.'. Just always add |
615 |
-+ an i if we're not starting with a alphanumeric character |
616 |
-+ already, to simplify the code. |
617 |
-+ */ |
618 |
-+ if (!isalpha(*id)) |
619 |
-+ { |
620 |
-+ *p++ = 'i'; |
621 |
-+ } |
622 |
-+ |
623 |
-+ strcpy (p, id); |
624 |
-+ |
625 |
- while (*p) |
626 |
- { |
627 |
-- if (strchr (":\" \t\f\r\n", *p)) |
628 |
-+ if (!isalnum (*p) && !strchr (":_.-", *p)) |
629 |
- *p = '-'; |
630 |
- p++; |
631 |
- } |
632 |
-- p = tem; |
633 |
-- |
634 |
-- /* First character cannot be a number. Clearly we should make this |
635 |
-- dependent on the actual numeral found. */ |
636 |
-- if (strchr ("0123456789", *p)) |
637 |
-- *p = 'i'; |
638 |
- |
639 |
- return tem; |
640 |
- } |
641 |
|
642 |
diff --git a/sys-apps/texinfo/files/texinfo-4.13-texi2dvi-regexp-range.patch b/sys-apps/texinfo/files/texinfo-4.13-texi2dvi-regexp-range.patch |
643 |
deleted file mode 100644 |
644 |
index 01b0746def..0000000000 |
645 |
--- a/sys-apps/texinfo/files/texinfo-4.13-texi2dvi-regexp-range.patch |
646 |
+++ /dev/null |
647 |
@@ -1,23 +0,0 @@ |
648 |
-Fix texi2dvi problem with egrep in some locales. |
649 |
-This patch is taken from the texinfo CVS repository, but stripped of |
650 |
-keyword substitutions to make it apply to a wider range of source code |
651 |
-revisions. |
652 |
- |
653 |
-Fix suggested by Martin von Gagern on 2010-03-29, committed by Karl Berry. |
654 |
- |
655 |
-References: |
656 |
-http://bugs.gentoo.org/311885 |
657 |
-http://thread.gmane.org/gmane.comp.tex.texinfo.bugs/5023 |
658 |
-http://cvs.savannah.gnu.org/viewvc/texinfo/util/texi2dvi?root=texinfo&r1=1.157&r2=1.158 |
659 |
- |
660 |
---- util/texi2dvi 2010/02/09 18:37:08 1.157 |
661 |
-+++ util/texi2dvi 2010/03/30 23:13:37 1.158 |
662 |
-@@ -1848,7 +1848,7 @@ |
663 |
- |
664 |
- # If the COMMAND_LINE_FILENAME is not absolute (e.g., --debug.tex), |
665 |
- # prepend `./' in order to avoid that the tools take it as an option. |
666 |
-- echo "$command_line_filename" | $EGREP '^(/|[A-z]:/)' >&6 \ |
667 |
-+ echo "$command_line_filename" | $EGREP '^(/|[A-Za-z]:/)' >&6 \ |
668 |
- || command_line_filename="./$command_line_filename" |
669 |
- |
670 |
- # See if the file exists. If it doesn't we're in trouble since, even |
671 |
|
672 |
diff --git a/sys-apps/texinfo/files/texinfo-4.13-tinfo.patch b/sys-apps/texinfo/files/texinfo-4.13-tinfo.patch |
673 |
deleted file mode 100644 |
674 |
index 10a557a303..0000000000 |
675 |
--- a/sys-apps/texinfo/files/texinfo-4.13-tinfo.patch |
676 |
+++ /dev/null |
677 |
@@ -1,24 +0,0 @@ |
678 |
-http://bugs.gentoo.org/457556 |
679 |
- |
680 |
---- configure.ac |
681 |
-+++ configure.ac |
682 |
-@@ -130,7 +130,7 @@ |
683 |
- # rather ncurses. So we check for it. |
684 |
- TERMLIBS= |
685 |
- # Check for termlib before termcap because Solaris termcap needs libucb. |
686 |
--TERMLIB_VARIANTS="ncurses curses termlib termcap terminfo" |
687 |
-+TERMLIB_VARIANTS="tinfo ncurses curses termlib termcap terminfo" |
688 |
- for termlib in ${TERMLIB_VARIANTS}; do |
689 |
- AC_CHECK_LIB(${termlib}, tgetent, |
690 |
- [TERMLIBS="${TERMLIBS} -l${termlib}"; break]) |
691 |
---- configure |
692 |
-+++ configure |
693 |
-@@ -17477,7 +17477,7 @@ |
694 |
- # rather ncurses. So we check for it. |
695 |
- TERMLIBS= |
696 |
- # Check for termlib before termcap because Solaris termcap needs libucb. |
697 |
--TERMLIB_VARIANTS="ncurses curses termlib termcap terminfo" |
698 |
-+TERMLIB_VARIANTS="tinfo ncurses curses termlib termcap terminfo" |
699 |
- for termlib in ${TERMLIB_VARIANTS}; do |
700 |
- as_ac_Lib=`$as_echo "ac_cv_lib_${termlib}''_tgetent" | $as_tr_sh` |
701 |
- { $as_echo "$as_me:$LINENO: checking for tgetent in -l${termlib}" >&5 |
702 |
|
703 |
diff --git a/sys-apps/texinfo/files/texinfo-4.13-xz.patch b/sys-apps/texinfo/files/texinfo-4.13-xz.patch |
704 |
deleted file mode 100644 |
705 |
index f5bb023be5..0000000000 |
706 |
--- a/sys-apps/texinfo/files/texinfo-4.13-xz.patch |
707 |
+++ /dev/null |
708 |
@@ -1,130 +0,0 @@ |
709 |
-https://bugs.gentoo.org/269742 |
710 |
- |
711 |
-From bfae00d02b5fb3a2ce34c09d2dbf0ca2f96b154f Mon Sep 17 00:00:00 2001 |
712 |
-From: Karl Berry <karl@×××.org> |
713 |
-Date: Sat, 14 Mar 2009 17:57:41 +0000 |
714 |
-Subject: [PATCH] support xz compression, http://tukaani.org/xz |
715 |
- |
716 |
---- |
717 |
- ChangeLog | 6 ++++++ |
718 |
- NEWS | 4 ++++ |
719 |
- doc/info-stnd.texi | 34 +++++++++++++++++----------------- |
720 |
- info/filesys.c | 1 + |
721 |
- install-info/install-info.c | 29 +++++++++++++++++++++++++---- |
722 |
- 5 files changed, 53 insertions(+), 21 deletions(-) |
723 |
- |
724 |
-2009-03-14 Karl Berry <karl@×××.org> |
725 |
- |
726 |
- * info/filesys.c (compress_suffixes): add .xz/unxz. |
727 |
- |
728 |
- * info/filesys.h (DEFAULT_INFOPATH): include PATH by default. |
729 |
- |
730 |
-diff --git a/doc/info-stnd.texi b/doc/info-stnd.texi |
731 |
-index 2bd67f3..c730cff 100644 |
732 |
---- a/doc/info-stnd.texi |
733 |
-+++ b/doc/info-stnd.texi |
734 |
-@@ -202,21 +202,21 @@ directory. |
735 |
- @cindex Info files, compressed |
736 |
- In every directory Info tries, if @var{filename} is not found, Info |
737 |
- looks for it with a number of known extensions of Info files@footnote{ |
738 |
--@file{.info}, @file{-info}, @file{/index}, and @file{.inf}.}. For every |
739 |
--known extension, Info looks for a compressed file, if a regular file |
740 |
--isn't found. Info supports files compressed with @code{gzip}, |
741 |
--@code{bzip2}, @code{compress} and @code{yabba} programs; it calls |
742 |
--@code{gunzip}, @code{bunzip2}, @code{uncompress} and @code{unyabba}, |
743 |
--accordingly, to decompress such files. Compressed Info files are |
744 |
--assumed to have @file{.z}, @file{.gz}, @file{.bz2}, @file{.Z}, or |
745 |
--@file{.Y} extensions, possibly in addition to one of the known Info |
746 |
--files extensions@footnote{The MS-DOS version allows for the Info |
747 |
--extension, such as @code{.inf}, and the short compressed file |
748 |
--extensions, such as @file{.z} and @file{.gz}, to be merged into a single |
749 |
--extension, since DOS doesn't allow more than a single dot in the |
750 |
--basename of a file. Thus, on MS-DOS, if Info looks for @file{bison}, |
751 |
--file names like @file{bison.igz} and @file{bison.inz} will be found and |
752 |
--decompressed by @code{gunzip}.}. |
753 |
-+@file{.info}, @file{-info}, @file{/index}, and @file{.inf}.}. For |
754 |
-+every known extension, Info looks for a compressed file, if a regular |
755 |
-+file isn't found. Info supports files compressed with @code{gzip}, |
756 |
-+@code{xz}, @code{bzip2}, @code{lzma}, @code{compress} and @code{yabba} |
757 |
-+programs, assumed to have @file{.z}, @file{.gz}, @file{.xz}, |
758 |
-+@file{.bz2}, @file{.lzma}, @file{.Z}, or @file{.Y} extensions, |
759 |
-+possibly after one of the known Info files extensions. |
760 |
-+ |
761 |
-+On MS-DOS, Info allows for the Info extension, such as @code{.inf}, |
762 |
-+and the short compressed file extensions, such as @file{.z} and |
763 |
-+@file{.gz}, to be merged into a single extension, since DOS doesn't |
764 |
-+allow more than a single dot in the basename of a file. Thus, on |
765 |
-+MS-DOS, if Info looks for @file{bison}, file names like |
766 |
-+@file{bison.igz} and @file{bison.inz} will be found and decompressed |
767 |
-+by @code{gunzip}. |
768 |
- |
769 |
- @item --help |
770 |
- @itemx -h |
771 |
-diff --git a/info/filesys.c b/info/filesys.c |
772 |
-index fdd18a8..5e795bc 100644 |
773 |
---- a/info/filesys.c |
774 |
-+++ b/info/filesys.c |
775 |
-@@ -55,6 +55,7 @@ static char *info_suffixes[] = { |
776 |
- |
777 |
- static COMPRESSION_ALIST compress_suffixes[] = { |
778 |
- { ".gz", "gunzip" }, |
779 |
-+ { ".xz", "unxz" }, |
780 |
- { ".bz2", "bunzip2" }, |
781 |
- { ".z", "gunzip" }, |
782 |
- { ".lzma", "unlzma" }, |
783 |
-diff --git a/install-info/install-info.c b/install-info/install-info.c |
784 |
-index 24669b3..0f18ca4 100644 |
785 |
---- a/install-info/install-info.c |
786 |
-+++ b/install-info/install-info.c |
787 |
-@@ -400,6 +400,11 @@ strip_info_suffix (char *fname) |
788 |
- len -= 3; |
789 |
- ret[len] = 0; |
790 |
- } |
791 |
-+ else if (len > 3 && FILENAME_CMP (ret + len - 3, ".xz") == 0) |
792 |
-+ { |
793 |
-+ len -= 3; |
794 |
-+ ret[len] = 0; |
795 |
-+ } |
796 |
- else if (len > 4 && FILENAME_CMP (ret + len - 4, ".bz2") == 0) |
797 |
- { |
798 |
- len -= 4; |
799 |
-@@ -659,6 +664,12 @@ open_possibly_compressed_file (char *filename, |
800 |
- { |
801 |
- *opened_filename = concat (filename, ".gz", ""); |
802 |
- f = fopen (*opened_filename, FOPEN_RBIN); |
803 |
-+ } |
804 |
-+ if (!f) |
805 |
-+ { |
806 |
-+ *opened_filename = concat (filename, ".xz", ""); |
807 |
-+ f = fopen (*opened_filename, FOPEN_RBIN); |
808 |
-+ } |
809 |
- if (!f) |
810 |
- { |
811 |
- free (*opened_filename); |
812 |
-@@ -702,7 +712,6 @@ open_possibly_compressed_file (char *filename, |
813 |
- else |
814 |
- pfatal_with_name (filename); |
815 |
- } |
816 |
-- } |
817 |
- |
818 |
- /* Read first few bytes of file rather than relying on the filename. |
819 |
- If the file is shorter than this it can't be usable anyway. */ |
820 |
-@@ -727,6 +736,15 @@ open_possibly_compressed_file (char *filename, |
821 |
- #else |
822 |
- *compression_program = "gzip"; |
823 |
- #endif |
824 |
-+ |
825 |
-+ else if (data[0] == '\xFD' && data[1] == '7' && data[2] == 'z' |
826 |
-+ && data[3] == 'X' && data[4] == 'Z' && data[5] == 0) |
827 |
-+#ifndef STRIP_DOT_EXE |
828 |
-+ *compression_program = "xz.exe"; |
829 |
-+#else |
830 |
-+ *compression_program = "xz"; |
831 |
-+#endif |
832 |
-+ |
833 |
- else if (data[0] == 'B' && data[1] == 'Z' && data[2] == 'h') |
834 |
- #ifndef STRIP_DOT_EXE |
835 |
- *compression_program = "bzip2.exe"; |
836 |
--- |
837 |
-1.7.4.rc2 |
838 |
- |
839 |
|
840 |
diff --git a/sys-apps/texinfo/files/texinfo-4.8-bounds-check.patch b/sys-apps/texinfo/files/texinfo-4.8-bounds-check.patch |
841 |
deleted file mode 100644 |
842 |
index 48176af4f3..0000000000 |
843 |
--- a/sys-apps/texinfo/files/texinfo-4.8-bounds-check.patch |
844 |
+++ /dev/null |
845 |
@@ -1,32 +0,0 @@ |
846 |
-http://bugs.gentoo.org/140902 |
847 |
- |
848 |
-revision 1.30 |
849 |
-date: 2005-04-05 17:04:16 -0400; author: karl; state: Exp; lines: +6 -4 |
850 |
-negative array indexing, grep -c for tests |
851 |
- |
852 |
-Index: makeinfo/html.c |
853 |
-=================================================================== |
854 |
-RCS file: /cvsroot/texinfo/texinfo/makeinfo/html.c,v |
855 |
-retrieving revision 1.29 |
856 |
-retrieving revision 1.30 |
857 |
-diff -u -p -r1.29 -r1.30 |
858 |
---- makeinfo/html.c 12 Mar 2005 23:59:39 -0000 1.29 |
859 |
-+++ makeinfo/html.c 5 Apr 2005 21:04:16 -0000 1.30 |
860 |
-@@ -448,7 +450,7 @@ rollback_empty_tag (char *tag) |
861 |
- return 0; |
862 |
- |
863 |
- /* Find the end of the previous tag. */ |
864 |
-- while (output_paragraph[check_position-1] != '>' && check_position > 0) |
865 |
-+ while (check_position > 0 && output_paragraph[check_position-1] != '>') |
866 |
- check_position--; |
867 |
- |
868 |
- /* Save stuff between tag's end to output_paragraph's end. */ |
869 |
-@@ -465,7 +467,7 @@ rollback_empty_tag (char *tag) |
870 |
- } |
871 |
- |
872 |
- /* Find the start of the previous tag. */ |
873 |
-- while (output_paragraph[check_position-1] != '<' && check_position > 0) |
874 |
-+ while (check_position > 0 && output_paragraph[check_position-1] != '<') |
875 |
- check_position--; |
876 |
- |
877 |
- /* Check to see if this is the tag. */ |
878 |
|
879 |
diff --git a/sys-apps/texinfo/files/texinfo-4.8-buf-overflow-CVE-2006-4810.patch b/sys-apps/texinfo/files/texinfo-4.8-buf-overflow-CVE-2006-4810.patch |
880 |
deleted file mode 100644 |
881 |
index a842b56335..0000000000 |
882 |
--- a/sys-apps/texinfo/files/texinfo-4.8-buf-overflow-CVE-2006-4810.patch |
883 |
+++ /dev/null |
884 |
@@ -1,15 +0,0 @@ |
885 |
-fix for buffer overflow CVE-2006-4810 |
886 |
- |
887 |
-http://bugs.gentoo.org/154316 |
888 |
- |
889 |
---- util/texindex.c |
890 |
-+++ util/texindex.c |
891 |
-@@ -858,7 +857,7 @@ |
892 |
- { |
893 |
- buffer = (char *) xrealloc (buffer, linebuffer->size *= 2); |
894 |
- p += buffer - linebuffer->buffer; |
895 |
-- end += buffer - linebuffer->buffer; |
896 |
-+ end = buffer + linebuffer->size; |
897 |
- linebuffer->buffer = buffer; |
898 |
- } |
899 |
- if (c < 0 || c == '\n') |
900 |
|
901 |
diff --git a/sys-apps/texinfo/files/texinfo-4.8-freebsd.patch b/sys-apps/texinfo/files/texinfo-4.8-freebsd.patch |
902 |
deleted file mode 100644 |
903 |
index b6909b72dc..0000000000 |
904 |
--- a/sys-apps/texinfo/files/texinfo-4.8-freebsd.patch |
905 |
+++ /dev/null |
906 |
@@ -1,114 +0,0 @@ |
907 |
-Adds a couple of commandline arguments which adds compatibility with fbsd's |
908 |
-install-info program. |
909 |
- |
910 |
-Patch by Diego Pettenò. |
911 |
- |
912 |
-http://bugs.gentoo.org/92434 |
913 |
- |
914 |
---- texinfo-4.8/util/install-info.c |
915 |
-+++ texinfo-4.8/util/install-info.c |
916 |
-@@ -22,6 +22,8 @@ |
917 |
- #include <getopt.h> |
918 |
- |
919 |
- static char *progname = "install-info"; |
920 |
-+/* Added for compatibility with FreeBSD texinfo */ |
921 |
-+static char *default_section = NULL; |
922 |
- |
923 |
- struct spec_entry; |
924 |
- struct spec_section; |
925 |
-@@ -117,9 +119,13 @@ |
926 |
- /* This table defines all the long-named options, says whether they |
927 |
- use an argument, and maps them into equivalent single-letter options. */ |
928 |
- |
929 |
-+/* defentry and defsection added for compatibility with FreeBSD texinfo */ |
930 |
-+ |
931 |
- struct option longopts[] = |
932 |
- { |
933 |
- { "delete", no_argument, NULL, 'r' }, |
934 |
-+ { "defentry", required_argument, NULL, 'E' }, |
935 |
-+ { "defsection", required_argument, NULL, 'S' }, |
936 |
- { "dir-file", required_argument, NULL, 'd' }, |
937 |
- { "entry", required_argument, NULL, 'e' }, |
938 |
- { "help", no_argument, NULL, 'h' }, |
939 |
-@@ -428,6 +434,7 @@ |
940 |
- xexit (1); |
941 |
- } |
942 |
- |
943 |
-+/* defentry and defsection added for compatibility with FreeBSD's texinfo */ |
944 |
- void |
945 |
- print_help (void) |
946 |
- { |
947 |
-@@ -439,6 +446,10 @@ |
948 |
- --delete delete existing entries for INFO-FILE from DIR-FILE;\n\ |
949 |
- don't insert any new entries.\n\ |
950 |
- --dir-file=NAME specify file name of Info directory file.\n\ |
951 |
-+ --defentry=TEXT same as --entry, but only use TEXT if an entry is not\n\ |
952 |
-+ present in INFO-FILE.\n\ |
953 |
-+ --desection=SEC same as --section, but only use TEXT if an entry is not\n\ |
954 |
-+ present in INFO-FILE.\n\ |
955 |
- This is equivalent to using the DIR-FILE argument.\n\ |
956 |
- --entry=TEXT insert TEXT as an Info directory entry.\n\ |
957 |
- TEXT should have the form of an Info menu item line\n\ |
958 |
-@@ -1143,6 +1154,10 @@ |
959 |
- struct spec_entry *entries_to_add = NULL; |
960 |
- int n_entries_to_add = 0; |
961 |
- |
962 |
-+ /* Added for compatibility w/ original texinfo in FBSD */ |
963 |
-+ struct spec_entry *default_entries_to_add = NULL; |
964 |
-+ int n_default_entries_to_add = 0; |
965 |
-+ |
966 |
- /* Record the old text of the dir file, as plain characters, |
967 |
- as lines, and as nodes. */ |
968 |
- char *dir_data; |
969 |
-@@ -1205,6 +1220,7 @@ |
970 |
- dirfile = concat (optarg, "", "/dir"); |
971 |
- break; |
972 |
- |
973 |
-+ case 'E': |
974 |
- case 'e': |
975 |
- { |
976 |
- struct spec_entry *next |
977 |
-@@ -1222,6 +1238,20 @@ |
978 |
- next->next = entries_to_add; |
979 |
- entries_to_add = next; |
980 |
- n_entries_to_add++; |
981 |
-+ |
982 |
-+ /* Added for compatibility with FreeBSD's texinfo */ |
983 |
-+ if (opt == 'e') |
984 |
-+ { |
985 |
-+ next->next = entries_to_add; |
986 |
-+ entries_to_add = next; |
987 |
-+ n_entries_to_add++; |
988 |
-+ } |
989 |
-+ else |
990 |
-+ { |
991 |
-+ next->next = default_entries_to_add; |
992 |
-+ default_entries_to_add = next; |
993 |
-+ n_default_entries_to_add++; |
994 |
-+ } |
995 |
- } |
996 |
- break; |
997 |
- |
998 |
-@@ -1259,6 +1289,11 @@ |
999 |
- } |
1000 |
- break; |
1001 |
- |
1002 |
-+ /* Added for compatibility with FreeBSD's texinfo */ |
1003 |
-+ case 'S': |
1004 |
-+ default_section = optarg; |
1005 |
-+ break; |
1006 |
-+ |
1007 |
- case 'V': |
1008 |
- printf ("install-info (GNU %s) %s\n", PACKAGE, VERSION); |
1009 |
- puts (""); |
1010 |
-@@ -1332,7 +1367,9 @@ |
1011 |
- { |
1012 |
- input_sections = (struct spec_section *) |
1013 |
- xmalloc (sizeof (struct spec_section)); |
1014 |
-- input_sections->name = "Miscellaneous"; |
1015 |
-+ /* Modified for compatibility with FreeBSD's texinfo */ |
1016 |
-+ input_sections->name = |
1017 |
-+ default_section ? default_section : "Miscellaneous"; |
1018 |
- input_sections->next = NULL; |
1019 |
- input_sections->missing = 1; |
1020 |
- } |
1021 |
|
1022 |
diff --git a/sys-apps/texinfo/files/texinfo-4.8-tempfile-owl.patch b/sys-apps/texinfo/files/texinfo-4.8-tempfile-owl.patch |
1023 |
deleted file mode 100644 |
1024 |
index 449b30e815..0000000000 |
1025 |
--- a/sys-apps/texinfo/files/texinfo-4.8-tempfile-owl.patch |
1026 |
+++ /dev/null |
1027 |
@@ -1,111 +0,0 @@ |
1028 |
-http://bugs.gentoo.org/114499 |
1029 |
- |
1030 |
---- texinfo-4.8/util/texindex.c |
1031 |
-+++ texinfo-4.8/util/texindex.c |
1032 |
-@@ -20,6 +20,7 @@ |
1033 |
- |
1034 |
- #include "system.h" |
1035 |
- #include <getopt.h> |
1036 |
-+#include <stdlib.h> |
1037 |
- |
1038 |
- static char *program_name = "texindex"; |
1039 |
- |
1040 |
-@@ -37,8 +38,6 @@ static char *program_name = "texindex"; |
1041 |
- #define memset(ptr, ignore, count) bzero (ptr, count) |
1042 |
- #endif |
1043 |
- |
1044 |
--char *mktemp (char *); |
1045 |
-- |
1046 |
- #if !defined (SEEK_SET) |
1047 |
- # define SEEK_SET 0 |
1048 |
- # define SEEK_CUR 1 |
1049 |
-@@ -146,6 +145,7 @@ void error (const char *format, const ch |
1050 |
- void *xmalloc (), *xrealloc (); |
1051 |
- char *concat (char *s1, char *s2); |
1052 |
- void flush_tempfiles (int to_count); |
1053 |
-+void flush_tempfiles_atexit (); |
1054 |
- |
1055 |
- #define MAX_IN_CORE_SORT 500000 |
1056 |
- |
1057 |
-@@ -307,6 +307,7 @@ decode_command (int argc, char **argv) |
1058 |
- int arg_index = 1; |
1059 |
- char **ip; |
1060 |
- char **op; |
1061 |
-+ int retries; |
1062 |
- |
1063 |
- /* Store default values into parameter variables. */ |
1064 |
- |
1065 |
-@@ -320,8 +321,26 @@ decode_command (int argc, char **argv) |
1066 |
- else |
1067 |
- tempdir = concat (tempdir, "/"); |
1068 |
- |
1069 |
-+ tempdir = concat (tempdir, "txidx.XXXXXX"); |
1070 |
-+ retries = 0x1000; |
1071 |
-+ |
1072 |
-+ do |
1073 |
-+ { |
1074 |
-+ char *dot; |
1075 |
-+ if (mktemp(tempdir) == NULL || !tempdir[0]) |
1076 |
-+ fatal("mktemp failed for '%s'", tempdir); |
1077 |
-+ if (mkdir(tempdir, 0700) == 0) break; |
1078 |
-+ if (errno != EEXIST || !--retries) |
1079 |
-+ pfatal_with_name(tempdir); |
1080 |
-+ if ((dot = strrchr (tempdir, "."))) |
1081 |
-+ strcpy (dot, ".XXXXXX"); |
1082 |
-+ } |
1083 |
-+ while (1); |
1084 |
-+ |
1085 |
- keep_tempfiles = 0; |
1086 |
- |
1087 |
-+ atexit(flush_tempfiles_atexit); |
1088 |
-+ |
1089 |
- /* Allocate ARGC input files, which must be enough. */ |
1090 |
- |
1091 |
- infiles = (char **) xmalloc (argc * sizeof (char *)); |
1092 |
-@@ -389,21 +408,9 @@ For more information about these matters |
1093 |
- static char * |
1094 |
- maketempname (int count) |
1095 |
- { |
1096 |
-- static char *tempbase = NULL; |
1097 |
- char tempsuffix[10]; |
1098 |
-- |
1099 |
-- if (!tempbase) |
1100 |
-- { |
1101 |
-- int fd; |
1102 |
-- tempbase = concat (tempdir, "txidxXXXXXX"); |
1103 |
-- |
1104 |
-- fd = mkstemp (tempbase); |
1105 |
-- if (fd == -1) |
1106 |
-- pfatal_with_name (tempbase); |
1107 |
-- } |
1108 |
-- |
1109 |
-- sprintf (tempsuffix, ".%d", count); |
1110 |
-- return concat (tempbase, tempsuffix); |
1111 |
-+ sprintf (tempsuffix, "/%d", count); |
1112 |
-+ return concat (tempdir, tempsuffix); |
1113 |
- } |
1114 |
- |
1115 |
- |
1116 |
-@@ -416,6 +423,13 @@ flush_tempfiles (int to_count) |
1117 |
- return; |
1118 |
- while (last_deleted_tempcount < to_count) |
1119 |
- unlink (maketempname (++last_deleted_tempcount)); |
1120 |
-+ rmdir(tempdir); |
1121 |
-+} |
1122 |
-+ |
1123 |
-+void |
1124 |
-+flush_tempfiles_atexit (void) |
1125 |
-+{ |
1126 |
-+ flush_tempfiles (tempcount); |
1127 |
- } |
1128 |
- |
1129 |
- |
1130 |
-@@ -1622,7 +1636,7 @@ concat (char *s1, char *s2) |
1131 |
- |
1132 |
- strcpy (result, s1); |
1133 |
- strcpy (result + len1, s2); |
1134 |
-- *(result + len1 + len2) = 0; |
1135 |
-+ result[len1 + len2] = '\0'; |
1136 |
- |
1137 |
- return result; |
1138 |
- } |
1139 |
|
1140 |
diff --git a/sys-apps/texinfo/metadata.xml b/sys-apps/texinfo/metadata.xml |
1141 |
index 56c1244130..c1b5fefb5a 100644 |
1142 |
--- a/sys-apps/texinfo/metadata.xml |
1143 |
+++ b/sys-apps/texinfo/metadata.xml |
1144 |
@@ -5,4 +5,14 @@ |
1145 |
<email>base-system@g.o</email> |
1146 |
<name>Gentoo Base System</name> |
1147 |
</maintainer> |
1148 |
+<maintainer type="project"> |
1149 |
+ <email>perl@g.o</email> |
1150 |
+ <name>Gentoo Perl Project</name> |
1151 |
+</maintainer> |
1152 |
+<use> |
1153 |
+ <flag name="standalone">Build standalone version that survives all Portage bugs</flag> |
1154 |
+</use> |
1155 |
+<upstream> |
1156 |
+ <remote-id type="cpe">cpe:/a:gnu:texinfo</remote-id> |
1157 |
+</upstream> |
1158 |
</pkgmetadata> |
1159 |
|
1160 |
diff --git a/sys-apps/texinfo/texinfo-4.13-r2.ebuild b/sys-apps/texinfo/texinfo-4.13-r2.ebuild |
1161 |
deleted file mode 100644 |
1162 |
index c884b69e4b..0000000000 |
1163 |
--- a/sys-apps/texinfo/texinfo-4.13-r2.ebuild |
1164 |
+++ /dev/null |
1165 |
@@ -1,61 +0,0 @@ |
1166 |
-# Copyright 1999-2017 Gentoo Foundation |
1167 |
-# Distributed under the terms of the GNU General Public License v2 |
1168 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/texinfo/texinfo-4.13-r2.ebuild,v 1.16 2014/01/18 19:27:30 vapier Exp $ |
1169 |
- |
1170 |
-EAPI="2" |
1171 |
- |
1172 |
-inherit flag-o-matic eutils |
1173 |
- |
1174 |
-DESCRIPTION="The GNU info program and utilities" |
1175 |
-HOMEPAGE="http://www.gnu.org/software/texinfo/" |
1176 |
-SRC_URI="mirror://gnu/${PN}/${P}.tar.lzma" |
1177 |
- |
1178 |
-LICENSE="GPL-3" |
1179 |
-SLOT="0" |
1180 |
-KEYWORDS="~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
1181 |
-IUSE="nls static" |
1182 |
- |
1183 |
-RDEPEND="!=app-text/tetex-2* |
1184 |
- >=sys-libs/ncurses-5.2-r2 |
1185 |
- nls? ( virtual/libintl )" |
1186 |
-DEPEND="${RDEPEND} |
1187 |
- app-arch/xz-utils |
1188 |
- nls? ( sys-devel/gettext )" |
1189 |
- |
1190 |
-src_prepare() { |
1191 |
- epatch "${FILESDIR}"/${PN}-4.11-prefix.patch # needs touch below |
1192 |
- epatch "${FILESDIR}"/${P}-mint.patch |
1193 |
- |
1194 |
- epatch "${FILESDIR}"/${P}-xz.patch #269742 |
1195 |
- touch doc/install-info.1 #354589 |
1196 |
- epatch "${FILESDIR}"/${P}-texi2dvi-regexp-range.patch #311885 |
1197 |
- epatch "${FILESDIR}"/${P}-accentenc-test.patch |
1198 |
- # waiting to be sent upstream for my copyright assignment form to be |
1199 |
- # ready - Flameeyes |
1200 |
- epatch "${FILESDIR}"/${P}-docbook.patch |
1201 |
- epatch "${FILESDIR}"/${P}-tinfo.patch #457556 |
1202 |
- # timestamps must be newer than configure.ac touched by ${P}-tinfo.patch |
1203 |
- touch doc/{texi2dvi,texi2pdf,pdftexi2dvi}.1 #354589 |
1204 |
-} |
1205 |
- |
1206 |
-src_configure() { |
1207 |
- use static && append-ldflags -static |
1208 |
- econf $(use_enable nls) |
1209 |
-} |
1210 |
- |
1211 |
-src_compile() { |
1212 |
- # Make cross-compiler safe (#196041) |
1213 |
- if tc-is-cross-compiler ; then |
1214 |
- emake -C tools/gnulib/lib || die |
1215 |
- fi |
1216 |
- |
1217 |
- emake || die |
1218 |
-} |
1219 |
- |
1220 |
-src_install() { |
1221 |
- emake DESTDIR="${D}" install || die |
1222 |
- |
1223 |
- dodoc AUTHORS ChangeLog INTRODUCTION NEWS README TODO |
1224 |
- newdoc info/README README.info |
1225 |
- newdoc makeinfo/README README.makeinfo |
1226 |
-} |
1227 |
|
1228 |
diff --git a/sys-apps/texinfo/texinfo-5.2.ebuild b/sys-apps/texinfo/texinfo-5.2.ebuild |
1229 |
deleted file mode 100644 |
1230 |
index 2d1eec2f08..0000000000 |
1231 |
--- a/sys-apps/texinfo/texinfo-5.2.ebuild |
1232 |
+++ /dev/null |
1233 |
@@ -1,48 +0,0 @@ |
1234 |
-# Copyright 1999-2017 Gentoo Foundation |
1235 |
-# Distributed under the terms of the GNU General Public License v2 |
1236 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/texinfo/texinfo-5.2.ebuild,v 1.7 2015/07/08 09:06:51 zlogene Exp $ |
1237 |
- |
1238 |
-EAPI="4" |
1239 |
- |
1240 |
-inherit flag-o-matic |
1241 |
- |
1242 |
-DESCRIPTION="The GNU info program and utilities" |
1243 |
-HOMEPAGE="http://www.gnu.org/software/texinfo/" |
1244 |
-SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" |
1245 |
- |
1246 |
-LICENSE="GPL-3" |
1247 |
-SLOT="0" |
1248 |
-KEYWORDS="~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
1249 |
-IUSE="nls static" |
1250 |
- |
1251 |
-RDEPEND="!=app-text/tetex-2* |
1252 |
- >=sys-libs/ncurses-5.2-r2 |
1253 |
- dev-lang/perl |
1254 |
- dev-perl/libintl-perl |
1255 |
- dev-perl/Unicode-EastAsianWidth |
1256 |
- dev-perl/Text-Unidecode |
1257 |
- nls? ( virtual/libintl )" |
1258 |
-DEPEND="${RDEPEND} |
1259 |
- app-arch/xz-utils |
1260 |
- nls? ( sys-devel/gettext )" |
1261 |
- |
1262 |
-src_prepare() { |
1263 |
- epatch "${FILESDIR}"/${PN}-4.13-mint.patch |
1264 |
- # timestamps must be newer than configure.ac touched by prefix patch |
1265 |
- sed -i -e '1c\#!/usr/bin/env sh' util/texi2dvi util/texi2pdf || die |
1266 |
- touch doc/{texi2dvi,texi2pdf,pdftexi2dvi}.1 |
1267 |
-} |
1268 |
- |
1269 |
-src_configure() { |
1270 |
- use static && append-ldflags -static |
1271 |
- econf \ |
1272 |
- --with-external-libintl-perl \ |
1273 |
- --with-external-Unicode-EastAsianWidth \ |
1274 |
- --with-external-Text-Unidecode \ |
1275 |
- $(use_enable nls) |
1276 |
-} |
1277 |
- |
1278 |
-src_install() { |
1279 |
- default |
1280 |
- newdoc info/README README.info |
1281 |
-} |
1282 |
|
1283 |
diff --git a/sys-apps/texinfo/texinfo-6.7.ebuild b/sys-apps/texinfo/texinfo-6.7.ebuild |
1284 |
new file mode 100644 |
1285 |
index 0000000000..955063e754 |
1286 |
--- /dev/null |
1287 |
+++ b/sys-apps/texinfo/texinfo-6.7.ebuild |
1288 |
@@ -0,0 +1,68 @@ |
1289 |
+# Copyright 1999-2020 Gentoo Authors |
1290 |
+# Distributed under the terms of the GNU General Public License v2 |
1291 |
+ |
1292 |
+# Note: if your package uses the texi2dvi utility, it must depend on the |
1293 |
+# virtual/texi2dvi package to pull in all the right deps. The tool is not |
1294 |
+# usable out-of-the-box because it requires the large tex packages. |
1295 |
+ |
1296 |
+EAPI=7 |
1297 |
+ |
1298 |
+inherit flag-o-matic toolchain-funcs |
1299 |
+ |
1300 |
+DESCRIPTION="The GNU info program and utilities" |
1301 |
+HOMEPAGE="https://www.gnu.org/software/texinfo/" |
1302 |
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" |
1303 |
+ |
1304 |
+LICENSE="GPL-3" |
1305 |
+SLOT="0" |
1306 |
+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" |
1307 |
+IUSE="nls +standalone static" |
1308 |
+ |
1309 |
+RDEPEND=" |
1310 |
+ !=app-text/tetex-2* |
1311 |
+ >=sys-libs/ncurses-5.2-r2:0= |
1312 |
+ standalone? ( dev-lang/perl ) |
1313 |
+ !standalone? ( |
1314 |
+ dev-lang/perl:= |
1315 |
+ dev-perl/libintl-perl |
1316 |
+ dev-perl/Unicode-EastAsianWidth |
1317 |
+ dev-perl/Text-Unidecode |
1318 |
+ ) |
1319 |
+ nls? ( virtual/libintl )" |
1320 |
+DEPEND="${RDEPEND} |
1321 |
+ app-arch/xz-utils |
1322 |
+ nls? ( >=sys-devel/gettext-0.19.6 )" |
1323 |
+ |
1324 |
+src_prepare() { |
1325 |
+ default |
1326 |
+ |
1327 |
+ eapply -p0 "${FILESDIR}"/${PN}-4.13-mint.patch |
1328 |
+ sed -i -e '1c\#!/usr/bin/env sh' util/texi2dvi util/texi2pdf || die |
1329 |
+ touch doc/{texi2dvi,texi2pdf,pdftexi2dvi}.1 |
1330 |
+} |
1331 |
+ |
1332 |
+src_configure() { |
1333 |
+ # Respect compiler and CPPFLAGS/CFLAGS/LDFLAGS for Perl extensions. #622576 |
1334 |
+ local -x PERL_EXT_CC="$(tc-getCC)" PERL_EXT_CPPFLAGS="${CPPFLAGS}" PERL_EXT_CFLAGS="${CFLAGS}" PERL_EXT_LDFLAGS="${LDFLAGS}" |
1335 |
+ |
1336 |
+ use static && append-ldflags -static |
1337 |
+ local myeconfargs |
1338 |
+ if use standalone ; then |
1339 |
+ myeconfargs=( |
1340 |
+ --without-external-libintl-perl |
1341 |
+ --without-external-Unicode-EastAsianWidth |
1342 |
+ --without-external-Text-Unidecode |
1343 |
+ $(use_enable nls) |
1344 |
+ --disable-perl-xs |
1345 |
+ ) |
1346 |
+ else |
1347 |
+ myeconfargs=( |
1348 |
+ --with-external-libintl-perl |
1349 |
+ --with-external-Unicode-EastAsianWidth |
1350 |
+ --with-external-Text-Unidecode |
1351 |
+ $(use_enable nls) |
1352 |
+ --enable-perl-xs |
1353 |
+ ) |
1354 |
+ fi |
1355 |
+ econf "${myeconfargs[@]}" |
1356 |
+} |