* gnome2.eclass: Moved auxiliary functions to gnome2-utils.eclass.

  Moved $SCROLLKEEPER_UPDATE logic out of gnome2_scrollkeeper_update.

  Removed 'eutils' from inherit call since it seems to have been added by
  mistake.

1 files changed, 13 insertions, 185 deletions

diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass
index a9445380b469..32e134d5f8a0 100644
--- a/eclass/gnome2.eclass
+++ b/eclass/gnome2.eclass
@@ -1,18 +1,18 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v 1.77 2006/12/12 02:58:22 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v 1.78 2006/12/13 02:27:48 leonardop Exp $
 
 #
 # gnome2.eclass
 #
 # Exports portage base functions used by ebuilds written for packages using the
-# GNOME framework.
+# GNOME framework. For additional functions, see gnome2-utils.eclass.
 #
 # Maintained by Gentoo's GNOME herd <gnome@gentoo.org>
 #
 
 
-inherit libtool gnome.org debug fdo-mime eutils
+inherit debug fdo-mime libtool gnome.org gnome2-utils
 
 
 # Extra configure opts passed to econf
@@ -27,20 +27,13 @@ USE_EINSTALL=${USE_EINSTALL:=""}
 # Run scrollkeeper for this package?
 SCROLLKEEPER_UPDATE=${SCROLLKEEPER_UPDATE:="1"}
 
-# Directory where scrollkeeper-update should do its work
-SCROLLKEEPER_DIR=${SCROLLKEEPER_DIR:="${ROOT}var/lib/scrollkeeper"}
 
-# Path to scrollkeeper-update
-SCROLLKEEPER_UPDATE_BIN=${SCROLLKEEPER_UPDATE_BIN:="${ROOT}usr/bin/scrollkeeper-update"}
-
-# Path to gconftool-2
-GCONFTOOL_BIN=${GCONFTOOL_BIN:="${ROOT}usr/bin/gconftool-2"}
 
 if [[ ${GCONF_DEBUG} != "no" ]]; then
 	IUSE="debug"
 fi
 
