diff options
| author |   Sebastian Pipping <sping@gentoo.org> | 2011-06-09 01:41:03 +0000 |
|---|---|---|
| committer | Sebastian Pipping <sping@gentoo.org> | 2011-06-09 01:41:03 +0000 |
| commit | 6fe5ecebbf2e45a2ccad211565e6749967c15eec (patch) | |
| tree | 04350e8f4282af392bd77d0aa194227b17f12ec4 /net-misc | |
| parent | Control nfs support via USE=nfs to fix building with glibc-2.14 #370655 by Di... (diff) | |
| download | gentoo-2-6fe5ecebbf2e45a2ccad211565e6749967c15eec.tar.gz gentoo-2-6fe5ecebbf2e45a2ccad211565e6749967c15eec.tar.bz2 gentoo-2-6fe5ecebbf2e45a2ccad211565e6749967c15eec.zip | |
net-misc/networkmanager: Fix conclict with sys-fs/udev-171 (bug #370339)
(Portage version: 2.1.10/cvs/Linux x86_64)
Diffstat (limited to 'net-misc')
8 files changed, 24 insertions, 16 deletions
diff --git a/net-misc/networkmanager/ChangeLog b/net-misc/networkmanager/ChangeLog index 55a84c80fa52..9d52b7a2fa08 100644 --- a/net-misc/networkmanager/ChangeLog +++ b/net-misc/networkmanager/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for net-misc/networkmanager # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.105 2011/05/18 11:20:12 qiaomuf Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.106 2011/06/09 01:41:03 sping Exp $ + + 09 Jun 2011; Sebastian Pipping <sping@gentoo.org> + networkmanager-0.8-r1.ebuild, networkmanager-0.8.1-r6.ebuild, + networkmanager-0.8.2-r1.ebuild, networkmanager-0.8.2-r2.ebuild, + networkmanager-0.8.2-r6.ebuild, networkmanager-0.8.2-r10.ebuild, + networkmanager-0.8.4.0-r1.ebuild: + Add >=sys-fs/udev-171[gudev] as an alternative dependency to + >=sys-fs/udev-145[extras] (bug #370339) *networkmanager-0.8.4.0-r1 (18 May 2011) diff --git a/net-misc/networkmanager/networkmanager-0.8-r1.ebuild b/net-misc/networkmanager/networkmanager-0.8-r1.ebuild index 6146d4d95fa0..43e015a595a8 100644 --- a/net-misc/networkmanager/networkmanager-0.8-r1.ebuild +++ b/net-misc/networkmanager/networkmanager-0.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/net-misc/networkmanager/networkmanager-0.8-r1.ebuild,v 1.11 2011/01/31 15:17:30 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.8-r1.ebuild,v 1.12 2011/06/09 01:41:03 sping Exp $ EAPI="2" @@ -22,7 +22,7 @@ IUSE="avahi bluetooth doc nss gnutls dhclient dhcpcd resolvconf connection-shari RDEPEND=">=sys-apps/dbus-1.2 >=dev-libs/dbus-glib-0.75 >=net-wireless/wireless-tools-28_pre9 - >=sys-fs/udev-145[extras] + || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] ) >=dev-libs/glib-2.18 >=sys-auth/polkit-0.92 >=dev-libs/libnl-1.1 diff --git a/net-misc/networkmanager/networkmanager-0.8.1-r6.ebuild b/net-misc/networkmanager/networkmanager-0.8.1-r6.ebuild index 3d6ffd11571f..246c6ccb3fcb 100644 --- a/net-misc/networkmanager/networkmanager-0.8.1-r6.ebuild +++ b/net-misc/networkmanager/networkmanager-0.8.1-r6.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/networkmanager/networkmanager-0.8.1-r6.ebuild,v 1.3 2011/01/31 15:17:30 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.8.1-r6.ebuild,v 1.4 2011/06/09 01:41:03 sping Exp $ EAPI="2" @@ -23,7 +23,7 @@ IUSE="avahi bluetooth doc nss gnutls dhclient dhcpcd kernel_linux resolvconf con RDEPEND=">=sys-apps/dbus-1.2 >=dev-libs/dbus-glib-0.75 >=net-wireless/wireless-tools-28_pre9 - >=sys-fs/udev-145[extras] + || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] ) >=dev-libs/glib-2.18 >=sys-auth/polkit-0.92 >=dev-libs/libnl-1.1 diff --git a/net-misc/networkmanager/networkmanager-0.8.2-r1.ebuild b/net-misc/networkmanager/networkmanager-0.8.2-r1.ebuild index f39e3320da2f..27be77c2fafe 100644 --- a/net-misc/networkmanager/networkmanager-0.8.2-r1.ebuild +++ b/net-misc/networkmanager/networkmanager-0.8.2-r1.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/networkmanager/networkmanager-0.8.2-r1.ebuild,v 1.1 2010/11/30 09:35:18 qiaomuf Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.8.2-r1.ebuild,v 1.2 2011/06/09 01:41:03 sping Exp $ EAPI="2" @@ -22,7 +22,7 @@ IUSE="avahi bluetooth doc nss gnutls dhclient dhcpcd kernel_linux resolvconf con RDEPEND=">=sys-apps/dbus-1.2 >=dev-libs/dbus-glib-0.75 >=net-wireless/wireless-tools-28_pre9 - >=sys-fs/udev-145[extras] + || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] ) >=dev-libs/glib-2.18 >=sys-auth/polkit-0.92 >=dev-libs/libnl-1.1 diff --git a/net-misc/networkmanager/networkmanager-0.8.2-r10.ebuild b/net-misc/networkmanager/networkmanager-0.8.2-r10.ebuild index cd38ce13eca7..ecfefa8d9eb4 100644 --- a/net-misc/networkmanager/networkmanager-0.8.2-r10.ebuild +++ b/net-misc/networkmanager/networkmanager-0.8.2-r10.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/networkmanager/networkmanager-0.8.2-r10.ebuild,v 1.1 2011/03/09 14:14:23 dagger Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.8.2-r10.ebuild,v 1.2 2011/06/09 01:41:03 sping Exp $ EAPI="2" @@ -22,7 +22,7 @@ IUSE="avahi bluetooth doc nss gnutls dhclient dhcpcd kernel_linux resolvconf con RDEPEND=">=sys-apps/dbus-1.2 >=dev-libs/dbus-glib-0.75 >=net-wireless/wireless-tools-28_pre9 - >=sys-fs/udev-145[extras] + || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] ) >=dev-libs/glib-2.18 >=sys-auth/polkit-0.92 >=dev-libs/libnl-1.1 diff --git a/net-misc/networkmanager/networkmanager-0.8.2-r2.ebuild b/net-misc/networkmanager/networkmanager-0.8.2-r2.ebuild index 4c6e2bdda355..a48a68fd2514 100644 --- a/net-misc/networkmanager/networkmanager-0.8.2-r2.ebuild +++ b/net-misc/networkmanager/networkmanager-0.8.2-r2.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/networkmanager/networkmanager-0.8.2-r2.ebuild,v 1.2 2011/01/31 15:17:30 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.8.2-r2.ebuild,v 1.3 2011/06/09 01:41:03 sping Exp $ EAPI="2" @@ -22,7 +22,7 @@ IUSE="avahi bluetooth doc nss gnutls dhclient dhcpcd kernel_linux resolvconf con RDEPEND=">=sys-apps/dbus-1.2 >=dev-libs/dbus-glib-0.75 >=net-wireless/wireless-tools-28_pre9 - >=sys-fs/udev-145[extras] + || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] ) >=dev-libs/glib-2.18 >=sys-auth/polkit-0.92 >=dev-libs/libnl-1.1 diff --git a/net-misc/networkmanager/networkmanager-0.8.2-r6.ebuild b/net-misc/networkmanager/networkmanager-0.8.2-r6.ebuild index 36a9fadf9c44..66b6a1c1de5d 100644 --- a/net-misc/networkmanager/networkmanager-0.8.2-r6.ebuild +++ b/net-misc/networkmanager/networkmanager-0.8.2-r6.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/networkmanager/networkmanager-0.8.2-r6.ebuild,v 1.1 2011/02/08 13:31:01 dagger Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.8.2-r6.ebuild,v 1.2 2011/06/09 01:41:03 sping Exp $ EAPI="2" @@ -22,7 +22,7 @@ IUSE="avahi bluetooth doc nss gnutls dhclient dhcpcd kernel_linux resolvconf con RDEPEND=">=sys-apps/dbus-1.2 >=dev-libs/dbus-glib-0.75 >=net-wireless/wireless-tools-28_pre9 - >=sys-fs/udev-145[extras] + || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] ) >=dev-libs/glib-2.18 >=sys-auth/polkit-0.92 >=dev-libs/libnl-1.1 diff --git a/net-misc/networkmanager/networkmanager-0.8.4.0-r1.ebuild b/net-misc/networkmanager/networkmanager-0.8.4.0-r1.ebuild index 4f7a00cd385b..b8ae56fe5375 100644 --- a/net-misc/networkmanager/networkmanager-0.8.4.0-r1.ebuild +++ b/net-misc/networkmanager/networkmanager-0.8.4.0-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/net-misc/networkmanager/networkmanager-0.8.4.0-r1.ebuild,v 1.1 2011/05/18 11:20:12 qiaomuf Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.8.4.0-r1.ebuild,v 1.2 2011/06/09 01:41:03 sping Exp $ EAPI="2" @@ -22,7 +22,7 @@ IUSE="avahi bluetooth doc nss gnutls dhclient dhcpcd kernel_linux resolvconf con RDEPEND=">=sys-apps/dbus-1.2 >=dev-libs/dbus-glib-0.75 >=net-wireless/wireless-tools-28_pre9 - >=sys-fs/udev-145[extras] + || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] ) >=dev-libs/glib-2.18 >=sys-auth/polkit-0.92 >=dev-libs/libnl-1.1 |