commit: b072cfaeb12a28b977754564d1817463cfc8ffae Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sat Feb 4 23:45:54 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Feb 4 23:45:54 2023 +0000 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 <sam <AT> 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..000000000000 --- 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 <gavinsmith0...@gmail.com> -Date: Mon, 12 Dec 2022 18:40:01 +0000 -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<hill...@web.de>.?= -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..000000000000 --- 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 <gavinsmith0...@gmail.com> -Date: Sat, 10 Dec 2022 01:10:38 +0000 -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<s...@gentoo.org>=20and=20suggested=20solution=20from=20A?= - =?UTF-8?q?rsen=20Arsenovi=C4=87=20<ar...@aarsen.me>.?= -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 deleted file mode 100644 index 924c8a3d1a00..000000000000 --- a/sys-apps/texinfo/texinfo-7.0.1-r1.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2023 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 ~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" -fi - -LICENSE="GPL-3+" -SLOT="0" -IUSE="nls +standalone static" - -RDEPEND=" - !=app-text/tetex-2* - >=sys-libs/ncurses-5.2-r2:= - virtual/perl-Data-Dumper - virtual/perl-Encode - standalone? ( >=dev-lang/perl-5.8.1 ) - !standalone? ( >=dev-lang/perl-5.8.1:= ) - nls? ( virtual/libintl ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - nls? ( >=sys-devel/gettext-0.19.6 ) -" - -PATCHES=( - "${FILESDIR}"/${P}-lto-type-mismatch.patch - "${FILESDIR}"/${P}-info-groff-crash.patch -) - -src_prepare() { - default - - # Drop after 7.0.1 (patch touches install-info which causes regeneration) - touch man/install-info.1 || die - - if use prefix ; then - sed -i -e '1c\#!/usr/bin/env sh' util/texi2dvi util/texi2pdf || die - touch {doc,man}/{texi2dvi,texi2pdf,pdftexi2dvi}.1 || die - fi -} - -src_configure() { - # Respect compiler and CPPFLAGS/CFLAGS/LDFLAGS for Perl extensions - # bug #622576 - local -x PERL_EXT_CC="$(tc-getCC)" PERL_EXT_CPPFLAGS="${CPPFLAGS}" - local -x PERL_EXT_CFLAGS="${CFLAGS}" PERL_EXT_LDFLAGS="${LDFLAGS}" - - use static && append-ldflags -static - - local myeconfargs=( - --cache-file="${S}"/config.cache - $(use_enable nls) - $(use_enable !standalone perl-xs) - ) - - econf "${myeconfargs[@]}" -} diff --git a/sys-apps/texinfo/texinfo-7.0.1.ebuild b/sys-apps/texinfo/texinfo-7.0.1.ebuild deleted file mode 100644 index 05ce4eb6f6dd..000000000000 --- a/sys-apps/texinfo/texinfo-7.0.1.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# 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 ~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" -fi - -LICENSE="GPL-3+" -SLOT="0" -IUSE="nls +standalone static" - -RDEPEND=" - !=app-text/tetex-2* - >=sys-libs/ncurses-5.2-r2:= - virtual/perl-Data-Dumper - virtual/perl-Encode - standalone? ( >=dev-lang/perl-5.8.1 ) - !standalone? ( >=dev-lang/perl-5.8.1:= ) - nls? ( virtual/libintl ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - sys-apps/help2man - nls? ( >=sys-devel/gettext-0.19.6 ) -" - -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 - # bug #622576 - local -x PERL_EXT_CC="$(tc-getCC)" PERL_EXT_CPPFLAGS="${CPPFLAGS}" - local -x PERL_EXT_CFLAGS="${CFLAGS}" PERL_EXT_LDFLAGS="${LDFLAGS}" - - use static && append-ldflags -static - - local myeconfargs=( - --cache-file="${S}"/config.cache - $(use_enable nls) - $(use_enable !standalone perl-xs) - ) - - econf "${myeconfargs[@]}" -}
