summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2017-07-08 21:47:26 +0200
committerMichał Górny <mgorny@gentoo.org>2017-09-08 09:32:25 +0200
commitedb22af023c9c0f3e4bce5d04d5f42482ffb909c (patch)
tree70d4d0dc2972c201bb4a52320df6bde58086663a
parentfdo-mime.eclass: Mark the eclass as deprecated (diff)
downloadgentoo-edb22af023c9c0f3e4bce5d04d5f42482ffb909c.tar.gz
gentoo-edb22af023c9c0f3e4bce5d04d5f42482ffb909c.tar.bz2
gentoo-edb22af023c9c0f3e4bce5d04d5f42482ffb909c.zip
*.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.
-rw-r--r--eclass/gnome2.eclass4
-rw-r--r--eclass/kde4-base.eclass4
-rw-r--r--eclass/kde5.eclass4
-rw-r--r--eclass/xfconf.eclass4
4 files changed, 12 insertions, 4 deletions
diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass
index feb6301221ea..cb233e747605 100644
--- a/eclass/gnome2.eclass
+++ b/eclass/gnome2.eclass
@@ -359,7 +359,9 @@ gnome2_pkg_postinst() {
# Handle scrollkeeper, GSettings, Icons, desktop and mime database updates.
gnome2_pkg_postrm() {
xdg_pkg_postrm
- gnome2_icon_cache_update
+ if [[ -n ${GNOME2_ECLASS_ICONS} ]]; then
+ gnome2_icon_cache_update
+ fi
gnome2_schemas_update
gnome2_scrollkeeper_update
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index 07b188d044f0..b43f0600e5e2 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -950,7 +950,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 b48dd4b46b15..256c59bc8737 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -803,7 +803,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
}
diff --git a/eclass/xfconf.eclass b/eclass/xfconf.eclass
index b91d0fe1eda3..4cbcb8fa9a4e 100644
--- a/eclass/xfconf.eclass
+++ b/eclass/xfconf.eclass
@@ -151,5 +151,7 @@ xfconf_pkg_postrm() {
debug-print-function ${FUNCNAME} "$@"
fdo-mime_desktop_database_update
fdo-mime_mime_database_update
- gnome2_icon_cache_update
+ if [[ -n ${GNOME2_ECLASS_ICONS} ]]; then
+ gnome2_icon_cache_update
+ fi
}