Attachment #115655 for bug #155993




	rm -fr "${D}/usr/share/applications/mimeinfo.cache"
}

gnome2_pkg_preinst() {
	pushd "${D}" 1>/dev/null
	#export GNOME2_SCHEMAS=etc/gconf/schemas/*schemas
	if [[ -d "${D}"/usr/share/icons/ ]]; then
		mkdir -p "${D}"/usr/share/gnome2-eclass/
		touch "${D}"/usr/share/gnome2-eclass/${PF}.icons
		echo "touched"
	fi
	popd 1>/dev/null
}

gnome2_pkg_postinst() {
	gnome2_gconf_install
	fdo-mime_desktop_database_update
	fdo-mime_mime_database_update

	if [[ -f "${ROOT}"/usr/share/gnome2-eclass/${PF}.icons ]] ; then
		gnome2_icon_cache_update
	fi

	if [[ "${SCROLLKEEPER_UPDATE}" = "1" ]]; then
		gnome2_scrollkeeper_update
	fi
}

gnome2_pkg_prerm() {
#	gnome2_gconf_uninstall

	if [[ -f "${ROOT}"/usr/share/gnome2-eclass/${PF}.icons ]] ; then
		export RUN_ICON_CACHE_UPDATE="1"
	fi

}

gnome2_pkg_postrm() {
	fdo-mime_desktop_database_update
	fdo-mime_mime_database_update

	if [[ "${RUN_ICON_CACHE_UPDATE}" == "1" ]]; then
		gnome2_icon_cache_update
	fi

	if [[ "${SCROLLKEEPER_UPDATE}" = "1" ]]; then
		gnome2_scrollkeeper_update
	fi
}

EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_prerm pkg_postrm




		return
	fi

	if ! grep -q "obj /usr/share/icons" ${ROOT}var/db/pkg/*/${PF}/CONTENTS
	then
		debug-print "No items to update"

		return
	fi

	ebegin "Updating icons cache"

	local retval=0

Return to bug 155993

Lines 106-134 Link Here

(-)gnome2.eclass (-5 / +27 lines)
106	rm -fr "${D}/usr/share/applications/mimeinfo.cache"	106	rm -fr "${D}/usr/share/applications/mimeinfo.cache"
107	}	107	}
108		108
		109	gnome2_pkg_preinst() {
		110	pushd "${D}" 1>/dev/null
		111	#export GNOME2_SCHEMAS=etc/gconf/schemas/*schemas
		112	if [[ -d "${D}"/usr/share/icons/ ]]; then
		113	mkdir -p "${D}"/usr/share/gnome2-eclass/
		114	touch "${D}"/usr/share/gnome2-eclass/${PF}.icons
		115	echo "touched"
		116	fi
		117	popd 1>/dev/null
		118	}
		119
109	gnome2_pkg_postinst() {	120	gnome2_pkg_postinst() {
110	gnome2_gconf_install	121	gnome2_gconf_install
111	fdo-mime_desktop_database_update	122	fdo-mime_desktop_database_update
112	fdo-mime_mime_database_update	123	fdo-mime_mime_database_update
113	gnome2_icon_cache_update	124
		125	if [[ -f "${ROOT}"/usr/share/gnome2-eclass/${PF}.icons ]] ; then
		126	gnome2_icon_cache_update
		127	fi
114		128
115	if [[ "${SCROLLKEEPER_UPDATE}" = "1" ]]; then	129	if [[ "${SCROLLKEEPER_UPDATE}" = "1" ]]; then
116	gnome2_scrollkeeper_update	130	gnome2_scrollkeeper_update
117	fi	131	fi
118	}	132	}
119		133
120	#gnome2_pkg_prerm() {	134	gnome2_pkg_prerm() {
121	# gnome2_gconf_uninstall	135	# gnome2_gconf_uninstall
122	#}	136
		137	if [[ -f "${ROOT}"/usr/share/gnome2-eclass/${PF}.icons ]] ; then
		138	export RUN_ICON_CACHE_UPDATE="1"
		139	fi
		140
		141	}
123		142
124	gnome2_pkg_postrm() {	143	gnome2_pkg_postrm() {
125	fdo-mime_desktop_database_update	144	fdo-mime_desktop_database_update
126	fdo-mime_mime_database_update	145	fdo-mime_mime_database_update
127	gnome2_icon_cache_update	146
		147	if [[ "${RUN_ICON_CACHE_UPDATE}" == "1" ]]; then
		148	gnome2_icon_cache_update
		149	fi
128		150
129	if [[ "${SCROLLKEEPER_UPDATE}" = "1" ]]; then	151	if [[ "${SCROLLKEEPER_UPDATE}" = "1" ]]; then
130	gnome2_scrollkeeper_update	152	gnome2_scrollkeeper_update
131	fi	153	fi
132	}	154	}
133		155
134	EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_postinst pkg_postrm	156	EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_prerm pkg_postrm

Lines 94-106 Link Here

(-)gnome2-utils.eclass (-7 lines)
94	return	94	return
95	fi	95	fi
96		96
97	if ! grep -q "obj /usr/share/icons" ${ROOT}var/db/pkg/*/${PF}/CONTENTS
98	then
99	debug-print "No items to update"
100
101	return
102	fi
103
104	ebegin "Updating icons cache"	97	ebegin "Updating icons cache"
105		98
106	local retval=0	99	local retval=0