[gentoo-commits] repo/gentoo:master commit in: app-text/docbook-xml-simple-dtd/

[Michał Górny]

commit:     3009bf38b7da4e92990c197f7d8e4d2d2b0bfec9
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 17 07:07:34 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Sep 17 07:11:53 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3009bf38

app-text/docbook-xml-simple-dtd: Restore .cat backup for non-empty too

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 .../docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r3.ebuild     | 6 ++++--
 .../docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r4.ebuild | 6 ++++--
 .../docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r3.ebuild | 6 ++++--
 3 files changed, 12 insertions(+), 6 deletions(-)

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 ca6929bbed3..19a3541028b 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
@@ -36,8 +36,10 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-       if [[ ! -f ${EROOT}/etc/sgml/xml-simple-docbook-${PV}.cat ]]; then
-               cp "${T}"/xml-simple-docbook-${PV}.cat "${EROOT}"/etc/sgml/ || 
die
+       local backup=${T}/xml-simple-docbook-${PV}.cat
+       local real=${EROOT}/etc/sgml/xml-simple-docbook-${PV}.cat
+       if ! cmp -s "${backup}" "${real}"; then
+               cp "${backup}" "${real}" || die
        fi
        build-docbook-catalog
        sgml-catalog-r1_pkg_postinst

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 d4e1735315d..bd0a32a10e5 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
@@ -39,8 +39,10 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-       if [[ ! -f ${EROOT}/etc/sgml/xml-simple-docbook-${PV}.cat ]]; then
-               cp "${T}"/xml-simple-docbook-${PV}.cat "${EROOT}"/etc/sgml/ || 
die
+       local backup=${T}/xml-simple-docbook-${PV}.cat
+       local real=${EROOT}/etc/sgml/xml-simple-docbook-${PV}.cat
+       if ! cmp -s "${backup}" "${real}"; then
+               cp "${backup}" "${real}" || die
        fi
        build-docbook-catalog
        sgml-catalog-r1_pkg_postinst

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 b818a587508..e68783e3d12 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
@@ -36,8 +36,10 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-       if [[ ! -f ${EROOT}/etc/sgml/xml-simple-docbook-${PV}.cat ]]; then
-               cp "${T}"/xml-simple-docbook-${PV}.cat "${EROOT}"/etc/sgml/ || 
die
+       local backup=${T}/xml-simple-docbook-${PV}.cat
+       local real=${EROOT}/etc/sgml/xml-simple-docbook-${PV}.cat
+       if ! cmp -s "${backup}" "${real}"; then
+               cp "${backup}" "${real}" || die
        fi
        build-docbook-catalog
        sgml-catalog-r1_pkg_postinst