From f8f03bdbbff14db0c79dfe1eb907e14a27ce0e73 Mon Sep 17 00:00:00 2001
From: "Robin H. Johnson" <robbat2@gentoo.org>
Date: Mon, 6 Dec 2010 02:54:21 +0000
Subject: [PATCH] Bug #345281: If wpa_supplicant is built w/ USE=dbus, we need
 to start after DBus is up.

---
 net/wpa_supplicant.sh | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/net/wpa_supplicant.sh b/net/wpa_supplicant.sh
index f4ca7d62..379e6153 100644
--- a/net/wpa_supplicant.sh
+++ b/net/wpa_supplicant.sh
@@ -3,10 +3,14 @@
 
 wpa_supplicant_depend()
 {
-	if [ -x /usr/sbin/wpa_supplicant ]; then
-		program start /usr/sbin/wpa_supplicant
-	else
-		program start /sbin/wpa_supplicant
+	wpas=/usr/sbin/wpa_supplicant
+	[ -x ${wpas} ] || wpas=/sbin/wpa_supplicant
+	if [ -x ${wpas} ]; then
+		program start ${wpas}
+		# bug 345281: if wpa_supplicant is built w/ USE=dbus, we need to start
+		# dbus before we can start wpa_supplicant.
+		${wpas} -h |grep DBus -sq
+		[ $? -eq 0 ] && need dbus
 	fi
 	after macnet plug
 	before interface