-DEPEND=">=sys-apps/sed-4"
+
 
 gnome2_src_unpack() {
 	unpack ${A}
@@ -113,183 +106,15 @@ gnome2_src_install() {
 	rm -fr "${D}/usr/share/applications/mimeinfo.cache"
 }
 
-
-
-# Applies any schema files installed by the current ebuild to Gconf's database
-# using gconftool-2 
-gnome2_gconf_install() {
-	if [[ ! -x ${GCONFTOOL_BIN} ]]; then
-		return
-	fi
-
-	# We are ready to install the GCONF Scheme now
-	unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
-	export GCONF_CONFIG_SOURCE=$(${GCONFTOOL_BIN} --get-default-source)
-
-	einfo "Installing GNOME 2 GConf schemas"
-
-	local contents="${ROOT}/var/db/pkg/*/${PN}-${PVR}/CONTENTS"
-	local F
-
-	for F in $(grep "^obj /etc/gconf/schemas/.\+\.schemas\b" ${contents} | gawk '{print $2}' ); do
-		if [[ -e "${F}" ]]; then
-			# echo "DEBUG::gconf install  ${F}"
-			${GCONFTOOL_BIN} --makefile-install-rule ${F} 1>/dev/null
-		fi
-	done
-
-	# have gconf reload the new schemas
-	ebegin "Reloading GConf schemas"
-	killall -HUP gconfd-2
-	eend $?
-}
-
-# Removes schema files previously installed by the current ebuild from Gconf's
-# database.
-gnome2_gconf_uninstall() {
-	if [[ ! -x ${GCONFTOOL_BIN} ]]; then
-		return
-	fi
-
-	unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
-	export GCONF_CONFIG_SOURCE=$(${GCONFTOOL_BIN} --get-default-source)
-
-	einfo "Uninstalling GNOME 2 GConf schemas"
-
-	local contents="${ROOT}/var/db/pkg/*/${PN}-${PVR}/CONTENTS"
-	local F
-
-	for F in $(grep "obj /etc/gconf/schemas" ${contents} | sed 's:obj \([^ ]*\) .*:\1:' ); do
-		# echo "DEBUG::gconf install  ${F}"
-		${GCONFTOOL_BIN} --makefile-uninstall-rule ${F} 1>/dev/null
-	done
-}
-
-# Updates Gtk+ icon cache files under /usr/share/icons if the current ebuild
-# have installed anything under that location.
-gnome2_icon_cache_update() {
-	local updater=$(type -p gtk-update-icon-cache 2> /dev/null)
-
-	if [[ ! -x ${updater} ]] ; then
-		debug-print "${updater} is not executable"
-
-		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
-	local fails=( )
-
-	for dir in $(find ${ROOT}/usr/share/icons -maxdepth 1 -mindepth 1 -type d)
-	do
-		if [[ -f "${dir}/index.theme" ]] ; then
-			local rv=0
-
-			${updater} -qf ${dir}
-			rv=$?
-
-			if [[ ! $rv -eq 0 ]] ; then
-				debug-print "Updating cache failed on ${dir}"
-
-				# Add to the list of failures
-				fails[$(( ${#fails[@]} + 1 ))]=$dir
-
-				retval=2
-			fi
-		fi
-	done
-
-	eend ${retval}
-
-	for (( i = 0 ; i < ${#fails[@]} ; i++ )) ; do
-		### HACK!! This is needed until bash 3.1 is unmasked.
-		## The current stable version of bash lists the sizeof fails to be 1
-		## when there are no elements in the list because it is declared local.
-		## In order to prevent the declaration from being in global scope, we
-		## this hack to prevent an empty error message being printed for stable
-		## users. -- compnerd && allanonjl
-		if [[ "${fails[i]}" != "" && "${fails[i]}" != "()" ]] ; then
-			eerror "Failed to update cache with icon ${fails[i]}"
-		fi
-	done
-}
-
-# Workaround applied to Makefile rules in order to remove redundant
-# calls to scrollkeeper-update and sandbox violations.
-gnome2_omf_fix() {
-	local omf_makefiles filename
-
-	omf_makefiles="$@"
-
-	if [[ -f ${S}/omf.make ]] ; then
-		omf_makefiles="${omf_makefiles} ${S}/omf.make"
-	fi
-
-	# testing fixing of all makefiles found
-	for filename in $(find ./ -name "Makefile.in" -o -name "Makefile.am") ; do
-		omf_makefiles="${omf_makefiles} ${filename}"
-	done
-
-	ebegin "Fixing OMF Makefiles"
-
-	local retval=0
-	local fails=( )
-
-	for omf in ${omf_makefiles} ; do
-		local rv=0
-
-		sed -i -e 's:scrollkeeper-update:true:' ${omf}
-		retval=$?
-
-		if [[ ! $rv -eq 0 ]] ; then
-			debug-print "updating of ${omf} failed"
-
-			# Add to the list of failures
-			fails[$(( ${#fails[@]} + 1 ))]=$omf
-
-			retval=2
-		fi
-	done
-
-	eend $retval
-
-	for (( i = 0 ; i < ${#fails[@]} ; i++ )) ; do
-		### HACK!! This is needed until bash 3.1 is unmasked.
-		## The current stable version of bash lists the sizeof fails to be 1
-		## when there are no elements in the list because it is declared local.
-		## In order to prevent the declaration from being in global scope, we
-		## this hack to prevent an empty error message being printed for stable
-		## users. -- compnerd && allanonjl
-		if [[ "${fails[i]}" != "" && "${fails[i]}" != "()" ]] ; then
-			eerror "Failed to update OMF Makefile ${fails[i]}"
-		fi
-	done
-}
-
-# Updates the scrollkeeper database if necessary. To force this action, make
-# sure to set SCROLLKEPER_UPDATE to 1.
-gnome2_scrollkeeper_update() {
-	if [[ -x ${SCROLLKEEPER_UPDATE_BIN} && "${SCROLLKEEPER_UPDATE}" = "1" ]]
-	then
-		einfo "Updating scrollkeeper database ..."
-		${SCROLLKEEPER_UPDATE_BIN} -q -p ${SCROLLKEEPER_DIR}
-	fi
-}
-
 gnome2_pkg_postinst() {
 	gnome2_gconf_install
-	gnome2_scrollkeeper_update
 	fdo-mime_desktop_database_update
 	fdo-mime_mime_database_update
 	gnome2_icon_cache_update
+	
+	if [[ "${SCROLLKEEPER_UPDATE}" = "1" ]]; then
+		gnome2_scrollkeeper_update
+	fi
 }
 
 #gnome2_pkg_prerm() {
@@ -297,10 +122,13 @@ gnome2_pkg_postinst() {
 #}
 
 gnome2_pkg_postrm() {
-	gnome2_scrollkeeper_update
 	fdo-mime_desktop_database_update
 	fdo-mime_mime_database_update
 	gnome2_icon_cache_update
+
+	if [[ "${SCROLLKEEPER_UPDATE}" = "1" ]]; then
+		gnome2_scrollkeeper_update
+	fi
 }
 
 EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_postinst pkg_postrm