net-misc/modemmanager: Fix conclict with sys-fs/udev-171 (bug #370385)

(Portage version: 2.1.10/cvs/Linux x86_64)

5 files changed, 18 insertions, 12 deletions

diff --git a/net-misc/modemmanager/ChangeLog b/net-misc/modemmanager/ChangeLog
index bd12f7fbbf2e..9b79550e5417 100644
--- a/net-misc/modemmanager/ChangeLog
+++ b/net-misc/modemmanager/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/modemmanager
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/modemmanager/ChangeLog,v 1.18 2011/02/05 00:00:36 dagger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/modemmanager/ChangeLog,v 1.19 2011/06/09 02:02:42 sping Exp $
+
+  09 Jun 2011; Sebastian Pipping <sping@gentoo.org> modemmanager-0.3.ebuild,
+  modemmanager-0.4.ebuild, modemmanager-0.4_p20101211.ebuild,
+  modemmanager-0.4_p20110205.ebuild:
+  Add >=sys-fs/udev-171[gudev] as an alternative dependency to
+  >=sys-fs/udev-145[extras] (bug #370385)
 
 *modemmanager-0.4_p20110205 (04 Feb 2011)
 
diff --git a/net-misc/modemmanager/modemmanager-0.3.ebuild b/net-misc/modemmanager/modemmanager-0.3.ebuild
index 125f2fd59589..682e6cc00c1e 100644
--- a/net-misc/modemmanager/modemmanager-0.3.ebuild
+++ b/net-misc/modemmanager/modemmanager-0.3.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/net-misc/modemmanager/modemmanager-0.3.ebuild,v 1.2 2010/03/10 08:58:25 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/modemmanager/modemmanager-0.3.ebuild,v 1.3 2011/06/09 02:02:42 sping Exp $
 
 EAPI="2"
 
@@ -21,7 +21,7 @@ IUSE="doc test"
 RDEPEND=">=dev-libs/glib-2.18
 	>=dev-libs/dbus-glib-0.75
 	net-dialup/ppp"
-DEPEND=">=sys-fs/udev-145[extras]
+DEPEND="|| ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] )
 	dev-util/pkgconfig"
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/net-misc/modemmanager/modemmanager-0.4.ebuild b/net-misc/modemmanager/modemmanager-0.4.ebuild
index fdc474e1572e..4d8af84d0ac0 100644
--- a/net-misc/modemmanager/modemmanager-0.4.ebuild
+++ b/net-misc/modemmanager/modemmanager-0.4.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/net-misc/modemmanager/modemmanager-0.4.ebuild,v 1.5 2010/10/28 09:04:31 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/modemmanager/modemmanager-0.4.ebuild,v 1.6 2011/06/09 02:02:42 sping Exp $
 
 EAPI="2"
 
@@ -19,7 +19,7 @@ KEYWORDS="amd64 ~arm ppc ppc64 x86"
 IUSE="doc policykit test"
 
 RDEPEND=">=dev-libs/glib-2.18
-	>=sys-fs/udev-145[extras]
+	|| ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] )
 	>=dev-libs/dbus-glib-0.86
 	net-dialup/ppp
 	policykit? ( >=sys-auth/polkit-0.95 )"
diff --git a/net-misc/modemmanager/modemmanager-0.4_p20101211.ebuild b/net-misc/modemmanager/modemmanager-0.4_p20101211.ebuild
index cd8430b898e2..6a868a00d88e 100644
--- a/net-misc/modemmanager/modemmanager-0.4_p20101211.ebuild
+++ b/net-misc/modemmanager/modemmanager-0.4_p20101211.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/net-misc/modemmanager/modemmanager-0.4_p20101211.ebuild,v 1.1 2010/12/11 21:22:51 dagger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/modemmanager/modemmanager-0.4_p20101211.ebuild,v 1.2 2011/06/09 02:02:42 sping Exp $
 
 EAPI="2"
 
@@ -20,7 +20,7 @@ KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 IUSE="doc policykit test"
 
 RDEPEND=">=dev-libs/glib-2.18
-	>=sys-fs/udev-145[extras]
+	|| ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] )
 	>=dev-libs/dbus-glib-0.86
 	net-dialup/ppp
 	policykit? ( >=sys-auth/polkit-0.95 )"
diff --git a/net-misc/modemmanager/modemmanager-0.4_p20110205.ebuild b/net-misc/modemmanager/modemmanager-0.4_p20110205.ebuild
index df1d4ad10b28..10f31b0a9a6d 100644
--- a/net-misc/modemmanager/modemmanager-0.4_p20110205.ebuild
+++ b/net-misc/modemmanager/modemmanager-0.4_p20110205.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/net-misc/modemmanager/modemmanager-0.4_p20110205.ebuild,v 1.1 2011/02/05 00:00:36 dagger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/modemmanager/modemmanager-0.4_p20110205.ebuild,v 1.2 2011/06/09 02:02:42 sping Exp $
 
 EAPI="2"
 
@@ -20,7 +20,7 @@ KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 IUSE="doc policykit test"
 
 RDEPEND=">=dev-libs/glib-2.18
-	>=sys-fs/udev-145[extras]
+	|| ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] )
 	>=dev-libs/dbus-glib-0.86
 	net-dialup/ppp
 	policykit? ( >=sys-auth/polkit-0.95 )"