Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/docbook-xml-simple-dtd/
Date: Tue, 17 Sep 2019 07:12:07
Message-Id: 1568704313.3009bf38b7da4e92990c197f7d8e4d2d2b0bfec9.mgorny@gentoo
1 commit: 3009bf38b7da4e92990c197f7d8e4d2d2b0bfec9
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Tue Sep 17 07:07:34 2019 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Tue Sep 17 07:11:53 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3009bf38
7
8 app-text/docbook-xml-simple-dtd: Restore .cat backup for non-empty too
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 .../docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r3.ebuild | 6 ++++--
13 .../docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r4.ebuild | 6 ++++--
14 .../docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r3.ebuild | 6 ++++--
15 3 files changed, 12 insertions(+), 6 deletions(-)
16
17 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
18 index ca6929bbed3..19a3541028b 100644
19 --- a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r3.ebuild
20 +++ b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r3.ebuild
21 @@ -36,8 +36,10 @@ pkg_preinst() {
22 }
23
24 pkg_postinst() {
25 - if [[ ! -f ${EROOT}/etc/sgml/xml-simple-docbook-${PV}.cat ]]; then
26 - cp "${T}"/xml-simple-docbook-${PV}.cat "${EROOT}"/etc/sgml/ || die
27 + local backup=${T}/xml-simple-docbook-${PV}.cat
28 + local real=${EROOT}/etc/sgml/xml-simple-docbook-${PV}.cat
29 + if ! cmp -s "${backup}" "${real}"; then
30 + cp "${backup}" "${real}" || die
31 fi
32 build-docbook-catalog
33 sgml-catalog-r1_pkg_postinst
34
35 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
36 index d4e1735315d..bd0a32a10e5 100644
37 --- a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r4.ebuild
38 +++ b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r4.ebuild
39 @@ -39,8 +39,10 @@ pkg_preinst() {
40 }
41
42 pkg_postinst() {
43 - if [[ ! -f ${EROOT}/etc/sgml/xml-simple-docbook-${PV}.cat ]]; then
44 - cp "${T}"/xml-simple-docbook-${PV}.cat "${EROOT}"/etc/sgml/ || die
45 + local backup=${T}/xml-simple-docbook-${PV}.cat
46 + local real=${EROOT}/etc/sgml/xml-simple-docbook-${PV}.cat
47 + if ! cmp -s "${backup}" "${real}"; then
48 + cp "${backup}" "${real}" || die
49 fi
50 build-docbook-catalog
51 sgml-catalog-r1_pkg_postinst
52
53 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
54 index b818a587508..e68783e3d12 100644
55 --- a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r3.ebuild
56 +++ b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r3.ebuild
57 @@ -36,8 +36,10 @@ pkg_preinst() {
58 }
59
60 pkg_postinst() {
61 - if [[ ! -f ${EROOT}/etc/sgml/xml-simple-docbook-${PV}.cat ]]; then
62 - cp "${T}"/xml-simple-docbook-${PV}.cat "${EROOT}"/etc/sgml/ || die
63 + local backup=${T}/xml-simple-docbook-${PV}.cat
64 + local real=${EROOT}/etc/sgml/xml-simple-docbook-${PV}.cat
65 + if ! cmp -s "${backup}" "${real}"; then
66 + cp "${backup}" "${real}" || die
67 fi
68 build-docbook-catalog
69 sgml-catalog-r1_pkg_postinst