From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1AB82158010 for ; Tue, 3 Jan 2023 03:50:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F1D8DE08DD; Tue, 3 Jan 2023 03:50:36 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D4A47E08DD for ; Tue, 3 Jan 2023 03:50:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E8776340C42 for ; Tue, 3 Jan 2023 03:50:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 34EDB7FA for ; Tue, 3 Jan 2023 03:50:34 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1672717735.24c3f5e13d994194972806ebbe8dff0fda37840e.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/texinfo/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/texinfo/texinfo-7.0.1-r1.ebuild X-VCS-Directories: sys-apps/texinfo/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 24c3f5e13d994194972806ebbe8dff0fda37840e X-VCS-Branch: master Date: Tue, 3 Jan 2023 03:50:34 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 3dda1f41-a890-4257-b881-cccbb3725bc1 X-Archives-Hash: 3d4cb3b3c9d37e2c4d94b897fc779038 commit: 24c3f5e13d994194972806ebbe8dff0fda37840e Author: Sam James gentoo org> AuthorDate: Tue Jan 3 03:48:55 2023 +0000 Commit: Sam James gentoo org> CommitDate: Tue Jan 3 03:48:55 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24c3f5e1 sys-apps/texinfo: drop help2man dep; repair prefix help2man usage too - help2man was being called for the normal case (non-prefix) because our patch from the 7.0.0 release branch was touching install-info.c which led to it trying to regenerate install-info.1. Update the timestamp of install-info.1 to be newer than the C file so it doesn't try to regenerate. - For Prefix, we've had a sed for a while to fix shebangs of some files, but the touch trick (as above) seems to have gone stale. Update it to touch more files to avoid the same problem as above with help2man. Fixes: 98dcd65a8e3e750ab30f0e5c7215335201130c5b Closes: https://bugs.gentoo.org/870814 Signed-off-by: Sam James gentoo.org> sys-apps/texinfo/texinfo-7.0.1-r1.ebuild | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sys-apps/texinfo/texinfo-7.0.1-r1.ebuild b/sys-apps/texinfo/texinfo-7.0.1-r1.ebuild index 09499a77dda3..924c8a3d1a00 100644 --- a/sys-apps/texinfo/texinfo-7.0.1-r1.ebuild +++ b/sys-apps/texinfo/texinfo-7.0.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# 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 @@ -34,7 +34,6 @@ RDEPEND=" " DEPEND="${RDEPEND}" BDEPEND=" - sys-apps/help2man nls? ( >=sys-devel/gettext-0.19.6 ) " @@ -46,9 +45,12 @@ PATCHES=( 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/{texi2dvi,texi2pdf,pdftexi2dvi}.1 + touch {doc,man}/{texi2dvi,texi2pdf,pdftexi2dvi}.1 || die fi }