commit: 385cffdb297bd3976244d43d5d8e908d67001c20
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 31 11:42:36 2021 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Tue Jan 25 23:37:26 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=385cffdb
sgml-catalog-r1.eclass: Remove obsolete environment files
These files are only regenerated when gensgmlenv is present, but this
tool was part of sgmltools-lite, which was last-rited over a year ago.
The presence of 93sgmltools-lite can break tools such as
asciidoc. When SGML_CATALOG_FILES is defined, it automatically passes
the --catalogs option to xmllint, which uses the obsolete variable
over the updated catalogs listed in /etc/sgml/catalog.
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
eclass/sgml-catalog-r1.eclass | 18 +++++-------------
1 file changed, 5 insertions(+), 13 deletions(-)
diff --git a/eclass/sgml-catalog-r1.eclass b/eclass/sgml-catalog-r1.eclass
index 1e1f17815ac4..9f8bb13d6095 100644
--- a/eclass/sgml-catalog-r1.eclass
+++ b/eclass/sgml-catalog-r1.eclass
@@ -1,4 +1,4 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# @ECLASS: sgml-catalog-r1.eclass
@@ -9,9 +9,8 @@
# @SUPPORTED_EAPIS: 7
# @BLURB: Functions for installing SGML catalogs
# @DESCRIPTION:
-# This eclass regenerates /etc/sgml/catalog, /etc/sgml.{,c}env
-# and /etc/env.d/93sgmltools-lite as necessary for the DocBook tooling.
-# This is done via exported pkg_postinst and pkg_postrm phases.
+# This eclass regenerates /etc/sgml/catalog as necessary for the DocBook
+# tooling. This is done via exported pkg_postinst and pkg_postrm phases.
case ${EAPI:-0} in
7) ;;
@@ -50,16 +49,9 @@ sgml-catalog-r1_update_catalog() {
# @FUNCTION: sgml-catalog-r1_update_env
# @DESCRIPTION:
-# Regenerate environment variables and copy them to env.d.
+# Remove obsolete environment files. They can break tools such as asciidoc.
sgml-catalog-r1_update_env() {
- # gensgmlenv doesn't support overriding root
- if [[ -z ${ROOT} && -x "${EPREFIX}/usr/bin/gensgmlenv" ]]; then
- ebegin "Regenerating SGML environment variables"
- gensgmlenv &&
- grep -v export "${EPREFIX}/etc/sgml/sgml.env" >
"${T}"/93sgmltools-lite &&
- mv "${T}"/93sgmltools-lite
"${EPREFIX}/etc/env.d/93sgmltools-lite"
- eend "${?}"
- fi
+ rm -f "${EROOT}"/etc/env.d/93sgmltools-lite
"${EROOT}"/etc/sgml/sgml.{,c}env
}
sgml-catalog-r1_pkg_postinst() {
