*.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.

diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass
index feb6301221eaf92b9c33206e67f887c731d1a5fe..cb233e747605b7973d0ad35383c04d0794a43d1c 100644 (file)
--- 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 07b188d044f07476e69e2957e7d3341826b138c2..b43f0600e5e267971db92c9a7ff686b38c162792 100644 (file)
--- 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 b48dd4b46b159d0064fdade1b92c7af026e63104..256c59bc8737f4c73fa3ed583332b1a1f4f2354d 100644 (file)
--- 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 b91d0fe1eda365b301c9087c432eff8f287c996e..4cbcb8fa9a4ebfb6f0fe5b128e389718c81970b6 100644 (file)
--- 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
 }