--- gnome2.eclass.old	2005-06-06 11:42:38.000000000 +0200
+++ gnome2.eclass	2005-06-06 11:43:03.000000000 +0200
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/www/www.gentoo.org/raw_cvs/gentoo-x86/eclass/gnome2.eclass,v 1.48 2005/06/05 16:33:18 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v 1.48 2005/06/05 16:33:18 foser Exp $
 #
 # Authors:
 # Bruce A. Locke <blocke@shivan.org>
@@ -49,17 +49,14 @@
 	dodir /var/lib/scrollkeeper
 
 	# we must delay gconf schema installation due to sandbox
-	export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1"
 
-	if [ -z "${USE_DESTDIR}" -o "${USE_DESTDIR}" = "0" ]; then
+	if [ "${FEATURES/sandbox/}" != "${FEATURES}" ]; then
 		einstall "scrollkeeper_localstate_dir=${D}/var/lib/scrollkeeper/" "$@"
 	else
 		make DESTDIR=${D} \
 		   	"$@" install
 	fi
 
-	unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
-
 	# manual document installation
 	[ -n "${DOCS}" ] && dodoc ${DOCS}