--- /usr/portage/app-arch/engrampa/engrampa-1.8.1.ebuild	2014-12-09 17:35:42.000000000 -0500
+++ engrampa-1.8.1-r1.ebuild	2015-01-19 02:50:44.792717235 -0500
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/app-arch/engrampa/engrampa-1.8.1.ebuild,v 1.1 2014/12/09 22:35:42 tamiko Exp $
 
@@ -21,16 +21,14 @@
 
 IUSE="caja"
 
-# GLib-GIO-ERROR **: Settings schema 'org.mate.caja.preferences' is not installed
-#
-# ... thus we depend on Caja regardless of the Caja USE flag. Patches welcome.
 RDEPEND=">=x11-libs/gtk+-2.21.4:2
 	>=dev-libs/glib-2.25.5:2
 	>=dev-libs/json-glib-0.14:0
 	x11-libs/gdk-pixbuf:2
 	x11-libs/pango:0
 	virtual/libintl:0
-	|| ( >=mate-base/caja-1.8:0 >=mate-base/mate-file-manager-1.6:0 )
+	x11-libs/libSM
+	caja? ( || ( >=mate-base/caja-1.8:0 >=mate-base/mate-file-manager-1.6:0 ) )
 	!!app-arch/mate-file-archiver"
 
 DEPEND="${RDEPEND}
@@ -41,6 +39,7 @@
 	virtual/pkgconfig:*"
 
 src_prepare() {
+	epatch "${FILESDIR}/engrampa-1.8.1-caja-schema-fix.patch"
 	gnome2_src_prepare
 
 	# Drop DEPRECATED flags as configure option doesn't do it, bug #385453