Index: gnome2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v
retrieving revision 1.75
diff -u -b -B -r1.75 gnome2.eclass
--- gnome2.eclass	31 Oct 2006 17:08:44 -0000	1.75
+++ gnome2.eclass	23 Nov 2006 05:30:50 -0000
@@ -112,7 +112,7 @@
 
 		local contents="${ROOT}/var/db/pkg/*/${PN}-${PVR}/CONTENTS"
 
-		for F in $(grep "^obj /etc/gconf/schemas/.\+\.schemas\b" ${contents} | gawk '{print $2}' ); do
+		for F in $(< "${T}"/installed-schemas); do
 			if [[ -e "${F}" ]]; then
 				# echo "DEBUG::gconf install  ${F}"
 				${GCONFTOOL_BIN} --makefile-install-rule ${F} 1>/dev/null
@@ -157,7 +157,7 @@
 		return
 	fi
 
-	if ! grep -q "obj /usr/share/icons" ${ROOT}/var/db/pkg/*/${PF}/CONTENTS
+	if [[ -e "${T}"/GNOME2_HAS_ICONS ]] 
 	then
 		debug-print "No items to update"
 
@@ -274,6 +274,11 @@
 	fi
 }
 
+gnome2_pkg_preinst() {
+	echo "${D}"/etc/gconf/schemas/*schemas >"${T}"/installed-schemas
+	[[ -d "${D}"/usr/share/icons/ ]] && > "${T}"/GNOME2_HAS_ICONS
+}
+
 gnome2_pkg_postinst() {
 	gnome2_gconf_install
 	gnome2_scrollkeeper_update
@@ -293,4 +298,4 @@
 	gnome2_icon_cache_update
 }
 
-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