[gentoo-commits] repo/gentoo:master commit in: sys-apps/texinfo/files/, sys-apps/texinfo/
commit: b072cfaeb12a28b977754564d1817463cfc8ffae
Author: Sam James gentoo org>
AuthorDate: Sat Feb 4 23:45:54 2023 +
Commit: Sam James gentoo org>
CommitDate: Sat Feb 4 23:45:54 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b072cfae
sys-apps/texinfo: drop 7.0.1, 7.0.1-r1
Signed-off-by: Sam James gentoo.org>
sys-apps/texinfo/Manifest | 1 -
.../files/texinfo-7.0.1-info-groff-crash.patch | 44 -
.../files/texinfo-7.0.1-lto-type-mismatch.patch| 31 --
sys-apps/texinfo/texinfo-7.0.1-r1.ebuild | 72 --
sys-apps/texinfo/texinfo-7.0.1.ebuild | 65 ---
5 files changed, 213 deletions(-)
diff --git a/sys-apps/texinfo/Manifest b/sys-apps/texinfo/Manifest
index 6fa5d6519a9a..7e5010a2e513 100644
--- a/sys-apps/texinfo/Manifest
+++ b/sys-apps/texinfo/Manifest
@@ -1,3 +1,2 @@
DIST texinfo-6.8.tar.xz 4961528 BLAKE2B
0256dac5ba9c7f171c970644907b763f7a88fd9995111244df0458591aed1a0fe94c76045dde69f9138d65d6f780aae6869bbbc013f58e04ae7c62456b222bbb
SHA512
0ff9290b14e4d83e32b889cfa24e6d065f98b2a764daf6b92c6c895fddbb35258398da6257c113220d5a4d886f7b54b09c4b117ca5eacfee6797f9bffde0f909
-DIST texinfo-7.0.1.tar.xz 4890348 BLAKE2B
9d61722e7ff8a71e05770552050cc861d778b9faa95f801e40d4353601a5692f01ad8e794dfb0e7b5b29efa2c701de4a76505732a806b0303b5c1fe0599816f1
SHA512
8e1616341fbbfe0cd90bd1b0452874c75b99d88dffe5f88c53fdc32f00d67c07c15c6c774b241e1f7507f0347314737e533854939c3be6334ca9feb9cd049009
DIST texinfo-7.0.2.tar.xz 4875424 BLAKE2B
23737cc800392c949add14c1d0a01a294e8c224d958c03325c96d6540dcfae49db5c2d4a8c29310c0603f8ac8477f6ee00a14db4aa6caab317b19e776139e617
SHA512
26dd5bb1392f2197ecde296ba157d4533f4b11fadf1238481da4cf2b3796c665ce96049df8d2f9a6d4fa22b7e9013d9978d195e525288663f0a54482bbc22b2b
diff --git a/sys-apps/texinfo/files/texinfo-7.0.1-info-groff-crash.patch
b/sys-apps/texinfo/files/texinfo-7.0.1-info-groff-crash.patch
deleted file mode 100644
index d215ae719ccb..
--- a/sys-apps/texinfo/files/texinfo-7.0.1-info-groff-crash.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-https://git.savannah.gnu.org/cgit/texinfo.git/commit/?h=release/7.0&id=86185e7cedafd011376d0efb6f7e028231dbf641
-
-From 86185e7cedafd011376d0efb6f7e028231dbf641 Mon Sep 17 00:00:00 2001
-From: Gavin Smith
-Date: Mon, 12 Dec 2022 18:40:01 +
-Subject: =?UTF-8?q?*=20info/util.c=20(text=5Fbuffer=5Ficonv):=20Correctly?=
- =?UTF-8?q?=20update=20arguments=20for=20iconv=20in=20loop.=20=20Crash=20f?=
- =?UTF-8?q?or=20"info=20groff"=20reported=20by=20Jakub=20Wilk=20via=20Hilm?=
- =?UTF-8?q?ar=20Preu=C3=9Fe=20.?=
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
a/info/util.c
-+++ b/info/util.c
-@@ -350,11 +350,11 @@ text_buffer_iconv (struct text_buffer *buf, iconv_t
iconv_state,
- size_t iconv_ret;
- size_t extra_alloc = 1;
-
-- outptr = text_buffer_base (buf) + text_buffer_off (buf);
-- out_bytes_left = text_buffer_space_left (buf);
--
- while (1)
- {
-+ outptr = text_buffer_base (buf) + text_buffer_off (buf);
-+ out_bytes_left = text_buffer_space_left (buf);
-+
- iconv_ret = iconv (iconv_state, inbuf, inbytesleft,
- &outptr, &out_bytes_left);
- if (iconv_ret != (size_t) -1)
-@@ -362,10 +362,7 @@ text_buffer_iconv (struct text_buffer *buf, iconv_t
iconv_state,
-
- /* If we ran out of space, allocate more and try again. */
- if (errno == E2BIG)
--{
-- text_buffer_alloc (buf, (extra_alloc *= 4));
-- out_bytes_left = text_buffer_space_left (buf);
--}
-+text_buffer_alloc (buf, (extra_alloc *= 4));
- else
- break; /* let calling code deal with it */
- }
---
-cgit v1.1
diff --git a/sys-apps/texinfo/files/texinfo-7.0.1-lto-type-mismatch.patch
b/sys-apps/texinfo/files/texinfo-7.0.1-lto-type-mismatch.patch
deleted file mode 100644
index a8906195480e..
--- a/sys-apps/texinfo/files/texinfo-7.0.1-lto-type-mismatch.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-https://git.savannah.gnu.org/cgit/texinfo.git/patch/?id=952b333db85f88fb51c7e051b15063d95cf7dfc8
-https://lists.gnu.org/archive/html/bug-texinfo/2022-12/msg00034.html
-https://bugs.gentoo.org/863713
-
-From 952b333db85f88fb51c7e051b15063d95cf7dfc8 Mon Sep 17 00:00:00 2001
-From: Gavin Smith
-Date: Sat, 10 Dec 2022 01:10:38 +
-Subject: =?UTF-8?q?*=20install-info/install-info.c=20(error):=20Declare=20?=
- =?UTF-8?q?as=20static=20to=20avoid=20clash=20with=20error=20function=20fr?=
- =?UTF-8?q?om=20glibc,=20called=20from=20gnulib.=20Report=20from=20Sam=20J?=
- =?UTF-8?q?ames=20=20and=20suggested=20solution=20from=20A?=
- =?UTF-8?q?rsen=20Arsenovi=C4=87=20.?=
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
a/install-info/install-info.c
-+++ b/install-info/install-info.c
-@@ -214,7 +214,9 @@ vdiag (cons
[gentoo-commits] repo/gentoo:master commit in: sys-apps/texinfo/files/, sys-apps/texinfo/
commit: ef0f2d0c1e074d48a6272a646dd0cb7f0605d160
Author: Sam James gentoo org>
AuthorDate: Thu Dec 29 01:13:59 2022 +
Commit: Sam James gentoo org>
CommitDate: Thu Dec 29 01:13:59 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef0f2d0c
sys-apps/texinfo: backport LTO & crash fixes
>From 7.0.1 branch.
Closes: https://bugs.gentoo.org/863713
Signed-off-by: Sam James gentoo.org>
.../files/texinfo-7.0.1-info-groff-crash.patch | 44 ++
.../files/texinfo-7.0.1-lto-type-mismatch.patch| 31 ++
sys-apps/texinfo/texinfo-7.0.1-r1.ebuild | 67 ++
3 files changed, 142 insertions(+)
diff --git a/sys-apps/texinfo/files/texinfo-7.0.1-info-groff-crash.patch
b/sys-apps/texinfo/files/texinfo-7.0.1-info-groff-crash.patch
new file mode 100644
index ..d215ae719ccb
--- /dev/null
+++ b/sys-apps/texinfo/files/texinfo-7.0.1-info-groff-crash.patch
@@ -0,0 +1,44 @@
+https://git.savannah.gnu.org/cgit/texinfo.git/commit/?h=release/7.0&id=86185e7cedafd011376d0efb6f7e028231dbf641
+
+From 86185e7cedafd011376d0efb6f7e028231dbf641 Mon Sep 17 00:00:00 2001
+From: Gavin Smith
+Date: Mon, 12 Dec 2022 18:40:01 +
+Subject: =?UTF-8?q?*=20info/util.c=20(text=5Fbuffer=5Ficonv):=20Correctly?=
+ =?UTF-8?q?=20update=20arguments=20for=20iconv=20in=20loop.=20=20Crash=20f?=
+ =?UTF-8?q?or=20"info=20groff"=20reported=20by=20Jakub=20Wilk=20via=20Hilm?=
+ =?UTF-8?q?ar=20Preu=C3=9Fe=20.?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+--- a/info/util.c
b/info/util.c
+@@ -350,11 +350,11 @@ text_buffer_iconv (struct text_buffer *buf, iconv_t
iconv_state,
+ size_t iconv_ret;
+ size_t extra_alloc = 1;
+
+- outptr = text_buffer_base (buf) + text_buffer_off (buf);
+- out_bytes_left = text_buffer_space_left (buf);
+-
+ while (1)
+ {
++ outptr = text_buffer_base (buf) + text_buffer_off (buf);
++ out_bytes_left = text_buffer_space_left (buf);
++
+ iconv_ret = iconv (iconv_state, inbuf, inbytesleft,
+ &outptr, &out_bytes_left);
+ if (iconv_ret != (size_t) -1)
+@@ -362,10 +362,7 @@ text_buffer_iconv (struct text_buffer *buf, iconv_t
iconv_state,
+
+ /* If we ran out of space, allocate more and try again. */
+ if (errno == E2BIG)
+-{
+- text_buffer_alloc (buf, (extra_alloc *= 4));
+- out_bytes_left = text_buffer_space_left (buf);
+-}
++text_buffer_alloc (buf, (extra_alloc *= 4));
+ else
+ break; /* let calling code deal with it */
+ }
+--
+cgit v1.1
diff --git a/sys-apps/texinfo/files/texinfo-7.0.1-lto-type-mismatch.patch
b/sys-apps/texinfo/files/texinfo-7.0.1-lto-type-mismatch.patch
new file mode 100644
index ..a8906195480e
--- /dev/null
+++ b/sys-apps/texinfo/files/texinfo-7.0.1-lto-type-mismatch.patch
@@ -0,0 +1,31 @@
+https://git.savannah.gnu.org/cgit/texinfo.git/patch/?id=952b333db85f88fb51c7e051b15063d95cf7dfc8
+https://lists.gnu.org/archive/html/bug-texinfo/2022-12/msg00034.html
+https://bugs.gentoo.org/863713
+
+From 952b333db85f88fb51c7e051b15063d95cf7dfc8 Mon Sep 17 00:00:00 2001
+From: Gavin Smith
+Date: Sat, 10 Dec 2022 01:10:38 +
+Subject: =?UTF-8?q?*=20install-info/install-info.c=20(error):=20Declare=20?=
+ =?UTF-8?q?as=20static=20to=20avoid=20clash=20with=20error=20function=20fr?=
+ =?UTF-8?q?om=20glibc,=20called=20from=20gnulib.=20Report=20from=20Sam=20J?=
+ =?UTF-8?q?ames=20=20and=20suggested=20solution=20from=20A?=
+ =?UTF-8?q?rsen=20Arsenovi=C4=87=20.?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+--- a/install-info/install-info.c
b/install-info/install-info.c
+@@ -214,7 +214,9 @@ vdiag (const char *fmt, const char *diagtype, va_list ap)
+ putc ('\n', stderr);
+ }
+
+-void
++/* declare as static to avoid clash with glibc error function, called from
++ gnulib. */
++static void
+ error (const char *fmt, ...)
+ {
+ va_list ap;
+--
+cgit v1.1
diff --git a/sys-apps/texinfo/texinfo-7.0.1-r1.ebuild
b/sys-apps/texinfo/texinfo-7.0.1-r1.ebuild
new file mode 100644
index ..ac7dbea1ee77
--- /dev/null
+++ b/sys-apps/texinfo/texinfo-7.0.1-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2022 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=8
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="The GNU info program and utilities"
+HOMEPAGE="https://www.gnu.org/software/texinfo/";
+
+if [[ $(ver_cut 3) -ge 90 ]] ; then
+ SRC_URI="https://alpha.gnu.org/gnu/${PN}/${P}.tar.xz";
+else
+ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68
[gentoo-commits] repo/gentoo:master commit in: sys-apps/texinfo/files/, sys-apps/texinfo/
commit: 3319a3d356bb473f91bdfbe799dc2ef6cfb4b379
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Sat Nov 13 00:10:27 2021 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Sat Nov 13 00:10:27 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3319a3d3
Revert "sys-apps/texinfo: enable Carp"
If we patch the perl file, the build system tries to rebuild the manpage,
and stage builds bail out because of missing dependencies.
Fixable, but let's wait for a new texinfo release instead which also
should fix the underlying bug.
This reverts commit 879158d05be754ba8c93c8b54772f7c3264401d7.
Signed-off-by: Andreas K. Hüttel gentoo.org>
.../texinfo/files/texinfo-6.8-enable-Carp.patch| 20 --
sys-apps/texinfo/texinfo-6.8-r1.ebuild | 73 --
2 files changed, 93 deletions(-)
diff --git a/sys-apps/texinfo/files/texinfo-6.8-enable-Carp.patch
b/sys-apps/texinfo/files/texinfo-6.8-enable-Carp.patch
deleted file mode 100644
index 1be85103789..000
--- a/sys-apps/texinfo/files/texinfo-6.8-enable-Carp.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-This fixes
-
-makeinfo: warning: error loading ./doc/t2h.pm: Undefined subroutine
&Texinfo::Config::carp called at /usr/share/texinfo/Texinfo/Convert/HTML.pm
line 7308.
-Compilation failed in require at /usr/bin/makeinfo line 342.
-
-when building media-video/ffmpeg-4.4 docs.
-
-diff -Nuar a/tp/texi2any.pl b/tp/texi2any.pl
a/tp/texi2any.pl 2021-06-30 16:25:37.0 +0200
-+++ b/tp/texi2any.pl 2021-11-11 04:17:32.0 +0100
-@@ -34,7 +34,7 @@
- #use Cwd;
- use Getopt::Long qw(GetOptions);
- # for carp
--#use Carp;
-+use Carp;
-
- Getopt::Long::Configure("gnu_getopt");
-
-
diff --git a/sys-apps/texinfo/texinfo-6.8-r1.ebuild
b/sys-apps/texinfo/texinfo-6.8-r1.ebuild
deleted file mode 100644
index 2d739e2bc0a..000
--- a/sys-apps/texinfo/texinfo-6.8-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv
~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~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}"
-BDEPEND="nls? ( >=sys-devel/gettext-0.19.6 )"
-
-PATCHES=(
- "${FILESDIR}/${P}-undo-gnulib-nonnul.patch"
- "${FILESDIR}/${P}-enable-Carp.patch"
-)
-
-src_prepare() {
- default
-
- if use prefix ; then
- sed -i -e '1c\#!/usr/bin/env sh' util/texi2dvi util/texi2pdf ||
die
- touch doc/{texi2dvi,texi2pdf,pdftexi2dvi}.1
- fi
-}
-
-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=( $(use_enable nls) )
-
- if use standalone ; then
- myeconfargs+=(
- --without-external-libintl-perl
- --without-external-Unicode-EastAsianWidth
- --without-external-Text-Unidecode
- --disable-perl-xs
- )
- else
- myeconfargs+=(
- --with-external-libintl-perl
- --with-external-Unicode-EastAsianWidth
- --with-external-Text-Unidecode
- --enable-perl-xs
- )
- fi
-
- econf "${myeconfargs[@]}"
-}
[gentoo-commits] repo/gentoo:master commit in: sys-apps/texinfo/files/, sys-apps/texinfo/
commit: 879158d05be754ba8c93c8b54772f7c3264401d7
Author: Matthew White inventati org>
AuthorDate: Thu Nov 11 23:04:48 2021 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Thu Nov 11 23:48:11 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=879158d0
sys-apps/texinfo: enable Carp
This fixes building media-video/ffmpeg docs.
makeinfo: warning: error loading ./doc/t2h.pm: Undefined subroutine
&Texinfo::Config::carp called at /usr/share/texinfo/Texinfo/Convert/HTML.pm
line 7308.
Compilation failed in require at /usr/bin/makeinfo line 342.
Closes: https://bugs.gentoo.org/823197
Package-Manager: Portage-3.0.28, Repoman-3.0.3-r1
Signed-off-by: Matteo Bianco inventati.org>
Closes: https://github.com/gentoo/gentoo/pull/22908
Signed-off-by: Andreas K. Hüttel gentoo.org>
.../texinfo/files/texinfo-6.8-enable-Carp.patch| 20 ++
sys-apps/texinfo/texinfo-6.8-r1.ebuild | 73 ++
2 files changed, 93 insertions(+)
diff --git a/sys-apps/texinfo/files/texinfo-6.8-enable-Carp.patch
b/sys-apps/texinfo/files/texinfo-6.8-enable-Carp.patch
new file mode 100644
index 000..1be85103789
--- /dev/null
+++ b/sys-apps/texinfo/files/texinfo-6.8-enable-Carp.patch
@@ -0,0 +1,20 @@
+This fixes
+
+makeinfo: warning: error loading ./doc/t2h.pm: Undefined subroutine
&Texinfo::Config::carp called at /usr/share/texinfo/Texinfo/Convert/HTML.pm
line 7308.
+Compilation failed in require at /usr/bin/makeinfo line 342.
+
+when building media-video/ffmpeg-4.4 docs.
+
+diff -Nuar a/tp/texi2any.pl b/tp/texi2any.pl
+--- a/tp/texi2any.pl 2021-06-30 16:25:37.0 +0200
b/tp/texi2any.pl 2021-11-11 04:17:32.0 +0100
+@@ -34,7 +34,7 @@
+ #use Cwd;
+ use Getopt::Long qw(GetOptions);
+ # for carp
+-#use Carp;
++use Carp;
+
+ Getopt::Long::Configure("gnu_getopt");
+
+
diff --git a/sys-apps/texinfo/texinfo-6.8-r1.ebuild
b/sys-apps/texinfo/texinfo-6.8-r1.ebuild
new file mode 100644
index 000..2d739e2bc0a
--- /dev/null
+++ b/sys-apps/texinfo/texinfo-6.8-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv
~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~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}"
+BDEPEND="nls? ( >=sys-devel/gettext-0.19.6 )"
+
+PATCHES=(
+ "${FILESDIR}/${P}-undo-gnulib-nonnul.patch"
+ "${FILESDIR}/${P}-enable-Carp.patch"
+)
+
+src_prepare() {
+ default
+
+ if use prefix ; then
+ sed -i -e '1c\#!/usr/bin/env sh' util/texi2dvi util/texi2pdf ||
die
+ touch doc/{texi2dvi,texi2pdf,pdftexi2dvi}.1
+ fi
+}
+
+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=( $(use_enable nls) )
+
+ if use standalone ; then
+ myeconfargs+=(
+ --without-external-libintl-perl
+ --without-external-Unicode-EastAsianWidth
+ --without-external-Text-Unidecode
+ --disable-perl-xs
+ )
+ else
+ myeconfargs+=(
+ --with-external-libintl-perl
+ --with-external-Unicode-EastAsianWidth
+ --with-external-Text-Unidecode
+ --enable-perl-xs
+ )
+ fi
+
+ econf "${myeconfargs[@]}"
+}
[gentoo-commits] repo/gentoo:master commit in: sys-apps/texinfo/files/, sys-apps/texinfo/
commit: a3af03bb17aa0f106c97032355aa2c7e63f58b02
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Thu Sep 9 19:23:28 2021 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Thu Sep 9 19:23:57 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3af03bb
sys-apps/texinfo: Fix build with glibc-2.34 (using RH patch)
Closes: https://bugs.gentoo.org/803485
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Andreas K. Huettel gentoo.org>
.../files/texinfo-6.8-undo-gnulib-nonnul.patch | 186 +
sys-apps/texinfo/texinfo-6.8.ebuild| 4 +
2 files changed, 190 insertions(+)
diff --git a/sys-apps/texinfo/files/texinfo-6.8-undo-gnulib-nonnul.patch
b/sys-apps/texinfo/files/texinfo-6.8-undo-gnulib-nonnul.patch
new file mode 100644
index 000..60f2e63b7ce
--- /dev/null
+++ b/sys-apps/texinfo/files/texinfo-6.8-undo-gnulib-nonnul.patch
@@ -0,0 +1,186 @@
+
+Patch by Vitezslav Crhonek
+Source:
https://src.fedoraproject.org/rpms/texinfo/c/9b2cca4817fa4bd8d520fed05e9560fc7183dcdf?branch=rawhide
+
+diff -up texinfo-6.8/gnulib/lib/cdefs.h.orig texinfo-6.8/gnulib/lib/cdefs.h
+--- texinfo-6.8/gnulib/lib/cdefs.h.orig2021-03-11 19:57:53.0
+0100
texinfo-6.8/gnulib/lib/cdefs.h 2021-07-19 12:26:46.985176475 +0200
+@@ -321,15 +321,15 @@
+
+ /* The nonnull function attribute marks pointer parameters that
+must not be NULL. */
+-#ifndef __attribute_nonnull__
++#ifndef __nonnull
+ # if __GNUC_PREREQ (3,3) || __glibc_has_attribute (__nonnull__)
+-# define __attribute_nonnull__(params) __attribute__ ((__nonnull__ params))
++# define __nonnull(params) __attribute__ ((__nonnull__ params))
+ # else
+-# define __attribute_nonnull__(params)
++# define __nonnull(params)
+ # endif
+-#endif
+-#ifndef __nonnull
+-# define __nonnull(params) __attribute_nonnull__ (params)
++#elif !defined __GLIBC__
++# undef __nonnull
++# define __nonnull(params) _GL_ATTRIBUTE_NONNULL (params)
+ #endif
+
+ /* If fortification mode, we warn about unused results of certain
+diff -up texinfo-6.8/gnulib/lib/libc-config.h.orig
texinfo-6.8/gnulib/lib/libc-config.h
+--- texinfo-6.8/gnulib/lib/libc-config.h.orig 2021-03-11 19:57:54.0
+0100
texinfo-6.8/gnulib/lib/libc-config.h 2021-07-19 12:27:58.810590975
+0200
+@@ -33,9 +33,9 @@
+ #include
+
+ /* On glibc this includes and and #defines
+- _FEATURES_H, __WORDSIZE, and __set_errno. On FreeBSD 11 and
+- DragonFlyBSD 5.9 it includes which defines __nonnull.
+- Elsewhere it is harmless. */
++ _FEATURES_H, __WORDSIZE, and __set_errno. On FreeBSD 11 it
++ includes which defines __nonnull. Elsewhere it
++ is harmless. */
+ #include
+
+ /* From glibc . */
+diff -up texinfo-6.8/gnulib/lib/malloc/dynarray-skeleton.c.orig
texinfo-6.8/gnulib/lib/malloc/dynarray-skeleton.c
+--- texinfo-6.8/gnulib/lib/malloc/dynarray-skeleton.c.orig 2021-03-11
19:57:54.0 +0100
texinfo-6.8/gnulib/lib/malloc/dynarray-skeleton.c 2021-07-19
12:24:46.878419397 +0200
+@@ -192,7 +192,7 @@ DYNARRAY_NAME (free__array__) (struct DY
+
+ /* Initialize a dynamic array object. This must be called before any
+use of the object. */
+-__attribute_nonnull__ ((1))
++__nonnull ((1))
+ static void
+ DYNARRAY_NAME (init) (struct DYNARRAY_STRUCT *list)
+ {
+@@ -202,7 +202,7 @@ DYNARRAY_NAME (init) (struct DYNARRAY_ST
+ }
+
+ /* Deallocate the dynamic array and its elements. */
+-__attribute_maybe_unused__ __attribute_nonnull__ ((1))
++__attribute_maybe_unused__ __nonnull ((1))
+ static void
+ DYNARRAY_FREE (struct DYNARRAY_STRUCT *list)
+ {
+@@ -213,7 +213,7 @@ DYNARRAY_FREE (struct DYNARRAY_STRUCT *l
+ }
+
+ /* Return true if the dynamic array is in an error state. */
+-__attribute_nonnull__ ((1))
++__nonnull ((1))
+ static inline bool
+ DYNARRAY_NAME (has_failed) (const struct DYNARRAY_STRUCT *list)
+ {
+@@ -222,7 +222,7 @@ DYNARRAY_NAME (has_failed) (const struct
+
+ /* Mark the dynamic array as failed. All elements are deallocated as
+a side effect. */
+-__attribute_nonnull__ ((1))
++__nonnull ((1))
+ static void
+ DYNARRAY_NAME (mark_failed) (struct DYNARRAY_STRUCT *list)
+ {
+@@ -236,7 +236,7 @@ DYNARRAY_NAME (mark_failed) (struct DYNA
+
+ /* Return the number of elements which have been added to the dynamic
+array. */
+-__attribute_nonnull__ ((1))
++__nonnull ((1))
+ static inline size_t
+ DYNARRAY_NAME (size) (const struct DYNARRAY_STRUCT *list)
+ {
+@@ -245,7 +245,7 @@ DYNARRAY_NAME (size) (const struct DYNAR
+
+ /* Return a pointer to the array element at INDEX. Terminate the
+process if INDEX is out of bounds. */
+-__attribute_nonnull__ ((1))
++__nonnull ((1))
+ static inline DYNARRAY_ELEMENT *
+ DYNARRAY_NAME (at) (struct DYNARRAY_STRUCT *list, size_t index)
+ {
+@@ -257,7 +257,7 @@ DYNARRAY_NAME (at) (struct DYNARRAY_STRU
+ /* Return a pointer to the first array element, if any. For a
+zero-length array, the pointe
[gentoo-commits] repo/gentoo:master commit in: sys-apps/texinfo/files/, sys-apps/texinfo/
commit: d49fb7d7cba3535c064677d1b12fe9e9a37391e9
Author: Sam James gentoo org>
AuthorDate: Sat Dec 26 21:05:37 2020 +
Commit: Sam James gentoo org>
CommitDate: Sat Dec 26 21:05:37 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d49fb7d7
sys-apps/texinfo: sync with ::prefix
Package-Manager: Portage-3.0.12-prefix, Repoman-3.0.2
Signed-off-by: Sam James gentoo.org>
sys-apps/texinfo/files/texinfo-4.13-mint.patch | 63 ++
sys-apps/texinfo/texinfo-6.7.ebuild| 13 +-
2 files changed, 75 insertions(+), 1 deletion(-)
diff --git a/sys-apps/texinfo/files/texinfo-4.13-mint.patch
b/sys-apps/texinfo/files/texinfo-4.13-mint.patch
new file mode 100644
index 000..b4533939c47
--- /dev/null
+++ b/sys-apps/texinfo/files/texinfo-4.13-mint.patch
@@ -0,0 +1,63 @@
+patch by Alan Hourihane for FreeMiNT
+http://archives.gentoo.org/gentoo-alt/msg_d2ac4e586d9c51b1d4e46f555e899cc9.xml
+
+diff -u gnulib/lib/mbiter.h gnulib/lib/mbiter.h
+--- gnulib/lib/mbiter.h2008-05-12 12:38:21.0 +
gnulib/lib/mbiter.h2008-11-19 21:13:17.0 +
+@@ -117,8 +117,10 @@
+ {
+ if (iter->next_done)
+ return;
++#if (HAVE_MBSINIT && HAVE_MBRTOWC)
+ if (iter->in_shift)
+ goto with_shift;
++#endif
+ /* Handle most ASCII characters quickly, without calling mbrtowc(). */
+ if (is_basic (*iter->cur.ptr))
+ {
+@@ -129,6 +131,7 @@
+ iter->cur.wc = *iter->cur.ptr;
+ iter->cur.wc_valid = true;
+ }
++#if (HAVE_MBSINIT && HAVE_MBRTOWC)
+ else
+ {
+ assert (mbsinit (&iter->state));
+@@ -169,6 +172,7 @@
+ iter->in_shift = false;
+ }
+ }
++#endif
+ iter->next_done = true;
+ }
+
+diff -u gnulib/lib/mbuiter.h gnulib/lib/mbuiter.h
+--- gnulib/lib/mbuiter.h 2007-12-25 23:57:18.0 +
gnulib/lib/mbuiter.h 2008-11-19 21:15:12.0 +
+@@ -125,8 +125,10 @@
+ {
+ if (iter->next_done)
+ return;
++#if (HAVE_MBSINIT && HAVE_MBRTOWC)
+ if (iter->in_shift)
+ goto with_shift;
++#endif
+ /* Handle most ASCII characters quickly, without calling mbrtowc(). */
+ if (is_basic (*iter->cur.ptr))
+ {
+@@ -137,6 +139,7 @@
+ iter->cur.wc = *iter->cur.ptr;
+ iter->cur.wc_valid = true;
+ }
++#if (HAVE_MBSINIT && HAVE_MBRTOWC)
+ else
+ {
+ assert (mbsinit (&iter->state));
+@@ -178,6 +181,7 @@
+ iter->in_shift = false;
+ }
+ }
++#endif
+ iter->next_done = true;
+ }
+
diff --git a/sys-apps/texinfo/texinfo-6.7.ebuild
b/sys-apps/texinfo/texinfo-6.7.ebuild
index cee372613a7..01d16d60a61 100644
--- a/sys-apps/texinfo/texinfo-6.7.ebuild
+++ b/sys-apps/texinfo/texinfo-6.7.ebuild
@@ -15,10 +15,11 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390
sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390
sparc x86 ~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? (
@@ -31,6 +32,16 @@ RDEPEND="
DEPEND="${RDEPEND}"
BDEPEND="nls? ( >=sys-devel/gettext-0.19.6 )"
+src_prepare() {
+ default
+
+ if use prefix ; then
+ 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
+ fi
+}
+
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}"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/texinfo/files/, sys-apps/texinfo/
commit: a879915c57fae99b25fc1fab0d4e0d0a529d6995
Author: Sam James gentoo org>
AuthorDate: Sat Dec 26 21:07:41 2020 +
Commit: Sam James gentoo org>
CommitDate: Sat Dec 26 21:07:41 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a879915c
sys-apps/texinfo: drop ~m68k-mint (inc. patch)
Deliberately included the patch in the previous commit
in case we ever want to revive it, so that it's in the
tree history.
Package-Manager: Portage-3.0.12-prefix, Repoman-3.0.2
Signed-off-by: Sam James gentoo.org>
sys-apps/texinfo/files/texinfo-4.13-mint.patch | 63 --
sys-apps/texinfo/texinfo-6.7.ebuild| 3 +-
2 files changed, 1 insertion(+), 65 deletions(-)
diff --git a/sys-apps/texinfo/files/texinfo-4.13-mint.patch
b/sys-apps/texinfo/files/texinfo-4.13-mint.patch
deleted file mode 100644
index b4533939c47..000
--- a/sys-apps/texinfo/files/texinfo-4.13-mint.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-patch by Alan Hourihane for FreeMiNT
-http://archives.gentoo.org/gentoo-alt/msg_d2ac4e586d9c51b1d4e46f555e899cc9.xml
-
-diff -u gnulib/lib/mbiter.h gnulib/lib/mbiter.h
gnulib/lib/mbiter.h2008-05-12 12:38:21.0 +
-+++ gnulib/lib/mbiter.h2008-11-19 21:13:17.0 +
-@@ -117,8 +117,10 @@
- {
- if (iter->next_done)
- return;
-+#if (HAVE_MBSINIT && HAVE_MBRTOWC)
- if (iter->in_shift)
- goto with_shift;
-+#endif
- /* Handle most ASCII characters quickly, without calling mbrtowc(). */
- if (is_basic (*iter->cur.ptr))
- {
-@@ -129,6 +131,7 @@
- iter->cur.wc = *iter->cur.ptr;
- iter->cur.wc_valid = true;
- }
-+#if (HAVE_MBSINIT && HAVE_MBRTOWC)
- else
- {
- assert (mbsinit (&iter->state));
-@@ -169,6 +172,7 @@
- iter->in_shift = false;
- }
- }
-+#endif
- iter->next_done = true;
- }
-
-diff -u gnulib/lib/mbuiter.h gnulib/lib/mbuiter.h
gnulib/lib/mbuiter.h 2007-12-25 23:57:18.0 +
-+++ gnulib/lib/mbuiter.h 2008-11-19 21:15:12.0 +
-@@ -125,8 +125,10 @@
- {
- if (iter->next_done)
- return;
-+#if (HAVE_MBSINIT && HAVE_MBRTOWC)
- if (iter->in_shift)
- goto with_shift;
-+#endif
- /* Handle most ASCII characters quickly, without calling mbrtowc(). */
- if (is_basic (*iter->cur.ptr))
- {
-@@ -137,6 +139,7 @@
- iter->cur.wc = *iter->cur.ptr;
- iter->cur.wc_valid = true;
- }
-+#if (HAVE_MBSINIT && HAVE_MBRTOWC)
- else
- {
- assert (mbsinit (&iter->state));
-@@ -178,6 +181,7 @@
- iter->in_shift = false;
- }
- }
-+#endif
- iter->next_done = true;
- }
-
diff --git a/sys-apps/texinfo/texinfo-6.7.ebuild
b/sys-apps/texinfo/texinfo-6.7.ebuild
index 01d16d60a61..3302ea6162b 100644
--- a/sys-apps/texinfo/texinfo-6.7.ebuild
+++ b/sys-apps/texinfo/texinfo-6.7.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390
sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390
sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="nls +standalone static"
RDEPEND="
@@ -36,7 +36,6 @@ src_prepare() {
default
if use prefix ; then
- 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
fi
[gentoo-commits] repo/gentoo:master commit in: sys-apps/texinfo/files/, sys-apps/texinfo/
commit: 0771146ab79d6c98adad0628c17fa0759528fe5b
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Wed Jun 5 12:18:21 2019 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Wed Jun 5 12:18:21 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0771146a
sys-apps/texinfo: remove old
Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Andreas K. Hüttel gentoo.org>
sys-apps/texinfo/Manifest | 1 -
.../files/texinfo-6.5-escape-braces-in-regex.patch | 28 -
...texinfo-6.5-perl-5.28-thread-safe-locales.patch | 37 -
sys-apps/texinfo/metadata.xml | 1 -
sys-apps/texinfo/texinfo-6.5-r1.ebuild | 47 --
sys-apps/texinfo/texinfo-6.6-r2.ebuild | 47 --
6 files changed, 161 deletions(-)
diff --git a/sys-apps/texinfo/Manifest b/sys-apps/texinfo/Manifest
index 02d330863d3..ea91c7c2989 100644
--- a/sys-apps/texinfo/Manifest
+++ b/sys-apps/texinfo/Manifest
@@ -1,3 +1,2 @@
DIST texinfo-6.3.tar.xz 4468048 BLAKE2B
ef255225e1f66dc5e6646761d78dcf3e7ba9c79aa2654dbb527ef10db54b8417af9e1a58a270683956624049c2fb624b29bc2f22763c79bab9858cdcf5e2edce
SHA512
ef6c5878d9db497d7963bd9138418b30c39a5605c215bf2f4e8f1f083d93c3c99f8c459aa675f7da3b78da6189cb6bbf3cf19a2ee1d52e569de2f6ce82762bf4
-DIST texinfo-6.5.tar.xz 4503048 BLAKE2B
9e194115a252500fe6048614a96c6992b6fbf9f3557265d8bdda143e10f781769ca5e97ded2d330da7c0ae1581bfdebbf2dbde736689412980b098ea935d9580
SHA512
06831b4c74a1ba7a9cff937069e40ab26db1204aa8761d63254651ffacf6b0cb95d7078ba1cc59d95427239ab7e4f4aedf582967854281bfea3850b1ed5b1fdc
DIST texinfo-6.6.tar.xz 4946900 BLAKE2B
bd33297549d5285d7a4a65041b6025c489c6b436e9591eaf5187ef34f6e869bf7a2a82a00ebe11adc1c4b2904119e9e3f25d2496b5507f91f4b9ba548ba98604
SHA512
96e0764d0808152d3662e65c3287fb0f86ed918912cdc036380637dbadaacd6a489b516543c07b08105686575e8d495a945f73e23ff0909d5a0f12026e4131e0
diff --git a/sys-apps/texinfo/files/texinfo-6.5-escape-braces-in-regex.patch
b/sys-apps/texinfo/files/texinfo-6.5-escape-braces-in-regex.patch
deleted file mode 100644
index 72f1288393a..000
--- a/sys-apps/texinfo/files/texinfo-6.5-escape-braces-in-regex.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From efde0da129154376bebcfff6a47424669bb849df Mon Sep 17 00:00:00 2001
-From: Gavin Smith
-Date: Fri, 13 Jul 2018 15:31:28 +
-Subject: [PATCH] escape braces in regex
-
-git-svn-id: svn://127.0.0.1/svn_repo/texinfo/trunk@8007
39fee189-59d7-47db-b5d4-205258b72aed
-
-diff --git a/tp/Texinfo/Parser.pm b/tp/Texinfo/Parser.pm
-index ba1cd423d..b5eece680 100644
a/tp/Texinfo/Parser.pm
-+++ b/tp/Texinfo/Parser.pm
-@@ -5531,11 +5531,11 @@ sub _parse_special_misc_command()
- }
- } elsif ($command eq 'clickstyle') {
- # REMACRO
--if ($line =~ /^\s+@([[:alnum:]][[:alnum:]\-]*)({})?\s*/) {
-+if ($line =~ /^\s+@([[:alnum:]][[:alnum:]\-]*)(\{\})?\s*/) {
- $args = ['@'.$1];
- $self->{'clickstyle'} = $1;
- $remaining = $line;
-- $remaining =~
s/^\s+@([[:alnum:]][[:alnum:]\-]*)({})?\s*(\@(c|comment)((\@|\s+).*)?)?//;
-+ $remaining =~
s/^\s+@([[:alnum:]][[:alnum:]\-]*)(\{\})?\s*(\@(c|comment)((\@|\s+).*)?)?//;
- $has_comment = 1 if (defined($4));
- } else {
- $self->line_error (sprintf($self->__(
---
-2.20.1
-
diff --git
a/sys-apps/texinfo/files/texinfo-6.5-perl-5.28-thread-safe-locales.patch
b/sys-apps/texinfo/files/texinfo-6.5-perl-5.28-thread-safe-locales.patch
deleted file mode 100644
index 2d33abe78c7..000
--- a/sys-apps/texinfo/files/texinfo-6.5-perl-5.28-thread-safe-locales.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From a028ef47353b03177aab3facb4b2b74f7c3823e2 Mon Sep 17 00:00:00 2001
-From: Gavin Smith
-Date: Fri, 13 Jul 2018 15:39:29 +
-Subject: [PATCH] perl 5.28 thread-safe locales
-
-git-svn-id: svn://127.0.0.1/svn_repo/texinfo/trunk@8008
39fee189-59d7-47db-b5d4-205258b72aed
-
-diff --git a/tp/Texinfo/Convert/XSParagraph/xspara.c
b/tp/Texinfo/Convert/XSParagraph/xspara.c
-index 51eea4a30..f2d6d1ccd 100644
a/tp/Texinfo/Convert/XSParagraph/xspara.c
-+++ b/tp/Texinfo/Convert/XSParagraph/xspara.c
-@@ -248,6 +248,11 @@ xspara_init (void)
-
- dTHX;
-
-+#if PERL_VERSION > 27 || (PERL_VERSION == 27 && PERL_SUBVERSION > 8)
-+ /* needed due to thread-safe locale handling in newer perls */
-+ switch_to_global_locale();
-+#endif
-+
- if (setlocale (LC_CTYPE, "en_US.UTF-8")
- || setlocale (LC_CTYPE, "en_US.utf8"))
- goto success;
-@@ -320,6 +325,10 @@ failure:
- {
- success: ;
- free (utf8_locale);
-+#if PERL_VERSION > 27 || (PERL_VERSION == 27 && PERL_SUBVERSION > 8)
-+ /* needed due to thread-safe locale handling in newer perls */
-+ sync_locale();
-+#endif
- /*
- fprintf (stderr, "tried to set LC_CTYPE to UTF-8.\n");
- fprintf (stderr, "character encoding is: %s\n",
---
-2.20.1
-
diff --git a/sys-apps/texinfo/meta
[gentoo-commits] repo/gentoo:master commit in: sys-apps/texinfo/files/, sys-apps/texinfo/
commit: 3331aabac66e77ff61f11c8e35c5a6f121f4cdc9
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Thu Jan 24 22:18:54 2019 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Thu Jan 24 22:19:20 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3331aaba
sys-apps/texinfo: Backport perl-5.28 fixes from upstream
Closes: https://bugs.gentoo.org/662368
Package-Manager: Portage-2.3.57, Repoman-2.3.12
Signed-off-by: Andreas K. Hüttel gentoo.org>
.../files/texinfo-6.5-escape-braces-in-regex.patch | 28 +
...texinfo-6.5-perl-5.28-thread-safe-locales.patch | 37 +
sys-apps/texinfo/texinfo-6.5-r1.ebuild | 47 ++
3 files changed, 112 insertions(+)
diff --git a/sys-apps/texinfo/files/texinfo-6.5-escape-braces-in-regex.patch
b/sys-apps/texinfo/files/texinfo-6.5-escape-braces-in-regex.patch
new file mode 100644
index 000..72f1288393a
--- /dev/null
+++ b/sys-apps/texinfo/files/texinfo-6.5-escape-braces-in-regex.patch
@@ -0,0 +1,28 @@
+From efde0da129154376bebcfff6a47424669bb849df Mon Sep 17 00:00:00 2001
+From: Gavin Smith
+Date: Fri, 13 Jul 2018 15:31:28 +
+Subject: [PATCH] escape braces in regex
+
+git-svn-id: svn://127.0.0.1/svn_repo/texinfo/trunk@8007
39fee189-59d7-47db-b5d4-205258b72aed
+
+diff --git a/tp/Texinfo/Parser.pm b/tp/Texinfo/Parser.pm
+index ba1cd423d..b5eece680 100644
+--- a/tp/Texinfo/Parser.pm
b/tp/Texinfo/Parser.pm
+@@ -5531,11 +5531,11 @@ sub _parse_special_misc_command()
+ }
+ } elsif ($command eq 'clickstyle') {
+ # REMACRO
+-if ($line =~ /^\s+@([[:alnum:]][[:alnum:]\-]*)({})?\s*/) {
++if ($line =~ /^\s+@([[:alnum:]][[:alnum:]\-]*)(\{\})?\s*/) {
+ $args = ['@'.$1];
+ $self->{'clickstyle'} = $1;
+ $remaining = $line;
+- $remaining =~
s/^\s+@([[:alnum:]][[:alnum:]\-]*)({})?\s*(\@(c|comment)((\@|\s+).*)?)?//;
++ $remaining =~
s/^\s+@([[:alnum:]][[:alnum:]\-]*)(\{\})?\s*(\@(c|comment)((\@|\s+).*)?)?//;
+ $has_comment = 1 if (defined($4));
+ } else {
+ $self->line_error (sprintf($self->__(
+--
+2.20.1
+
diff --git
a/sys-apps/texinfo/files/texinfo-6.5-perl-5.28-thread-safe-locales.patch
b/sys-apps/texinfo/files/texinfo-6.5-perl-5.28-thread-safe-locales.patch
new file mode 100644
index 000..2d33abe78c7
--- /dev/null
+++ b/sys-apps/texinfo/files/texinfo-6.5-perl-5.28-thread-safe-locales.patch
@@ -0,0 +1,37 @@
+From a028ef47353b03177aab3facb4b2b74f7c3823e2 Mon Sep 17 00:00:00 2001
+From: Gavin Smith
+Date: Fri, 13 Jul 2018 15:39:29 +
+Subject: [PATCH] perl 5.28 thread-safe locales
+
+git-svn-id: svn://127.0.0.1/svn_repo/texinfo/trunk@8008
39fee189-59d7-47db-b5d4-205258b72aed
+
+diff --git a/tp/Texinfo/Convert/XSParagraph/xspara.c
b/tp/Texinfo/Convert/XSParagraph/xspara.c
+index 51eea4a30..f2d6d1ccd 100644
+--- a/tp/Texinfo/Convert/XSParagraph/xspara.c
b/tp/Texinfo/Convert/XSParagraph/xspara.c
+@@ -248,6 +248,11 @@ xspara_init (void)
+
+ dTHX;
+
++#if PERL_VERSION > 27 || (PERL_VERSION == 27 && PERL_SUBVERSION > 8)
++ /* needed due to thread-safe locale handling in newer perls */
++ switch_to_global_locale();
++#endif
++
+ if (setlocale (LC_CTYPE, "en_US.UTF-8")
+ || setlocale (LC_CTYPE, "en_US.utf8"))
+ goto success;
+@@ -320,6 +325,10 @@ failure:
+ {
+ success: ;
+ free (utf8_locale);
++#if PERL_VERSION > 27 || (PERL_VERSION == 27 && PERL_SUBVERSION > 8)
++ /* needed due to thread-safe locale handling in newer perls */
++ sync_locale();
++#endif
+ /*
+ fprintf (stderr, "tried to set LC_CTYPE to UTF-8.\n");
+ fprintf (stderr, "character encoding is: %s\n",
+--
+2.20.1
+
diff --git a/sys-apps/texinfo/texinfo-6.5-r1.ebuild
b/sys-apps/texinfo/texinfo-6.5-r1.ebuild
new file mode 100644
index 000..d42ea554e6d
--- /dev/null
+++ b/sys-apps/texinfo/texinfo-6.5-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 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=6
+
+inherit flag-o-matic
+
+DESCRIPTION="The GNU info program and utilities"
+HOMEPAGE="https://www.gnu.org/software/texinfo/";
+SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390
~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="nls static"
+
+RDEPEND="
+ !=app-text/tetex-2*
+ >=sys-libs/ncurses-5.2-r2:0=
+ 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 )"
+
+PATCHES=(
+ "${FILESDIR}/${P}"-escape-braces-in-rege
[gentoo-commits] repo/gentoo:master commit in: sys-apps/texinfo/files/, sys-apps/texinfo/
commit: 4147c10a76d719cb3330f18bfb6073da5e16561a
Author: Lars Wendler gentoo org>
AuthorDate: Sun Sep 11 13:44:59 2016 +
Commit: Lars Wendler gentoo org>
CommitDate: Sun Sep 11 13:44:59 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4147c10a
Revert "sys-apps/texinfo: Removed old."
This reverts commit f2955742698b6b5eeca932fcc6289b7b60acf3b1.
Breaks some ebuilds that still depend on old texinfo versions.
sys-apps/texinfo/Manifest | 2 +
.../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 +
sys-apps/texinfo/texinfo-4.13-r2.ebuild| 58 +
sys-apps/texinfo/texinfo-6.0.ebuild| 46
8 files changed, 366 insertions(+)
diff --git a/sys-apps/texinfo/Manifest b/sys-apps/texinfo/Manifest
index d731b66..7eedd9e 100644
--- a/sys-apps/texinfo/Manifest
+++ b/sys-apps/texinfo/Manifest
@@ -1,3 +1,5 @@
+DIST texinfo-4.13.tar.lzma 1563777 SHA256
6d28b0ceae866e3536142fc552e7a3bc9f84c8303119c25731b2478eef64c9e5 SHA512
bded399ed5fcf97dfa72d9486df91ecfc501301d83929b09b230aee2b8ad6994b7d7b5965b04d43de729cee30575b2334cf75879ad0a61c4b781ccc16d6c12db
WHIRLPOOL
6ef9d5e47cae7c6a94272e35bafe0716e617691b6b549a59ef8f95244f1b9a94e9adb79db38cf8e23166a43e84725e3eb01c971c8894bc4201aa743a44170c35
DIST texinfo-5.2.tar.xz 3812944 SHA256
5471ef683a64588a7cfef46ef2bdd3fbcbca89d847e10832612293f105e44eda SHA512
6f9c5142db3b155bd601149b5632807b3c20dcfa7006ce5f7e120e6fc4b2174a3f4671c18232c040ffd69ebfb5950be5c563ac5cc08b88d03eb5a9f1b0f96c04
WHIRLPOOL
609f0c2ac4deccf85f99cae3f681ce3892c7822988a84970171dec0f1224052861b3ac3fac97e666016bac4469b0e8446133c775a20f7201ff6dffa90fc84290
+DIST texinfo-6.0.tar.xz 4086712 SHA256
11ba4358696e8be3b3c7cfc88b89cf69525791aeabf0ee0a59ca58ebbd3471e4 SHA512
36f82288dfb7c2385630043faf75ccef5af625952d792c669c5eea673ae5b3474c148041bf1935f87ddeaae7114103731277e715d0d510c6fb41e0211ab12494
WHIRLPOOL
1d1facd5670321aca908407f65ff6a8769f3d7528c4535d77cf3fc6d948d766acc1e3f592e74554c427fca51a9e54048d54774586543d6316b664ac3c92d06c8
DIST texinfo-6.1.tar.xz 4520376 SHA256
ac68394ce21b2420ba7ed7cec65d84aacf308cc88e9bf4716fcfff88286883d2 SHA512
ae47295f3bcfb728c3be59421cf830ecfa5fc7856a086e45da2bac89600d883aa4406a6ef62d7ee5dc2bab83a3efa1cec861a3b4b14b85bbecb53ebf3ebf7235
WHIRLPOOL
187f11681f041aa5f4260c6c2833cb877a4c74afda73d4f72008c61c8a089dd0393ff90257410d5e48b9501c36dd4991032db001c5c17b8224afb6f5819cd165
DIST texinfo-6.3.tar.xz 4468048 SHA256
246cf3ffa54985118ec2eea2b8d0c71b92114efe6282c2ae90d65029db4cf93a SHA512
ef6c5878d9db497d7963bd9138418b30c39a5605c215bf2f4e8f1f083d93c3c99f8c459aa675f7da3b78da6189cb6bbf3cf19a2ee1d52e569de2f6ce82762bf4
WHIRLPOOL
45cb684cd14fdfc5da1ec54cee017e0835334481df9f4db35c18b2837509b1d15ea590d90a925edf4febae59669e9dc8e6287838368e8730f714811e70dbd417
diff --git a/sys-apps/texinfo/files/texinfo-4.13-accentenc-test.patch
b/sys-apps/texinfo/files/texinfo-4.13-accentenc-test.patch
new file mode 100644
index ..ad470fa
--- /dev/null
+++ b/sys-apps/texinfo/files/texinfo-4.13-accentenc-test.patch
@@ -0,0 +1,17 @@
+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
new file mode 100644
index ..0622b94
--- /dev/null
+++ b/sys-apps/texinfo/files/texinfo-4.13-docbook.patch
@@ -0,0 +1,66 @@
+--- texinfo-4.13.orig/makeinfo/cmds.c 2008-05-22 05:11:34.0 -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 ("%s", filename);
+ free (filename);
+ }
+--- texinfo-4.13.orig/makeinfo/node.c 2008-07-05 16:59:47.0 -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);
++
[gentoo-commits] repo/gentoo:master commit in: sys-apps/texinfo/files/, sys-apps/texinfo/
commit: f2955742698b6b5eeca932fcc6289b7b60acf3b1
Author: Lars Wendler gentoo org>
AuthorDate: Sun Sep 11 10:32:55 2016 +
Commit: Lars Wendler gentoo org>
CommitDate: Sun Sep 11 10:34:12 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2955742
sys-apps/texinfo: Removed old.
Package-Manager: portage-2.3.0
Signed-off-by: Lars Wendler gentoo.org>
sys-apps/texinfo/Manifest | 2 -
.../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 -
sys-apps/texinfo/texinfo-4.13-r2.ebuild| 58 -
sys-apps/texinfo/texinfo-6.0.ebuild| 46
8 files changed, 366 deletions(-)
diff --git a/sys-apps/texinfo/Manifest b/sys-apps/texinfo/Manifest
index 7eedd9e..d731b66 100644
--- a/sys-apps/texinfo/Manifest
+++ b/sys-apps/texinfo/Manifest
@@ -1,5 +1,3 @@
-DIST texinfo-4.13.tar.lzma 1563777 SHA256
6d28b0ceae866e3536142fc552e7a3bc9f84c8303119c25731b2478eef64c9e5 SHA512
bded399ed5fcf97dfa72d9486df91ecfc501301d83929b09b230aee2b8ad6994b7d7b5965b04d43de729cee30575b2334cf75879ad0a61c4b781ccc16d6c12db
WHIRLPOOL
6ef9d5e47cae7c6a94272e35bafe0716e617691b6b549a59ef8f95244f1b9a94e9adb79db38cf8e23166a43e84725e3eb01c971c8894bc4201aa743a44170c35
DIST texinfo-5.2.tar.xz 3812944 SHA256
5471ef683a64588a7cfef46ef2bdd3fbcbca89d847e10832612293f105e44eda SHA512
6f9c5142db3b155bd601149b5632807b3c20dcfa7006ce5f7e120e6fc4b2174a3f4671c18232c040ffd69ebfb5950be5c563ac5cc08b88d03eb5a9f1b0f96c04
WHIRLPOOL
609f0c2ac4deccf85f99cae3f681ce3892c7822988a84970171dec0f1224052861b3ac3fac97e666016bac4469b0e8446133c775a20f7201ff6dffa90fc84290
-DIST texinfo-6.0.tar.xz 4086712 SHA256
11ba4358696e8be3b3c7cfc88b89cf69525791aeabf0ee0a59ca58ebbd3471e4 SHA512
36f82288dfb7c2385630043faf75ccef5af625952d792c669c5eea673ae5b3474c148041bf1935f87ddeaae7114103731277e715d0d510c6fb41e0211ab12494
WHIRLPOOL
1d1facd5670321aca908407f65ff6a8769f3d7528c4535d77cf3fc6d948d766acc1e3f592e74554c427fca51a9e54048d54774586543d6316b664ac3c92d06c8
DIST texinfo-6.1.tar.xz 4520376 SHA256
ac68394ce21b2420ba7ed7cec65d84aacf308cc88e9bf4716fcfff88286883d2 SHA512
ae47295f3bcfb728c3be59421cf830ecfa5fc7856a086e45da2bac89600d883aa4406a6ef62d7ee5dc2bab83a3efa1cec861a3b4b14b85bbecb53ebf3ebf7235
WHIRLPOOL
187f11681f041aa5f4260c6c2833cb877a4c74afda73d4f72008c61c8a089dd0393ff90257410d5e48b9501c36dd4991032db001c5c17b8224afb6f5819cd165
DIST texinfo-6.3.tar.xz 4468048 SHA256
246cf3ffa54985118ec2eea2b8d0c71b92114efe6282c2ae90d65029db4cf93a SHA512
ef6c5878d9db497d7963bd9138418b30c39a5605c215bf2f4e8f1f083d93c3c99f8c459aa675f7da3b78da6189cb6bbf3cf19a2ee1d52e569de2f6ce82762bf4
WHIRLPOOL
45cb684cd14fdfc5da1ec54cee017e0835334481df9f4db35c18b2837509b1d15ea590d90a925edf4febae59669e9dc8e6287838368e8730f714811e70dbd417
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 ad470fa..
--- 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 0622b94..
--- 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.0 -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 ("%s", filename);
- free (filename);
- }
texinfo-4.13.orig/makeinfo/node.c 2008-07-05 16:59:47.0 -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);
-+ f
[gentoo-commits] repo/gentoo:master commit in: sys-apps/texinfo/files/, sys-apps/texinfo/
commit: 7257191494c950bc7f057ff321e63e2e821ec28c
Author: Lars Wendler gentoo org>
AuthorDate: Sun Feb 7 13:37:52 2016 +
Commit: Lars Wendler gentoo org>
CommitDate: Sun Feb 7 14:45:43 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72571914
sys-apps/texinfo: Removed old.
Package-Manager: portage-2.2.27
Signed-off-by: Lars Wendler gentoo.org>
sys-apps/texinfo/Manifest | 1 -
.../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 -
sys-apps/texinfo/texinfo-4.13-r2.ebuild| 58 -
7 files changed, 319 deletions(-)
diff --git a/sys-apps/texinfo/Manifest b/sys-apps/texinfo/Manifest
index ef9eb65..f5d561a 100644
--- a/sys-apps/texinfo/Manifest
+++ b/sys-apps/texinfo/Manifest
@@ -1,4 +1,3 @@
-DIST texinfo-4.13.tar.lzma 1563777 SHA256
6d28b0ceae866e3536142fc552e7a3bc9f84c8303119c25731b2478eef64c9e5 SHA512
bded399ed5fcf97dfa72d9486df91ecfc501301d83929b09b230aee2b8ad6994b7d7b5965b04d43de729cee30575b2334cf75879ad0a61c4b781ccc16d6c12db
WHIRLPOOL
6ef9d5e47cae7c6a94272e35bafe0716e617691b6b549a59ef8f95244f1b9a94e9adb79db38cf8e23166a43e84725e3eb01c971c8894bc4201aa743a44170c35
DIST texinfo-5.2.tar.xz 3812944 SHA256
5471ef683a64588a7cfef46ef2bdd3fbcbca89d847e10832612293f105e44eda SHA512
6f9c5142db3b155bd601149b5632807b3c20dcfa7006ce5f7e120e6fc4b2174a3f4671c18232c040ffd69ebfb5950be5c563ac5cc08b88d03eb5a9f1b0f96c04
WHIRLPOOL
609f0c2ac4deccf85f99cae3f681ce3892c7822988a84970171dec0f1224052861b3ac3fac97e666016bac4469b0e8446133c775a20f7201ff6dffa90fc84290
DIST texinfo-6.0.tar.xz 4086712 SHA256
11ba4358696e8be3b3c7cfc88b89cf69525791aeabf0ee0a59ca58ebbd3471e4 SHA512
36f82288dfb7c2385630043faf75ccef5af625952d792c669c5eea673ae5b3474c148041bf1935f87ddeaae7114103731277e715d0d510c6fb41e0211ab12494
WHIRLPOOL
1d1facd5670321aca908407f65ff6a8769f3d7528c4535d77cf3fc6d948d766acc1e3f592e74554c427fca51a9e54048d54774586543d6316b664ac3c92d06c8
DIST texinfo-6.1.tar.xz 4520376 SHA256
ac68394ce21b2420ba7ed7cec65d84aacf308cc88e9bf4716fcfff88286883d2 SHA512
ae47295f3bcfb728c3be59421cf830ecfa5fc7856a086e45da2bac89600d883aa4406a6ef62d7ee5dc2bab83a3efa1cec861a3b4b14b85bbecb53ebf3ebf7235
WHIRLPOOL
187f11681f041aa5f4260c6c2833cb877a4c74afda73d4f72008c61c8a089dd0393ff90257410d5e48b9501c36dd4991032db001c5c17b8224afb6f5819cd165
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 ad470fa..000
--- 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 0622b94..000
--- 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.0 -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 ("%s", filename);
- free (filename);
- }
texinfo-4.13.orig/makeinfo/node.c 2008-07-05 16:59:47.0 -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.0 -0800
-+++ texinfo-4.13/makeinfo/xml.c2012-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
