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 31FAD158064 for ; Tue, 30 Apr 2024 08:16:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6AC3FE2A01; Tue, 30 Apr 2024 08:16:51 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 53833E2A01 for ; Tue, 30 Apr 2024 08:16:51 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 95173343091 for ; Tue, 30 Apr 2024 08:16:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2C92916C0 for ; Tue, 30 Apr 2024 08:16:49 +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: <1714465004.d27a512b8f11a2aa7618046dc9aae04d486195b1.flow@gentoo> Subject: [gentoo-commits] proj/tex-overlay:main commit in: eclass/ X-VCS-Repository: proj/tex-overlay X-VCS-Files: eclass/texlive-common.eclass X-VCS-Directories: eclass/ X-VCS-Committer: flow X-VCS-Committer-Name: Florian Schmaus X-VCS-Revision: d27a512b8f11a2aa7618046dc9aae04d486195b1 X-VCS-Branch: main Date: Tue, 30 Apr 2024 08:16:49 +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: 377de6f6-2df1-4826-93ec-bf1e687f4249 X-Archives-Hash: 75879f35ef9eccbdbe4bdf9451598883 commit: d27a512b8f11a2aa7618046dc9aae04d486195b1 Author: Florian Schmaus gentoo org> AuthorDate: Tue Apr 30 08:16:14 2024 +0000 Commit: Florian Schmaus gentoo org> CommitDate: Tue Apr 30 08:16:44 2024 +0000 URL: https://gitweb.gentoo.org/proj/tex-overlay.git/commit/?id=d27a512b texlive-common.eclass: sync Signed-off-by: Florian Schmaus gentoo.org> eclass/texlive-common.eclass | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/eclass/texlive-common.eclass b/eclass/texlive-common.eclass index 9cbb81b..15d4757 100644 --- a/eclass/texlive-common.eclass +++ b/eclass/texlive-common.eclass @@ -199,11 +199,9 @@ etexmf-update() { efmtutil-sys() { if has_version 'app-text/texlive-core' ; then if [[ -z ${ROOT} && -x "${EPREFIX}"/usr/bin/fmtutil-sys ]] ; then - ebegin "Rebuilding TexLive formats" - "${EPREFIX}"/usr/bin/fmtutil-sys --all \ - > "${T}"/fmutil-sys-all.log \ - 2> "${T}"/fmutil-sys-all.err.log - eend $? || die -n "fmtutil-sys returned non-zero exit status ${?}" + einfo "Rebuilding formats" + "${EPREFIX}"/usr/bin/fmtutil-sys --all &> /dev/null || + die -n "fmtutil-sys returned non-zero exit status ${?}" else ewarn "Cannot run fmtutil-sys for some reason." ewarn "Your formats might be inconsistent with your installed ${PN} version" @@ -271,10 +269,14 @@ texlive-common_update_tlpdb() { touch "${new_tlpdb}" || die - find "${tlpobj}" -maxdepth 1 -type f -name "*.tlpobj" -print0 | - sort -z | - xargs -0 --no-run-if-empty cat >> "${new_tlpdb}" - assert "generating tlpdb failed" + if [[ -d "${tlpobj}" ]]; then + # The "sed -s '$G' below concatenates all tlpobj files separated + # by a newline. + find "${tlpobj}" -maxdepth 1 -type f -name "*.tlpobj" -print0 | + sort -z | + xargs -0 --no-run-if-empty sed -s '$G' >> "${new_tlpdb}" + assert "generating tlpdb failed" + fi if [[ -f ${tlpdb} ]]; then cmp -s "${new_tlpdb}" "${tlpdb}"