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 (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E67261581F0 for ; Thu, 12 Dec 2024 17:03:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B41E2E0998; Thu, 12 Dec 2024 17:03:28 +0000 (UTC) Received: from smtp.gentoo.org (mail.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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 962CDE0887 for ; Thu, 12 Dec 2024 17:03:28 +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 B99A6341465 for ; Thu, 12 Dec 2024 17:03:27 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E8EE41F28 for ; Thu, 12 Dec 2024 17:03:25 +0000 (UTC) From: "Florian Schmaus" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Florian Schmaus" Message-ID: <1734022625.b19ff3462450417986410812624ed7c29a767824.flow@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/latex-package.eclass X-VCS-Directories: eclass/ X-VCS-Committer: flow X-VCS-Committer-Name: Florian Schmaus X-VCS-Revision: b19ff3462450417986410812624ed7c29a767824 X-VCS-Branch: master Date: Thu, 12 Dec 2024 17:03:25 +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: c1258a90-21a4-452b-9549-b52494fa7b4a X-Archives-Hash: 13cb1de8b0819759a9acb55f735fb328 commit: b19ff3462450417986410812624ed7c29a767824 Author: Florian Schmaus gentoo org> AuthorDate: Wed Dec 11 09:13:32 2024 +0000 Commit: Florian Schmaus gentoo org> CommitDate: Thu Dec 12 16:57:05 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b19ff346 latex-package.eclass: do not set $@ in latex-package_src_doinstall's loop Since 595611085bc5 ("latex-package: kill POSIX and old EAPI"), the 'tex' and 'dtx' case handling of latex-package_src_doinstall's loop would set $@ to a pdflatex invocation. However, the main loop of this function iterates over $@, and after $@ is set to a pdflatex command, this iteration would continue to process the components of the pdflatex command. As result, ebuild have to latex-package_src_doinstall doc latex-package_src_doinstall pdf when latex-package_src_doinstall doc should be sufficient, because the 'doc' case expands to the "tex dtx dvi ps pdf" cases. However, once a 'tex' or 'dtx' case was processed, the remaining onces are no longer be processed, due the bug described above. The fix is simple: do not abuse $@ to save the pdflatex command, instead, use a dedicated local variable. Fixes: 595611085bc532afb9f31fa23cee734bc37d21a4 Signed-off-by: Florian Schmaus gentoo.org> eclass/latex-package.eclass | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/eclass/latex-package.eclass b/eclass/latex-package.eclass index 4082e161b843..d6426775f720 100644 --- a/eclass/latex-package.eclass +++ b/eclass/latex-package.eclass @@ -137,11 +137,16 @@ latex-package_src_doinstall() { continue einfo "Making documentation: ${i}" + local mypdflatex=( + pdflatex + ${LATEX_DOC_ARGUMENTS} + --halt-on-error + --interaction=nonstopmode + "${i}" + ) # some macros need compiler called twice, do it here. - set -- pdflatex ${LATEX_DOC_ARGUMENTS} \ - --halt-on-error --interaction=nonstopmode "${i}" - if "${@}"; then - "${@}" + if "${mypdflatex[@]}"; then + "${mypdflatex[@]}" else einfo "pdflatex failed, trying texi2dvi" texi2dvi -q -c --language=latex "${i}" || die