diff options
| author |   Tom Wijsman <tomwij@gentoo.org> | 2014-07-18 14:40:15 +0000 |
|---|---|---|
| committer | Tom Wijsman <tomwij@gentoo.org> | 2014-07-18 14:40:15 +0000 |
| commit | 0f55c4d090c0bef1c5f522197f2f82e30220cf55 (patch) | |
| tree | a8780ddf5cc2a3c632c5505085b38fad70cc5bbe /app-arch | |
| parent | Stable for amd64 wrt bug #511056 (diff) | |
| download | gentoo-2-0f55c4d090c0bef1c5f522197f2f82e30220cf55.tar.gz gentoo-2-0f55c4d090c0bef1c5f522197f2f82e30220cf55.tar.bz2 gentoo-2-0f55c4d090c0bef1c5f522197f2f82e30220cf55.zip | |
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)
Diffstat (limited to 'app-arch')
| -rw-r--r-- | app-arch/engrampa/ChangeLog | 8 | ||||
| -rw-r--r-- | app-arch/engrampa/engrampa-1.8.0.ebuild | 7 | ||||
| -rw-r--r-- | app-arch/engrampa/metadata.xml | 4 |
3 files changed, 14 insertions, 5 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/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> |