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 }