From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-971687-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 027B61396D0
for <garchives@archives.gentoo.org>; Sat, 9 Sep 2017 11:16:08 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 579181FC054;
Sat, 9 Sep 2017 11:16:08 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(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 373171FC054
for <gentoo-commits@lists.gentoo.org>; Sat, 9 Sep 2017 11:16:08 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(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 1596E3416A5
for <gentoo-commits@lists.gentoo.org>; Sat, 9 Sep 2017 11:16:07 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 7E93C8F52
for <gentoo-commits@lists.gentoo.org>; Sat, 9 Sep 2017 11:16:05 +0000 (UTC)
From: "Johannes Huber" <johu@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, "Johannes Huber" <johu@gentoo.org>
Message-ID: <1504955720.58a5081de7ff55cd0661013ae65b825a4e04f2e7.johu@gentoo>
Subject: [gentoo-commits] proj/kde:master commit in: eclass/
X-VCS-Repository: proj/kde
X-VCS-Files: eclass/kde4-base.eclass eclass/kde5.eclass
X-VCS-Directories: eclass/
X-VCS-Committer: johu
X-VCS-Committer-Name: Johannes Huber
X-VCS-Revision: 58a5081de7ff55cd0661013ae65b825a4e04f2e7
X-VCS-Branch: master
Date: Sat, 9 Sep 2017 11:16:05 +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-Archives-Salt: b6751d16-f013-4ee5-8a8f-ef2035f94184
X-Archives-Hash: e1dba3e8ffbc25c43e15ff0741b00209
commit: 58a5081de7ff55cd0661013ae65b825a4e04f2e7
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 9 11:15:20 2017 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Sep 9 11:15:20 2017 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=58a5081d
*.eclass: Include GNOME2_ECLASS_ICONS condition in postrm as well
The original GNOME2_ECLASS_ICONS patch has moved the condition from
gnome2_icon_cache_update to postinst phases of functions using
the preinst/postinst logic but accidentally omitted postrm. Include it
there as well to restore the old behavior.
eclass/kde4-base.eclass | 4 +++-
eclass/kde5.eclass | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index ec1082c835..0348a5f80f 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -1013,7 +1013,9 @@ kde4-base_pkg_postinst() {
kde4-base_pkg_postrm() {
debug-print-function ${FUNCNAME} "$@"
- gnome2_icon_cache_update
+ if [[ -n ${GNOME2_ECLASS_ICONS} ]]; then
+ gnome2_icon_cache_update
+ fi
fdo-mime_desktop_database_update
fdo-mime_mime_database_update
buildsycoca
diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 59fe12b9de..9870e73a2f 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -733,7 +733,9 @@ kde5_pkg_postinst() {
kde5_pkg_postrm() {
debug-print-function ${FUNCNAME} "$@"
- gnome2_icon_cache_update
+ if [[ -n ${GNOME2_ECLASS_ICONS} ]]; then
+ gnome2_icon_cache_update
+ fi
xdg_pkg_postrm
}