commit: 0977b78999668cebc0aac4235ccf47d9502f1e00
Author: Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 4 08:10:03 2024 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Thu Apr 4 08:17:55 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0977b789
texlive-*.eclass: move update_tldb from texlive-module to texlive-common
The TexLive package database (tlpdb) also needs to be updated by
app-text/texlive-core, which only inherits texlive-common.eclass.
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
eclass/texlive-common.eclass | 54 ++++++++++++++++++++++++++++++++++++++++
eclass/texlive-module.eclass | 59 ++------------------------------------------
2 files changed, 56 insertions(+), 57 deletions(-)
diff --git a/eclass/texlive-common.eclass b/eclass/texlive-common.eclass
index e8a740df1f27..66d3999bd103 100644
--- a/eclass/texlive-common.eclass
+++ b/eclass/texlive-common.eclass
@@ -249,4 +249,58 @@ texlive-common_append_to_src_uri() {
fi
}
+# @FUNCTION: texlive-common_update_tlpdb
+# @DESCRIPTION:
+# Update the TexLive package database at /usr/share/tlpkg/texlive.tlpdb.
+texlive-common_update_tlpdb() {
+ [[ -v TL_PV && ${TL_PV} -lt 2023 ]] && return
+
+ # If we are updating this package, then there is no need to update
+ # the tlpdb in postrm, as it will be again updated in postinst.
+ [[ ${EBUILD_PHASE} == postrm && -n ${REPLACED_BY_VERSION} ]] && return
+
+ local tlpkg="${EROOT}"/usr/share/tlpkg
+ local tlpobj="${tlpkg}"/tlpobj
+ local tlpdb="${tlpkg}"/texlive.tlpdb
+
+ ebegin "Regenerating TexLive package database"
+
+ local new_tlpdb="${T}"/texlive.tlpdb
+
+ touch "${new_tlpdb}" || die
+
+ find "${tlpobj}" -maxdepth 1 -type f -name "*.tlpobj" -print0 |
+ sort -z |
+ xargs -0 --no-run-if-empty cat >> "${new_tlpdb}"
+ assert "generating tlpdb failed"
+
+ if [[ -f ${tlpdb} ]]; then
+ cmp -s "${new_tlpdb}" "${tlpdb}"
+ local ret=$?
+ case ${ret} in
+ # content equal
+ 0)
+ # Nothing to do, return.
+ eend 0
+ return
+ ;;
+ # content differs
+ 1)
+ ;;
+ # cmp failed with an error
+ *)
+ eend ${ret} "comparing new and existing tlpdb
failed (exit status: ${ret})"
+ die
+ ;;
+ esac
+ fi
+
+ mv "${new_tlpdb}" "${tlpdb}"
+ eend $? "moving tlpdb into position failed (exit status: ${?})" || die
+
+ if [[ ! -s ${tlpdb} ]]; then
+ rm "${tlpdb}" || die
+ fi
+}
+
fi
diff --git a/eclass/texlive-module.eclass b/eclass/texlive-module.eclass
index bfe5e12bf250..401b75bc4d11 100644
--- a/eclass/texlive-module.eclass
+++ b/eclass/texlive-module.eclass
@@ -420,61 +420,6 @@ texlive-module_src_install() {
texlive-common_handle_config_files
}
-# @FUNCTION: texlive-module_update_tlpdb
-# @DESCRIPTION:
-# Update the TexLive package database at /usr/share/tlpkg/texlive.tlpdb.
-
-texlive-module_update_tlpdb() {
- [[ ${TL_PV} -lt 2023 ]] && return
-
- # If we are updating this package, then there is no need to update
- # the tlpdb in postrm, as it will be again updated in postinst.
- [[ ${EBUILD_PHASE} == postrm && -n ${REPLACED_BY_VERSION} ]] && return
-
- local tlpkg="${EROOT}"/usr/share/tlpkg
- local tlpobj="${tlpkg}"/tlpobj
- local tlpdb="${tlpkg}"/texlive.tlpdb
-
- ebegin "Regenerating TexLive package database"
-
- local new_tlpdb="${T}"/texlive.tlpdb
-
- touch "${new_tlpdb}" || die
-
- find "${tlpobj}" -maxdepth 1 -type f -name "*.tlpobj" -print0 |
- sort -z |
- xargs -0 --no-run-if-empty cat >> "${new_tlpdb}"
- assert "generating tlpdb failed"
-
- if [[ -f ${tlpdb} ]]; then
- cmp -s "${new_tlpdb}" "${tlpdb}"
- local ret=$?
- case ${ret} in
- # content equal
- 0)
- # Nothing to do, return.
- eend 0
- return
- ;;
- # content differs
- 1)
- ;;
- # cmp failed with an error
- *)
- eend ${ret} "comparing new and existing tlpdb
failed (exit status: ${ret})"
- die
- ;;
- esac
- fi
-
- mv "${new_tlpdb}" "${tlpdb}"
- eend $? "moving tlpdb into position failed (exit status: ${?})" || die
-
- if [[ ! -s ${tlpdb} ]]; then
- rm "${tlpdb}" || die
- fi
-}
-
# @FUNCTION: texlive-module_pkg_postinst
# @DESCRIPTION:
# exported function:
@@ -483,7 +428,7 @@ texlive-module_update_tlpdb() {
texlive-module_pkg_postinst() {
etexmf-update
- texlive-module_update_tlpdb
+ texlive-common_update_tlpdb
[[ -n ${TL_MODULE_INFORMATION} ]] && elog "${TL_MODULE_INFORMATION}"
}
@@ -495,7 +440,7 @@ texlive-module_pkg_postinst() {
texlive-module_pkg_postrm() {
[[ -z ${REPLACED_BY_VERSION} ]] && etexmf-update
- texlive-module_update_tlpdb
+ texlive-common_update_tlpdb
}
fi
