Deprecate 1.6 and restore caja USE flag functionality, resolving bug #538218

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x18F89C67

4 files changed, 35 insertions, 32 deletions

diff --git a/app-arch/engrampa/ChangeLog b/app-arch/engrampa/ChangeLog
index 5e469e6bdb5e..93836820a971 100644
--- a/app-arch/engrampa/ChangeLog
+++ b/app-arch/engrampa/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-arch/engrampa
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/engrampa/ChangeLog,v 1.8 2015/07/11 22:38:47 np-hardass Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/engrampa/ChangeLog,v 1.9 2015/07/11 23:44:18 np-hardass Exp $
+
+*engrampa-1.8.0-r1 (11 Jul 2015)
+*engrampa-1.8.1-r1 (11 Jul 2015)
+
+  11 Jul 2015; NP-Hardass <NP-Hardass@gentoo.org> +engrampa-1.8.0-r1.ebuild,
+  +engrampa-1.8.1-r1.ebuild, -engrampa-1.8.0.ebuild, -engrampa-1.8.1.ebuild:
+  Deprecate 1.6 and restore caja USE flag functionality, resolving bug #538218
 
   11 Jul 2015; NP-Hardass <NP-Hardass@gentoo.org> metadata.xml:
   Update metadata.xml with mate herd
diff --git a/app-arch/engrampa/Manifest b/app-arch/engrampa/Manifest
index bcad55ea3945..4a903713b91f 100644
--- a/app-arch/engrampa/Manifest
+++ b/app-arch/engrampa/Manifest
@@ -3,24 +3,24 @@ Hash: SHA256
 
 DIST engrampa-1.8.0.tar.xz 1357360 SHA256 d802acee43e24b8513e661a91dd7943ebdc55270ed0ceee0a8e29f981f0f6230 SHA512 3be9ba254cefe82e16eb533d5738dacb29e770e30b7a8cc1e62af0476b9b28d90bb86937f559d40eda79116172035c730d8f50053936857587c198461a401eea WHIRLPOOL c625de1156e582f58beed4b04087528e08f1d93de804b022bfc69ed04b12e3c53df92a51534693434d7b3237890d7ee8334a5cd830040b0374aa5f70710ab921
 DIST engrampa-1.8.1.tar.xz 1367088 SHA256 f8c541de364352005b2f4a100140197a2190269d3dbffe032e284a98478f1be7 SHA512 0733ef93d34356d6c9cdda7ac91c97ef10fe47df0962375e0270b25873c2271ade4ee9b82f7d6c4c3fd1de5dbe51e9ca1b30acf208b3a7f80a19a4899299b00b WHIRLPOOL 63fde3e27240b175dff12d7a3e15123413033faa7f49a0dcb6fa75eb8b51ab63246879ebacd4295f95b8f9964b48fcba85264378ea3659e5864b43e591133318
