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 D1BA4158245 for ; Fri, 6 Dec 2024 10:36:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DDA69E0AAE; Fri, 6 Dec 2024 10:36:08 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 C4A66E0AAE for ; Fri, 6 Dec 2024 10:36:08 +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 D9A1633BF41 for ; Fri, 6 Dec 2024 10:36:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7250112D4 for ; Fri, 6 Dec 2024 10:36:06 +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: <1733480462.4431c1a51f0556196200d07b8ccee8a44978f0a9.flow@gentoo> Subject: [gentoo-commits] proj/tex-overlay:main commit in: dev-texlive/texlive-langjapanese/ X-VCS-Repository: proj/tex-overlay X-VCS-Files: dev-texlive/texlive-langjapanese/texlive-langjapanese-2024_p72817.ebuild X-VCS-Directories: dev-texlive/texlive-langjapanese/ X-VCS-Committer: flow X-VCS-Committer-Name: Florian Schmaus X-VCS-Revision: 4431c1a51f0556196200d07b8ccee8a44978f0a9 X-VCS-Branch: main Date: Fri, 6 Dec 2024 10:36:06 +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: f48ca968-028e-4ec5-8ddc-001ae6c63c53 X-Archives-Hash: 467779cbefcb45901d5dbf504354a24f commit: 4431c1a51f0556196200d07b8ccee8a44978f0a9 Author: Florian Schmaus gentoo org> AuthorDate: Fri Dec 6 10:21:02 2024 +0000 Commit: Florian Schmaus gentoo org> CommitDate: Fri Dec 6 10:21:02 2024 +0000 URL: https://gitweb.gentoo.org/proj/tex-overlay.git/commit/?id=4431c1a5 dev-texlive/texlive-langjapanese: fix file collisions Closes: https://bugs.gentoo.org/945910 Signed-off-by: Florian Schmaus gentoo.org> .../texlive-langjapanese-2024_p72817.ebuild | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dev-texlive/texlive-langjapanese/texlive-langjapanese-2024_p72817.ebuild b/dev-texlive/texlive-langjapanese/texlive-langjapanese-2024_p72817.ebuild index 2df6a55..670d13f 100644 --- a/dev-texlive/texlive-langjapanese/texlive-langjapanese-2024_p72817.ebuild +++ b/dev-texlive/texlive-langjapanese/texlive-langjapanese-2024_p72817.ebuild @@ -174,3 +174,13 @@ TEXLIVE_MODULE_BINSCRIPTS=" texmf-dist/scripts/ptex-fontmaps/kanji-fontmap-creator.pl texmf-dist/scripts/ptex2pdf/ptex2pdf.lua " + +src_prepare() { + default + + # e(u)ptex are installed by texlive-core[cjk] + sed -i '/AddFormat name=eptex /d' tlpkg/tlpobj/ptex.tlpobj || die + sed -i '/AddFormat name=euptex /d' tlpkg/tlpobj/uptex.tlpobj || die + # ptekf.1 is installed by dev-libs/ptexenc + rm texmf-dist/doc/man/man1/ptekf.1 || die +}