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 (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2CC1015838C for ; Tue, 16 Jan 2024 11:37:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5AC66E2A9E; Tue, 16 Jan 2024 11:37:31 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 350AFE2A9E for ; Tue, 16 Jan 2024 11:37:31 +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 4F9A934309B for ; Tue, 16 Jan 2024 11:37:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AB7ED97B for ; Tue, 16 Jan 2024 11:37:28 +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: <1705405045.bb9ec7d4bafd5daad4d6e4897fc09dab7ee5a197.flow@gentoo> Subject: [gentoo-commits] proj/tex-overlay:main commit in: eclass/ X-VCS-Repository: proj/tex-overlay X-VCS-Files: eclass/texlive-common.eclass eclass/texlive-module.eclass X-VCS-Directories: eclass/ X-VCS-Committer: flow X-VCS-Committer-Name: Florian Schmaus X-VCS-Revision: bb9ec7d4bafd5daad4d6e4897fc09dab7ee5a197 X-VCS-Branch: main Date: Tue, 16 Jan 2024 11:37:28 +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: a9e5681d-3d0b-49cc-abe2-5c316df099d1 X-Archives-Hash: 6a8f58cdf902f40e1bf7c4e8bf3140db commit: bb9ec7d4bafd5daad4d6e4897fc09dab7ee5a197 Author: Florian Schmaus gentoo org> AuthorDate: Tue Jan 16 11:37:25 2024 +0000 Commit: Florian Schmaus gentoo org> CommitDate: Tue Jan 16 11:37:25 2024 +0000 URL: https://gitweb.gentoo.org/proj/tex-overlay.git/commit/?id=bb9ec7d4 eclass: reduce diff, minor changes Signed-off-by: Florian Schmaus gentoo.org> eclass/texlive-common.eclass | 4 ++-- eclass/texlive-module.eclass | 38 +++++++++++++++++++------------------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eclass/texlive-common.eclass b/eclass/texlive-common.eclass index d6c381a..5de5830 100644 --- a/eclass/texlive-common.eclass +++ b/eclass/texlive-common.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: texlive-common.eclass @@ -36,7 +36,7 @@ _TEXLIVE_COMMON_ECLASS=1 texlive-common_handle_config_files() { local texmf_path # Starting with TeX Live 2023, we install in texmf-dist, where a - # distribution provided TeX Live installation is supposed to be, + # distribution-provided TeX Live installation is supposed to be, # instead of texmf. if ver_test -ge 2023; then texmf_path=/usr/share/texmf-dist diff --git a/eclass/texlive-module.eclass b/eclass/texlive-module.eclass index 2a1d7bb..afcd453 100644 --- a/eclass/texlive-module.eclass +++ b/eclass/texlive-module.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: texlive-module.eclass @@ -118,7 +118,7 @@ fi if [[ -n ${TEXLIVE_MODULE_OPTIONAL_ENGINE} ]] ; then for engine in ${TEXLIVE_MODULE_OPTIONAL_ENGINE} ; do - IUSE="${IUSE} +${engine}" # TODO + IUSE="${IUSE} +${engine}" done fi @@ -161,19 +161,19 @@ texlive-module_src_unpack() { texlive-module_add_format() { local name engine mode patterns options eval $@ - einfo "Appending to format.${PN}.cnf for $*" + einfo "Appending to format.${PN}.cnf for $@" if [[ ! -d texmf-dist/fmtutil ]]; then mkdir -p texmf-dist/fmtutil || die fi - [[ -f texmf-dist/fmtutil/format.${PN}.cnf ]] || { echo "# Generated for ${PN} by texlive-module.eclass" > "texmf-dist/fmtutil/format.${PN}.cnf"; } - [[ -n ${TEXLIVE_MODULE_OPTIONAL_ENGINE} ]] && has "${engine}" "${TEXLIVE_MODULE_OPTIONAL_ENGINE}" && use "!${engine}" && mode="disabled" + [[ -f texmf-dist/fmtutil/format.${PN}.cnf ]] || { echo "# Generated for ${PN} by texlive-module.eclass" > texmf-dist/fmtutil/format.${PN}.cnf; } + [[ -n ${TEXLIVE_MODULE_OPTIONAL_ENGINE} ]] && has ${engine} ${TEXLIVE_MODULE_OPTIONAL_ENGINE} && use !${engine} && mode="disabled" if [[ ${mode} = disabled ]]; then - printf "#! " >> "texmf-dist/fmtutil/format.${PN}.cnf" || die + printf "#! " >> texmf-dist/fmtutil/format.${PN}.cnf || die fi [[ -z ${patterns} ]] && patterns="-" - printf "%s\t%s\t%s\t%s\n" "${name}" "${engine}" "${patterns}" "${options}" >> "texmf-dist/fmtutil/format.${PN}.cnf" || die + printf "${name}\t${engine}\t${patterns}\t${options}\n" >> texmf-dist/fmtutil/format.${PN}.cnf || die } # @FUNCTION: texlive-module_make_language_def_lines @@ -184,14 +184,14 @@ texlive-module_add_format() { texlive-module_make_language_def_lines() { local lefthyphenmin righthyphenmin synonyms name file file_patterns file_exceptions luaspecial eval $@ - einfo "Generating language.def entry for $*" + einfo "Generating language.def entry for $@" [[ -z ${lefthyphenmin} ]] && lefthyphenmin="2" [[ -z ${righthyphenmin} ]] && righthyphenmin="3" - printf "\\addlanguage{%s}{%s}{}{%s}{%s}" "${name}" "${file}" "${lefthyphenmin}" "${righthyphenmin}" >> "${S}/language.${PN}.def" || die + echo "\\addlanguage{$name}{$file}{}{$lefthyphenmin}{$righthyphenmin}" >> "${S}/language.${PN}.def" || die if [[ -n ${synonyms} ]]; then - for i in $(echo "${synonyms}" | tr ',' ' ') ; do - einfo "Generating language.def synonym ${i} for $*" - printf "\\addlanguage{%s}{%s}{}{%s}{%s}" "${i}" "${file}" "${lefthyphenmin}" "${righthyphenmin}" >> "${S}/language.${PN}.def" || die + for i in $(echo $synonyms | tr ',' ' ') ; do + einfo "Generating language.def synonym $i for $@" + echo "\\addlanguage{$i}{$file}{}{$lefthyphenmin}{$righthyphenmin}" >> "${S}/language.${PN}.def" || die done fi } @@ -204,11 +204,11 @@ texlive-module_make_language_def_lines() { texlive-module_make_language_dat_lines() { local lefthyphenmin righthyphenmin synonyms name file file_patterns file_exceptions luaspecial eval $@ - einfo "Generating language.dat entry for $*" - echo "${name} ${file}" >> "${S}/language.${PN}.dat" || die + einfo "Generating language.dat entry for $@" + echo "$name $file" >> "${S}/language.${PN}.dat" || die if [[ -n ${synonyms} ]]; then - for i in $(echo "${synonyms}" | tr ',' ' ') ; do - einfo "Generating language.dat synonym ${i} for $*" + for i in $(echo ${synonyms} | tr ',' ' ') ; do + einfo "Generating language.dat synonym ${i} for $@" echo "=${i}" >> "${S}/language.${PN}.dat" || die done fi @@ -221,8 +221,8 @@ texlive-module_make_language_dat_lines() { texlive-module_synonyms_to_language_lua_line() { local prev="" - for i in $(echo "$@" | tr ',' ' ') ; do - printf "${prev} '%s'" "${i}" + for i in $(echo $@ | tr ',' ' ') ; do + printf "${prev} '%s'" ${i} prev="," done } @@ -240,7 +240,7 @@ texlive-module_make_language_lua_lines() { eval $@ [[ -z ${lefthyphenmin} ]] && lefthyphenmin="2" [[ -z ${righthyphenmin} ]] && righthyphenmin="3" - einfo "Generating language.dat.lua entry for $*" + einfo "Generating language.dat.lua entry for $@" printf "\t['%s'] = {\n" "${name}" >> "${dest}" || die printf "\t\tloader = '%s',\n" "${file}" >> "${dest}" || die printf "\t\tlefthyphenmin = %s,\n\t\trighthyphenmin = %s,\n" "${lefthyphenmin}" "${righthyphenmin}" >> "${dest}" || die