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 CE01F158232 for ; Fri, 6 Dec 2024 10:35:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8E3A3E0AAD; Fri, 6 Dec 2024 10:35:55 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2B689E0A63 for ; Fri, 6 Dec 2024 10:35:55 +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 255A633BF41 for ; Fri, 6 Dec 2024 10:35:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8813712D4 for ; Fri, 6 Dec 2024 10:35:52 +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: <1733481316.2b3f1dcb45a23d03471efa4d8faa983109527d51.flow@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-texlive/texlive-langjapanese/ X-VCS-Repository: repo/gentoo 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: 2b3f1dcb45a23d03471efa4d8faa983109527d51 X-VCS-Branch: master Date: Fri, 6 Dec 2024 10:35:52 +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: 569d947f-1a40-41ba-863a-ba23c29bfb9e X-Archives-Hash: 03942ea986412c9807f7e107326f2286 commit: 2b3f1dcb45a23d03471efa4d8faa983109527d51 Author: Florian Schmaus gentoo org> AuthorDate: Fri Dec 6 10:20:42 2024 +0000 Commit: Florian Schmaus gentoo org> CommitDate: Fri Dec 6 10:35:16 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b3f1dcb 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 2df6a55d90ec..670d13fb0ce1 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 +}