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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4F6D1138334 for ; Mon, 3 Jun 2019 14:40:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1DB45E07D0; Mon, 3 Jun 2019 14:40:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E4217E07D0 for ; Mon, 3 Jun 2019 14:40:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 60A7834558D for ; Mon, 3 Jun 2019 14:40:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5FA70622 for ; Mon, 3 Jun 2019 14:40:20 +0000 (UTC) From: "Mikle Kolyada" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mikle Kolyada" Message-ID: <1559572816.6fd653b0b20cf6f81b0686565ec1a56775e12b6e.zlogene@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/texlive-module.eclass X-VCS-Directories: eclass/ X-VCS-Committer: zlogene X-VCS-Committer-Name: Mikle Kolyada X-VCS-Revision: 6fd653b0b20cf6f81b0686565ec1a56775e12b6e X-VCS-Branch: master Date: Mon, 3 Jun 2019 14:40:20 +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: 0edb405c-5f86-4733-8105-83e5a6687c79 X-Archives-Hash: 0e3c63e81cd4cc40e0b3ee0a5fd2b33c commit: 6fd653b0b20cf6f81b0686565ec1a56775e12b6e Author: Mikle Kolyada gentoo org> AuthorDate: Mon Jun 3 14:38:54 2019 +0000 Commit: Mikle Kolyada gentoo org> CommitDate: Mon Jun 3 14:40:16 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fd653b0 eclass/texlive-module: specify fmtutil mode for user TexLive-2019 introduces 'fmtutil-user' that should be now called by regular users rather than plain 'fmtutil' Signed-off-by: Mikle Kolyada gentoo.org> eclass/texlive-module.eclass | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/eclass/texlive-module.eclass b/eclass/texlive-module.eclass index 2b9fac4da17..c9faf39debd 100644 --- a/eclass/texlive-module.eclass +++ b/eclass/texlive-module.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: texlive-module.eclass @@ -320,6 +320,10 @@ texlive-module_src_compile() { esac done + # Determine texlive-core version for fmtutil call + fmt_call="$(has_version '>=app-text/texlive-core-2019' \ + && echo "fmtutil-user" || echo "fmtutil")" + # Build format files for i in texmf-dist/fmtutil/format*.cnf; do if [ -f "${i}" ]; then @@ -327,14 +331,14 @@ texlive-module_src_compile() { [ -d texmf-var ] || mkdir texmf-var [ -d texmf-var/web2c ] || mkdir texmf-var/web2c VARTEXFONTS="${T}/fonts" TEXMFHOME="${S}/texmf:${S}/texmf-dist:${S}/texmf-var"\ - env -u TEXINPUTS fmtutil --cnffile "${i}" --fmtdir "${S}/texmf-var/web2c" --all\ + env -u TEXINPUTS $fmt_call --cnffile "${i}" --fmtdir "${S}/texmf-var/web2c" --all\ || die "failed to build format ${i}" fi done # Delete ls-R files, these should not be created but better be certain they # do not end up being installed. - find . -name 'ls-R' -delete + find . -name 'ls-R' -delete || die } # @FUNCTION: texlive-module_src_install