Version bump, lots of bugs fixed. "systemctl enable NetworkManager" now properly enables NetworkManager-dispatcher (bug #477086). Drop old.

Package-Manager: portage-2.2.4/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

6 files changed, 172 insertions, 278 deletions

diff --git a/net-misc/networkmanager/ChangeLog b/net-misc/networkmanager/ChangeLog
index 5539488f32cc..64f85942ef12 100644
--- a/net-misc/networkmanager/ChangeLog
+++ b/net-misc/networkmanager/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-misc/networkmanager
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.179 2013/07/25 17:39:00 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.180 2013/09/15 04:31:07 tetromino Exp $
+
+*networkmanager-0.9.8.4 (15 Sep 2013)
+
+  15 Sep 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -networkmanager-0.9.8.2.ebuild, -networkmanager-0.9.8.2-r2.ebuild,
+  +networkmanager-0.9.8.4.ebuild, -files/10-openrc-status-r2,
+  +files/networkmanager-0.9.8.4-pre-sleep.patch:
+  Version bump, lots of bugs fixed. "systemctl enable NetworkManager" now
+  properly enables NetworkManager-dispatcher (bug #477086). Drop old.
 
   25 Jul 2013; Pacho Ramos <pacho@gentoo.org> networkmanager-0.9.8.2-r3.ebuild:
   Refix completion dir using eclass (#477820 by Alexander Tsoy and poncho)
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 0fdae0bc1880..b8f1626a72ca 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -3,7 +3,6 @@ Hash: SHA256
 
 AUX 01-org.freedesktop.NetworkManager.settings.modify.system.pkla 187 SHA256 909356b25e2d887a31c0f9f2a23a466957f27b163bbd5172fa852988a1db1860 SHA512 b0f24294cf9a0c09ffa323c4d79a6758b128ae60d35eebc7db3a6de35a2117a5aeb58ede132be8170876ab069a2afc81cca3c75ee0e9f6e3a37fe5c9e45bbce4 WHIRLPOOL 54cb4687452bbba2ba78ed7fc237ef72f7b8e07fb30d239a1b7d5845c73eada0442ec1f18a9e3730169f30a621f0f45b4f715fa29d2e31084eefa8877925531d
 AUX 01-org.freedesktop.NetworkManager.settings.modify.system.rules 265 SHA256 702e1e702ec633608fd75dfd44f66437896421c9d2d7fe9966df8e4ef1d93a6c SHA512 22dfa5b071891ba16b9a8b90a1964d56e370cb640d78191934ae802e568f92c299b9d4d965f7081fb36a8c09378bfb0b33193b2332cbdc28c6799b152128c214 WHIRLPOOL b89a4069cc973cf55001a5f0028c75a90ce4ea070c4424b5a22f3e9b8e61ee34ff7b06891eb1c6f8fa24735b3e5d98e61f0bfefca7dd12eeb615b83e72225c8b
-AUX 10-openrc-status-r2 899 SHA256 4391d3c53f7904bfd287e767c791c5c1b605d5bff7f5aaa00b8d7655101f2732 SHA512 5b5f783d2c68da4f47db919aea60963986638c313645e8f0ba3c89b3b339257b28eaaf65571536254e266e1da510cde7a157a8fdba1feb0d79b4d0c8ee3c51af WHIRLPOOL b941201368ee8c419fbbd0b33752deb70d9b9e140c76d74f50836734d22eeae70790cc3c7ac3b07cd40f95c3635fd99db92e161a21d74af1889dc0c48bb049ac
 AUX 10-openrc-status-r3 1103 SHA256 3ee158de440df6e6a8ddcc7c0622cb94039cffe6b0cc0b88d35a53333d32f73d SHA512 b848327b0975a59420a4e7132c45a15267a7d98b0f430f52d95991e7946eca787faf5b9a5adb3f1b294f5cc761f14d693d9d4e604ff091160da9610b76cb72e8 WHIRLPOOL 7745a0469e1bec653736c14e4e6f5f9593ef9a752d4973ad538350a1f934bcdf1e2cd4c276ce3f57515e9d8c34168014e138ab9627e57cd3cef79b852ebacc40
 AUX 10-openrc-status-r4 1182 SHA256 f8ed424818b866a0bf882c569f4484e8b1485ce7ac8c472f060fd877f2dcfe65 SHA512 b1f0cd7eaeb13af9ab1ce192fd3f47e52d505c4ad5a0888af1ad2598701a034231c03f5346441f44443daca84f2089cb68e08c2876396be0e668c484c3d331ec WHIRLPOOL c71c923c293730894a660c8db3371fee2697666388f49947ecc2508b18a0a0d16a72643f34e8a1dadb559743ea1b56a34d3abfd95bced85dc0d753a33d661fb8
 AUX conf.d.NetworkManager 230 SHA256 4594573f01fe5e04b6dde4525796acf909158591bdcefd662ec23fe0d1c3e1bd SHA512 f8c9331834cbc66ab0e4e6f4a120fde6a08a435d680a1e1087718fdbb2b9843a313e7ec30b7008822999dafd98e152aa7d2a96f87320ba9c91c3adb63e0b7c9a WHIRLPOOL 7dbb15bf184e918369187605af91816ed11c460147066ede11f200d73103bb6f7f63ccc7abe7996d485294f44282d6bbd9520cc9e50f04ce41262c9817f7b994
@@ -22,20 +21,25 @@ AUX networkmanager-0.9.4.0-wifi-kernel-api.patch 2734 SHA256 e442f9ea526ae37f216
 AUX networkmanager-0.9.6.0-daemon-signals.patch 1045 SHA256 eb9e01f5622aabf611f881e3bf7989cdaa9df25dc19b0087747f04c423efe503 SHA512 2f6e7fcb76eb3944ae5df0fcc7b894ed45a8e852b0cba425fc6001de8a5532a1691ed847bb6c0b54988b9f2df5e9fa1720e4c6306e295477d7c8d246d00bf29a WHIRLPOOL 3243def958145d734954b8baaf4fefce4b9becf7e274f297010be9fb80998ae43df987061a7e0d00348df68bb84e92e1f90b5419567b88ed5a72e0db200a9598
 AUX networkmanager-0.9.7.995-pre-sleep.patch 4585 SHA256 d01d598846fccacbc5d4ddda8d31b6113c193bdbf2adbd72786d8385b9ae3d2a SHA512 d7e4b9a0dc934382e3fa3c49dcae0f9d5fb5eed39c67ca4f4a372acdfcd84beee4bbf7f9ce484f04b063cd0626d5c81ba69de1bdb3496746a0fff7a434864719 WHIRLPOOL 0d7f59fb2bbce67dce03e2286c294658e571cf57e1fc9915462a947def16ee695fc55e36abd171f491db9d23c184bdf5ea65e9e235cd5a76e7c0a656db800c52
 AUX networkmanager-0.9.8.2-allow-new-dhcpcd.patch 917 SHA256 b3a69fd9850634edc19a0db4d3ba5e8e3127c7aab518d3249e9b90420a98c667 SHA512 82aab846312f4932560b141c59fe2be75050879c1200a12391cca64fbcb62f7ccbb081eaf8a0b4af296c694c6936a48ede05303aef2b2566a23ca20770e31f85 WHIRLPOOL 105af5b1127ded7f121bcbaa41009f3d185c444f3541ce0af58c316c11f61a7c911205b399013015a0d12fb12fa876b6c7f055feb6482d99c982569bc2a8f253
+AUX networkmanager-0.9.8.4-pre-sleep.patch 4606 SHA256 ea70654524d5b414fcef10164b8dfb5e84bdf2444341f62fc7617952e2e721de SHA512 0781743f1e1afce3e51df6958996ea96885f56be96bd377dfbf115efaaa935396d468c701dd8a8c97e3a1623743476880e5936f4c0db4d560188e1f4c3b9b814 WHIRLPOOL 76dc1381cf0d7aa4d2d1530c077379929b40fcd54f66426ff46cca28d128fb40c88fd15bb6cb6139bec8c6bc338dbc8d266512056d27f307fa4e830cf28deb12
 AUX nm-system-settings.conf-ifnet 70 SHA256 34f53d9ac1ad65eda6942dc3059117f60f6321059ca23f4fbfcc2f2edcae151f SHA512 74304a367c0675cfc88a6ae17b291a9bc20f24a9dab72e9a4578e697870c4d96245aa45ce62ec86f1e5e7e3069ab8fccec33936e479ca630a836805addb5574d WHIRLPOOL 24e140440014c07c355cecab0564d6a57fc2e37e3ded242f3b9dd3e6ddd05dd924a7497400d2984eed407e99ba9661028a159dd4e393917cee7665b0ff4737eb
 DIST NetworkManager-0.9.6.4.tar.xz 1968564 SHA256 511b411e055d187bc8f26c519fdb3e55e07fc40d4adecbbec623c0249380a7eb SHA512 900eb30f7fed35d43f2c1003fcf7fc0b6ab9c5a9f0a14777d4636372376af8477e63fc7fc9b05d2f281d48de658d96d9b30f44851af8ae2b4271bb2b5c2cb669 WHIRLPOOL b87903e4cbb3efcec17b25e74dd67dc6a81a6d553df57e9c699bb1f0d40fe6d611953f6baaeca48ef4387316980d775ec2b07a9df06ecb5f03c10dffc2b60584
 DIST NetworkManager-0.9.8.2.tar.xz 1967452 SHA256 5c0b2f71b2f61e0dfbe95cebad83001758db252d5cdf5b6f7ceebac9c6bd7ead SHA512 a731b85d267bcbd837960b0b1bec2c8ec0458180a751bce353e763e9fca033dfc8101a1267101dadcc8984138a4b693a198a09c15acd7faab3930f98c8246775 WHIRLPOOL 788c3f07f66aca9099349a1a8325cf4ba5c23665d019c508baf4bf037f77316379a1c47c1eb67d4ab6ef845ff6a783e2453d6ff50cde6b830d36f2d5cd648e3c
+DIST NetworkManager-0.9.8.4.tar.xz 2007408 SHA256 4c9ff0aaf52bee8df9a73290ec2b3f4441ff504420d0b0dfd729b00a92d80d99 SHA512 2e70ab144a07d5d452efbd445ab0fc28a0a64934661cc77456ec0c4f8ba4015e8943759954b0c6d6bb0994237e97a53ff16929a4ac7a620cfc5fde095f02c327 WHIRLPOOL 900d2ff6adbfd71f5d26734a3c9791d46be8e3a76775e2878767573004ef78047338e188e9200b64955504c547467c2e07909ba6bcc5db98bd6d1aa85940040d
 EBUILD networkmanager-0.9.6.4-r1.ebuild 7546 SHA256 a998f7bad28581572ed7375ecdc33615d71a4b70c153d32f3142feee745016e3 SHA512 26636400345268f7534aeee029b29af5c53cc68f2b9d721c62f9cf206a2b5396641ded815fca1d2c375fedecb16c07bdf81b33fdc03bc8a46f40c50c3a7dea0a WHIRLPOOL 8c1549c48141feadf1cf1f7950b177fda1e044f23708af6e35502746f86fc5e1e2e26295ea9da6fb2f572b5cd8e3af2e4b3dde5481070bb9243669de277538a7
 EBUILD networkmanager-0.9.6.4.ebuild 7518 SHA256 e1786b0b52196e98b6c7aff8dd641193f196ecf5ed8fbcf088ff4baa4ec9d56f SHA512 7b74e41be564767a591eadf50445b6a278cb9fe571f512a6075bc72268198b841ffb3e818276aaf3c738b2198b5ff9de037f6d60b7e32d6c91e380bd016386d5 WHIRLPOOL 2702292d1530bb4e7b6177cd3a54d7640842eac179f05e174fa8bbf590a81ac25af7ec769f7ddd5e71e0446df0c9c370deeb3d5edb2ac3cab8ddd98b5a6bde80
-EBUILD networkmanager-0.9.8.2-r2.ebuild 7318 SHA256 151468e28a05e56bc13e7af82f8a15f133b79e66d661b3c36b6a68c0f8662a49 SHA512 5da4b6d056312ce40a6f8e2772fe151195d513a6dc7a6a600ae447debf18e7d47456b5cfa4eda0563f3fee677413161ad701a07e04d6dafb280b6398a3b5f7ed WHIRLPOOL 7714163ced345a55243f92d7bbb1c2787cb24526e747c30dc86fbb0f482980e63896a79aec00a3d710a004e0b44e19536fecd881f2133b4f755dad7e711a8f84
 EBUILD networkmanager-0.9.8.2-r3.ebuild 7602 SHA256 7c49ecc92e20c3e470749b777615299b3c8dea5ee18b845541d94f176ad86546 SHA512 a968becdcf15838471468120debb3200eec16249c83bbefba1950ab98db69a0e6369cba44b0e2f8dc5843ac4402145ff8ad04d5e5bbaeb9aab50151df501883e WHIRLPOOL 3ce5761608d808f199bc4132c80671c065a51bd26a6cf10c959ab1c4d563a4d93db9c9fcb7e0b1d8ffd3206e6937e79916aed8ced71bfbe157f8ead2f12fbe77
-EBUILD networkmanager-0.9.8.2.ebuild 7503 SHA256 3338fe5460c0920f363483de0c5f89bc32420a270e4bc9e6a5fe393037a23c1b SHA512 50ef0324ac5f336b73ae1674a6441b2f470de8d4a4a6ea5e0bd8922f5d15605e888acaf615cb4ecefbeb1cb132c4cc6fea0b4c8a591eb642cbc4dc554531d9c5 WHIRLPOOL d0ca01bb3f815f5a8be00fb48f98c1377e1f6abf4fffbceb0f0e2a79647f06c13aef54e14418a6f567ddd569627b6e50e923ee7456989b4801190225cf2a8dba
-MISC ChangeLog 44790 SHA256 37a288087da9c6cbc100a241682d70263ccd30474a628b30d093570e641a1fd3 SHA512 208f855e750e1d80b778fe9789b420f83c77718af79cea779e11d5feccd593dffc571fc25f99f87ca73aa0243779259cd953dd709309ab8d4dc03348ce7dd86b WHIRLPOOL f9bcc775937111e1747f51db6ebd8e083c4afa6127b216dfee155d94c6100d09cc2f70b3d4032ae7d1f577ea7cc0a90c1a98d6af21aff126fb3428c66ab03c69
+EBUILD networkmanager-0.9.8.4.ebuild 7698 SHA256 9f690529b37407b3abc5442b892b49196516d695a5953fe0c8a35e4ae71d147c SHA512 fa0a10c66a640db6078b7108954b4674c8ed186dfa5ca9e0189ab59718618b6a48c3dd18c569982e19e8f13b1fb4253a69e0d4f98f5e0635ba91a7bf3603e4f6 WHIRLPOOL c8bf9f9386ee14873f4916ab6017eacab6ceaac48a6688a5af11300939dc9fa598311be8e95db3a2168a59c2bb81c46e6eb81049f13012bf712d3650719b1d6f
+MISC ChangeLog 45217 SHA256 fa04321bd3f7122936fd31d421c4d3e22bf44a70796555596d7aeacd5c5e371d SHA512 85b39dc4882e3c11da735828da14454b1870e62c66af218792e3468a8fc4720069e0667a24dc41c71e51ddc8638369de1c9e0a037b4a23af74c02b3245ad942f WHIRLPOOL d5015f55268970a98f814bc0c0a7b09838e2a675d0d5220246b2f565022d997656fb45f0378be006d6113e771b9a006e0b215d3426179d5f65eaf9807a97ce0c
 MISC metadata.xml 1310 SHA256 7bc71d09fd619c5f65f1e9b5618d49f9f8ee38fe5b437cab2a3a870b8272fdbd SHA512 5637c1aed72ac8bcecd6fa806f4f8c35aa8ed353b5a4ae649cc415a1bad31b62ed657ed0a8c43cfdcbeebdac827ede6fa86c88a7ed49fa38464f00bcb4e72574 WHIRLPOOL 13bc9e31905900f2c23399268e5f670b6b75cf21ad6c1a7ccde29668fc441362f9b8b03ff2eba2de320c395f79dbd5dffa03d0ebcf62bf95a4f1a525c446dc42
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.21 (GNU/Linux)
 
-iEYEAREIAAYFAlHxYrUACgkQCaWpQKGI+9RH+QCeKheGET0clqBCIoDyo4V3nl1y
-pcsAn1qFXyKbsLVgFN36rB+UHkdKBF39
-=vJzg
+iQEcBAEBCAAGBQJSNTgHAAoJEJ0WA1zPCt1hOOkH/292900zPPhv6VzoX1rwPkN7
+wDoHsNN3HavgAyRuz+LektomEqMyvgq/RgjmK26i5JYehAm3S9Gcw317UHn8iPTT
+lBo0lRkQCNSGkcSNl+Zw3t1IDe3zx4nSqi9hNZHdFOSOhLQtHrr+b6O42MwOzBur
+SAueqphW6ikDVm5EWbGGto9P4jrsiCBMonBYnJzmitadHZmkVJrsWNaMwI72jW+W
+t/RqWRdimNvxtHbYrZYrPVk9syqLClU8HpsFRqbhzjDdH+hZQexWwcYLHEqYl32t
+xhHf8Ai4Um0JnriiqnlDqK/uK/kAcwIlbC5BdFeR+agGk6qH2DtTEdscA6jTptI=
+=BSzs
 -----END PGP SIGNATURE-----
diff --git a/net-misc/networkmanager/files/10-openrc-status-r2 b/net-misc/networkmanager/files/10-openrc-status-r2
deleted file mode 100644
index 967c56600a54..000000000000
--- a/net-misc/networkmanager/files/10-openrc-status-r2
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# Copyright (c) 2012 Alexandre Rostovtsev
-# Released under the 2-clause BSD license.
-
-# Ensures that the NetworkManager OpenRC service is marked as started and
-# providing net only when it has a successful connection.
-
-# Ensure rc-service is in PATH
-PATH="${PATH}:@EPREFIX@/sbin:@EPREFIX@/usr/sbin"
-
-# Exit if the NetworkManager OpenRC service is not running
-rc-service NetworkManager status 2>&1 | grep -Eq "status: (starting|started|inactive|stopping)" || exit 0
-
-# Call rc-service in background mode so that the start/stop functions update
-# NetworkManager service status to started or inactive instead of actually
-# starting or stopping the daemon
-export IN_BACKGROUND=YES
-
-case "$2" in
-    up) nm-online -t 0 -x && exec rc-service NetworkManager start ;;
-    down) nm-online -t 0 -x || exec rc-service NetworkManager stop ;;
-    pre-sleep) exec rc-service NetworkManager stop ;;
-esac
diff --git a/net-misc/networkmanager/files/networkmanager-0.9.8.4-pre-sleep.patch b/net-misc/networkmanager/files/networkmanager-0.9.8.4-pre-sleep.patch
new file mode 100644
index 000000000000..6e6dfbe8ee29
--- /dev/null
+++ b/net-misc/networkmanager/files/networkmanager-0.9.8.4-pre-sleep.patch
@@ -0,0 +1,131 @@
+From ffb08fa288cea4c9ac8f18fd83e063b2e86ac51b Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Sun, 27 Jan 2013 23:39:56 -0500
+Subject: [PATCH] Implement "pre-sleep" action dispatch
+
+Based on work by Christian Becke <christianbecke@gmail.com> in
+https://bugzilla.gnome.org/show_bug.cgi?id=387832
+---
+ callouts/nm-dispatcher-utils.c |  3 ++-
+ src/nm-dispatcher.c            |  8 ++++++--
+ src/nm-dispatcher.h            |  3 ++-
+ src/nm-manager.c               | 28 +++++++++++++++++++++-------
+ 4 files changed, 31 insertions(+), 11 deletions(-)
+
+diff --git a/callouts/nm-dispatcher-utils.c b/callouts/nm-dispatcher-utils.c
+index 8824295..66cbc4b 100644
+--- a/callouts/nm-dispatcher-utils.c
++++ b/callouts/nm-dispatcher-utils.c
+@@ -409,7 +409,8 @@ nm_dispatcher_utils_construct_envp (const char *action,
+ 	g_return_val_if_fail (*out_iface == NULL, NULL);
+ 
+ 	/* Hostname changes don't require a device nor contain a connection */
+-	if (!strcmp (action, "hostname"))
++	if (!strcmp (action, "hostname") ||
++	    !strcmp (action, "pre-sleep"))
+ 		return g_new0 (char *, 1);
+ 
+ 	/* Canonicalize the VPN interface name; "" is used when passing it through
+diff --git a/src/nm-dispatcher.c b/src/nm-dispatcher.c
+index 12cd0f0..42d7e12 100644
+--- a/src/nm-dispatcher.c
++++ b/src/nm-dispatcher.c
+@@ -237,6 +237,8 @@ action_to_string (DispatcherAction action)
+ 		return "dhcp4-change";
+ 	case DISPATCHER_ACTION_DHCP6_CHANGE:
+ 		return "dhcp6-change";
++	case DISPATCHER_ACTION_PRE_SLEEP:
++		return "pre-sleep";
+ 	default:
+ 		break;
+ 	}
+@@ -269,7 +271,8 @@ _dispatcher_call (DispatcherAction action,
+ 	DispatchInfo *info;
+ 
+ 	/* All actions except 'hostname' require a device */
+-	if (action != DISPATCHER_ACTION_HOSTNAME)
++	if (action != DISPATCHER_ACTION_HOSTNAME &&
++	    action != DISPATCHER_ACTION_PRE_SLEEP)
+ 		g_return_val_if_fail (NM_IS_DEVICE (device), NULL);
+ 	/* VPN actions require at least an IPv4 config (for now) */
+ 	if (action == DISPATCHER_ACTION_VPN_UP)
+@@ -308,7 +311,8 @@ _dispatcher_call (DispatcherAction action,
+ 	vpn_ip6_props = value_hash_create ();
+ 
+ 	/* hostname actions only send the hostname */
+-	if (action != DISPATCHER_ACTION_HOSTNAME) {
++	if (action != DISPATCHER_ACTION_HOSTNAME &&
++	    action != DISPATCHER_ACTION_PRE_SLEEP) {
+ 		fill_device_props (device,
+ 		                   device_props,
+ 		                   device_ip4_props,
+diff --git a/src/nm-dispatcher.h b/src/nm-dispatcher.h
+index 05a6c87..8e95834 100644
+--- a/src/nm-dispatcher.h
++++ b/src/nm-dispatcher.h
+@@ -39,7 +39,8 @@ typedef enum {
+ 	DISPATCHER_ACTION_VPN_PRE_DOWN,
+ 	DISPATCHER_ACTION_VPN_DOWN,
+ 	DISPATCHER_ACTION_DHCP4_CHANGE,
+-	DISPATCHER_ACTION_DHCP6_CHANGE
++	DISPATCHER_ACTION_DHCP6_CHANGE,
++	DISPATCHER_ACTION_PRE_SLEEP = 999,
+ } DispatcherAction;
+ 
+ typedef void (*DispatcherFunc) (gconstpointer call, gpointer user_data);
+diff --git a/src/nm-manager.c b/src/nm-manager.c
+index 811f49d..f52956d 100644
+--- a/src/nm-manager.c
++++ b/src/nm-manager.c
+@@ -73,6 +73,7 @@
+ #include "nm-sleep-monitor.h"
+ #include "nm-connectivity.h"
+ #include "nm-policy.h"
++#include "nm-dispatcher.h"
+ 
+ 
+ #define NM_AUTOIP_DBUS_SERVICE "org.freedesktop.nm_avahi_autoipd"
+@@ -3350,6 +3351,23 @@ impl_manager_deactivate_connection (NMManager *self,
+ }
+ 
+ static void
++pre_sleep_dispatcher_done (gpointer call, gpointer user_data)
++{
++	NMManager *self = (NMManager *) user_data;
++	NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (self);
++	GSList *iter;
++
++	/* Just deactivate and down all devices from the device list,
++	 * to keep things fast the device list will get resynced when
++	 * the manager wakes up.
++	 */
++	for (iter = priv->devices; iter; iter = iter->next)
++		nm_device_set_managed (NM_DEVICE (iter->data), FALSE, NM_DEVICE_STATE_REASON_SLEEPING);
++
++	nm_manager_update_state (self);
++}
++
++static void
+ do_sleep_wake (NMManager *self)
+ {
+ 	NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (self);
+@@ -3359,13 +3377,9 @@ do_sleep_wake (NMManager *self)
+ 	if (manager_sleeping (self)) {
+ 		nm_log_info (LOGD_SUSPEND, "sleeping or disabling...");
+ 
+-		/* Just deactivate and down all devices from the device list,
+-		 * to keep things fast the device list will get resynced when
+-		 * the manager wakes up.
+-		 */
+-		for (iter = priv->devices; iter; iter = iter->next)
+-			nm_device_set_managed (NM_DEVICE (iter->data), FALSE, NM_DEVICE_STATE_REASON_SLEEPING);
+-
++		nm_dispatcher_call (DISPATCHER_ACTION_PRE_SLEEP, NULL, NULL,
++		                    pre_sleep_dispatcher_done, self);
++		return;
+ 	} else {
+ 		nm_log_info (LOGD_SUSPEND, "waking up and re-enabling...");
+ 
+-- 
+1.8.3.2
+
diff --git a/net-misc/networkmanager/networkmanager-0.9.8.2.ebuild b/net-misc/networkmanager/networkmanager-0.9.8.2.ebuild
deleted file mode 100644
index 0ff38efecb18..000000000000
--- a/net-misc/networkmanager/networkmanager-0.9.8.2.ebuild
+++ /dev/null
@@ -1,235 +0,0 @@
-# Copyright 1999-2013 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.2.ebuild,v 1.1 2013/06/10 09:25:33 pacho Exp $
-
-EAPI="5"
-GNOME_ORG_MODULE="NetworkManager"
-VALA_MIN_API_VERSION="0.18"
-VALA_USE_DEPEND="vapigen"
-
-inherit eutils gnome.org linux-info systemd user readme.gentoo toolchain-funcs vala virtualx udev
-
-DESCRIPTION="Universal network configuration daemon for laptops, desktops, servers and virtualization hosts"
-HOMEPAGE="http://projects.gnome.org/NetworkManager/"
-
-LICENSE="GPL-2+"
-SLOT="0" # add subslot if libnm-util.so.2 or libnm-glib.so.4 bumps soname version
-IUSE="avahi bluetooth connection-sharing +consolekit dhclient +dhcpcd gnutls
-+introspection kernel_linux +nss modemmanager +ppp resolvconf systemd test vala
-+wext" # wimax
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-REQUIRED_USE="
-	modemmanager? ( ppp )
-	^^ ( nss gnutls )
-	^^ ( dhclient dhcpcd )
-	?? ( consolekit systemd )
-"
-
-# gobject-introspection-0.10.3 is needed due to gnome bug 642300
-# wpa_supplicant-0.7.3-r3 is needed due to bug 359271
-# TODO: Qt support?
-COMMON_DEPEND="
-	>=sys-apps/dbus-1.2
-	>=dev-libs/dbus-glib-0.94
-	>=dev-libs/glib-2.30
-	>=dev-libs/libnl-3.2.7:3=
-	>=sys-auth/polkit-0.106
-	>=net-libs/libsoup-2.26:2.4=
-	>=net-wireless/wpa_supplicant-0.7.3-r3[dbus]
-	>=virtual/udev-165[gudev]
-	bluetooth? ( >=net-wireless/bluez-4.82 )
-	avahi? ( net-dns/avahi:=[autoipd] )
-	connection-sharing? (
-		net-dns/dnsmasq
-		net-firewall/iptables )
-	gnutls? (
-		dev-libs/libgcrypt:=
-		net-libs/gnutls:= )
-	modemmanager? ( >=net-misc/modemmanager-0.7.991 )
-	nss? ( >=dev-libs/nss-3.11:= )
-	dhclient? ( =net-misc/dhcp-4*[client] )
-	dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 )
-	introspection? ( >=dev-libs/gobject-introspection-0.10.3 )
-	ppp? ( >=net-dialup/ppp-2.4.5[ipv6] )
-	resolvconf? ( net-dns/openresolv )
-	systemd? ( >=sys-apps/systemd-200 )
-	!systemd? ( sys-power/upower )
-"
-RDEPEND="${COMMON_DEPEND}
-	consolekit? ( sys-auth/consolekit )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	>=sys-kernel/linux-headers-2.6.29
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-	test? (
-		dev-lang/python:2.7
-		dev-python/dbus-python[python_targets_python2_7]
-		dev-python/pygobject:2[python_targets_python2_7] )
-"
-
-sysfs_deprecated_check() {
-	ebegin "Checking for SYSFS_DEPRECATED support"
-
-	if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
-		eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
-		eerror "or NetworkManager will not work correctly."
-		eerror "See http://bugs.gentoo.org/333639 for more info."
-		die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
-	fi
-	eend $?
-}
-
-pkg_pretend() {
-	if use kernel_linux; then
-		get_version
-		if linux_config_exists; then
-			sysfs_deprecated_check
-		else
-			ewarn "Was unable to determine your kernel .config"
-			ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
-			ewarn "See http://bugs.gentoo.org/333639 for more info."
-		fi
-
-	fi
-}
-
-pkg_setup() {
-	enewgroup plugdev
-}
-
-src_prepare() {
-	DOC_CONTENTS="To modify system network connections without needing to enter the
-		root password, add your user account to the 'plugdev' group."
-
-	# Bug #402085, https://bugzilla.gnome.org/show_bug.cgi?id=387832
-	epatch "${FILESDIR}/${PN}-0.9.7.995-pre-sleep.patch"
-
-	# Use python2.7 shebangs for test scripts
-	sed -e 's@\(^#!.*python\)@\12.7@' \
-		-i */tests/*.py || die
-
-	# Fix completiondir, avoid eautoreconf, bug #465100
-	sed -i 's|^completiondir =.*|completiondir = $(datadir)/bash-completion|' \
-		cli/completion/Makefile.in || die "sed completiondir failed"
-
-	epatch_user
-
-	use vala && vala_src_prepare
-
-	# Force use of /run, avoid eautoreconf
-	sed -e 's:$localstatedir/run/:/run/:' -i configure || die
-
-	default
-}
-
-src_configure() {
-	# TODO: enable wimax when we have a libnl:3 compatible revision of it
-	econf \
-		--disable-more-warnings \
-		--disable-static \
-		--localstatedir=/var \
-		--enable-ifnet \
-		--without-netconfig \
-		--with-dbus-sys-dir=/etc/dbus-1/system.d \
-		--with-udev-dir="$(udev_get_udevdir)" \
-		--with-iptables=/sbin/iptables \
-		--enable-concheck \
-		--with-crypto=$(usex nss nss gnutls) \
-		--with-session-tracking=$(usex consolekit consolekit $(usex systemd systemd no)) \
-		--with-suspend-resume=$(usex systemd systemd upower) \
-		$(use_enable introspection) \
-		$(use_enable ppp) \
-		--disable-wimax \
-		$(use_with dhclient) \
-		$(use_with dhcpcd) \
-		$(use_with modemmanager modem-manager-1) \
-		$(use_with resolvconf) \
-		$(use_enable test tests) \
-		$(use_enable vala) \
-		$(use_with wext) \
-		"$(systemd_with_unitdir)"
-}
-
-src_test() {
-	cp libnm-util/tests/certs/test_ca_cert.pem src/settings/plugins/ifnet/tests/ || die
-	Xemake check
-}
-
-src_install() {
-	default
-
-	readme.gentoo_create_doc
-
-	# Gentoo init script
-	newinitd "${FILESDIR}/init.d.NetworkManager" NetworkManager
-
-	# /var/run/NetworkManager is used by some distros, but not by Gentoo
-	rmdir -v "${ED}/var/run/NetworkManager" || die "rmdir failed"
-
-	# Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
-	keepdir /etc/NetworkManager/dispatcher.d
-
-	if use systemd; then
-		# Our init.d script requires running a dispatcher script that annoys
-		# systemd users; bug #434692
-		rm -rv "${ED}/etc/init.d" || die "rm failed"
-	else
-		# Provide openrc net dependency only when nm is connected
-		exeinto /etc/NetworkManager/dispatcher.d
-		newexe "${FILESDIR}/10-openrc-status-r3" 10-openrc-status
-		sed -e "s:@EPREFIX@:${EPREFIX}:g" \
-			-i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
-
-		# Default conf.d file
-		newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
-	fi
-
-	# Add keyfile plugin support
-	keepdir /etc/NetworkManager/system-connections
-	chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765
-	insinto /etc/NetworkManager
-	newins "${FILESDIR}/nm-system-settings.conf-ifnet" NetworkManager.conf
-
-	# Allow users in plugdev group to modify system connections
-	insinto /usr/share/polkit-1/rules.d/
-	doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
-
-	# Remove useless .la files
-	prune_libtool_files --modules
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	if [[ -e "${EROOT}etc/NetworkManager/nm-system-settings.conf" ]]; then
-		ewarn "The ${PN} system configuration file has moved to a new location."
-		ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
-		ewarn "to ${EROOT}etc/NetworkManager/NetworkManager.conf"
-		ewarn
-		ewarn "After doing so, you can remove ${EROOT}etc/NetworkManager/nm-system-settings.conf"
-	fi
-
-	# The polkit rules file moved to /usr/share
-	old_rules="${EROOT}etc/polkit-1/rules.d/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
-	if [[ -f "${old_rules}" ]]; then
-		case "$(md5sum ${old_rules})" in
-		  574d0cfa7e911b1f7792077003060240* )
-			# Automatically delete the old rules.d file if the user did not change it
-			elog
-			elog "Removing old ${old_rules} ..."
-			rm -f "${old_rules}" || eerror "Failed, please remove ${old_rules} manually"
-			;;
-		  * )
-			elog "The ${old_rules}"
-			elog "file moved to /usr/share/polkit-1/rules.d/ in >=networkmanager-0.9.4.0-r4"
-			elog "If you edited ${old_rules}"
-			elog "without changing its behavior, you may want to remove it."
-			;;
-		esac
-	fi
-}
diff --git a/net-misc/networkmanager/networkmanager-0.9.8.2-r2.ebuild b/net-misc/networkmanager/networkmanager-0.9.8.4.ebuild
index 52f957b77805..b0c31393dd87 100644
--- a/net-misc/networkmanager/networkmanager-0.9.8.2-r2.ebuild
+++ b/net-misc/networkmanager/networkmanager-0.9.8.4.ebuild
@@ -1,22 +1,20 @@
 # Copyright 1999-2013 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.2-r2.ebuild,v 1.2 2013/07/19 19:07:13 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.9.8.4.ebuild,v 1.1 2013/09/15 04:31:07 tetromino Exp $
 
 EAPI="5"
 GNOME_ORG_MODULE="NetworkManager"
 VALA_MIN_API_VERSION="0.18"
 VALA_USE_DEPEND="vapigen"
 
-inherit gnome.org linux-info systemd user readme.gentoo toolchain-funcs vala virtualx udev eutils
+inherit bash-completion-r1 gnome.org linux-info systemd user readme.gentoo toolchain-funcs vala virtualx udev eutils
 
 DESCRIPTION="Universal network configuration daemon for laptops, desktops, servers and virtualization hosts"
 HOMEPAGE="http://projects.gnome.org/NetworkManager/"
 
 LICENSE="GPL-2+"
 SLOT="0" # add subslot if libnm-util.so.2 or libnm-glib.so.4 bumps soname version
-IUSE="avahi bluetooth connection-sharing consolekit dhclient +dhcpcd gnutls
-+introspection kernel_linux +nss modemmanager +ppp resolvconf systemd test vala
-+wext" # wimax
+IUSE="avahi bluetooth connection-sharing consolekit dhclient +dhcpcd gnutls +introspection kernel_linux +nss modemmanager +ppp resolvconf systemd test vala +wext" # wimax
 
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
@@ -49,9 +47,7 @@ COMMON_DEPEND="
 	modemmanager? ( >=net-misc/modemmanager-0.7.991 )
 	nss? ( >=dev-libs/nss-3.11:= )
 	dhclient? ( =net-misc/dhcp-4*[client] )
-	dhcpcd? (
-		>=net-misc/dhcpcd-4.0.0_rc3
-		<net-misc/dhcpcd-6 )
+	dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 )
 	introspection? ( >=dev-libs/gobject-introspection-0.10.3 )
 	ppp? ( >=net-dialup/ppp-2.4.5[ipv6] )
 	resolvconf? ( net-dns/openresolv )
@@ -108,21 +104,30 @@ src_prepare() {
 	DOC_CONTENTS="To modify system network connections without needing to enter the
 		root password, add your user account to the 'plugdev' group."
 
+	if use systemd; then
+		DOC_CONTENTS="${DOC_CONTENTS}\n\n
+		Starting with version 0.9.8.4, running\n
+		# systemctl enable NetworkManager\n
+		will both enable NetworkManager and allow nm-dispatcher to be activated via dbus."
+	fi
+
 	# Bug #402085, https://bugzilla.gnome.org/show_bug.cgi?id=387832
-	epatch "${FILESDIR}/${PN}-0.9.7.995-pre-sleep.patch"
+	epatch "${FILESDIR}/${PN}-0.9.8.4-pre-sleep.patch"
 
 	# Use python2.7 shebangs for test scripts
 	sed -e 's@\(^#!.*python\)@\12.7@' \
 		-i */tests/*.py || die
 
 	# Fix completiondir, avoid eautoreconf, bug #465100
-	sed -i 's|^completiondir =.*|completiondir = $(datadir)/bash-completion|' \
+	sed -i "s|^completiondir =.*|completiondir = $(get_bashcompdir)|" \
 		cli/completion/Makefile.in || die "sed completiondir failed"
 
-	# Force use of /run, avoid eautoreconf
+	## Force use of /run, avoid eautoreconf
 	sed -e 's:$localstatedir/run/:/run/:' -i configure || die
 
 	use vala && vala_src_prepare
+
+	epatch_user # don't remove, users often want custom patches for NM
 }
 
 src_configure() {
@@ -192,6 +197,9 @@ src_install() {
 	insinto /usr/share/polkit-1/rules.d/
 	doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
 
+	# https://bugzilla.redhat.com/show_bug.cgi?id=974811 + bug #477086
+	# systemd can't find "
+
 	# Remove useless .la files
 	prune_libtool_files --modules
 }