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

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

6 files changed, 23 insertions, 27 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/Manifest b/net-misc/modemmanager/Manifest
index 16f2285eb06e..6f406c1362ac 100644
--- a/net-misc/modemmanager/Manifest
+++ b/net-misc/modemmanager/Manifest
@@ -1,20 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST ModemManager-0.3.tar.bz2 363848 RMD160 e23ef4492df4f292531b588f99853c6ede078433 SHA1 d4adf26da3ef015d7cc4e25d2ebbc692b6c566f8 SHA256 6bcfce70a26ed9c3162ba23fd0591029441c57e146d7ff4b2fd8036eb50945da
 DIST ModemManager-0.4.tar.bz2 444746 RMD160 c2d82f746bc3611e11b7f0c4504fa4cc14fa0788 SHA1 786231841cfa3824ff69ad2c9a6a40b881689012 SHA256 8b5415ae8597726f82e9fd09237c02b5c8af7e9f4fc4cba00f9fe183cc2c6c5f
 DIST ModemManager-0.4_p20101211.tar.bz2 486733 RMD160 f9880d3316ba412178fd9c057eb317bf062fddd1 SHA1 59b75af0632b633fc6fb5b51633122401e726925 SHA256 fa62056609bd8aa23f7e66b46a05b5518bd509d7eb77d1b45ec3f073f235dbd4
 DIST ModemManager-0.4_p20110205.tar.bz2 482484 RMD160 7ef84838751685c2d731285b9ea78c0cadcdd684 SHA1 26a624c4a1a133a6b0817ed81fe1fa3e207647bc SHA256 fe3e9ab797e60bf4ead90c40ea88c33c81d36e991408f62276cb30111f66d051
-EBUILD modemmanager-0.3.ebuild 1045 RMD160 cbdd14dbf055453d90ba5e4ed487c5f76ac1b984 SHA1 91e39e656a584adb5d8f372b28b856eb7251d728 SHA256 c97046875250ca4975635ecf022822ad1f28ced3fc05754ac65c8281c86f5dec
-EBUILD modemmanager-0.4.ebuild 1871 RMD160 ae039343155e99f90cad560e0d0a51e49e51b296 SHA1 48f09562361b72c701efa70dee4059413e1b61c9 SHA256 c643c2f1e6a457aace4a2c5cb6d78960446c6817cfc1cc92258475c9b4d2f308
-EBUILD modemmanager-0.4_p20101211.ebuild 1952 RMD160 740bce0118259d016633b71d9911b1881c607bb5 SHA1 1eeb4a02612c1c45f0a17ecfbbe993cb0ce0d4f3 SHA256 00c8306fcdd4dd6baa76211ad85fbf1532d32156d3ebca25ad4aa2f7dae173d1
-EBUILD modemmanager-0.4_p20110205.ebuild 1952 RMD160 3cbb68d389006148592b7c4001486cc6212cac04 SHA1 6983b67cad6b1d7de1c1870412ab12fd3e6c3a7a SHA256 4b37d8ea35650bde25423d816953e5dd3c713ae9a1f8423b36274e12ac72bac9
-MISC ChangeLog 3190 RMD160 e6c5e321598c92dff27963f79ae2994711903e52 SHA1 568a38769d365b61a35380af05adbaa87ef8a7e3 SHA256 913c85ad0c6acc5512761a8d27c64f1fc2d8c61fc4c3e477519d51c1ad6bff81
+EBUILD modemmanager-0.3.ebuild 1076 RMD160 0703353e7b53564ab133690fd43d6bb72e7a5822 SHA1 9062bcb55b32440ea8d8cd58ea8947888e2e4f25 SHA256 4651e7b2b93dedecab3a7e2b7df27c55957c77af213bbbeb2c047a0d91ab13b3
+EBUILD modemmanager-0.4.ebuild 1899 RMD160 1f0197e22816ab58b3d3747c2edc07e7a09b762a SHA1 2438445cbe2a15a896529f710ca5ea96bcad7d47 SHA256 0a15d6aa26ee6a3be3448cbf6fe07a1dc11abf5ab184da8ac6c62fedf053617a
+EBUILD modemmanager-0.4_p20101211.ebuild 1983 RMD160 b94066b74fed8faa8bee77c2f100fbc9e7920a49 SHA1 2405dc7f2799ce71f488c0c43e03f0f679c6690d SHA256 abd24c7bac98f010316957c25c8ff63318c67256133c09ca1e32f431f20e801b
+EBUILD modemmanager-0.4_p20110205.ebuild 1983 RMD160 7d0ba25b99b6c6ab543af3c9c7570a5cdb38e772 SHA1 ef76449f7dcd15ae75a18685315b87a131c77af5 SHA256 69c708a9b923d82a8039697ebdee994bca424cb69668d452331950b0bd150d09
+MISC ChangeLog 3471 RMD160 ef3bea2969e865c7cbc213de8c67225697729ae8 SHA1 a532c2f0da935139442ff4c5eed652fb91a2eb43 SHA256 2777ea800a806cc7e9b01563b6839f7bd3d2035b440f48d3462580800c6210f4
 MISC metadata.xml 352 RMD160 9f952eb61b72059009703562b751c2523db8d769 SHA1 3e56456d5906a68f5f14fd0d97c22ef43f4f6a2e SHA256 1a8953fc88dcb46dd2a6a566027f69e792f03d7f86581546d8069cbe1768e53a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iF4EAREIAAYFAk2Zw6oACgkQXkR9YqOcLPEV6AD9Fb1XGRdEyiq3rYYWiTwp18aF
-faBllJnd1+1xXNL4vU8A/A+G5XWkxioqtx+1SllQpfhjqxlq9o1fcOAvD66yqMZ7
-=My4Y
------END PGP SIGNATURE-----
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 )"