USE=-caja fails to build without Caja, temporarily adjust the dependencies to unbreak that. Corrected the metadata.xml description. Bug #517018, reported by Dmitry (sema19689).

Package-Manager: portage-2.2.10_p125/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D

4 files changed, 24 insertions, 15 deletions

diff --git a/app-arch/engrampa/ChangeLog b/app-arch/engrampa/ChangeLog
index 523da68972b4..4a3bff66ce99 100644
--- a/app-arch/engrampa/ChangeLog
+++ b/app-arch/engrampa/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-arch/engrampa
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/engrampa/ChangeLog,v 1.5 2014/07/07 23:42:48 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/engrampa/ChangeLog,v 1.6 2014/07/18 14:40:15 tomwij Exp $
+
+  18 Jul 2014; Tom Wijsman <TomWij@gentoo.org> engrampa-1.8.0.ebuild,
+  metadata.xml:
+  USE=-caja fails to build without Caja, temporarily adjust the dependencies to
+  unbreak that. Corrected the metadata.xml description. Bug #517018, reported by
+  Dmitry (sema19689).
 
   07 Jul 2014; Tom Wijsman <TomWij@gentoo.org> engrampa-1.8.0.ebuild:
   Add missing itstool dependency; fixes bug #515770, reported by Patrick Lauer.
diff --git a/app-arch/engrampa/Manifest b/app-arch/engrampa/Manifest
index 6119394afb48..d950c278a33d 100644
--- a/app-arch/engrampa/Manifest
+++ b/app-arch/engrampa/Manifest
@@ -2,17 +2,17 @@
 Hash: SHA256
 
 DIST engrampa-1.8.0.tar.xz 1357360 SHA256 d802acee43e24b8513e661a91dd7943ebdc55270ed0ceee0a8e29f981f0f6230 SHA512 3be9ba254cefe82e16eb533d5738dacb29e770e30b7a8cc1e62af0476b9b28d90bb86937f559d40eda79116172035c730d8f50053936857587c198461a401eea WHIRLPOOL c625de1156e582f58beed4b04087528e08f1d93de804b022bfc69ed04b12e3c53df92a51534693434d7b3237890d7ee8334a5cd830040b0374aa5f70710ab921