-EBUILD engrampa-1.8.0.ebuild 2412 SHA256 5d1d100797af22ad694f89f2263559485239f5dea326fc83f10cc120446be658 SHA512 630b0cfbc787b7eb71fbf04b6327a9574ca9531a61d3d83bb6a02a7a0974d7995cb2e9a14a2cae21f03e28a7928daa2a2f8ce7bde94b0a31f038a86c0e81e6be WHIRLPOOL 0490609f478cfe449e9abdc598c65ffd8b6cf3531af5a861ab128675c2fb249edf765c9de058fbfabafb0c5ea6dccc7c04560f901f9718cd99764eb3603689dd
-EBUILD engrampa-1.8.1.ebuild 2414 SHA256 5eca2e918f3bd3697656573a2f19bbe74014431c96af817db751410f48534e9e SHA512 85c382597e9cc3f337e04f0c570284989de32ba20085ca4a0849f483801622d1d8a4efdaa68bc39c9a22c7d087241f8292b41b91dcb2cffd33a5055b942c6c96 WHIRLPOOL 1b847c26fc612fbc35c43fb3295dd8981c349d86cbb8b2111ab5954201cf577a9bdcde6a6e6fb192ae00c013ab93ca2f5654734a73a41262a88207c2852911df
-MISC ChangeLog 1337 SHA256 eb798d9917c006e0c094d7cf8d67af92a4418e754e133f8af2d44e7ad7646ef1 SHA512 d85b8761b257ff225acdd88257065aab0fbb04344f5fea45158ed44bf6256cd5a1082cb5bcf6ff94f3dc9bdc9ebe123850747e620a8af074e6cda29d64968f42 WHIRLPOOL 5b994e9a621870cb57e55c2e8b9c6302b3f94c8a45e6b90958f55bb5c1556dea4383f9db7336df89060eaac4605ee13021cd3792edb2d98b6446a1da08d9d911
+EBUILD engrampa-1.8.0-r1.ebuild 2284 SHA256 470be3e0368ea92b581990343c8692f58a169112204139ab50f6f0a4ecdd56d5 SHA512 966d4b82fd583f66cfbf7d04ef06059c39a9b458bae79061b0116d75721af44b83cd5344b9fddc3372caca147fd5c21979a44c527b7ec75f510e7e06058aa8a2 WHIRLPOOL 814bdece378e2e78f881cfcf082b9f98ef5241893157f3e79fdec2e04fb2a0663b3865245081994a12abdbd1ff5edd03d9f929cb9d27aa94b8521ad790040e03
+EBUILD engrampa-1.8.1-r1.ebuild 2284 SHA256 2dadd83e8da4a6d9cf2645244e2f56e5b9e2305e89229bf2cd9313c3efcfdadf SHA512 f236dee5a91b19525d4534aa3d0ad43329daf0ad51344007f008866fda00eda636693abf7abd0975942204223bf35c447530ce86c7cfe56a092ebfdf6a8723a7 WHIRLPOOL b30d1da841b276ffa699d8f82a4cbfb08af9aa857b1a982a73a1a4c156e27b282b70684d2dc152d3a9d76fd90a1360e8e6b20bfb0139b404af3426dcba347d80
+MISC ChangeLog 1638 SHA256 7801799bee0e2a5a7b695eaa50ea9a8ec971abb587d87330ce9e4cf09abdcac2 SHA512 038cbd30de3cc820da947a8fb5f539d0cdb1fc15019b9f033731fb8577d6c183c3ccf1672c26d2afc8a2d3cbb23d3e960e5b87fb93e82932d853a3585b5848ab WHIRLPOOL 97353e5ab0e2134a8c7fda8882349fea99b5b33ef0b93745a178eb335d457001bedd6d374f12d63f186083f4dfd26c1632b883b7acbf33fba798c0608ec2be91
 MISC metadata.xml 415 SHA256 e11774078e961a5a1f849f4d1f6a9eef0da01507f5c2010304497e75b16e59b4 SHA512 04e133803a40ff137535f9f3fa4e33b3f2e2beaaaaacabba71e9135d057fe04d291abbca462d5e93019673f4bb487ad018d3e2ffea9c65e2d6f3f4aa3dce2ce0 WHIRLPOOL 5a8655fcc48b71ebbb26873298c46b2d39dccbc1dfdc91ea9c79afa18ab23bd6ccb208a7b137042099e052071305655015f9466527d741af6239f64adf1e36b6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVoZrsAAoJEBzZQR2yrxj7ugwP/3V5Ss6h1cg6njdzi2Dn4QtR
