From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1626284-garchives=archives.gentoo.org@lists.gentoo.org>
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 D9D161581E7
for <garchives@archives.gentoo.org>; Mon, 29 Apr 2024 17:31:50 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 08F4EE2A01;
Mon, 29 Apr 2024 17:31:50 +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 DEED5E2A01
for <gentoo-commits@lists.gentoo.org>; Mon, 29 Apr 2024 17:31:49 +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 0E87B335DC2
for <gentoo-commits@lists.gentoo.org>; Mon, 29 Apr 2024 17:31:49 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 65E601779
for <gentoo-commits@lists.gentoo.org>; Mon, 29 Apr 2024 17:31:47 +0000 (UTC)
From: "Florian Schmaus" <flow@gentoo.org>
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" <flow@gentoo.org>
Message-ID: <1714411888.ac62beddba2f03695f0d2a223c6f6463713b4e41.flow@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
X-VCS-Repository: repo/gentoo
X-VCS-Files: eclass/texlive-common.eclass
X-VCS-Directories: eclass/
X-VCS-Committer: flow
X-VCS-Committer-Name: Florian Schmaus
X-VCS-Revision: ac62beddba2f03695f0d2a223c6f6463713b4e41
X-VCS-Branch: master
Date: Mon, 29 Apr 2024 17:31:47 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 6b74a8e8-69f4-4f1b-8972-be55630e49f3
X-Archives-Hash: 80296c6a658c27ff012bc6b426100488
commit: ac62beddba2f03695f0d2a223c6f6463713b4e41
Author: Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 28 08:32:09 2024 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Mon Apr 29 17:31:28 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac62bedd
texlive-common.eclass: add newline between tlpobj entries in tlpdb
We previously created the texlive.tlpdb by concatenating all tlpobj
files. This means that the entries will be right after another.
As it turns out, some TeX Live tools require a newline (e.g., tlmgr)
between the entries, while others do not (e.g., texdoc). And the
"official" tlpdb also has the entries separated by newlines. Therefore
this changes texlive-common_update_tlpdb() to also add them.
Thanks to ulm for showing how this can be done with sed.
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
Thanks-to: Ulrich Müller <ulm <AT> gentoo.org>
eclass/texlive-common.eclass | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/eclass/texlive-common.eclass b/eclass/texlive-common.eclass
index b32ea2af1121..15d475799a88 100644
--- a/eclass/texlive-common.eclass
+++ b/eclass/texlive-common.eclass
@@ -270,9 +270,11 @@ texlive-common_update_tlpdb() {
touch "${new_tlpdb}" || die
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 cat >> "${new_tlpdb}"
+ xargs -0 --no-run-if-empty sed -s '$G' >> "${new_tlpdb}"
assert "generating tlpdb failed"
fi