--- /usr/portage/eclass/gnome2.eclass	2007-02-23 16:35:43.000000000 +0100
+++ ./gnome2.eclass	2008-01-11 16:49:51.000000000 +0100
@@ -37,7 +37,7 @@
 
 gnome2_src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
 	# Prevent scrollkeeper access violations
 	gnome2_omf_fix
@@ -82,7 +82,7 @@
 
 	if [[ -z "${USE_EINSTALL}" || "${USE_EINSTALL}" = "0" ]]; then
 		debug-print "Installing with 'make install'"
-		make DESTDIR=${D} "scrollkeeper_localstate_dir=${D}${sk_tmp_dir} " "$@" install || die "install failed"
+		emake DESTDIR="${D}" "scrollkeeper_localstate_dir=${D}${sk_tmp_dir} " "$@" install || die "install failed"
 	else
 		debug-print "Installing with 'einstall'"
 		einstall "scrollkeeper_localstate_dir=${D}${sk_tmp_dir} " "$@" || die "einstall failed"
@@ -97,7 +97,7 @@
 	# 1. The scrollkeeper database is regenerated at pkg_postinst()
 	# 2. ${D}/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
+	if [[ -z "$(find "${D}" -name '*.omf')" ]]; then
 		export SCROLLKEEPER_UPDATE="0"
 	fi
 	rm -rf "${D}${sk_tmp_dir}"