-shHh3VCl94dnChScxTY7SAFDMCzeDY0KlmX1F7wrvD1fIgmOUxjMHQ0IRfQv9N/t
-Vs1WBVdRQtmAgqkCjE66/7LfEKImFrP+qs9G3LMPJW/+qL1mQkcHi3/uSAGur5MB
-SFVtjARZpWXEuvYzGKIv728//eQHKE8Ig2h/aIRQEPolFSpDafjiX+Xo8Uuh8v/G
-ujep+MbscWYpk82JIFoL+7vN4H5edyYiA9bj4SIU1pNNlx7QELGPrCjuv9nfOJYW
-+b8i8wDeX00T4RuhJJoF2wFRNKQVG72D9jOfwXNoAeeGKG1kPGjqbu7PAqdozgk1
-dFRrUa63mgLfXiPLMbdcLPBykHkMD1U2AiYHZfP6hxBxtUz28YxkOOCWajGznsxg
-QnudkadLeh8Z/po5mB/jOBrzsntbPqTXF/c/sqjFh2+cJ7ZdlpAlHPmrNIXb/hNs
-Oc7Ng8WM2P8QYx8ahcrTbjo1t5xeG5/NudHfz6gzfKXQu+R1E68asnv2IKpVC/9I
-zTszDAbzIjWQDHzRBroHXEmI3bkgE0yJQLfNrtK2nTGOh6r+pI+Yh3Dfs8dX4Ft7
-642THvqlZ3k8atnyaNlzA/+puJdUP0vMSLANSa4gdWaviO33fDQYIyaJOKPUuMvs
-2ZyQly9PsgxXexJrrYdA
-=qsL5
+iQIcBAEBCAAGBQJVoapHAAoJEBzZQR2yrxj7D8YP/2gWT+GwFyuNqljGBODWKQw6
+tKDrqamrfLw6GGqn+pxoiU5Pi6DvFL3M8C9jJfcYOiXIWyA8mQg9bGtqyWor0+X7
+nbRB9PCMq+rdpqNIFSAruzgek1BwIspmsHQIc6jnQlCxnmxZihp6gMUmTxKo6tU+
+ZBWFP75DD51/pyJIKFAw3+n4nAJ5om3TzGL2sF/1lryuRCFlBHrTuLD3iU9ZNFJ9
+vGfpCOYAP10M2MuFGPoHOQ2BTBfaeS6A4KtjG32KoCrAhcTdEz9u6yaYxur5pRoi
+JPHfScLfmSUMWzeZZwY5KTG8NVOUGxVEPCo6tJQYk/7kn3Xd0IJN39ExMhttLc+h
+MSnZ8Nw3FT+4ZEMbvsDHtCcI0Q9s4bBSXEpgCOwjaL8BMvAW3bmf1S+nTHfOE6l0
+J1U64WEJmqc4Rn3HRdvTFddDyRq4jplXj77HYW+WYFoPaR5T35sXFTMrmpGAwdwQ
+zZWH+wHrMjpXD/dzO+FGuzoI14OKhZjE1KsaTAKNlu2WELhQ/OWR5ZXToBm9NyaX
+kgDbv93CvhfXOQdEK1miKoWasrFKsmDRCQE2+umjMCwj23aCEeA1rrSGPTHTCPim
+XGBtUvdVzPODxHPkFbGnwrn5ztzrjDYhZ/thOx6CjvOCpH83+ujg8EwMxRXW4SsG
+1lebYRlDA3C5Ofm2jDlf
+=hFkD
 -----END PGP SIGNATURE-----
diff --git a/app-arch/engrampa/engrampa-1.8.1.ebuild b/app-arch/engrampa/engrampa-1.8.0-r1.ebuild
index 256efa28a420..4c6200cbf33b 100644
--- a/app-arch/engrampa/engrampa-1.8.1.ebuild
+++ b/app-arch/engrampa/engrampa-1.8.0-r1.ebuild
@@ -1,6 +1,6 @@
-# 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 $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/engrampa/engrampa-1.8.0-r1.ebuild,v 1.1 2015/07/11 23:44:18 np-hardass Exp $
 
 EAPI="5"
 
@@ -21,26 +21,24 @@ 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
-	|| ( >=mate-base/caja-1.8:0 >=mate-base/mate-file-manager-1.6:0 )
+	caja? ( >=mate-base/caja-1.8:0 )
 	!!app-arch/mate-file-archiver"
 
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.35:*
 	dev-util/itstool:0
-	>=mate-base/mate-common-1.6:0
+	>=mate-base/mate-common-1.8:0
 	sys-devel/gettext:*
 	virtual/pkgconfig:*"
 
 src_prepare() {
+	epatch "${FILESDIR}/engrampa-1.8.0-caja-schema-fix.patch"
 	gnome2_src_prepare
 
 	# Drop DEPRECATED flags as configure option doesn't do it, bug #385453
diff --git a/app-arch/engrampa/engrampa-1.8.0.ebuild b/app-arch/engrampa/engrampa-1.8.1-r1.ebuild
index be130991e1e4..d6c4dbda95b1 100644
--- a/app-arch/engrampa/engrampa-1.8.0.ebuild
+++ b/app-arch/engrampa/engrampa-1.8.1-r1.ebuild
@@ -1,6 +1,6 @@
-# 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.0.ebuild,v 1.6 2014/07/18 14:40:15 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/engrampa/engrampa-1.8.1-r1.ebuild,v 1.1 2015/07/11 23:44:18 np-hardass Exp $
 
 EAPI="5"
 
@@ -17,30 +17,28 @@ HOMEPAGE="http://mate-desktop.org"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+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
-	|| ( >=mate-base/caja-1.8:0 >=mate-base/mate-file-manager-1.6:0 )
+	caja? ( >=mate-base/caja-1.8:0 )
 	!!app-arch/mate-file-archiver"
 
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.35:*
 	dev-util/itstool:0
-	>=mate-base/mate-common-1.6:0
+	>=mate-base/mate-common-1.8:0
 	sys-devel/gettext:*
 	virtual/pkgconfig:*"
 
 src_prepare() {
+	epatch "${FILESDIR}/engrampa-1.8.0-caja-schema-fix.patch"
 	gnome2_src_prepare
 
 	# Drop DEPRECATED flags as configure option doesn't do it, bug #385453