diff options
| author |   Sebastian Pipping <sping@gentoo.org> | 2011-06-09 01:28:06 +0000 |
|---|---|---|
| committer | Sebastian Pipping <sping@gentoo.org> | 2011-06-09 01:28:06 +0000 |
| commit | f64407712ddf3b3a1506b36794b2ee4a91fa0db7 (patch) | |
| tree | b1b7b3ea8e1f2625e337f09bec427cb6a3b8ef37 /media-video/cheese | |
| parent | media-sound/rhythmbox: Fix conclict with sys-fs/udev-171 (bug #370379) (diff) | |
| download | gentoo-2-f64407712ddf3b3a1506b36794b2ee4a91fa0db7.tar.gz gentoo-2-f64407712ddf3b3a1506b36794b2ee4a91fa0db7.tar.bz2 gentoo-2-f64407712ddf3b3a1506b36794b2ee4a91fa0db7.zip | |
media-video/cheese: Fix conclict with sys-fs/udev-171 (bug ##370381)
(Portage version: 2.1.10/cvs/Linux x86_64)
Diffstat (limited to 'media-video/cheese')
| -rw-r--r-- | media-video/cheese/ChangeLog | 6 | ||||
| -rw-r--r-- | media-video/cheese/cheese-2.32.0.ebuild | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/media-video/cheese/ChangeLog b/media-video/cheese/ChangeLog index 0c809700d1a0..fe26629389c4 100644 --- a/media-video/cheese/ChangeLog +++ b/media-video/cheese/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/cheese # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/cheese/ChangeLog,v 1.47 2011/03/31 07:51:18 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/cheese/ChangeLog,v 1.48 2011/06/09 01:28:06 sping Exp $ + + 09 Jun 2011; Sebastian Pipping <sping@gentoo.org> cheese-2.32.0.ebuild: + Add >=sys-fs/udev-171[gudev] as an alternative dependency to + >=sys-fs/udev-145-r1[extras] (bug #370381) 31 Mar 2011; Samuli Suominen <ssuominen@gentoo.org> cheese-2.32.0.ebuild: Remove USE="v4l" and gst-plugins-v4l RDEPEND wrt #359647. diff --git a/media-video/cheese/cheese-2.32.0.ebuild b/media-video/cheese/cheese-2.32.0.ebuild index 46fffa62d53c..3fb05b70ee2d 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-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.11 2011/03/31 07:51:18 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/cheese/cheese-2.32.0.ebuild,v 1.12 2011/06/09 01:28:06 sping Exp $ EAPI="3" GCONF_DEBUG="no" @@ -24,7 +24,7 @@ COMMON_DEPEND=">=dev-libs/dbus-glib-0.7 >=x11-libs/cairo-1.4 >=x11-libs/pango-1.18 >=sys-apps/dbus-1[X] - >=sys-fs/udev-145-r1[extras] + || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145-r1[extras] ) >=gnome-base/gconf-2.16:2 >=gnome-base/gnome-desktop-2.26:2 >=gnome-base/librsvg-2.18:2 |