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 | 4861dbfb9bad3333e1d7331a8f68d8aed89efdbd (patch) | |
tree | e223a3880506d54dc4d2b832e7ed7821593a5266 /media-video/cheese | |
parent | media-sound/rhythmbox: Fix conclict with sys-fs/udev-171 (bug #370379) (diff) | |
download | historical-4861dbfb9bad3333e1d7331a8f68d8aed89efdbd.tar.gz historical-4861dbfb9bad3333e1d7331a8f68d8aed89efdbd.tar.bz2 historical-4861dbfb9bad3333e1d7331a8f68d8aed89efdbd.zip |
media-video/cheese: Fix conclict with sys-fs/udev-171 (bug ##370381)
Package-Manager: portage-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/Manifest | 14 | ||||
-rw-r--r-- | media-video/cheese/cheese-2.32.0.ebuild | 4 |
3 files changed, 9 insertions, 15 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/Manifest b/media-video/cheese/Manifest index 7a30c60f629c..29ca325b892e 100644 --- a/media-video/cheese/Manifest +++ b/media-video/cheese/Manifest @@ -1,14 +1,4 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - DIST cheese-2.32.0.tar.bz2 5303805 RMD160 a52845cd51cc223854141d3f1a5f30f934109e24 SHA1 32c8d087f796799153f9365e9e0082068db0e0cb SHA256 8debc47113d9889247f411d256a8eca0d8da49e5ab5909c200923945b8d5e087 -EBUILD cheese-2.32.0.ebuild 1821 RMD160 0cca906f447183a5cfa6b9515cce91d5623795e4 SHA1 5fffc1b097568ad775ae32747313a099700363b0 SHA256 7f14b386e03dd8250ff39d2e3f5cb60e0fa244a8e1106207060888706d65604a -MISC ChangeLog 7405 RMD160 ced38bd81ef6a1075aa9841a9ccadc119c566b66 SHA1 067c26b4fbac74d7edf3d9bb27404c8106ef2fd9 SHA256 22eb750518b4b11d2b914c12fb045dac5060b90ec1cd074fdff03949b30287ca +EBUILD cheese-2.32.0.ebuild 1849 RMD160 2cb38572cce85c868405c16ed193e15742b88d8a SHA1 47efdc3b9a6cb617806b8096f6b5ba83de540573 SHA256 753b5d184017784c9aea8312ae01b1dd5b2fa4f88cb83e56314138dcd7cbeab2 +MISC ChangeLog 7584 RMD160 4f236f11a505178f8ecd4529979e7cff1f2a13ce SHA1 1c1adc96bcc594a5b88a97e4b0ba4a52b9c07efc SHA256 a44a5a0c58688f859821c870641f0128585207da9fe77d2bd948ac88445689a7 MISC metadata.xml 327 RMD160 268d592c31ba814f607002d14ce24e23c5a57e79 SHA1 c14a18cd951d749c88ad9d6b09bfd942e3eb0a35 SHA256 d01ed77f4fec70b249e7df85f015d7f8e4afd11ed5e77de4e98565ff230cb091 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) - -iF4EAREIAAYFAk2UMqMACgkQXkR9YqOcLPG78wD/WKNTZY2TNMpAYuthw+SFUoDK -WitLeXEwayDvNs+hxncA/1FIQ53vUcYUo2fuD6R5BmHKJinDBKZ9BBVQxeHQB61K -=QhjT ------END PGP SIGNATURE----- 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 |