diff options
| author |   Sebastian Pipping <sping@gentoo.org> | 2011-06-09 01:21:35 +0000 |
|---|---|---|
| committer | Sebastian Pipping <sping@gentoo.org> | 2011-06-09 01:21:35 +0000 |
| commit | bd91c1904dd2aa427dee9242cf34d8e471150210 (patch) | |
| tree | 0ded508dd165db97e8cebf56d3b5cb6c115810a9 /media-sound | |
| parent | Version bump. Use the git-2 eclass and update dependencies for the live ebuild. (diff) | |
| download | gentoo-2-bd91c1904dd2aa427dee9242cf34d8e471150210.tar.gz gentoo-2-bd91c1904dd2aa427dee9242cf34d8e471150210.tar.bz2 gentoo-2-bd91c1904dd2aa427dee9242cf34d8e471150210.zip | |
media-sound/rhythmbox: Fix conclict with sys-fs/udev-171 (bug #370379)
(Portage version: 2.1.10/cvs/Linux x86_64)
Diffstat (limited to 'media-sound')
| -rw-r--r-- | media-sound/rhythmbox/ChangeLog | 7 | ||||
| -rw-r--r-- | media-sound/rhythmbox/rhythmbox-0.12.8-r1.ebuild | 4 | ||||
| -rw-r--r-- | media-sound/rhythmbox/rhythmbox-0.13.3.ebuild | 4 |
3 files changed, 10 insertions, 5 deletions
diff --git a/media-sound/rhythmbox/ChangeLog b/media-sound/rhythmbox/ChangeLog index 79d7cd75d967..83c20504dd23 100644 --- a/media-sound/rhythmbox/ChangeLog +++ b/media-sound/rhythmbox/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-sound/rhythmbox # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v 1.203 2011/04/14 10:44:36 nirbheek Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v 1.204 2011/06/09 01:21:35 sping Exp $ + + 09 Jun 2011; Sebastian Pipping <sping@gentoo.org> rhythmbox-0.12.8-r1.ebuild, + rhythmbox-0.13.3.ebuild: + Add >=sys-fs/udev-171[gudev] as an alternative dependency to + >=sys-fs/udev-145[extras] (bug #370379) 14 Apr 2011; Nirbheek Chauhan <nirbheek@gentoo.org> rhythmbox-0.13.3.ebuild: diff --git a/media-sound/rhythmbox/rhythmbox-0.12.8-r1.ebuild b/media-sound/rhythmbox/rhythmbox-0.12.8-r1.ebuild index c73760fd75e8..75c712f6170c 100644 --- a/media-sound/rhythmbox/rhythmbox-0.12.8-r1.ebuild +++ b/media-sound/rhythmbox/rhythmbox-0.12.8-r1.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-sound/rhythmbox/rhythmbox-0.12.8-r1.ebuild,v 1.13 2011/03/27 17:33:27 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.12.8-r1.ebuild,v 1.14 2011/06/09 01:21:35 sping Exp $ EAPI="2" @@ -38,7 +38,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.18:2 udev? ( ipod? ( >=media-libs/libgpod-0.6 ) mtp? ( >=media-libs/libmtp-0.3 ) - >=sys-fs/udev-145[extras] ) + || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] ) ) libnotify? ( >=x11-libs/libnotify-0.4.1 ) lirc? ( app-misc/lirc ) musicbrainz? ( media-libs/musicbrainz:3 ) diff --git a/media-sound/rhythmbox/rhythmbox-0.13.3.ebuild b/media-sound/rhythmbox/rhythmbox-0.13.3.ebuild index 335aead25532..c2b9133b8200 100644 --- a/media-sound/rhythmbox/rhythmbox-0.13.3.ebuild +++ b/media-sound/rhythmbox/rhythmbox-0.13.3.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-sound/rhythmbox/rhythmbox-0.13.3.ebuild,v 1.4 2011/04/14 10:44:36 nirbheek Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.13.3.ebuild,v 1.5 2011/06/09 01:21:35 sping Exp $ EAPI="3" PYTHON_DEPEND="python? 2:2.4" @@ -43,7 +43,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.26:2 udev? ( ipod? ( >=media-libs/libgpod-0.7.92 ) mtp? ( >=media-libs/libmtp-0.3 ) - >=sys-fs/udev-145[extras] ) + || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] ) ) lastfm? ( dev-libs/json-glib ) libnotify? ( >=x11-libs/libnotify-0.4.1 ) lirc? ( app-misc/lirc ) |