commit: 3319a3d356bb473f91bdfbe799dc2ef6cfb4b379
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 13 00:10:27 2021 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Nov 13 00:10:27 2021 +0000
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 <dilfridge <AT> 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..00000000000
--- 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.000000000 +0200
-+++ b/tp/texi2any.pl 2021-11-11 04:17:32.000000000 +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..00000000000
--- 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[@]}"
-}
