diff options
author | Gilles Dartiguelongue <eva@gentoo.org> | 2011-02-15 08:12:36 +0000 |
---|---|---|
committer | Gilles Dartiguelongue <eva@gentoo.org> | 2011-02-15 08:12:36 +0000 |
commit | 545420f1ffccdb099b129581c1133a8c07f68d52 (patch) | |
tree | 3e0365dfc02d307d41243dfc27725b92fc8764b0 | |
parent | ppc stable wrt #332421 (diff) | |
download | gentoo-2-545420f1ffccdb099b129581c1133a8c07f68d52.tar.gz gentoo-2-545420f1ffccdb099b129581c1133a8c07f68d52.tar.bz2 gentoo-2-545420f1ffccdb099b129581c1133a8c07f68d52.zip |
Fix gdk-pixbuf/gtk+ USE flag dependencies.
(Portage version: 2.2.0_alpha23/cvs/Linux x86_64, RepoMan options: --force)
-rw-r--r-- | media-video/cheese/ChangeLog | 7 | ||||
-rw-r--r-- | media-video/cheese/cheese-2.32.0.ebuild | 9 |
2 files changed, 11 insertions, 5 deletions
diff --git a/media-video/cheese/ChangeLog b/media-video/cheese/ChangeLog index d4fd4cbe96ff..b9d47672a6a5 100644 --- a/media-video/cheese/ChangeLog +++ b/media-video/cheese/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-video/cheese -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/cheese/ChangeLog,v 1.39 2010/11/02 02:51:13 ford_prefect Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-video/cheese/ChangeLog,v 1.40 2011/02/15 08:12:36 eva Exp $ + + 15 Feb 2011; Gilles Dartiguelongue <eva@gentoo.org> cheese-2.32.0.ebuild: + Fix gdk-pixbuf/gtk+ USE flag dependencies. 02 Nov 2010; Arun Raghavan <ford_prefect@gentoo.org> cheese-2.32.0.ebuild: Clarify gnome-desktop dep as being slot 2 diff --git a/media-video/cheese/cheese-2.32.0.ebuild b/media-video/cheese/cheese-2.32.0.ebuild index 673e9c4a6439..48d3cdda9ed1 100644 --- a/media-video/cheese/cheese-2.32.0.ebuild +++ b/media-video/cheese/cheese-2.32.0.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/cheese/cheese-2.32.0.ebuild,v 1.3 2010/11/02 02:51:13 ford_prefect Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/cheese/cheese-2.32.0.ebuild,v 1.4 2011/02/15 08:12:36 eva Exp $ EAPI="3" GCONF_DEBUG="no" @@ -17,7 +17,10 @@ IUSE="doc v4l" COMMON_DEPEND=">=dev-libs/dbus-glib-0.7 >=dev-libs/glib-2.16:2 - >=x11-libs/gtk+-2.19.1:2[jpeg] + >=x11-libs/gtk+-2.19.1:2 + || ( + x11-libs/gtk+:2[jpeg] + x11-libs/gdk-pixbuf:2[jpeg] ) >=x11-libs/cairo-1.4 >=x11-libs/pango-1.18 >=sys-apps/dbus-1[X] |