commit: 1345f0ba22b2515512618d4d7f2b2f46d8843b26
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 16 07:45:00 2025 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Dec 16 07:47:27 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1345f0ba
app-text: call build-docbook-catalog with absolute path in pkg_postinst
build-docbook-catalog needs not to be in PATH, or the correct binary
when using ROOT. Similarly when using cross-Prefix setup. So ensure we
call the intended script by calling it by absolute path in EROOT.
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
app-text/build-docbook-catalog/build-docbook-catalog-2.3-r1.ebuild | 2 +-
app-text/build-docbook-catalog/build-docbook-catalog-2.4.ebuild | 4 +++-
app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r7.ebuild | 4 ++--
app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r3.ebuild | 4 ++--
app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r2.ebuild | 4 ++--
app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r3.ebuild | 4 ++--
app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r2.ebuild | 4 ++--
app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r3.ebuild | 4 ++--
.../docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r4.ebuild | 4 ++--
.../docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r3.ebuild | 4 ++--
.../docbook-xsl-ns-stylesheets-1.79.1.ebuild | 4 ++--
.../docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r4.ebuild | 4 ++--
12 files changed, 24 insertions(+), 22 deletions(-)
diff --git a/app-text/build-docbook-catalog/build-docbook-catalog-2.3-r1.ebuild
b/app-text/build-docbook-catalog/build-docbook-catalog-2.3-r1.ebuild
index 354ddb3a611e..82eba7ae87fc 100644
--- a/app-text/build-docbook-catalog/build-docbook-catalog-2.3-r1.ebuild
+++ b/app-text/build-docbook-catalog/build-docbook-catalog-2.3-r1.ebuild
@@ -34,5 +34,5 @@ src_configure() {
pkg_postinst() {
# New version -> regen files
# See bug #816303 for rationale behind die
- build-docbook-catalog || die "Failed to regenerate docbook catalog."
+ "${EROOT}"/usr/sbin/build-docbook-catalog || die "Failed to regenerate
docbook catalog."
}
diff --git a/app-text/build-docbook-catalog/build-docbook-catalog-2.4.ebuild
b/app-text/build-docbook-catalog/build-docbook-catalog-2.4.ebuild
index 354ddb3a611e..7d2c37c87724 100644
--- a/app-text/build-docbook-catalog/build-docbook-catalog-2.4.ebuild
+++ b/app-text/build-docbook-catalog/build-docbook-catalog-2.4.ebuild
@@ -34,5 +34,7 @@ src_configure() {
pkg_postinst() {
# New version -> regen files
# See bug #816303 for rationale behind die
- build-docbook-catalog || die "Failed to regenerate docbook catalog."
+ # build-docbook-catalog needs not to be in PATH when using ROOT or
+ # cross-EPREFIX merging
+ "${EROOT}"/usr/sbin/build-docbook-catalog || die "Failed to regenerate
docbook catalog."
}
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r7.ebuild
b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r7.ebuild
index c8245c85bfa4..5274535acb80 100644
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r7.ebuild
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r7.ebuild
@@ -57,12 +57,12 @@ pkg_postinst() {
fi
# See bug #816303 for rationale behind die
- build-docbook-catalog || die "Failed to regenerate docbook catalog. Is
/run mounted?"
+ "${EROOT}"/usr/sbin/build-docbook-catalog || die "Failed to regenerate
docbook catalog. Is /run mounted?"
sgml-catalog-r1_pkg_postinst
}
pkg_postrm() {
# See bug #816303 for rationale behind die
- build-docbook-catalog || die "Failed to regenerate docbook catalog. Is
/run mounted?"
+ "${EROOT}"/usr/sbin/build-docbook-catalog || die "Failed to regenerate
docbook catalog. Is /run mounted?"
sgml-catalog-r1_pkg_postrm
}
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r3.ebuild
b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r3.ebuild
index dbaf0f1c3dbb..30ef28ff0392 100644
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r3.ebuild
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r3.ebuild
@@ -57,12 +57,12 @@ pkg_postinst() {
fi
# See bug #816303 for rationale behind die
- build-docbook-catalog || die "Failed to regenerate docbook catalog. Is
/run mounted?"
+ "${EROOT}"/usr/sbin/build-docbook-catalog || die "Failed to regenerate
docbook catalog. Is /run mounted?"
sgml-catalog-r1_pkg_postinst
}
pkg_postrm() {
# See bug #816303 for rationale behind die
- build-docbook-catalog || die "Failed to regenerate docbook catalog. Is
/run mounted?"
+ "${EROOT}"/usr/sbin/build-docbook-catalog || die "Failed to regenerate
docbook catalog. Is /run mounted?"
sgml-catalog-r1_pkg_postrm
}
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r2.ebuild
b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r2.ebuild
index dbaf0f1c3dbb..30ef28ff0392 100644
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r2.ebuild
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r2.ebuild
@@ -57,12 +57,12 @@ pkg_postinst() {
fi
# See bug #816303 for rationale behind die
- build-docbook-catalog || die "Failed to regenerate docbook catalog. Is
/run mounted?"
+ "${EROOT}"/usr/sbin/build-docbook-catalog || die "Failed to regenerate
docbook catalog. Is /run mounted?"
sgml-catalog-r1_pkg_postinst
}
pkg_postrm() {
# See bug #816303 for rationale behind die
- build-docbook-catalog || die "Failed to regenerate docbook catalog. Is
/run mounted?"
+ "${EROOT}"/usr/sbin/build-docbook-catalog || die "Failed to regenerate
docbook catalog. Is /run mounted?"
sgml-catalog-r1_pkg_postrm
}
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r3.ebuild
b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r3.ebuild
index ad762db256ad..e5862d048326 100644
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r3.ebuild
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r3.ebuild
@@ -58,12 +58,12 @@ pkg_postinst() {
fi
# See bug #816303 for rationale behind die
- build-docbook-catalog || die "Failed to regenerate docbook catalog. Is
/run mounted?"
+ "${EROOT}"/usr/sbin/build-docbook-catalog || die "Failed to regenerate
docbook catalog. Is /run mounted?"
sgml-catalog-r1_pkg_postinst
}
pkg_postrm() {
# See bug #816303 for rationale behind die
- build-docbook-catalog || die "Failed to regenerate docbook catalog. Is
/run mounted?"
+ "${EROOT}"/usr/sbin/build-docbook-catalog || die "Failed to regenerate
docbook catalog. Is /run mounted?"
sgml-catalog-r1_pkg_postrm
}
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r2.ebuild
b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r2.ebuild
index ad762db256ad..e5862d048326 100644
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r2.ebuild
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r2.ebuild
@@ -58,12 +58,12 @@ pkg_postinst() {
fi
# See bug #816303 for rationale behind die
- build-docbook-catalog || die "Failed to regenerate docbook catalog. Is
/run mounted?"
+ "${EROOT}"/usr/sbin/build-docbook-catalog || die "Failed to regenerate
docbook catalog. Is /run mounted?"
sgml-catalog-r1_pkg_postinst
}
pkg_postrm() {
# See bug #816303 for rationale behind die
- build-docbook-catalog || die "Failed to regenerate docbook catalog. Is
/run mounted?"
+ "${EROOT}"/usr/sbin/build-docbook-catalog || die "Failed to regenerate
docbook catalog. Is /run mounted?"
sgml-catalog-r1_pkg_postrm
}
diff --git
a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r3.ebuild
b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r3.ebuild
index 71e79e2aad67..e05edd36be6a 100644
--- a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r3.ebuild
+++ b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r3.ebuild
@@ -44,12 +44,12 @@ pkg_postinst() {
fi
# See bug #816303 for rationale behind die
- build-docbook-catalog || die "Failed to regenerate docbook catalog. Is
/run mounted?"
+ "${EROOT}"/usr/sbin/build-docbook-catalog || die "Failed to regenerate
docbook catalog. Is /run mounted?"
sgml-catalog-r1_pkg_postinst
}
pkg_postrm() {
# See bug #816303 for rationale behind die
- build-docbook-catalog || die "Failed to regenerate docbook catalog. Is
/run mounted?"
+ "${EROOT}"/usr/sbin/build-docbook-catalog || die "Failed to regenerate
docbook catalog. Is /run mounted?"
sgml-catalog-r1_pkg_postrm
}
diff --git
a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r4.ebuild
b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r4.ebuild
index aeb6f1f2820e..9239634ebfb5 100644
--- a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r4.ebuild
+++ b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r4.ebuild
@@ -47,12 +47,12 @@ pkg_postinst() {
fi
# See bug #816303 for rationale behind die
- build-docbook-catalog || die "Failed to regenerate docbook catalog. Is
/run mounted?"
+ "${EROOT}"/usr/sbin/build-docbook-catalog || die "Failed to regenerate
docbook catalog. Is /run mounted?"
sgml-catalog-r1_pkg_postinst
}
pkg_postrm() {
# See bug #816303 for rationale behind die
- build-docbook-catalog || die "Failed to regenerate docbook catalog. Is
/run mounted?"
+ "${EROOT}"/usr/sbin/build-docbook-catalog || die "Failed to regenerate
docbook catalog. Is /run mounted?"
sgml-catalog-r1_pkg_postrm
}
diff --git
a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r3.ebuild
b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r3.ebuild
index 7c507b36e4d0..69eb28f890eb 100644
--- a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r3.ebuild
+++ b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r3.ebuild
@@ -44,12 +44,12 @@ pkg_postinst() {
fi
# See bug #816303 for rationale behind die
- build-docbook-catalog || die "Failed to regenerate docbook catalog. Is
/run mounted?"
+ "${EROOT}"/usr/sbin/build-docbook-catalog || die "Failed to regenerate
docbook catalog. Is /run mounted?"
sgml-catalog-r1_pkg_postinst
}
pkg_postrm() {
# See bug #816303 for rationale behind die
- build-docbook-catalog || die "Failed to regenerate docbook catalog. Is
/run mounted?"
+ "${EROOT}"/usr/sbin/build-docbook-catalog || die "Failed to regenerate
docbook catalog. Is /run mounted?"
sgml-catalog-r1_pkg_postrm
}
diff --git
a/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.79.1.ebuild
b/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.79.1.ebuild
index 39ee587c3759..af23f5e4f21d 100644
---
a/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.79.1.ebuild
+++
b/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.79.1.ebuild
@@ -73,10 +73,10 @@ EOF
pkg_postinst() {
# See bug #816303 for rationale behind die
- build-docbook-catalog || die "Failed to regenerate docbook catalog. Is
/run mounted?"
+ "${EROOT}"/usr/sbin/build-docbook-catalog || die "Failed to regenerate
docbook catalog. Is /run mounted?"
}
pkg_postrm() {
# See bug #816303 for rationale behind die
- build-docbook-catalog || die "Failed to regenerate docbook catalog. Is
/run mounted?"
+ "${EROOT}"/usr/sbin/build-docbook-catalog || die "Failed to regenerate
docbook catalog. Is /run mounted?"
}
diff --git
a/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r4.ebuild
b/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r4.ebuild
index 5c3b44931e32..e92109d0c5df 100644
--- a/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r4.ebuild
+++ b/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r4.ebuild
@@ -88,10 +88,10 @@ src_install() {
pkg_postinst() {
# See bug #816303 for rationale behind die
- build-docbook-catalog || die "Failed to regenerate docbook catalog. Is
/run mounted?"
+ "${EROOT}"/usr/sbin/build-docbook-catalog || die "Failed to regenerate
docbook catalog. Is /run mounted?"
}
pkg_postrm() {
# See bug #816303 for rationale behind die
- build-docbook-catalog || die "Failed to regenerate docbook catalog. Is
/run mounted?"
+ "${EROOT}"/usr/sbin/build-docbook-catalog || die "Failed to regenerate
docbook catalog. Is /run mounted?"
}
