From fd1824e9b1fd180f410170bf2d02e1f098f53db9 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 1 Mar 2024 11:41:16 +0000 Subject: gentoo auto-resync : 01:03:2024 - 11:41:16 --- eclass/Manifest.gz | Bin 39611 -> 39610 bytes eclass/texlive-common.eclass | 7 ++++++- eclass/texlive-module.eclass | 6 ++++++ 3 files changed, 12 insertions(+), 1 deletion(-) (limited to 'eclass') diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz index 324e8879623e..1033c43fb425 100644 Binary files a/eclass/Manifest.gz and b/eclass/Manifest.gz differ diff --git a/eclass/texlive-common.eclass b/eclass/texlive-common.eclass index fab6ff66ecd5..1e5c8a53d5cc 100644 --- a/eclass/texlive-common.eclass +++ b/eclass/texlive-common.eclass @@ -178,6 +178,10 @@ etexmf-update() { if has_version 'app-text/texlive-core' ; then if [[ -z ${ROOT} && -x "${EPREFIX}"/usr/sbin/texmf-update ]] ; then "${EPREFIX}"/usr/sbin/texmf-update + local res="${?}" + if [[ "${res}" -ne 0 ]] && ver_test -ge 2023; then + die -n "texmf-update returned non-zero exit status ${res}" + fi else ewarn "Cannot run texmf-update for some reason." ewarn "Your texmf tree might be inconsistent with your configuration" @@ -195,7 +199,8 @@ efmtutil-sys() { if has_version 'app-text/texlive-core' ; then if [[ -z ${ROOT} && -x "${EPREFIX}"/usr/bin/fmtutil-sys ]] ; then einfo "Rebuilding formats" - "${EPREFIX}"/usr/bin/fmtutil-sys --all &> /dev/null || die + "${EPREFIX}"/usr/bin/fmtutil-sys --all &> /dev/null || + die -n "fmtutil-sys returned non-zero exit status ${?}" else ewarn "Cannot run fmtutil-sys for some reason." ewarn "Your formats might be inconsistent with your installed ${PN} version" diff --git a/eclass/texlive-module.eclass b/eclass/texlive-module.eclass index afcd4532975a..9fc4e619ff9b 100644 --- a/eclass/texlive-module.eclass +++ b/eclass/texlive-module.eclass @@ -85,6 +85,12 @@ HOMEPAGE="https://www.tug.org/texlive/" IUSE="doc source" +if [[ -z ${TL_PV} ]] \ + && [[ ${EAPI} != 7 ]] \ + && [[ ${CATEGORY} == dev-texlive ]]; then + TL_PV=$(ver_cut 1) +fi + RDEPEND=">=app-text/texlive-core-${TL_PV:-${PV}}" # We do not need anything from SYSROOT: # Everything is built from the texlive install in / -- cgit v1.2.3