| 1 |
These files are only regenerated when gensgmlenv is present, but this |
| 2 |
tool was part of sgmltools-lite, which was last-rited over a year ago. |
| 3 |
|
| 4 |
The presence of 93sgmltools-lite can break tools such as |
| 5 |
asciidoc. When SGML_CATALOG_FILES is defined, it automatically passes |
| 6 |
the --catalogs option to xmllint, which uses the obsolete variable |
| 7 |
over the updated catalogs listed in /etc/sgml/catalog. |
| 8 |
|
| 9 |
Signed-off-by: James Le Cuirot <chewi@g.o> |
| 10 |
--- |
| 11 |
eclass/sgml-catalog-r1.eclass | 18 +++++------------- |
| 12 |
1 file changed, 5 insertions(+), 13 deletions(-) |
| 13 |
|
| 14 |
diff --git a/eclass/sgml-catalog-r1.eclass b/eclass/sgml-catalog-r1.eclass |
| 15 |
index 1e1f17815ac4..9f8bb13d6095 100644 |
| 16 |
--- a/eclass/sgml-catalog-r1.eclass |
| 17 |
+++ b/eclass/sgml-catalog-r1.eclass |
| 18 |
@@ -1,4 +1,4 @@ |
| 19 |
-# Copyright 2019 Gentoo Authors |
| 20 |
+# Copyright 2019-2021 Gentoo Authors |
| 21 |
# Distributed under the terms of the GNU General Public License v2 |
| 22 |
|
| 23 |
# @ECLASS: sgml-catalog-r1.eclass |
| 24 |
@@ -9,9 +9,8 @@ |
| 25 |
# @SUPPORTED_EAPIS: 7 |
| 26 |
# @BLURB: Functions for installing SGML catalogs |
| 27 |
# @DESCRIPTION: |
| 28 |
-# This eclass regenerates /etc/sgml/catalog, /etc/sgml.{,c}env |
| 29 |
-# and /etc/env.d/93sgmltools-lite as necessary for the DocBook tooling. |
| 30 |
-# This is done via exported pkg_postinst and pkg_postrm phases. |
| 31 |
+# This eclass regenerates /etc/sgml/catalog as necessary for the DocBook |
| 32 |
+# tooling. This is done via exported pkg_postinst and pkg_postrm phases. |
| 33 |
|
| 34 |
case ${EAPI:-0} in |
| 35 |
7) ;; |
| 36 |
@@ -50,16 +49,9 @@ sgml-catalog-r1_update_catalog() { |
| 37 |
|
| 38 |
# @FUNCTION: sgml-catalog-r1_update_env |
| 39 |
# @DESCRIPTION: |
| 40 |
-# Regenerate environment variables and copy them to env.d. |
| 41 |
+# Remove obsolete environment files. They can break tools such as asciidoc. |
| 42 |
sgml-catalog-r1_update_env() { |
| 43 |
- # gensgmlenv doesn't support overriding root |
| 44 |
- if [[ -z ${ROOT} && -x "${EPREFIX}/usr/bin/gensgmlenv" ]]; then |
| 45 |
- ebegin "Regenerating SGML environment variables" |
| 46 |
- gensgmlenv && |
| 47 |
- grep -v export "${EPREFIX}/etc/sgml/sgml.env" > "${T}"/93sgmltools-lite && |
| 48 |
- mv "${T}"/93sgmltools-lite "${EPREFIX}/etc/env.d/93sgmltools-lite" |
| 49 |
- eend "${?}" |
| 50 |
- fi |
| 51 |
+ rm -f "${EROOT}"/etc/env.d/93sgmltools-lite "${EROOT}"/etc/sgml/sgml.{,c}env |
| 52 |
} |
| 53 |
|
| 54 |
sgml-catalog-r1_pkg_postinst() { |
| 55 |
-- |
| 56 |
2.34.1 |
Archives