commit: 1a932d2c13888ba8c221a108f004dd000fb4c812 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> AuthorDate: Sun May 31 17:14:04 2020 +0000 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> CommitDate: Sun May 31 17:14:04 2020 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=1a932d2c
sys-apps/texinfo-6.7: sync with gx86 Package-Manager: Portage-2.3.84-prefix, Repoman-2.3.22 Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> sys-apps/texinfo/Manifest | 3 +- sys-apps/texinfo/files/mkinfodir | 233 --------------------- sys-apps/texinfo/files/texinfo-4.11-aix.patch | 25 --- .../texinfo/files/texinfo-4.11-dir-entry.patch | 24 --- .../files/texinfo-4.11-high-precision.patch | 43 ---- .../files/texinfo-4.11-parallel-build.patch | 21 -- sys-apps/texinfo/files/texinfo-4.11-prefix.patch | 16 -- sys-apps/texinfo/files/texinfo-4.11-test-tex.patch | 24 --- sys-apps/texinfo/files/texinfo-4.11-test.patch | 14 -- sys-apps/texinfo/files/texinfo-4.12-utilpath.patch | 34 --- .../files/texinfo-4.13-accentenc-test.patch | 17 -- sys-apps/texinfo/files/texinfo-4.13-docbook.patch | 66 ------ .../files/texinfo-4.13-texi2dvi-regexp-range.patch | 23 -- sys-apps/texinfo/files/texinfo-4.13-tinfo.patch | 24 --- sys-apps/texinfo/files/texinfo-4.13-xz.patch | 130 ------------ .../texinfo/files/texinfo-4.8-bounds-check.patch | 32 --- .../texinfo-4.8-buf-overflow-CVE-2006-4810.patch | 15 -- sys-apps/texinfo/files/texinfo-4.8-freebsd.patch | 114 ---------- .../texinfo/files/texinfo-4.8-tempfile-owl.patch | 111 ---------- sys-apps/texinfo/metadata.xml | 10 + sys-apps/texinfo/texinfo-4.13-r2.ebuild | 61 ------ sys-apps/texinfo/texinfo-5.2.ebuild | 48 ----- sys-apps/texinfo/texinfo-6.7.ebuild | 68 ++++++ 23 files changed, 79 insertions(+), 1077 deletions(-) diff --git a/sys-apps/texinfo/Manifest b/sys-apps/texinfo/Manifest index f65820dd02..85e5d79e69 100644 --- a/sys-apps/texinfo/Manifest +++ b/sys-apps/texinfo/Manifest @@ -1,3 +1,2 @@ -DIST texinfo-4.13.tar.lzma 1563777 BLAKE2B 8cc316979c681fd0587e01ac48b3ec00f6a128bf643c8ef5329d93944f55cba70c8c3820df17bee5402b6ced374e3f0cc5b4f686ea62a1ae2d63c22849eb7421 SHA512 bded399ed5fcf97dfa72d9486df91ecfc501301d83929b09b230aee2b8ad6994b7d7b5965b04d43de729cee30575b2334cf75879ad0a61c4b781ccc16d6c12db -DIST texinfo-5.2.tar.xz 3812944 BLAKE2B 31f46ca94901ac67f75e7d2876ace9e15d6dc65529ffcf2bec75f0141b977394a3e44799d2d651f01e1a98a96bf4c5caecc091055a0a456508a3e241a1deac3b SHA512 6f9c5142db3b155bd601149b5632807b3c20dcfa7006ce5f7e120e6fc4b2174a3f4671c18232c040ffd69ebfb5950be5c563ac5cc08b88d03eb5a9f1b0f96c04 DIST texinfo-6.0.tar.xz 4086712 BLAKE2B e13ef2fff8b0d94396565b093f81a42dab35dcd43be96337f5fce2df884b59108f9e68e0762b059ff1e8f5294b2daf6164ca61a9e9888da39d32c75ffe103620 SHA512 36f82288dfb7c2385630043faf75ccef5af625952d792c669c5eea673ae5b3474c148041bf1935f87ddeaae7114103731277e715d0d510c6fb41e0211ab12494 +DIST texinfo-6.7.tar.gz 9027808 BLAKE2B ac9a47ae98f27ae55ea1844c74ead6fba256635a56e7a226a1bbdd9ee9ab33565ff8cc7a874410afe6463741285c8fcfd8ff835ae2802009e2d0758405559140 SHA512 a52aaa2f0113c6f14b3cb94fbf7191770017ff6ce2016292770831279cfbb898c2f7f720adee620e08d9d80a9505df89a689ba0c25e92f6579b28b075f7b8ee2 diff --git a/sys-apps/texinfo/files/mkinfodir b/sys-apps/texinfo/files/mkinfodir deleted file mode 100755 index db825de097..0000000000 --- a/sys-apps/texinfo/files/mkinfodir +++ /dev/null @@ -1,233 +0,0 @@ -#!/bin/bash -# $Id: mkinfodir,v 1.1 2000/08/03 16:16:11 achim Exp $ -# Generate the top-level Info node, given a directory of Info files -# and (optionally) a skeleton file. The output will be suitable for a -# top-level dir file. The skeleton file contains info topic names in the -# order they should appear in the output. There are three special -# lines that alter the behavior: a line consisting of just "--" causes -# the next line to be echoed verbatim to the output. A line -# containing just "%%" causes all the remaining filenames (wildcards -# allowed) in the rest of the file to be ignored. A line containing -# just "!!" exits the script when reached (unless preceded by a line -# containing just "--"). Once the script reaches the end of the -# skeleton file, it goes through the remaining files in the directory -# in order, putting their entries at the end. The script will use the -# ENTRY information in each info file if it exists. Otherwise it will -# make a minimal entry. - -# sent by Jeffrey Osier <[email protected]>, who thinks it came from -# [email protected] (david d `zoo' zuhn) - -# modified 7 April 1995 by Joe Harrington <[email protected]> to -# take special flags - -INFODIR=$1 -if [ $# = 2 ] ; then - SKELETON=$2 -else - SKELETON=/dev/null -fi - -skip= - -if [ $# -gt 2 ] ; then - echo usage: $0 info-directory [ skeleton-file ] 1>&2 - exit 1 -elif [ -z "${INFODIR}" ] ; then - INFODIR="%%DEFAULT_INFO_DIR%%" -else - true -fi - -if [ ! -d ${INFODIR} ] ; then - echo "$0: first argument must specify a directory" - exit 1 -fi - -### output the dir header -echo "-*- Text -*-" -echo "This file was generated automatically by $0." -echo "This version was generated on `date`" -echo "by `whoami`@`hostname` for `(cd ${INFODIR}; pwd)`" - -cat << moobler -\$Id: mkinfodir,v 1.1 2000/08/03 16:16:11 achim Exp $ -This is the file .../info/dir, which contains the topmost node of the -Info hierarchy. The first time you invoke Info you start off -looking at that node, which is (dir)Top. - -File: dir Node: Top This is the top of the INFO tree - - This (the Directory node) gives a menu of major topics. - Typing "q" exits, "?" lists all Info commands, "d" returns here, - "h" gives a primer for first-timers, - "mEmacs<Return>" visits the Emacs topic, etc. - - In Emacs, you can click mouse button 2 on a menu item or cross reference - to select it. - -* Menu: The list of major topics begins on the next line. - -moobler - -### go through the list of files in the skeleton. If an info file -### exists, grab the ENTRY information from it. If an entry exists -### use it, otherwise create a minimal dir entry. -### -### Then remove that file from the list of existing files. If any -### additional files remain (ones that don't have a skeleton entry), -### then generate entries for those in the same way, putting the info for -### those at the end.... - -infofiles=`(cd ${INFODIR}; /bin/ls | grep -v '\-[0-9]*\.gz$' | grep -v '\-[0-9]*$' | egrep -v '^dir$|^dir\.info$|^dir\.orig$')` - -# echoing gets clobbered by backquotes; we do it the hard way... -lines=`wc $SKELETON | awk '{print $1}'` -line=1 -while [ $lines -ge $line ] ; do - # Read one line from the file. This is so that we can echo lines with - # whitespace and quoted characters in them. - fileline=`awk NR==$line $SKELETON` - - # flag fancy features - if [ ! -z "$echoline" ] ; then # echo line - echo "$fileline" - fileline= - echoline= - elif [ "${fileline}" = "--" ] ; then # should we echo the next line? - echoline=1 - elif [ "${fileline}" = "%%" ] ; then # eliminate remaining files from dir? - skip=1 - elif [ "${fileline}" = "!!" ] ; then # quit now - exit 0 - fi - - # handle files if they exist - for file in $fileline"" ; do # expand wildcards ("" handles blank lines) - - fname= - - if [ -z "$echoline" -a ! -z "$file" ] ; then - - # Find the file to operate upon. Check both possible names. - infoname=`echo $file | sed 's/\.gz$//'` - infoname=`echo $infoname | sed 's/\.info$//'` - noext= - ext= - if [ -f ${INFODIR}/$infoname ] ; then - noext=$infoname - fi - if [ -f ${INFODIR}/${infoname}.info ] ; then - ext=${infoname}.info - fi - if [ -f ${INFODIR}/${infoname}.info.gz ] ; then - ext=${infoname}.info.gz - fi - # If it exists with both names take what was said in the file. - if [ ! -z "$ext" -a ! -z "$noext" ]; then - fname=$file - warn="### Warning: $ext and $noext both exist! Using ${file}. ###" - elif [ ! \( -z "$ext" -a -z "$noext" \) ]; then - # just take the name if it exists only once - fname=${noext}${ext} - fi - - # if we found something and aren't skipping, do the entry - if [ ! -z "$fname" ] ; then - if [ -z "$skip" ] ; then - - if [ ! -z "$warn" ] ; then # issue any warning - echo $warn - warn= - fi - if [ "${fname##*.}" = "gz" ] ; then - entry=`zcat ${INFODIR}/${fname} | sed -e '1,/START-INFO-DIR-ENTRY/d' \ - -e '/END-INFO-DIR-ENTRY/,$d' ` - else - entry=`sed -e '1,/START-INFO-DIR-ENTRY/d' \ - -e '/END-INFO-DIR-ENTRY/,$d' ${INFODIR}/$fname` - fi - if [ ! -z "${entry}" ] ; then - echo "${entry}" - else - echo "* ${infoname}: (${infoname})." - fi - fi - - # remove the name from the directory listing - infofiles=`echo "" ${infofiles} "" | sed -e "s/ ${fname} / /" -e "s/ / /g"` - - fi - - fi - - done - - line=`expr $line + 1` -done - -if [ -z "${infofiles}" ] ; then - exit 0 -elif [ $lines -gt 0 ]; then - echo -fi - -# Sort remaining files by INFO-DIR-SECTION. -prevsect= -filesectdata=`(cd ${INFODIR}; fgrep INFO-DIR-SECTION /dev/null ${infofiles} | \ - fgrep -v 'INFO-DIR-SECTION Miscellaneous' | \ - sort -t: -k2 -k1 | tr ' ' '_')` -for sectdata in ${filesectdata}; do - file=`echo ${sectdata} | cut -d: -f1` - section=`sed -n -e 's/^INFO-DIR-SECTION //p' ${INFODIR}/${file}` - infofiles=`echo "" ${infofiles} "" | sed -e "s/ ${file} / /" -e "s/ / /g"` - - if [ "${prevsect}" != "${section}" ] ; then - if [ ! -z "${prevsect}" ] ; then - echo "" - fi - echo "${section}" - prevsect="${section}" - fi - infoname=`echo $file | sed 's/\.gz$//'` - infoname=`echo $infoname | sed 's/\.info$//'` - if [ "${file##*.}" = "gz" ] ; then - entry=`zcat ${INFODIR}/$file | sed -e '1,/START-INFO-DIR-ENTRY/d' \ - -e '/END-INFO-DIR-ENTRY/,$d' ` - else - entry=`sed -e '1,/START-INFO-DIR-ENTRY/d' \ - -e '/END-INFO-DIR-ENTRY/,$d' ${INFODIR}/$file` - fi - if [ ! -z "${entry}" ] ; then - echo "${entry}" - elif [ ! -d "${INFODIR}/${file}" ] ; then - echo "* ${infoname}: (${infoname})." - fi -done - -# Process miscellaneous files. -for file in ${infofiles}; do - if [ ! -z "${prevsect}" ] ; then - echo "" - echo "Miscellaneous" - prevsect="" - fi - - infoname=`echo $file | sed 's/\.gz$//'` - infoname=`echo $infoname | sed 's/\.info$//'` - if [ "${file##*.}" = "gz" ] ; then - entry=`zcat ${INFODIR}/${file} | sed -e '1,/START-INFO-DIR-ENTRY/d' \ - -e '/END-INFO-DIR-ENTRY/,$d'` - else - entry=`sed -e '1,/START-INFO-DIR-ENTRY/d' \ - -e '/END-INFO-DIR-ENTRY/,$d' ${INFODIR}/$file` - fi - - - if [ ! -z "${entry}" ] ; then - echo "${entry}" - elif [ ! -d "${INFODIR}/${file}" ] ; then - echo "* ${infoname}: (${infoname})." - fi -done - diff --git a/sys-apps/texinfo/files/texinfo-4.11-aix.patch b/sys-apps/texinfo/files/texinfo-4.11-aix.patch deleted file mode 100644 index 3f0c1d222c..0000000000 --- a/sys-apps/texinfo/files/texinfo-4.11-aix.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- makeinfo/lang.h.orig 2007-12-01 23:21:02 +0100 -+++ makeinfo/lang.h 2007-12-01 23:22:18 +0100 -@@ -26,6 +26,10 @@ - * Actually we don't currently support this (may be in the future) ;-) - * These code are the ISO-639 two letter codes. - */ -+#ifdef hz /* AIX defines this in <sys/m_param.h> */ -+#undef hz -+#endif -+ - typedef enum - { - aa, ab, ae, af, ak, am, an, ar, as, av, ay, az, ba, be, bg, bh, bi, ---- gnulib/lib/stdlib_.h.orig 2007-12-01 23:32:27 +0100 -+++ gnulib/lib/stdlib_.h 2007-12-01 23:33:05 +0100 -@@ -108,6 +108,9 @@ - implementation. - Returns the open file descriptor if successful, otherwise -1 and errno - set. */ -+# ifdef mkstemp -+# undef mkstemp /* aix might have defined this to mkstemp64 */ -+# endif - # define mkstemp rpl_mkstemp - extern int mkstemp (char * /*template*/); - # else diff --git a/sys-apps/texinfo/files/texinfo-4.11-dir-entry.patch b/sys-apps/texinfo/files/texinfo-4.11-dir-entry.patch deleted file mode 100644 index 3a621d4909..0000000000 --- a/sys-apps/texinfo/files/texinfo-4.11-dir-entry.patch +++ /dev/null @@ -1,24 +0,0 @@ -fix from upstream - -http://bugs.gentoo.org/198545 - ---- texinfo/makeinfo/cmds.c 2007/09/26 20:53:39 1.76 -+++ texinfo/makeinfo/cmds.c 2007/10/13 23:44:34 1.77 -@@ -1631,10 +1631,14 @@ - - if (!no_headers && !html) - { -+ /* use add_* instead of insert_* because otherwise the -+ file header ("This is ...") will end up inside the -+ dir section markers. */ - kill_self_indent (-1); /* make sure there's no indentation */ -- insert_string ("INFO-DIR-SECTION "); -- insert_string (line); -- insert ('\n'); -+ cm_noindent (); /* make sure again */ -+ add_word ("INFO-DIR-SECTION "); -+ add_word (line); -+ add_char ('\n'); - } - - free (line); diff --git a/sys-apps/texinfo/files/texinfo-4.11-high-precision.patch b/sys-apps/texinfo/files/texinfo-4.11-high-precision.patch deleted file mode 100644 index fc78bd14c8..0000000000 --- a/sys-apps/texinfo/files/texinfo-4.11-high-precision.patch +++ /dev/null @@ -1,43 +0,0 @@ -* http://bugs.gentoo.org/show_bug.cgi?id=200662 - -diff -ru texinfo-4.11.orig/info/makedoc.c texinfo-4.11/info/makedoc.c ---- texinfo-4.11.orig/info/makedoc.c 2007-07-01 23:20:30.000000000 +0200 -+++ texinfo-4.11/info/makedoc.c 2007-12-03 17:40:18.241898334 +0100 -@@ -144,9 +144,11 @@ - key_filename = NULL_DEVICE; - } - -+ /* the order of these files depends exactly on the order in the -+ * Makefile.{in,am}, see also the fclose calls below */ - funs_stream = must_fopen (funs_filename, "w"); -- doc_stream = must_fopen (doc_filename, "w"); - key_stream = must_fopen (key_filename, "w"); -+ doc_stream = must_fopen (doc_filename, "w"); - - fprintf (funs_stream, - "/* %s -- Generated declarations for Info commands. */\n\n\ -@@ -225,9 +227,11 @@ - fprintf (key_stream, " { (char *)NULL, 0 }\n};\n"); - fprintf (funs_stream, "\n#define A_NCOMMANDS %u\n", next_func_key()); - -+ /* the order of these files depends exactly on the order in the -+ * Makefile.{in,am}, see also the must_fopen calls above */ - fclose (funs_stream); -- fclose (doc_stream); - fclose (key_stream); -+ fclose (doc_stream); - - if (tags_only) - maybe_dump_tags (stdout); -diff -ru texinfo-4.11.orig/info/Makefile.am texinfo-4.11/info/Makefile.am ---- texinfo-4.11.orig/info/Makefile.am 2006-06-29 09:58:26.000000000 +0200 -+++ texinfo-4.11/info/Makefile.am 2007-12-03 17:41:21.644483827 +0100 -@@ -54,6 +54,8 @@ - - # We need a linear ordering to prevent race condition in parallel make. - # See the node ``(automake)Multiple Outputs'' for an explanation. -+# Make sure this matches with order in which makedoc.c creates these -+# files. - doc.c: key.c - key.c: funs.h - diff --git a/sys-apps/texinfo/files/texinfo-4.11-parallel-build.patch b/sys-apps/texinfo/files/texinfo-4.11-parallel-build.patch deleted file mode 100644 index ef8ad7deeb..0000000000 --- a/sys-apps/texinfo/files/texinfo-4.11-parallel-build.patch +++ /dev/null @@ -1,21 +0,0 @@ -Index: info/Makefile.am -=================================================================== -RCS file: /cvsroot/texinfo/texinfo/info/Makefile.am,v -retrieving revision 1.14 -retrieving revision 1.15 -diff -u -p -r1.14 -r1.15 ---- info/Makefile.in 15 Dec 2007 14:32:51 -0000 1.14 -+++ info/Makefile.in 28 Mar 2008 23:39:20 -0000 1.15 -@@ -70,8 +70,10 @@ cmd_sources = $(srcdir)/session.c $(srcd - $(srcdir)/m-x.c $(srcdir)/indices.c $(srcdir)/nodemenu.c \ - $(srcdir)/footnotes.c $(srcdir)/variables.c - --# The $(EXEEXT) should be added by Automake, but isn't. Fine. --$(generated_sources): makedoc$(EXEEXT) $(cmd_sources) -+# Make the target only funs.h even though we create all the -+# $(generated_sources) so that parallel makes won't do the rm && makedoc -+# more than once. -+funs.h: makedoc$(EXEEXT) $(cmd_sources) - rm -f $(generated_sources) - $(top_builddir)/$(native_tools)/info/makedoc $(cmd_sources) - diff --git a/sys-apps/texinfo/files/texinfo-4.11-prefix.patch b/sys-apps/texinfo/files/texinfo-4.11-prefix.patch deleted file mode 100644 index 90c697f539..0000000000 --- a/sys-apps/texinfo/files/texinfo-4.11-prefix.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- util/texi2dvi -+++ util/texi2dvi -@@ -1,4 +1,4 @@ --#! /bin/sh -+#!/usr/bin/env bash - # texi2dvi --- produce DVI (or PDF) files from Texinfo (or (La)TeX) sources. - # $Id: texi2dvi,v 1.104 2007/09/10 00:36:30 karl Exp $ - # ---- util/texi2pdf -+++ util/texi2pdf -@@ -1,4 +1,4 @@ --#!/bin/sh -+#!/usr/bin/env bash - # $Id: texi2pdf,v 1.2 2005/01/28 01:52:04 karl Exp $ - # Written by Thomas Esser. Public domain. - # Execute texi2dvi --pdf. diff --git a/sys-apps/texinfo/files/texinfo-4.11-test-tex.patch b/sys-apps/texinfo/files/texinfo-4.11-test-tex.patch deleted file mode 100644 index 7357971202..0000000000 --- a/sys-apps/texinfo/files/texinfo-4.11-test-tex.patch +++ /dev/null @@ -1,24 +0,0 @@ -http://bugs.gentoo.org/195313 - ---- texinfo-4.11/util/dvipdf.test -+++ texinfo-4.11/util/dvipdf.test -@@ -16,6 +16,8 @@ - # You should have received a copy of the GNU General Public License - # along with this program. If not, see <http://www.gnu.org/licenses/>. - -+required='tex' -+ - . ./defs || exit 1 - - set -e ---- texinfo-4.11/util/texi2dvi.test -+++ texinfo-4.11/util/texi2dvi.test -@@ -16,6 +16,8 @@ - # You should have received a copy of the GNU General Public License - # along with this program. If not, see <http://www.gnu.org/licenses/>. - -+required='tex' -+ - . ./defs || exit 1 - - set -e diff --git a/sys-apps/texinfo/files/texinfo-4.11-test.patch b/sys-apps/texinfo/files/texinfo-4.11-test.patch deleted file mode 100644 index 68cc188cb2..0000000000 --- a/sys-apps/texinfo/files/texinfo-4.11-test.patch +++ /dev/null @@ -1,14 +0,0 @@ -test the local compiled version, not the system installed version - -http://bugs.gentoo.org/215359 - ---- util/defs.in -+++ util/defs.in -@@ -67,6 +67,7 @@ - export SHELL - test -z "$TEXI2DVI" && TEXI2DVI=`cd $srcdir && pwd`/texi2dvi - -+PATH=$PWD:$PATH - echo $PATH - # Some shells forget to export modified environment variables. - # (See note about `export' in the Autoconf manual.) diff --git a/sys-apps/texinfo/files/texinfo-4.12-utilpath.patch b/sys-apps/texinfo/files/texinfo-4.12-utilpath.patch deleted file mode 100644 index 1b4202ccdc..0000000000 --- a/sys-apps/texinfo/files/texinfo-4.12-utilpath.patch +++ /dev/null @@ -1,34 +0,0 @@ -http://lists.gnu.org/archive/html/bug-texinfo/2008-07/msg00000.html - -diff -ru texinfo-4.12.orig/doc/Makefile.am texinfo-4.12/doc/Makefile.am ---- texinfo-4.12.orig/doc/Makefile.am 2008-03-25 16:31:36.000000000 +0100 -+++ texinfo-4.12/doc/Makefile.am 2008-07-01 13:18:19.000000000 +0200 -@@ -115,10 +115,10 @@ - $(unset_envvars); $(HELP2MAN) --name="convert Texinfo documents to DVI" $(util_srcdir)/texi2dvi >$@ - - $(srcdir)/texi2pdf.1: $(common_texi2dvi_deps) -- $(unset_envvars); $(HELP2MAN) --name="convert Texinfo documents to PDF" $(util_srcdir)/texi2pdf >$@ -+ $(unset_envvars); PATH=$(util_srcdir):${PATH} $(HELP2MAN) --name="convert Texinfo documents to PDF" $(util_srcdir)/texi2pdf >$@ - - $(srcdir)/pdftexi2dvi.1: $(common_texi2dvi_deps) -- $(unset_envvars); $(HELP2MAN) --name="convert Texinfo documents to PDF" $(util_srcdir)/pdftexi2dvi >$@ -+ $(unset_envvars); PATH=$(util_srcdir):${PATH} $(HELP2MAN) --name="convert Texinfo documents to PDF" $(util_srcdir)/pdftexi2dvi >$@ - - # Do not create info files for distribution. - dist-info: -diff -ru texinfo-4.12.orig/doc/Makefile.in texinfo-4.12/doc/Makefile.in ---- texinfo-4.12.orig/doc/Makefile.in 2008-04-18 09:34:57.000000000 +0200 -+++ texinfo-4.12/doc/Makefile.in 2008-07-01 13:18:47.000000000 +0200 -@@ -1101,10 +1101,10 @@ - $(unset_envvars); $(HELP2MAN) --name="convert Texinfo documents to DVI" $(util_srcdir)/texi2dvi >$@ - - $(srcdir)/texi2pdf.1: $(common_texi2dvi_deps) -- $(unset_envvars); $(HELP2MAN) --name="convert Texinfo documents to PDF" $(util_srcdir)/texi2pdf >$@ -+ $(unset_envvars); PATH=$(util_srcdir):${PATH} $(HELP2MAN) --name="convert Texinfo documents to PDF" $(util_srcdir)/texi2pdf >$@ - - $(srcdir)/pdftexi2dvi.1: $(common_texi2dvi_deps) -- $(unset_envvars); $(HELP2MAN) --name="convert Texinfo documents to PDF" $(util_srcdir)/pdftexi2dvi >$@ -+ $(unset_envvars); PATH=$(util_srcdir):${PATH} $(HELP2MAN) --name="convert Texinfo documents to PDF" $(util_srcdir)/pdftexi2dvi >$@ - - # Do not create info files for distribution. - dist-info: diff --git a/sys-apps/texinfo/files/texinfo-4.13-accentenc-test.patch b/sys-apps/texinfo/files/texinfo-4.13-accentenc-test.patch deleted file mode 100644 index ad470faf0d..0000000000 --- a/sys-apps/texinfo/files/texinfo-4.13-accentenc-test.patch +++ /dev/null @@ -1,17 +0,0 @@ -Fails in UTF-8 locales with grep-2.6 - -https://bugs.gentoo.org/322151 -https://savannah.gnu.org/bugs/index.php?31068 - ---- a/makeinfo/tests/accentenc -+++ b/makeinfo/tests/accentenc -@@ -1,7 +1,8 @@ - #!/bin/sh - # Test encoded accent info output. - --unset TEXINFO_OUTPUT -+unset TEXINFO_OUTPUT LANG LANGUAGE -+LC_ALL=POSIX; export LC_ALL - : ${srcdir=.} - input=`basename $0`.txi - output=`basename $0`.info diff --git a/sys-apps/texinfo/files/texinfo-4.13-docbook.patch b/sys-apps/texinfo/files/texinfo-4.13-docbook.patch deleted file mode 100644 index 0622b94f98..0000000000 --- a/sys-apps/texinfo/files/texinfo-4.13-docbook.patch +++ /dev/null @@ -1,66 +0,0 @@ ---- texinfo-4.13.orig/makeinfo/cmds.c 2008-05-22 05:11:34.000000000 -0700 -+++ texinfo-4.13/makeinfo/cmds.c 2012-05-23 18:31:57.108264307 -0700 -@@ -1560,7 +1560,7 @@ cm_setfilename (void) - char *filename; - get_rest_of_line (1, &filename); - /* warning ("`@%s %s' encountered and ignored", command, filename); */ -- if (xml) -+ if (xml && !docbook) - add_word_args ("<setfilename>%s</setfilename>", filename); - free (filename); - } ---- texinfo-4.13.orig/makeinfo/node.c 2008-07-05 16:59:47.000000000 -0700 -+++ texinfo-4.13/makeinfo/node.c 2012-05-23 17:02:46.517345024 -0700 -@@ -1233,10 +1233,12 @@ cm_anchor (int arg) - } - else if (xml || docbook) - { -+ char *id = xml_id(anchor); - xml_insert_element_with_attribute (ANCHOR, START, - docbook ? "id=\"%s\"" : "name=\"%s\"", -- anchor); -+ id); - xml_insert_element (ANCHOR, END); -+ free(id); - } - - /* Save it in the tag table. */ ---- texinfo-4.13.orig/makeinfo/xml.c 2008-02-12 17:00:55.000000000 -0800 -+++ texinfo-4.13/makeinfo/xml.c 2012-05-23 17:20:13.698858895 -0700 -@@ -586,21 +586,27 @@ static int in_indexterm = 0; - char * - xml_id (char *id) - { -- char *tem = xmalloc (strlen (id) + 1); -+ /* Get an extra space to accomodate adding an i-prefix. */ -+ char *tem = xmalloc (strlen (id) + 2); - char *p = tem; -- strcpy (tem, id); -+ -+ /* First character cannot be a number, '-' or '.'. Just always add -+ an i if we're not starting with a alphanumeric character -+ already, to simplify the code. -+ */ -+ if (!isalpha(*id)) -+ { -+ *p++ = 'i'; -+ } -+ -+ strcpy (p, id); -+ - while (*p) - { -- if (strchr (":\" \t\f\r\n", *p)) -+ if (!isalnum (*p) && !strchr (":_.-", *p)) - *p = '-'; - p++; - } -- p = tem; -- -- /* First character cannot be a number. Clearly we should make this -- dependent on the actual numeral found. */ -- if (strchr ("0123456789", *p)) -- *p = 'i'; - - return tem; - } 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 deleted file mode 100644 index 01b0746def..0000000000 --- a/sys-apps/texinfo/files/texinfo-4.13-texi2dvi-regexp-range.patch +++ /dev/null @@ -1,23 +0,0 @@ -Fix texi2dvi problem with egrep in some locales. -This patch is taken from the texinfo CVS repository, but stripped of -keyword substitutions to make it apply to a wider range of source code -revisions. - -Fix suggested by Martin von Gagern on 2010-03-29, committed by Karl Berry. - -References: -http://bugs.gentoo.org/311885 -http://thread.gmane.org/gmane.comp.tex.texinfo.bugs/5023 -http://cvs.savannah.gnu.org/viewvc/texinfo/util/texi2dvi?root=texinfo&r1=1.157&r2=1.158 - ---- util/texi2dvi 2010/02/09 18:37:08 1.157 -+++ util/texi2dvi 2010/03/30 23:13:37 1.158 -@@ -1848,7 +1848,7 @@ - - # If the COMMAND_LINE_FILENAME is not absolute (e.g., --debug.tex), - # prepend `./' in order to avoid that the tools take it as an option. -- echo "$command_line_filename" | $EGREP '^(/|[A-z]:/)' >&6 \ -+ echo "$command_line_filename" | $EGREP '^(/|[A-Za-z]:/)' >&6 \ - || command_line_filename="./$command_line_filename" - - # See if the file exists. If it doesn't we're in trouble since, even diff --git a/sys-apps/texinfo/files/texinfo-4.13-tinfo.patch b/sys-apps/texinfo/files/texinfo-4.13-tinfo.patch deleted file mode 100644 index 10a557a303..0000000000 --- a/sys-apps/texinfo/files/texinfo-4.13-tinfo.patch +++ /dev/null @@ -1,24 +0,0 @@ -http://bugs.gentoo.org/457556 - ---- configure.ac -+++ configure.ac -@@ -130,7 +130,7 @@ - # rather ncurses. So we check for it. - TERMLIBS= - # Check for termlib before termcap because Solaris termcap needs libucb. --TERMLIB_VARIANTS="ncurses curses termlib termcap terminfo" -+TERMLIB_VARIANTS="tinfo ncurses curses termlib termcap terminfo" - for termlib in ${TERMLIB_VARIANTS}; do - AC_CHECK_LIB(${termlib}, tgetent, - [TERMLIBS="${TERMLIBS} -l${termlib}"; break]) ---- configure -+++ configure -@@ -17477,7 +17477,7 @@ - # rather ncurses. So we check for it. - TERMLIBS= - # Check for termlib before termcap because Solaris termcap needs libucb. --TERMLIB_VARIANTS="ncurses curses termlib termcap terminfo" -+TERMLIB_VARIANTS="tinfo ncurses curses termlib termcap terminfo" - for termlib in ${TERMLIB_VARIANTS}; do - as_ac_Lib=`$as_echo "ac_cv_lib_${termlib}''_tgetent" | $as_tr_sh` - { $as_echo "$as_me:$LINENO: checking for tgetent in -l${termlib}" >&5 diff --git a/sys-apps/texinfo/files/texinfo-4.13-xz.patch b/sys-apps/texinfo/files/texinfo-4.13-xz.patch deleted file mode 100644 index f5bb023be5..0000000000 --- a/sys-apps/texinfo/files/texinfo-4.13-xz.patch +++ /dev/null @@ -1,130 +0,0 @@ -https://bugs.gentoo.org/269742 - -From bfae00d02b5fb3a2ce34c09d2dbf0ca2f96b154f Mon Sep 17 00:00:00 2001 -From: Karl Berry <[email protected]> -Date: Sat, 14 Mar 2009 17:57:41 +0000 -Subject: [PATCH] support xz compression, http://tukaani.org/xz - ---- - ChangeLog | 6 ++++++ - NEWS | 4 ++++ - doc/info-stnd.texi | 34 +++++++++++++++++----------------- - info/filesys.c | 1 + - install-info/install-info.c | 29 +++++++++++++++++++++++++---- - 5 files changed, 53 insertions(+), 21 deletions(-) - -2009-03-14 Karl Berry <[email protected]> - - * info/filesys.c (compress_suffixes): add .xz/unxz. - - * info/filesys.h (DEFAULT_INFOPATH): include PATH by default. - -diff --git a/doc/info-stnd.texi b/doc/info-stnd.texi -index 2bd67f3..c730cff 100644 ---- a/doc/info-stnd.texi -+++ b/doc/info-stnd.texi -@@ -202,21 +202,21 @@ directory. - @cindex Info files, compressed - In every directory Info tries, if @var{filename} is not found, Info - looks for it with a number of known extensions of Info files@footnote{ --@file{.info}, @file{-info}, @file{/index}, and @file{.inf}.}. For every --known extension, Info looks for a compressed file, if a regular file --isn't found. Info supports files compressed with @code{gzip}, --@code{bzip2}, @code{compress} and @code{yabba} programs; it calls --@code{gunzip}, @code{bunzip2}, @code{uncompress} and @code{unyabba}, --accordingly, to decompress such files. Compressed Info files are --assumed to have @file{.z}, @file{.gz}, @file{.bz2}, @file{.Z}, or --@file{.Y} extensions, possibly in addition to one of the known Info --files extensions@footnote{The MS-DOS version allows for the Info --extension, such as @code{.inf}, and the short compressed file --extensions, such as @file{.z} and @file{.gz}, to be merged into a single --extension, since DOS doesn't allow more than a single dot in the --basename of a file. Thus, on MS-DOS, if Info looks for @file{bison}, --file names like @file{bison.igz} and @file{bison.inz} will be found and --decompressed by @code{gunzip}.}. -+@file{.info}, @file{-info}, @file{/index}, and @file{.inf}.}. For -+every known extension, Info looks for a compressed file, if a regular -+file isn't found. Info supports files compressed with @code{gzip}, -+@code{xz}, @code{bzip2}, @code{lzma}, @code{compress} and @code{yabba} -+programs, assumed to have @file{.z}, @file{.gz}, @file{.xz}, -+@file{.bz2}, @file{.lzma}, @file{.Z}, or @file{.Y} extensions, -+possibly after one of the known Info files extensions. -+ -+On MS-DOS, Info allows for the Info extension, such as @code{.inf}, -+and the short compressed file extensions, such as @file{.z} and -+@file{.gz}, to be merged into a single extension, since DOS doesn't -+allow more than a single dot in the basename of a file. Thus, on -+MS-DOS, if Info looks for @file{bison}, file names like -+@file{bison.igz} and @file{bison.inz} will be found and decompressed -+by @code{gunzip}. - - @item --help - @itemx -h -diff --git a/info/filesys.c b/info/filesys.c -index fdd18a8..5e795bc 100644 ---- a/info/filesys.c -+++ b/info/filesys.c -@@ -55,6 +55,7 @@ static char *info_suffixes[] = { - - static COMPRESSION_ALIST compress_suffixes[] = { - { ".gz", "gunzip" }, -+ { ".xz", "unxz" }, - { ".bz2", "bunzip2" }, - { ".z", "gunzip" }, - { ".lzma", "unlzma" }, -diff --git a/install-info/install-info.c b/install-info/install-info.c -index 24669b3..0f18ca4 100644 ---- a/install-info/install-info.c -+++ b/install-info/install-info.c -@@ -400,6 +400,11 @@ strip_info_suffix (char *fname) - len -= 3; - ret[len] = 0; - } -+ else if (len > 3 && FILENAME_CMP (ret + len - 3, ".xz") == 0) -+ { -+ len -= 3; -+ ret[len] = 0; -+ } - else if (len > 4 && FILENAME_CMP (ret + len - 4, ".bz2") == 0) - { - len -= 4; -@@ -659,6 +664,12 @@ open_possibly_compressed_file (char *filename, - { - *opened_filename = concat (filename, ".gz", ""); - f = fopen (*opened_filename, FOPEN_RBIN); -+ } -+ if (!f) -+ { -+ *opened_filename = concat (filename, ".xz", ""); -+ f = fopen (*opened_filename, FOPEN_RBIN); -+ } - if (!f) - { - free (*opened_filename); -@@ -702,7 +712,6 @@ open_possibly_compressed_file (char *filename, - else - pfatal_with_name (filename); - } -- } - - /* Read first few bytes of file rather than relying on the filename. - If the file is shorter than this it can't be usable anyway. */ -@@ -727,6 +736,15 @@ open_possibly_compressed_file (char *filename, - #else - *compression_program = "gzip"; - #endif -+ -+ else if (data[0] == '\xFD' && data[1] == '7' && data[2] == 'z' -+ && data[3] == 'X' && data[4] == 'Z' && data[5] == 0) -+#ifndef STRIP_DOT_EXE -+ *compression_program = "xz.exe"; -+#else -+ *compression_program = "xz"; -+#endif -+ - else if (data[0] == 'B' && data[1] == 'Z' && data[2] == 'h') - #ifndef STRIP_DOT_EXE - *compression_program = "bzip2.exe"; --- -1.7.4.rc2 - diff --git a/sys-apps/texinfo/files/texinfo-4.8-bounds-check.patch b/sys-apps/texinfo/files/texinfo-4.8-bounds-check.patch deleted file mode 100644 index 48176af4f3..0000000000 --- a/sys-apps/texinfo/files/texinfo-4.8-bounds-check.patch +++ /dev/null @@ -1,32 +0,0 @@ -http://bugs.gentoo.org/140902 - -revision 1.30 -date: 2005-04-05 17:04:16 -0400; author: karl; state: Exp; lines: +6 -4 -negative array indexing, grep -c for tests - -Index: makeinfo/html.c -=================================================================== -RCS file: /cvsroot/texinfo/texinfo/makeinfo/html.c,v -retrieving revision 1.29 -retrieving revision 1.30 -diff -u -p -r1.29 -r1.30 ---- makeinfo/html.c 12 Mar 2005 23:59:39 -0000 1.29 -+++ makeinfo/html.c 5 Apr 2005 21:04:16 -0000 1.30 -@@ -448,7 +450,7 @@ rollback_empty_tag (char *tag) - return 0; - - /* Find the end of the previous tag. */ -- while (output_paragraph[check_position-1] != '>' && check_position > 0) -+ while (check_position > 0 && output_paragraph[check_position-1] != '>') - check_position--; - - /* Save stuff between tag's end to output_paragraph's end. */ -@@ -465,7 +467,7 @@ rollback_empty_tag (char *tag) - } - - /* Find the start of the previous tag. */ -- while (output_paragraph[check_position-1] != '<' && check_position > 0) -+ while (check_position > 0 && output_paragraph[check_position-1] != '<') - check_position--; - - /* Check to see if this is the tag. */ 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 deleted file mode 100644 index a842b56335..0000000000 --- a/sys-apps/texinfo/files/texinfo-4.8-buf-overflow-CVE-2006-4810.patch +++ /dev/null @@ -1,15 +0,0 @@ -fix for buffer overflow CVE-2006-4810 - -http://bugs.gentoo.org/154316 - ---- util/texindex.c -+++ util/texindex.c -@@ -858,7 +857,7 @@ - { - buffer = (char *) xrealloc (buffer, linebuffer->size *= 2); - p += buffer - linebuffer->buffer; -- end += buffer - linebuffer->buffer; -+ end = buffer + linebuffer->size; - linebuffer->buffer = buffer; - } - if (c < 0 || c == '\n') diff --git a/sys-apps/texinfo/files/texinfo-4.8-freebsd.patch b/sys-apps/texinfo/files/texinfo-4.8-freebsd.patch deleted file mode 100644 index b6909b72dc..0000000000 --- a/sys-apps/texinfo/files/texinfo-4.8-freebsd.patch +++ /dev/null @@ -1,114 +0,0 @@ -Adds a couple of commandline arguments which adds compatibility with fbsd's -install-info program. - -Patch by Diego Petten�. - -http://bugs.gentoo.org/92434 - ---- texinfo-4.8/util/install-info.c -+++ texinfo-4.8/util/install-info.c -@@ -22,6 +22,8 @@ - #include <getopt.h> - - static char *progname = "install-info"; -+/* Added for compatibility with FreeBSD texinfo */ -+static char *default_section = NULL; - - struct spec_entry; - struct spec_section; -@@ -117,9 +119,13 @@ - /* This table defines all the long-named options, says whether they - use an argument, and maps them into equivalent single-letter options. */ - -+/* defentry and defsection added for compatibility with FreeBSD texinfo */ -+ - struct option longopts[] = - { - { "delete", no_argument, NULL, 'r' }, -+ { "defentry", required_argument, NULL, 'E' }, -+ { "defsection", required_argument, NULL, 'S' }, - { "dir-file", required_argument, NULL, 'd' }, - { "entry", required_argument, NULL, 'e' }, - { "help", no_argument, NULL, 'h' }, -@@ -428,6 +434,7 @@ - xexit (1); - } - -+/* defentry and defsection added for compatibility with FreeBSD's texinfo */ - void - print_help (void) - { -@@ -439,6 +446,10 @@ - --delete delete existing entries for INFO-FILE from DIR-FILE;\n\ - don't insert any new entries.\n\ - --dir-file=NAME specify file name of Info directory file.\n\ -+ --defentry=TEXT same as --entry, but only use TEXT if an entry is not\n\ -+ present in INFO-FILE.\n\ -+ --desection=SEC same as --section, but only use TEXT if an entry is not\n\ -+ present in INFO-FILE.\n\ - This is equivalent to using the DIR-FILE argument.\n\ - --entry=TEXT insert TEXT as an Info directory entry.\n\ - TEXT should have the form of an Info menu item line\n\ -@@ -1143,6 +1154,10 @@ - struct spec_entry *entries_to_add = NULL; - int n_entries_to_add = 0; - -+ /* Added for compatibility w/ original texinfo in FBSD */ -+ struct spec_entry *default_entries_to_add = NULL; -+ int n_default_entries_to_add = 0; -+ - /* Record the old text of the dir file, as plain characters, - as lines, and as nodes. */ - char *dir_data; -@@ -1205,6 +1220,7 @@ - dirfile = concat (optarg, "", "/dir"); - break; - -+ case 'E': - case 'e': - { - struct spec_entry *next -@@ -1222,6 +1238,20 @@ - next->next = entries_to_add; - entries_to_add = next; - n_entries_to_add++; -+ -+ /* Added for compatibility with FreeBSD's texinfo */ -+ if (opt == 'e') -+ { -+ next->next = entries_to_add; -+ entries_to_add = next; -+ n_entries_to_add++; -+ } -+ else -+ { -+ next->next = default_entries_to_add; -+ default_entries_to_add = next; -+ n_default_entries_to_add++; -+ } - } - break; - -@@ -1259,6 +1289,11 @@ - } - break; - -+ /* Added for compatibility with FreeBSD's texinfo */ -+ case 'S': -+ default_section = optarg; -+ break; -+ - case 'V': - printf ("install-info (GNU %s) %s\n", PACKAGE, VERSION); - puts (""); -@@ -1332,7 +1367,9 @@ - { - input_sections = (struct spec_section *) - xmalloc (sizeof (struct spec_section)); -- input_sections->name = "Miscellaneous"; -+ /* Modified for compatibility with FreeBSD's texinfo */ -+ input_sections->name = -+ default_section ? default_section : "Miscellaneous"; - input_sections->next = NULL; - input_sections->missing = 1; - } diff --git a/sys-apps/texinfo/files/texinfo-4.8-tempfile-owl.patch b/sys-apps/texinfo/files/texinfo-4.8-tempfile-owl.patch deleted file mode 100644 index 449b30e815..0000000000 --- a/sys-apps/texinfo/files/texinfo-4.8-tempfile-owl.patch +++ /dev/null @@ -1,111 +0,0 @@ -http://bugs.gentoo.org/114499 - ---- texinfo-4.8/util/texindex.c -+++ texinfo-4.8/util/texindex.c -@@ -20,6 +20,7 @@ - - #include "system.h" - #include <getopt.h> -+#include <stdlib.h> - - static char *program_name = "texindex"; - -@@ -37,8 +38,6 @@ static char *program_name = "texindex"; - #define memset(ptr, ignore, count) bzero (ptr, count) - #endif - --char *mktemp (char *); -- - #if !defined (SEEK_SET) - # define SEEK_SET 0 - # define SEEK_CUR 1 -@@ -146,6 +145,7 @@ void error (const char *format, const ch - void *xmalloc (), *xrealloc (); - char *concat (char *s1, char *s2); - void flush_tempfiles (int to_count); -+void flush_tempfiles_atexit (); - - #define MAX_IN_CORE_SORT 500000 - -@@ -307,6 +307,7 @@ decode_command (int argc, char **argv) - int arg_index = 1; - char **ip; - char **op; -+ int retries; - - /* Store default values into parameter variables. */ - -@@ -320,8 +321,26 @@ decode_command (int argc, char **argv) - else - tempdir = concat (tempdir, "/"); - -+ tempdir = concat (tempdir, "txidx.XXXXXX"); -+ retries = 0x1000; -+ -+ do -+ { -+ char *dot; -+ if (mktemp(tempdir) == NULL || !tempdir[0]) -+ fatal("mktemp failed for '%s'", tempdir); -+ if (mkdir(tempdir, 0700) == 0) break; -+ if (errno != EEXIST || !--retries) -+ pfatal_with_name(tempdir); -+ if ((dot = strrchr (tempdir, "."))) -+ strcpy (dot, ".XXXXXX"); -+ } -+ while (1); -+ - keep_tempfiles = 0; - -+ atexit(flush_tempfiles_atexit); -+ - /* Allocate ARGC input files, which must be enough. */ - - infiles = (char **) xmalloc (argc * sizeof (char *)); -@@ -389,21 +408,9 @@ For more information about these matters - static char * - maketempname (int count) - { -- static char *tempbase = NULL; - char tempsuffix[10]; -- -- if (!tempbase) -- { -- int fd; -- tempbase = concat (tempdir, "txidxXXXXXX"); -- -- fd = mkstemp (tempbase); -- if (fd == -1) -- pfatal_with_name (tempbase); -- } -- -- sprintf (tempsuffix, ".%d", count); -- return concat (tempbase, tempsuffix); -+ sprintf (tempsuffix, "/%d", count); -+ return concat (tempdir, tempsuffix); - } - - -@@ -416,6 +423,13 @@ flush_tempfiles (int to_count) - return; - while (last_deleted_tempcount < to_count) - unlink (maketempname (++last_deleted_tempcount)); -+ rmdir(tempdir); -+} -+ -+void -+flush_tempfiles_atexit (void) -+{ -+ flush_tempfiles (tempcount); - } - - -@@ -1622,7 +1636,7 @@ concat (char *s1, char *s2) - - strcpy (result, s1); - strcpy (result + len1, s2); -- *(result + len1 + len2) = 0; -+ result[len1 + len2] = '\0'; - - return result; - } diff --git a/sys-apps/texinfo/metadata.xml b/sys-apps/texinfo/metadata.xml index 56c1244130..c1b5fefb5a 100644 --- a/sys-apps/texinfo/metadata.xml +++ b/sys-apps/texinfo/metadata.xml @@ -5,4 +5,14 @@ <email>[email protected]</email> <name>Gentoo Base System</name> </maintainer> +<maintainer type="project"> + <email>[email protected]</email> + <name>Gentoo Perl Project</name> +</maintainer> +<use> + <flag name="standalone">Build standalone version that survives all Portage bugs</flag> +</use> +<upstream> + <remote-id type="cpe">cpe:/a:gnu:texinfo</remote-id> +</upstream> </pkgmetadata> diff --git a/sys-apps/texinfo/texinfo-4.13-r2.ebuild b/sys-apps/texinfo/texinfo-4.13-r2.ebuild deleted file mode 100644 index c884b69e4b..0000000000 --- a/sys-apps/texinfo/texinfo-4.13-r2.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/texinfo/texinfo-4.13-r2.ebuild,v 1.16 2014/01/18 19:27:30 vapier Exp $ - -EAPI="2" - -inherit flag-o-matic eutils - -DESCRIPTION="The GNU info program and utilities" -HOMEPAGE="http://www.gnu.org/software/texinfo/"; -SRC_URI="mirror://gnu/${PN}/${P}.tar.lzma" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="nls static" - -RDEPEND="!=app-text/tetex-2* - >=sys-libs/ncurses-5.2-r2 - nls? ( virtual/libintl )" -DEPEND="${RDEPEND} - app-arch/xz-utils - nls? ( sys-devel/gettext )" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-4.11-prefix.patch # needs touch below - epatch "${FILESDIR}"/${P}-mint.patch - - epatch "${FILESDIR}"/${P}-xz.patch #269742 - touch doc/install-info.1 #354589 - epatch "${FILESDIR}"/${P}-texi2dvi-regexp-range.patch #311885 - epatch "${FILESDIR}"/${P}-accentenc-test.patch - # waiting to be sent upstream for my copyright assignment form to be - # ready - Flameeyes - epatch "${FILESDIR}"/${P}-docbook.patch - epatch "${FILESDIR}"/${P}-tinfo.patch #457556 - # timestamps must be newer than configure.ac touched by ${P}-tinfo.patch - touch doc/{texi2dvi,texi2pdf,pdftexi2dvi}.1 #354589 -} - -src_configure() { - use static && append-ldflags -static - econf $(use_enable nls) -} - -src_compile() { - # Make cross-compiler safe (#196041) - if tc-is-cross-compiler ; then - emake -C tools/gnulib/lib || die - fi - - emake || die -} - -src_install() { - emake DESTDIR="${D}" install || die - - dodoc AUTHORS ChangeLog INTRODUCTION NEWS README TODO - newdoc info/README README.info - newdoc makeinfo/README README.makeinfo -} diff --git a/sys-apps/texinfo/texinfo-5.2.ebuild b/sys-apps/texinfo/texinfo-5.2.ebuild deleted file mode 100644 index 2d1eec2f08..0000000000 --- a/sys-apps/texinfo/texinfo-5.2.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/texinfo/texinfo-5.2.ebuild,v 1.7 2015/07/08 09:06:51 zlogene Exp $ - -EAPI="4" - -inherit flag-o-matic - -DESCRIPTION="The GNU info program and utilities" -HOMEPAGE="http://www.gnu.org/software/texinfo/"; -SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="nls static" - -RDEPEND="!=app-text/tetex-2* - >=sys-libs/ncurses-5.2-r2 - dev-lang/perl - dev-perl/libintl-perl - dev-perl/Unicode-EastAsianWidth - dev-perl/Text-Unidecode - nls? ( virtual/libintl )" -DEPEND="${RDEPEND} - app-arch/xz-utils - nls? ( sys-devel/gettext )" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-4.13-mint.patch - # timestamps must be newer than configure.ac touched by prefix patch - sed -i -e '1c\#!/usr/bin/env sh' util/texi2dvi util/texi2pdf || die - touch doc/{texi2dvi,texi2pdf,pdftexi2dvi}.1 -} - -src_configure() { - use static && append-ldflags -static - econf \ - --with-external-libintl-perl \ - --with-external-Unicode-EastAsianWidth \ - --with-external-Text-Unidecode \ - $(use_enable nls) -} - -src_install() { - default - newdoc info/README README.info -} diff --git a/sys-apps/texinfo/texinfo-6.7.ebuild b/sys-apps/texinfo/texinfo-6.7.ebuild new file mode 100644 index 0000000000..955063e754 --- /dev/null +++ b/sys-apps/texinfo/texinfo-6.7.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Note: if your package uses the texi2dvi utility, it must depend on the +# virtual/texi2dvi package to pull in all the right deps. The tool is not +# usable out-of-the-box because it requires the large tex packages. + +EAPI=7 + +inherit flag-o-matic toolchain-funcs + +DESCRIPTION="The GNU info program and utilities" +HOMEPAGE="https://www.gnu.org/software/texinfo/"; +SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="nls +standalone static" + +RDEPEND=" + !=app-text/tetex-2* + >=sys-libs/ncurses-5.2-r2:0= + standalone? ( dev-lang/perl ) + !standalone? ( + dev-lang/perl:= + dev-perl/libintl-perl + dev-perl/Unicode-EastAsianWidth + dev-perl/Text-Unidecode + ) + nls? ( virtual/libintl )" +DEPEND="${RDEPEND} + app-arch/xz-utils + nls? ( >=sys-devel/gettext-0.19.6 )" + +src_prepare() { + default + + eapply -p0 "${FILESDIR}"/${PN}-4.13-mint.patch + sed -i -e '1c\#!/usr/bin/env sh' util/texi2dvi util/texi2pdf || die + touch doc/{texi2dvi,texi2pdf,pdftexi2dvi}.1 +} + +src_configure() { + # Respect compiler and CPPFLAGS/CFLAGS/LDFLAGS for Perl extensions. #622576 + local -x PERL_EXT_CC="$(tc-getCC)" PERL_EXT_CPPFLAGS="${CPPFLAGS}" PERL_EXT_CFLAGS="${CFLAGS}" PERL_EXT_LDFLAGS="${LDFLAGS}" + + use static && append-ldflags -static + local myeconfargs + if use standalone ; then + myeconfargs=( + --without-external-libintl-perl + --without-external-Unicode-EastAsianWidth + --without-external-Text-Unidecode + $(use_enable nls) + --disable-perl-xs + ) + else + myeconfargs=( + --with-external-libintl-perl + --with-external-Unicode-EastAsianWidth + --with-external-Text-Unidecode + $(use_enable nls) + --enable-perl-xs + ) + fi + econf "${myeconfargs[@]}" +}
