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-dtd/
Date: Tue, 17 Sep 2019 07:12:07
Message-Id: 1568704312.c2dcf16a1ca58a9e7b9b932aaccd43454dcfeb21.mgorny@gentoo
1 commit: c2dcf16a1ca58a9e7b9b932aaccd43454dcfeb21
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Tue Sep 17 07:07:33 2019 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Tue Sep 17 07:11:52 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2dcf16a
7
8 app-text/docbook-xml-dtd: Restore .cat backup for non-empty too
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r7.ebuild | 6 ++++--
13 app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r3.ebuild | 6 ++++--
14 app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r2.ebuild | 6 ++++--
15 app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r3.ebuild | 6 ++++--
16 app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r2.ebuild | 6 ++++--
17 5 files changed, 20 insertions(+), 10 deletions(-)
18
19 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
20 index fdf2ac2ad67..9d06ca5a515 100644
21 --- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r7.ebuild
22 +++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r7.ebuild
23 @@ -49,8 +49,10 @@ pkg_preinst() {
24 }
25
26 pkg_postinst() {
27 - if [[ ! -f ${EROOT}/etc/sgml/xml-docbook-${PV}.cat ]]; then
28 - cp "${T}"/xml-docbook-${PV}.cat "${EROOT}"/etc/sgml/ || die
29 + local backup=${T}/xml-docbook-${PV}.cat
30 + local real=${EROOT}/etc/sgml/xml-docbook-${PV}.cat
31 + if ! cmp -s "${backup}" "${real}"; then
32 + cp "${backup}" "${real}" || die
33 fi
34 build-docbook-catalog
35 sgml-catalog-r1_pkg_postinst
36
37 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
38 index db788fca68f..2864178f068 100644
39 --- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r3.ebuild
40 +++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r3.ebuild
41 @@ -49,8 +49,10 @@ pkg_preinst() {
42 }
43
44 pkg_postinst() {
45 - if [[ ! -f ${EROOT}/etc/sgml/xml-docbook-${PV}.cat ]]; then
46 - cp "${T}"/xml-docbook-${PV}.cat "${EROOT}"/etc/sgml/ || die
47 + local backup=${T}/xml-docbook-${PV}.cat
48 + local real=${EROOT}/etc/sgml/xml-docbook-${PV}.cat
49 + if ! cmp -s "${backup}" "${real}"; then
50 + cp "${backup}" "${real}" || die
51 fi
52 build-docbook-catalog
53 sgml-catalog-r1_pkg_postinst
54
55 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
56 index db788fca68f..2864178f068 100644
57 --- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r2.ebuild
58 +++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r2.ebuild
59 @@ -49,8 +49,10 @@ pkg_preinst() {
60 }
61
62 pkg_postinst() {
63 - if [[ ! -f ${EROOT}/etc/sgml/xml-docbook-${PV}.cat ]]; then
64 - cp "${T}"/xml-docbook-${PV}.cat "${EROOT}"/etc/sgml/ || die
65 + local backup=${T}/xml-docbook-${PV}.cat
66 + local real=${EROOT}/etc/sgml/xml-docbook-${PV}.cat
67 + if ! cmp -s "${backup}" "${real}"; then
68 + cp "${backup}" "${real}" || die
69 fi
70 build-docbook-catalog
71 sgml-catalog-r1_pkg_postinst
72
73 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
74 index d0987c01141..fb841c4266b 100644
75 --- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r3.ebuild
76 +++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r3.ebuild
77 @@ -50,8 +50,10 @@ pkg_preinst() {
78 }
79
80 pkg_postinst() {
81 - if [[ ! -f ${EROOT}/etc/sgml/xml-docbook-${PV}.cat ]]; then
82 - cp "${T}"/xml-docbook-${PV}.cat "${EROOT}"/etc/sgml/ || die
83 + local backup=${T}/xml-docbook-${PV}.cat
84 + local real=${EROOT}/etc/sgml/xml-docbook-${PV}.cat
85 + if ! cmp -s "${backup}" "${real}"; then
86 + cp "${backup}" "${real}" || die
87 fi
88 build-docbook-catalog
89 sgml-catalog-r1_pkg_postinst
90
91 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
92 index d0987c01141..fb841c4266b 100644
93 --- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r2.ebuild
94 +++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r2.ebuild
95 @@ -50,8 +50,10 @@ pkg_preinst() {
96 }
97
98 pkg_postinst() {
99 - if [[ ! -f ${EROOT}/etc/sgml/xml-docbook-${PV}.cat ]]; then
100 - cp "${T}"/xml-docbook-${PV}.cat "${EROOT}"/etc/sgml/ || die
101 + local backup=${T}/xml-docbook-${PV}.cat
102 + local real=${EROOT}/etc/sgml/xml-docbook-${PV}.cat
103 + if ! cmp -s "${backup}" "${real}"; then
104 + cp "${backup}" "${real}" || die
105 fi
106 build-docbook-catalog
107 sgml-catalog-r1_pkg_postinst