--- /usr/portage/eclass/gnome2.eclass	2007-02-23 16:35:43.000000000 +0100
+++ gnome2.eclass	2007-03-11 10:45:16.000000000 +0100
@@ -106,6 +106,15 @@
 	rm -fr "${D}/usr/share/applications/mimeinfo.cache"
 }
 
+gnome2_pkg_preinst() {
+	pushd "${D}" 1>/dev/null
+	#export GNOME2_SCHEMAS=etc/gconf/schemas/*schemas
+	echo "(${D}/usr/share/icons/)"
+	export GNOME2_HAS_ICONS="no"
+	#[[ -d "${D}"/usr/share/icons/ ]] && export GNOME2_HAS_ICONS="yes"
+	popd 1>/dev/null
+}
+
 gnome2_pkg_postinst() {
 	gnome2_gconf_install
 	fdo-mime_desktop_database_update
@@ -131,4 +140,4 @@
 	fi
 }
 
-EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_postinst pkg_postrm
+EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm
--- /usr/portage/eclass/gnome2-utils.eclass	2007-01-24 19:35:48.000000000 +0100
+++ gnome2-utils.eclass	2007-03-11 10:51:55.000000000 +0100
@@ -94,14 +94,13 @@
 		return
 	fi
 
-	if ! grep -q "obj /usr/share/icons" ${ROOT}var/db/pkg/*/${PF}/CONTENTS
-	then
+	if [[ "${GNOME2_HAS_ICONS}" = "no" ]] ; then
 		debug-print "No items to update"
 
 		return
 	fi
 
-	ebegin "Updating icons cache"
+	ebegin "Updating icons cache (${GNOME2_HAS_ICONS})"
 
 	local retval=0
 	local fails=( )