From 0fff67f78401feffda2557aad7b263e3590fd324 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 12 Jan 2026 07:11:00 +0000 Subject: [PATCH] app-text/build-docbook-catalog: Sync with Gentoo It's from Gentoo commit 2d25fad95cbaa525c8945d8e582c749d49524f49. Signed-off-by: Flatcar Buildbot --- .../build-docbook-catalog-2.3-r1.ebuild | 4 ++-- .../build-docbook-catalog/build-docbook-catalog-2.4.ebuild | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/app-text/build-docbook-catalog/build-docbook-catalog-2.3-r1.ebuild b/sdk_container/src/third_party/portage-stable/app-text/build-docbook-catalog/build-docbook-catalog-2.3-r1.ebuild index 354ddb3a61..4f48e24616 100644 --- a/sdk_container/src/third_party/portage-stable/app-text/build-docbook-catalog/build-docbook-catalog-2.3-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-text/build-docbook-catalog/build-docbook-catalog-2.3-r1.ebuild @@ -9,7 +9,7 @@ SRC_URI="https://gitweb.gentoo.org/proj/build-docbook-catalog.git/snapshot/${P}. LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris" RDEPEND=" dev-libs/libxml2 @@ -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/sdk_container/src/third_party/portage-stable/app-text/build-docbook-catalog/build-docbook-catalog-2.4.ebuild b/sdk_container/src/third_party/portage-stable/app-text/build-docbook-catalog/build-docbook-catalog-2.4.ebuild index 354ddb3a61..868df2f6fb 100644 --- a/sdk_container/src/third_party/portage-stable/app-text/build-docbook-catalog/build-docbook-catalog-2.4.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-text/build-docbook-catalog/build-docbook-catalog-2.4.ebuild @@ -9,7 +9,7 @@ SRC_URI="https://gitweb.gentoo.org/proj/build-docbook-catalog.git/snapshot/${P}. LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris" RDEPEND=" dev-libs/libxml2 @@ -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." }