tomwij 14/07/18 14:40:15 Modified: metadata.xml engrampa-1.8.0.ebuild ChangeLog Log: 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). (Portage version: 2.2.10_p125/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)
Revision Changes Path 1.2 app-arch/engrampa/metadata.xml file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/engrampa/metadata.xml?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/engrampa/metadata.xml?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/engrampa/metadata.xml?r1=1.1&r2=1.2 Index: metadata.xml =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-arch/engrampa/metadata.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- metadata.xml 27 Apr 2014 15:49:03 -0000 1.1 +++ metadata.xml 18 Jul 2014 14:40:15 -0000 1.2 @@ -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> 1.6 app-arch/engrampa/engrampa-1.8.0.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/engrampa/engrampa-1.8.0.ebuild?rev=1.6&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/engrampa/engrampa-1.8.0.ebuild?rev=1.6&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/engrampa/engrampa-1.8.0.ebuild?r1=1.5&r2=1.6 Index: engrampa-1.8.0.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-arch/engrampa/engrampa-1.8.0.ebuild,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- engrampa-1.8.0.ebuild 7 Jul 2014 23:42:48 -0000 1.5 +++ engrampa-1.8.0.ebuild 18 Jul 2014 14:40:15 -0000 1.6 @@ -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 @@ 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} 1.6 app-arch/engrampa/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/engrampa/ChangeLog?rev=1.6&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/engrampa/ChangeLog?rev=1.6&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/engrampa/ChangeLog?r1=1.5&r2=1.6 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-arch/engrampa/ChangeLog,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ChangeLog 7 Jul 2014 23:42:48 -0000 1.5 +++ ChangeLog 18 Jul 2014 14:40:15 -0000 1.6 @@ -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 <tom...@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 <tom...@gentoo.org> engrampa-1.8.0.ebuild: Add missing itstool dependency; fixes bug #515770, reported by Patrick Lauer.
