From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1111538-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 46990138334
for <garchives@archives.gentoo.org>; Tue, 17 Sep 2019 07:12:09 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 2D517E0AA6;
Tue, 17 Sep 2019 07:12:07 +0000 (UTC)
Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 12B5CE0AA6
for <gentoo-commits@lists.gentoo.org>; Tue, 17 Sep 2019 07:12:07 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 19B7A34B28D
for <gentoo-commits@lists.gentoo.org>; Tue, 17 Sep 2019 07:12:06 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id A96377F8
for <gentoo-commits@lists.gentoo.org>; Tue, 17 Sep 2019 07:12:02 +0000 (UTC)
From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" <mgorny@gentoo.org>
Message-ID: <1568704316.1ffd1b26731d512c0554282394d7f3e58d1fa6f7.mgorny@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/openjade/
X-VCS-Repository: repo/gentoo
X-VCS-Files: app-text/openjade/openjade-1.3.2-r9.ebuild
X-VCS-Directories: app-text/openjade/
X-VCS-Committer: mgorny
X-VCS-Committer-Name: Michał Górny
X-VCS-Revision: 1ffd1b26731d512c0554282394d7f3e58d1fa6f7
X-VCS-Branch: master
Date: Tue, 17 Sep 2019 07:12:02 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 6d4fe286-2035-4dfe-81ae-90c94f3c3c7c
X-Archives-Hash: 5226640df4562db62d1c7eb32d0efb17
commit: 1ffd1b26731d512c0554282394d7f3e58d1fa6f7
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 17 07:07:39 2019 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Sep 17 07:11:56 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ffd1b26
app-text/openjade: Restore .cat backup for non-empty too
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
app-text/openjade/openjade-1.3.2-r9.ebuild | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/app-text/openjade/openjade-1.3.2-r9.ebuild b/app-text/openjade/openjade-1.3.2-r9.ebuild
index 2d63798c3d7..9aa17662d63 100644
--- a/app-text/openjade/openjade-1.3.2-r9.ebuild
+++ b/app-text/openjade/openjade-1.3.2-r9.ebuild
@@ -124,8 +124,10 @@ pkg_preinst() {
}
pkg_postinst() {
- if [[ ! -f ${EROOT}/etc/sgml/${P}.cat ]]; then
- cp "${T}"/${P}.cat "${EROOT}"/etc/sgml/ || die
+ local backup=${T}/${P}.cat
+ local real=${EROOT}/etc/sgml/${P}.cat
+ if ! cmp -s "${backup}" "${real}"; then
+ cp "${backup}" "${real}" || die
fi
# this one's shared with docbook-dsssl, so we need to do it in postinst
if ! grep -q -s ${P}.cat \