-EBUILD engrampa-1.8.0.ebuild 2259 SHA256 f3763db925e504a771f68a7cffd1024aa87a53ec7ad4e72d1a6e026f5f278d7b SHA512 c2b7a183fdb8d22a7688259a183e0afb9132c116df448ad0342633552711b50348b4c28724ee69b8e62b53da6ca46ac95c00cb4cc84a972cfab2383719c32637 WHIRLPOOL 906229af941cca90632edb4bd0eb4adc46ca182624680d413692c055db5eb00c39a4cbda443070c2238cf00c108b37e7f4ab5aae7099bdbebde34829e12c7bf6
-MISC ChangeLog 840 SHA256 fd982fd1e03cbcb90634a2c0670caefc74aeb82661a2310e6afd217e6c7f859c SHA512 92b5cd59be20fde2cd186cca3a6f6713c51bd3a0d12e404e9637719ec0721c0ec144a47d3ccf16e98f6fe77b978b1939a6c29804a1b706980342ec1fe49da21c WHIRLPOOL 9d3f834ab1731e3ab8dbc50963c947cb1f28b29c8dac6224df06462abbb2b7e5dc2084f75e9ac6869e2383a79b3588b1de64f39003983860b94abfdcc56119d5
-MISC metadata.xml 393 SHA256 8438375e18388ee501ab391fe3ff0af70d1635275ab782136eefe5bc86352680 SHA512 3641824933fc997c60c26d18ee368fa6e77712982928dd829255720fa0fa787e33890decc29a720e4db780f391d748cf13148a04eaac05cfda18e35db2ebba23 WHIRLPOOL c920f6f5f917252a582254a38d5b634d47a13cadc0513a4bc676df1ce238b65fc69e2c1e6b5f03bff6b32bf0c3d1ba79719ae0b81c54eeae0ed73fc0e23a5015
+EBUILD engrampa-1.8.0.ebuild 2412 SHA256 5d1d100797af22ad694f89f2263559485239f5dea326fc83f10cc120446be658 SHA512 630b0cfbc787b7eb71fbf04b6327a9574ca9531a61d3d83bb6a02a7a0974d7995cb2e9a14a2cae21f03e28a7928daa2a2f8ce7bde94b0a31f038a86c0e81e6be WHIRLPOOL 0490609f478cfe449e9abdc598c65ffd8b6cf3531af5a861ab128675c2fb249edf765c9de058fbfabafb0c5ea6dccc7c04560f901f9718cd99764eb3603689dd
+MISC ChangeLog 1110 SHA256 e36d316b9b0ebf082ab6da0f6c9933153ba3e6c147c0bef40e11704b47008851 SHA512 df2e4a74f843a119a1f9bbf22bc3e93e5aa50c2726eea6c5344d593088760106a41e29cca262ae05075fe7cd4f01fa859a10397d8a27fb7a1cdc8ffbacf56cc1 WHIRLPOOL aa03f777b3552caed9fc862cbdfae7ad66ad7ea7e7fe278c0a5f3bea135e90ee277c18d7f3461524e3b323f3c3166e2772b028becf754879d5ff5acd068966a2
+MISC metadata.xml 380 SHA256 2bd839927923c8b22cbd22783b77d508926fcba263728d42e8e1d474e0e3524d SHA512 1f5001fd4b3a4e7e01ed1741d8fabae4b5e9841a2b89f863ec85b05d4918282b08d4675a2d2f91693100745e13fd94b4d636b88b0793615fe4302c1eb742ab45 WHIRLPOOL e9fa9d42fb2e5d66ca6953a429015799772cbf58f3a2a93ae6513d968124b10d5b9c3a20fe8efa55e3c7d26aa58e20fdb6a3357bd97282241c74c58022787d0b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJTuzB8AAoJEJWyH81tNOV9dQAIAMXDO+Q6sUIzSX6sxDLi7Rvn
-sAOx8IOw9Y/HwEnqqQMXtWf6VybWBsitdtgLCwlFjLArEB/X/MM3ELJmWrHwmfCd
-XKh3iCRvfsAk7wGkhX9Tkwbj1KGo1d8fbJWIpi9p65nc+zsmoUXnIJPSfe+23s2K
-ghFqM27pl2haG/520e1RJwQstWQDOGN56c9d8dAGE7itYE1TX7aQ8VXyuLiPl0HV
-BO4SWGUN5JHc5baNjoeSrL4gUwz6nWyDWajQC+TN9zb6zGJjp66qCR/LoREEOUgy
-SiIDOh1mlYeiuWUl/uf9yJLO+EOxSsSc3hnxbaE+9EijAMb8D6dISsAFGXmdt+I=
-=8yv+
+iQEcBAEBCAAGBQJTyTHTAAoJEJWyH81tNOV9C+cIAK9c9qnO694KyjJPLQzIcWNi
+sVxhsGWMZFPdhk4z/ke1fmK8fi7yak4xQ1yrum655IGOlJX8vFl5WgAevBjLdmco
+zdou/nbodvCQfg1PKOW1oKm91XXSIWYlns7llT4EnOaxhLcPVKbzJC1zgOjj/Zdo
+cxEugc7PtfO3dMoHvsiP9NrGBla8J1WSYwh8sg7z1McoCKB59VSmWl7lZvO2HKK/
+flvTZ0q13kSZP9+Q9JuWCc/NYknfoklhGdahzOqerM+sDXPwRXjX00bfWZfZ7yFs
+mYkFCcsMqPEr8OS9r226F+TX+011bvqaNnY6coNiAbrWowW5t7bp8omwfyLrGEA=
+=R22n
 -----END PGP SIGNATURE-----
diff --git a/app-arch/engrampa/engrampa-1.8.0.ebuild b/app-arch/engrampa/engrampa-1.8.0.ebuild
index 58ca12d3ff21..be130991e1e4 100644
--- a/app-arch/engrampa/engrampa-1.8.0.ebuild
+++ b/app-arch/engrampa/engrampa-1.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/engrampa/engrampa-1.8.0.ebuild,v 1.5 2014/07/07 23:42:48 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/engrampa/engrampa-1.8.0.ebuild,v 1.6 2014/07/18 14:40:15 tomwij Exp $
 
 EAPI="5"
 
@@ -21,13 +21,16 @@ KEYWORDS="amd64 x86"
 
 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
-	caja? ( || ( >=mate-base/caja-1.8:0 >=mate-base/mate-file-manager-1.6:0 ) )
+	|| ( >=mate-base/caja-1.8:0 >=mate-base/mate-file-manager-1.6:0 )
 	!!app-arch/mate-file-archiver"
 
 DEPEND="${RDEPEND}
diff --git a/app-arch/engrampa/metadata.xml b/app-arch/engrampa/metadata.xml
index 91262c10f902..56018656ac37 100644
--- a/app-arch/engrampa/metadata.xml
+++ b/app-arch/engrampa/metadata.xml
@@ -7,7 +7,7 @@
 	</maintainer>
 	<use>
 		<flag name="caja">Enable engrampa to integrate with
-			<pkg>mate-base/mate-file-manager</pkg> by providing entries in its 
-			context menu</flag>
+			<pkg>mate-base/caja</pkg> by providing entries in its context 
+			menu</flag>
 	</use>
 </pkgmetadata>