diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2014-05-31 20:39:59 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2014-05-31 20:39:59 +0000 |
commit | c7b80626adb56662168a1f4f25e76e10becc1914 (patch) | |
tree | 9687a3d0bde239f3344aa6abe344aaccbd915996 /net-misc/networkmanager | |
parent | Fix up upower dependency, due to the 0.9 -> 0.99 bump; with help from ssuominen. (diff) | |
download | gentoo-2-c7b80626adb56662168a1f4f25e76e10becc1914.tar.gz gentoo-2-c7b80626adb56662168a1f4f25e76e10becc1914.tar.bz2 gentoo-2-c7b80626adb56662168a1f4f25e76e10becc1914.zip |
Allow falling back to sys-power/upower-pm-utils.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Diffstat (limited to 'net-misc/networkmanager')
-rw-r--r-- | net-misc/networkmanager/ChangeLog | 6 | ||||
-rw-r--r-- | net-misc/networkmanager/networkmanager-0.9.8.10.ebuild | 4 | ||||
-rw-r--r-- | net-misc/networkmanager/networkmanager-0.9.8.8.ebuild | 4 |
3 files changed, 9 insertions, 5 deletions
diff --git a/net-misc/networkmanager/ChangeLog b/net-misc/networkmanager/ChangeLog index 65d02ca59047..c93af306db71 100644 --- a/net-misc/networkmanager/ChangeLog +++ b/net-misc/networkmanager/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-misc/networkmanager # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.195 2014/04/27 18:04:11 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.196 2014/05/31 20:39:59 ssuominen Exp $ + + 31 May 2014; Samuli Suominen <ssuominen@gentoo.org> + networkmanager-0.9.8.10.ebuild, networkmanager-0.9.8.8.ebuild: + Allow falling back to sys-power/upower-pm-utils. *networkmanager-0.9.8.10 (27 Apr 2014) diff --git a/net-misc/networkmanager/networkmanager-0.9.8.10.ebuild b/net-misc/networkmanager/networkmanager-0.9.8.10.ebuild index 449a71c17d19..df933626ec62 100644 --- a/net-misc/networkmanager/networkmanager-0.9.8.10.ebuild +++ b/net-misc/networkmanager/networkmanager-0.9.8.10.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.9.8.10.ebuild,v 1.1 2014/04/27 18:04:11 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.9.8.10.ebuild,v 1.2 2014/05/31 20:39:59 ssuominen Exp $ EAPI="5" GNOME_ORG_MODULE="NetworkManager" @@ -51,7 +51,7 @@ COMMON_DEPEND=" ppp? ( >=net-dialup/ppp-2.4.5[ipv6] ) resolvconf? ( net-dns/openresolv ) systemd? ( >=sys-apps/systemd-183:0= ) - || ( sys-power/upower >=sys-apps/systemd-183 ) + || ( sys-power/upower sys-power/upower-pm-utils >=sys-apps/systemd-183 ) " RDEPEND="${COMMON_DEPEND} consolekit? ( sys-auth/consolekit ) diff --git a/net-misc/networkmanager/networkmanager-0.9.8.8.ebuild b/net-misc/networkmanager/networkmanager-0.9.8.8.ebuild index 506593cf4843..e90d54105f09 100644 --- a/net-misc/networkmanager/networkmanager-0.9.8.8.ebuild +++ b/net-misc/networkmanager/networkmanager-0.9.8.8.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.9.8.8.ebuild,v 1.11 2014/03/29 21:57:33 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.9.8.8.ebuild,v 1.12 2014/05/31 20:39:59 ssuominen Exp $ EAPI="5" GNOME_ORG_MODULE="NetworkManager" @@ -51,7 +51,7 @@ COMMON_DEPEND=" ppp? ( >=net-dialup/ppp-2.4.5[ipv6] ) resolvconf? ( net-dns/openresolv ) systemd? ( >=sys-apps/systemd-183:0= ) - || ( sys-power/upower >=sys-apps/systemd-183 ) + || ( sys-power/upower sys-power/upower-pm-utils >=sys-apps/systemd-183 ) " RDEPEND="${COMMON_DEPEND} consolekit? ( sys-auth/consolekit ) |