Index: gnome2.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v retrieving revision 1.104 diff -u -B -u -r1.104 gnome2.eclass --- gnome2.eclass 14 Dec 2011 19:47:54 -0000 1.104 +++ gnome2.eclass 14 Apr 2012 18:28:48 -0000 @@ -125,6 +125,11 @@ G2CONF="${G2CONF} --disable-maintainer-mode" fi + # Pass --disable-scrollkeeper when possible + if grep -q "disable-scrollkeeper" configure; then + G2CONF="${G2CONF} --disable-scrollkeeper" + fi + # Avoid sandbox violations caused by gnome-vfs (bug #128289 and #345659) addwrite "$(unset HOME; echo ~)/.gnome2" @@ -172,10 +177,9 @@ # 1. The scrollkeeper database is regenerated at pkg_postinst() # 2. ${ED}/var/lib/scrollkeeper contains only indexes for the current pkg # thus it makes no sense if pkg_postinst ISN'T run for some reason. - if [[ -z "$(find "${D}" -name '*.omf')" ]]; then - export SCROLLKEEPER_UPDATE="0" - fi rm -rf "${ED}${sk_tmp_dir}" + rmdir "${ED}/var/lib" 2>/dev/null + rmdir "${ED}/var" 2>/dev/null # Make sure this one doesn't get in the portage db rm -fr "${ED}/usr/share/applications/mimeinfo.cache" @@ -197,6 +201,7 @@ gnome2_gconf_savelist gnome2_icon_savelist gnome2_schemas_savelist + gnome2_scrollkeeper_savelist } # @FUNCTION: gnome2_pkg_postinst @@ -209,10 +214,7 @@ fdo-mime_mime_database_update gnome2_icon_cache_update gnome2_schemas_update - - if [[ "${SCROLLKEEPER_UPDATE}" = "1" ]]; then - gnome2_scrollkeeper_update - fi + gnome2_scrollkeeper_update } # @#FUNCTION: gnome2_pkg_prerm @@ -230,8 +232,5 @@ fdo-mime_mime_database_update gnome2_icon_cache_update gnome2_schemas_update - - if [[ "${SCROLLKEEPER_UPDATE}" = "1" ]]; then - gnome2_scrollkeeper_update - fi + gnome2_scrollkeeper_update }