media-sound/rhythmbox: Fix conclict with sys-fs/udev-171 (bug #370379)

Package-Manager: portage-2.1.10/cvs/Linux x86_64

4 files changed, 13 insertions, 28 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/Manifest b/media-sound/rhythmbox/Manifest
index 08370c285934..0615c99ddf42 100644
--- a/media-sound/rhythmbox/Manifest
+++ b/media-sound/rhythmbox/Manifest
@@ -1,29 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX rhythmbox-0.12-python-initialization.patch 5167 RMD160 cacae6274841d595a0d55ed92c42815793081176 SHA1 0b306455b027f8f9c73e185acdbbb1d041ce882d SHA256 54f3f492d4c3204b93a1fed3886ca76aa42d36737e66c6424426fc0116b25d3e
 AUX rhythmbox-0.12.8-libnotify-0.7.patch 1156 RMD160 78ce782ffc424eefbe9fc59cb94e245714377c61 SHA1 cef431a34f3e82d3475229b3111ca234af8aee7d SHA256 39b66a3b8e439f0e0dbde63a1d7f5472c262f344db1334b24591e18be22fb46d
 AUX rhythmbox-0.12.8-namespace-conflict.patch 2155 RMD160 2ed6fe3966c860845d0d12ca3e8023c78d7e1bdb SHA1 6e67ba7802d6dc1ff4131942d9aa1af91dec2586 SHA256 538b36af3824aa45b215b247d586c872ff1ee6cb174b8764e22a11410fd3a204
 DIST rhythmbox-0.12.8.tar.bz2 5358950 RMD160 072d4fa06408ebc181b40147db1575d0ef4c99fe SHA1 5d27923cc29b81d7bfbc73d867d7976a5295f964 SHA256 1752fab135808aa78a9afde78448e992020c58c07701f43c989fbabfc6352213
 DIST rhythmbox-0.13.3.tar.bz2 9978135 RMD160 f6f155768ce9c87d844ee47f7f1cc4f167d05052 SHA1 1c6e83972dcd7de8fc1a71586843e29092a0c706 SHA256 ad6532864bb4df30f1014ec81ddc0d2d3f69241235627f46abe5578cf629052a
-EBUILD rhythmbox-0.12.8-r1.ebuild 5018 RMD160 e7273790a1ec6c2eb389f2236ee24d6c3f47e292 SHA1 9802498b41757a0e9e3f49d60447d63e4ede97d4 SHA256 8114581a7c0305bfaf313721818387cf2e9a3d6e5cdfddb47d2648f2815aaf74
-EBUILD rhythmbox-0.13.3.ebuild 4962 RMD160 2e453f2dd41c9362f297ab74551a89a2e3db505b SHA1 aea1861fd98b1adab5377446b49a3a2977e0d944 SHA256 1ed4f2768fbd38c0ae612f3f02a8e205ebc7eab9632ca14a4e59c75e485b19d4
-MISC ChangeLog 31323 RMD160 12753af412055dbe80107c48a7d55a56648cd318 SHA1 9de237c0c00283b017b1d7fbe5ac8043f72ae321 SHA256 90eddd647cb204b4f309f57216ce78d1f6e2bfd9ee45f4dc13ad1c827a14ad74
+EBUILD rhythmbox-0.12.8-r1.ebuild 5046 RMD160 d0de9d16fe74c733adcba15ffffe8e4bf029f8a7 SHA1 f9b001dfc7ded956f05dd4d218fd0d0660205a59 SHA256 016709936561a7b9f069802ec33cc4e50c785460696de7ef013c0c82268944b9
+EBUILD rhythmbox-0.13.3.ebuild 4991 RMD160 66c370eb7aa09e644e93d044283122ebf6a705a6 SHA1 b628ce8e0ae75d32cf504024d849b48f30b76adc SHA256 0ed57788ecd9b5603f25c7bf95d199d8aa465d6e87032801af270fb434ceb875
+MISC ChangeLog 31533 RMD160 6ad64221c4e4d8bfc7531036815d212d492f9ff4 SHA1 d22ab583169235c6651d5fb2ad86a5279c40b9d9 SHA256 357d70b559e4cc84ae7dbdf78f20cb18961b1d08c8da1f28233d9aa515e119c6
 MISC metadata.xml 493 RMD160 99d7c84f2cb44d34d07dbdbc9666531ca7d081ef SHA1 e014344c61ed45fd609943fec4097f3861bcebec SHA256 1fece30d8969d46bfa5a547efda6d08b53017ad2475729fc8e7b8ee25621dc0f
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQIcBAEBAgAGBQJNptAQAAoJEO/kOhxWD91k/L8P/RoPwBMgV7s50Mft8RNMYmuI
-idC4HroJRAzzG3izdSQeU/ndHOLVVxJdDSrqkFAoHzvxGEi35DDFbgjxlJKeKze0
-n0UO4DlA+772x5wEk36oofrQkXo1ngW15M/Ane5gH4o3QP3a68VNF7RiogBOo4bK
-Ph/x2RtLNGRdeh5AS82osRRZaHDtzhlZI+d5ckIyfrpDMGq+gCLaRKukKlLLvaZB
-P+pEA/QwmVKowT4Xeb3I9JWJu4G/Rp0tDr6EIDepCEV4YUxQekTIVhokNMonAOFY
-yy3AuImPd5AaQOtBFNis86xeyMBoHOaj71tJV4qD+oaEMy61EN2cOMb31+sNI0tr
-6T4YmN6DdXIi1aWbzhu/Q2Wlj4xo1ppvbaaBzLk1Y5Ujs8qFtEzGxW1LDBsTNUmN
-rU9Ir44jt+BXFha6wz5BZpsgwsKIWBVF2muW5TqRx3jTwlyVBDtnfPp7yqaPKBCr
-z3i5gS7u9b946vao08Dx2Zs50ecas+CgBWKtMM1YFeZTB/FXARIIsW2atSaOMzz4
-G34ueULt1r4o9CWA3gOlKPm8vtYVo5tTn/JMMyeT90qLzX3i+jvmKKIUCcR2J68z
-D3v/yAZxH5HkatjaSKYjfPmHCahacSMR78pxQ5fMVWQx2eBKIgCreyw6sz9zjL+l
-rhQvFMR6+8IokYpOjoU/
-=XWJf
------END PGP SIGNATURE-----
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 )