gentoo resync : 08.10.2021

6 files changed, 35 insertions, 15 deletions

diff --git a/app-text/docbook-xml-dtd/Manifest b/app-text/docbook-xml-dtd/Manifest
index 512f534c1356..d8028ed023e7 100644
--- a/app-text/docbook-xml-dtd/Manifest
+++ b/app-text/docbook-xml-dtd/Manifest
@@ -3,9 +3,9 @@ DIST docbook-xml-4.2.zip 78428 BLAKE2B 542a2b658a10e0eee4928666a2edbdbff12e96dbc
 DIST docbook-xml-4.3.zip 83865 BLAKE2B d231a6e6ba3d8023d83358080d136880a5d65b4b3b135b2f60e3a784d2f2231d12e1e9d1b5284a7d3fa1b9281466591e0438adbf6160d33732e3611f5c58f21b SHA512 f5090fb74884bae3d4fac8a3c5060bffff5d6a74272de183c181a7642e4b91f4ed32ad028537d198010782c3d98575ce679672f76a9749ed124432195886a7cb
 DIST docbook-xml-4.4.zip 96107 BLAKE2B 3616c20758de6c14e08f2a9b32682da33be741153d4586c8062d6ff895f0158decc188c5e1db4f0caafbea14afb139e39bd6805842f7bedc18f0770d22e0d2d3 SHA512 7df5af4df24e4618b09814e4e20c147c722962531f03a40c28cd60f1db16b4c330420adf96adb7d66ed6eda84046ee91b467fd6f6fbfac2201537e2080735d76
 DIST docbook-xml-4.5.zip 98497 BLAKE2B 3487f4488a9e3dbc3e366d63b61940727287a97f4e0ee2d2dda031cbba96cd4d85e5b729b7ee4d32e8a6842748fc688f85c94e1a0ab2f7ebc062dd8c7b800e20 SHA512 1ee282fe86c9282610ee72c0e1d1acfc03f1afb9dc67166f438f2703109046479edb6329313ecb2949db27993077e077d111501c10b8769ebb20719eb6213d27
