Re: [PATCH 2/4] texlive-common.eclass: support TeX Live 2026 distfiles from d.g.o/pub/proj/tex

Florian Schmaus <[email protected]> writes:

> Starting with TeX Live 2026, we will use
>
> 		 https://distfiles.gentoo.org/pub/proj/tex/

Drop the weird spacing here?

>
> as distfile source. Also add the TEXLIVE_SRC_URI_PROJ_TEX eclass
> variable, so that consumers of this eclass can opt-in to using this
> distfile location.
>
> Signed-off-by: Florian Schmaus <[email protected]>
> ---
>  eclass/texlive-common.eclass | 23 ++++++++++++++++++-----
>  1 file changed, 18 insertions(+), 5 deletions(-)
>
> diff --git a/eclass/texlive-common.eclass b/eclass/texlive-common.eclass
> index 583e77d5d736..022ac11c6f05 100644
> --- a/eclass/texlive-common.eclass
> +++ b/eclass/texlive-common.eclass
> @@ -41,6 +41,12 @@ _TEXLIVE_COMMON_ECLASS=1
>  # @CODE
>  : "${CTAN_MIRROR_URL:="https://mirrors.ctan.org"}"
>  
> +# @ECLASS_VARIABLE: TEXLIVE_SRC_URI_PROJ_TEX
> +# @DEFAULT_UNSET
> +# @DESCRIPTION:
> +# If set, use https://distfiles.gentoo.org/pub/proj/tex/ as additional
> +# SRC_URI of texlive distfiles.
> +

I'd just set the default value here instead, like we do for CTAN.

>  # @ECLASS_VARIABLE: TEXLIVE_SCRIPTS_W_FILE_EXT
>  # @DEFAULT_UNSET
>  # @DESCRIPTION:
> @@ -240,13 +246,20 @@ texlive-common_append_to_src_uri() {
>  
>  	local tl_uri_prefix="https://dev.gentoo.org/~@dev@/distfiles/texlive/tl-"
>  	local tl_2023_uri_prefix="https://dev.gentoo.org/~@dev@/distfiles/texlive/"
> +	local tl_proj_tex_uri_prefix="https://distfiles.gentoo.org/pub/proj/tex/"
> +	local tl_mirror="${CTAN_MIRROR_URL%/}/systems/texlive/tlnet/archive/"
>  
>  	local tl_dev
> -	# If the version is less than 2023 and the package is the
> -	# dev-texlive category, we fallback to the old SRC_URI layout. With
> -	# the 2023 bump, packages outside the dev-texlive category start to
> -	# inherit texlive-common.eclass.
> -	if ver_test -lt 2023 && [[ ${CATEGORY} == dev-texlive ]]; then
> +	if ver_test -ge 2026 || [[ ${TEXLIVE_SRC_URI_PROJ_TEX} ]]; then
> +		tl_uri=( "${tl_uri[@]/%/.${tl_pkgext}}" )
> +
> +		SRC_URI+=" ${tl_uri[*]/#/${tl_proj_tex_uri_prefix}}"
> +		SRC_URI+=" ${tl_uri[*]/#/${tl_mirror}}"
> +	elif ver_test -lt 2023 && [[ ${CATEGORY} == dev-texlive ]]; then
> +		# If the version is less than 2023 and the package is the
> +		# dev-texlive category, we fallback to the old SRC_URI layout. With
> +		# the 2023 bump, packages outside the dev-texlive category start to

Can't this be cleaned up now?

> +		# inherit texlive-common.eclass.
>  		local texlive_lt_2023_devs=( zlogene dilfridge sam )
>  		local tl_uri_suffix="-${PV}.${tl_pkgext}"

-----BEGIN PGP SIGNATURE-----

iQEBBAEWCgCpFiEEJaa7iN2bdkxrVUHCc4QJ9SDfkZAFAmqE2vkbFIAAAAAABAAO
bWFudTIsMi41KzEuMTIsMiwyXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25z
Lm9wZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyNUE2QkI4OEREOUI3NjRDNkI1NTQx
QzI3Mzg0MDlGNTIwREY5MTkwDxxzYW1AZ2VudG9vLm9yZwAKCRBzhAn1IN+RkG0K
AQDG05tuH39Ot6vJWkG9Ku+BNfTLN6IwkoPCu2votR6lpQD/Q9hzfZrilBvlIN51
et0SigwzxF96VROWYPtFc0oSRAo=
=6H+j
-----END PGP SIGNATURE-----