diff options
| author |   Mikle Kolyada <zlogene@gentoo.org> | 2019-06-03 17:38:54 +0300 |
|---|---|---|
| committer | Mikle Kolyada <zlogene@gentoo.org> | 2019-06-03 17:40:16 +0300 |
| commit | 6fd653b0b20cf6f81b0686565ec1a56775e12b6e (patch) | |
| tree | 6f127c2a9dc0e68e1f7c552a74602510ca05bb41 /eclass | |
| parent | app-admin/keepassxc: Added dependency on >=dev-libs/libsodium-1.0.12 (diff) | |
| download | gentoo-6fd653b0b20cf6f81b0686565ec1a56775e12b6e.tar.gz gentoo-6fd653b0b20cf6f81b0686565ec1a56775e12b6e.tar.bz2 gentoo-6fd653b0b20cf6f81b0686565ec1a56775e12b6e.zip | |
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 <zlogene@gentoo.org>
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/texlive-module.eclass | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/eclass/texlive-module.eclass b/eclass/texlive-module.eclass index 2b9fac4da173..c9faf39debd3 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 |