-EBUILD docbook-xml-dtd-4.1.2-r7.ebuild 1588 BLAKE2B 73d9a0d59518e3acb6a1dc3ec01769029161400642e1f686a7ea33a4cc0d409a88790d5f53418328b7bd07025f9eb0aa7da15a65717aaa20b7fe7e432f3a69ff SHA512 c02b1444770ea6ecdc73f194f9d1ea2d6651885465836f0a847ff90ae8ed727c58cfe7985b969c7158ff859b7a1e82a86f5f2cd9ee25020d507334bfa902a6d8
-EBUILD docbook-xml-dtd-4.2-r3.ebuild 1582 BLAKE2B 2b6bac21849b642d48efe05e64652697f956a726c34c396b7934baa2d1d360f510961dd64d401cd0c68070481c10cbdcf936d0e51c05d3ad999a1f3ac130f732 SHA512 264f0f2599dd323eee76760573b83ec3e5f9230e2e85a4aa3c5a9b2fac3b17f3022010ff24c59198c54bf411aff8d6d5ec67170a4b476a10447c07459b06ac4c
-EBUILD docbook-xml-dtd-4.3-r2.ebuild 1582 BLAKE2B 2b6bac21849b642d48efe05e64652697f956a726c34c396b7934baa2d1d360f510961dd64d401cd0c68070481c10cbdcf936d0e51c05d3ad999a1f3ac130f732 SHA512 264f0f2599dd323eee76760573b83ec3e5f9230e2e85a4aa3c5a9b2fac3b17f3022010ff24c59198c54bf411aff8d6d5ec67170a4b476a10447c07459b06ac4c
-EBUILD docbook-xml-dtd-4.4-r3.ebuild 1615 BLAKE2B 367eda96ba82a870d66e72d7e1d808be2505caf6bc264ff6bf6996e1d8cef8733078854aa42f324b7ae7ca16f0cd99c4c8a399aeab8100325eeb965c4cd9ccf2 SHA512 d5d109e9e80efbea312ae0669c1d050e0e0291f5877ffbfe522c01872accf833e0a9f2a45295b1ad51f585a949e47c25cb2d6e49ba9b4117c003cef64ae729ed
-EBUILD docbook-xml-dtd-4.5-r2.ebuild 1615 BLAKE2B 367eda96ba82a870d66e72d7e1d808be2505caf6bc264ff6bf6996e1d8cef8733078854aa42f324b7ae7ca16f0cd99c4c8a399aeab8100325eeb965c4cd9ccf2 SHA512 d5d109e9e80efbea312ae0669c1d050e0e0291f5877ffbfe522c01872accf833e0a9f2a45295b1ad51f585a949e47c25cb2d6e49ba9b4117c003cef64ae729ed
+EBUILD docbook-xml-dtd-4.1.2-r7.ebuild 1806 BLAKE2B 8017f7637b75bd1f93cd79afd4a2210119046afc36686bf5c970ba2e8f23040e6250fcb7347ce45f4999cc7f408432a8fddfe641f30799b557261c884835779a SHA512 fe7abd8eefb51b9123d91d1e1804bdf8ff62795eb19af0556b4c4d6e293ad864cd8f577131514e892318d7c76d4934c636a071dcf3164c595116fb8ac54d918f
+EBUILD docbook-xml-dtd-4.2-r3.ebuild 1800 BLAKE2B d2266ff1659bb71a0ce95854c028327c47e34faec2842c3f479a822d8818daa8eef152108eb5eb49931d53ca07fbab5dfb3ca60a69c94acfc5edfd33d5d47a30 SHA512 524ee2896ae4bbdb463eff7f6c9f3c6707a91b121e194b2528b9d1c287e56f588ede2f1764c5412e00fc1c3c793b01fcd18724a81c3874d814f5bf3caef5ac5a
+EBUILD docbook-xml-dtd-4.3-r2.ebuild 1800 BLAKE2B d2266ff1659bb71a0ce95854c028327c47e34faec2842c3f479a822d8818daa8eef152108eb5eb49931d53ca07fbab5dfb3ca60a69c94acfc5edfd33d5d47a30 SHA512 524ee2896ae4bbdb463eff7f6c9f3c6707a91b121e194b2528b9d1c287e56f588ede2f1764c5412e00fc1c3c793b01fcd18724a81c3874d814f5bf3caef5ac5a
+EBUILD docbook-xml-dtd-4.4-r3.ebuild 1833 BLAKE2B b3e8e7cba229bb5b1d7204a9a78c0cfb592cc5caef91b85257960a6e37515782e692a8396db3fa3b8ef7fdb8cc2dd734cff2134e2f18d5b2875bd1ae6ab44a9d SHA512 06b575f8767ece925d8c25265f168a7fc0532026a194f913e2cbca1fd2e3464a2aeb33c9c285491e6f5713b444ebab520c289eb4c3e387f29842ba4f496d49e5
+EBUILD docbook-xml-dtd-4.5-r2.ebuild 1833 BLAKE2B b3e8e7cba229bb5b1d7204a9a78c0cfb592cc5caef91b85257960a6e37515782e692a8396db3fa3b8ef7fdb8cc2dd734cff2134e2f18d5b2875bd1ae6ab44a9d SHA512 06b575f8767ece925d8c25265f168a7fc0532026a194f913e2cbca1fd2e3464a2aeb33c9c285491e6f5713b444ebab520c289eb4c3e387f29842ba4f496d49e5
 MISC metadata.xml 248 BLAKE2B f308d2aa052d11e427850af58bbebf95e7773f5562ed221f39043474b4c3827d724d49667edf1874272a5586a13201159f40e8f5eafb7e400e79c6566e1a6ac2 SHA512 b875c838394523483ae7d93585207eb3c642a345bbb08e1dcef3ceb737c813fa779e2f5479d48cdcc30732b8a0a9e6ecc648df940def6731e4dff43b23786e6d
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 f049bf68fffd..e3188ba498f9 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
@@ -51,14 +51,18 @@ pkg_preinst() {
 pkg_postinst() {
 	local backup=${T}/xml-docbook-${PV}.cat
 	local real=${EROOT}/etc/sgml/xml-docbook-${PV}.cat
+
 	if ! cmp -s "${backup}" "${real}"; then
 		cp "${backup}" "${real}" || die
 	fi
-	build-docbook-catalog
+
+	# See bug #816303 for rationale behind die
+	build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?"
 	sgml-catalog-r1_pkg_postinst
 }
 
 pkg_postrm() {
-	build-docbook-catalog
+	# See bug #816303 for rationale behind die
+	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 ee06649a6b4a..ee19a3db01c8 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
@@ -51,14 +51,18 @@ pkg_preinst() {
 pkg_postinst() {
 	local backup=${T}/xml-docbook-${PV}.cat
 	local real=${EROOT}/etc/sgml/xml-docbook-${PV}.cat
+
 	if ! cmp -s "${backup}" "${real}"; then
 		cp "${backup}" "${real}" || die
 	fi
-	build-docbook-catalog
+
+	# See bug #816303 for rationale behind die
+	build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?"
 	sgml-catalog-r1_pkg_postinst
 }
 
 pkg_postrm() {
-	build-docbook-catalog
+	# See bug #816303 for rationale behind die
+	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 ee06649a6b4a..ee19a3db01c8 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
@@ -51,14 +51,18 @@ pkg_preinst() {
 pkg_postinst() {
 	local backup=${T}/xml-docbook-${PV}.cat
 	local real=${EROOT}/etc/sgml/xml-docbook-${PV}.cat
+
 	if ! cmp -s "${backup}" "${real}"; then
 		cp "${backup}" "${real}" || die
 	fi
-	build-docbook-catalog
+
+	# See bug #816303 for rationale behind die
+	build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?"
 	sgml-catalog-r1_pkg_postinst
 }
 
 pkg_postrm() {
-	build-docbook-catalog
+	# See bug #816303 for rationale behind die
+	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 175a7581c5ed..b9ce7d99daff 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
@@ -52,14 +52,18 @@ pkg_preinst() {
 pkg_postinst() {
 	local backup=${T}/xml-docbook-${PV}.cat
 	local real=${EROOT}/etc/sgml/xml-docbook-${PV}.cat
+
 	if ! cmp -s "${backup}" "${real}"; then
 		cp "${backup}" "${real}" || die
 	fi
-	build-docbook-catalog
+
+	# See bug #816303 for rationale behind die
+	build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?"
 	sgml-catalog-r1_pkg_postinst
 }
 
 pkg_postrm() {
-	build-docbook-catalog
+	# See bug #816303 for rationale behind die
+	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 175a7581c5ed..b9ce7d99daff 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
@@ -52,14 +52,18 @@ pkg_preinst() {
 pkg_postinst() {
 	local backup=${T}/xml-docbook-${PV}.cat
 	local real=${EROOT}/etc/sgml/xml-docbook-${PV}.cat
+
 	if ! cmp -s "${backup}" "${real}"; then
 		cp "${backup}" "${real}" || die
 	fi
-	build-docbook-catalog
+
+	# See bug #816303 for rationale behind die
+	build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?"
 	sgml-catalog-r1_pkg_postinst
 }
 
 pkg_postrm() {
-	build-docbook-catalog
+	# See bug #816303 for rationale behind die
+	build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?"
 	sgml-catalog-r1_pkg_postrm
 }