Cleaning up, now that 2.0-r2 is stable

(Portage version: 2.2.7/cvs/Linux i686, signed Manifest commit with key 15AE484C)

13 files changed, 14 insertions, 1424 deletions

diff --git a/net-wireless/wpa_supplicant/ChangeLog b/net-wireless/wpa_supplicant/ChangeLog
index 4e4c3c2e3300..516b9da1d24e 100644
--- a/net-wireless/wpa_supplicant/ChangeLog
+++ b/net-wireless/wpa_supplicant/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for net-wireless/wpa_supplicant
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.206 2013/12/22 12:03:58 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.207 2013/12/22 14:40:18 gurligebis Exp $
+
+  22 Dec 2013; <gurligebis@gentoo.org> -wpa_supplicant-0.7.3-r5.ebuild,
+  -files/wpa_supplicant-0.7.3-dbus-WPAIE-fix.patch,
+  -files/wpa_supplicant-0.7.3-dbus-api-changes.patch,
+  -files/wpa_supplicant-0.7.3-dbus_path_fix.patch,
+  -files/wpa_supplicant-0.7.3-generate-libeap-peer.patch,
+  -files/wpa_supplicant-1.1-dbus-path-fix.patch,
+  -files/do-not-call-dbus-functions-with-NULL-path.patch,
+  -files/wpa_supplicant-gcc470.patch,
+  -files/wpa_supplicant-1.1-do-not-call-dbus-functions-with-NULL-path.patch,
+  -files/wpa_supplicant-1.1-generate-libeap-peer.patch,
+  -files/wpa_supplicant-1.1-libnl_path_fix.patch, metadata.xml:
+  Cleaning up, now that 2.0-r2 is stable
 
   22 Dec 2013; Agostino Sarubbo <ago@gentoo.org> wpa_supplicant-2.0-r2.ebuild:
   Stable for ppc64, wrt bug #486008
diff --git a/net-wireless/wpa_supplicant/files/do-not-call-dbus-functions-with-NULL-path.patch b/net-wireless/wpa_supplicant/files/do-not-call-dbus-functions-with-NULL-path.patch
deleted file mode 100644
index d868f84384e0..000000000000
--- a/net-wireless/wpa_supplicant/files/do-not-call-dbus-functions-with-NULL-path.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff --git a/wpa_supplicant/dbus/dbus_new_helpers.c b/wpa_supplicant/dbus/dbus_new_helpers.c
-index 06749db..1cbdee9 100644
---- a/wpa_supplicant/dbus/dbus_new_helpers.c
-+++ b/wpa_supplicant/dbus/dbus_new_helpers.c
-@@ -810,7 +810,7 @@ void wpa_dbus_mark_property_changed(struct wpas_dbus_priv *iface,
- 	const struct wpa_dbus_property_desc *dsc;
- 	int i = 0;
- 
--	if (iface == NULL)
-+	if (iface == NULL || path == NULL)
- 		return;
- 
- 	dbus_connection_get_object_path_data(iface->con, path,
-diff --git a/wpa_supplicant/dbus/dbus_old.c b/wpa_supplicant/dbus/dbus_old.c
-index 437a04d..9e6c762 100644
---- a/wpa_supplicant/dbus/dbus_old.c
-+++ b/wpa_supplicant/dbus/dbus_old.c
-@@ -377,7 +377,7 @@ void wpa_supplicant_dbus_notify_scan_results(struct wpa_supplicant *wpa_s)
- 	DBusMessage *_signal;
- 
- 	/* Do nothing if the control interface is not turned on */
--	if (iface == NULL)
-+	if (iface == NULL || wpa_s->dbus_path == NULL)
- 		return;
- 
- 	_signal = dbus_message_new_signal(wpa_s->dbus_path,
-@@ -414,7 +414,7 @@ void wpa_supplicant_dbus_notify_state_change(struct wpa_supplicant *wpa_s,
- 	if (wpa_s->global == NULL)
- 		return;
- 	iface = wpa_s->global->dbus;
--	if (iface == NULL)
-+	if (iface == NULL || wpa_s->dbus_path == NULL)
- 		return;
- 
- 	/* Only send signal if state really changed */
-@@ -473,7 +473,7 @@ void wpa_supplicant_dbus_notify_scanning(struct wpa_supplicant *wpa_s)
- 	dbus_bool_t scanning = wpa_s->scanning ? TRUE : FALSE;
- 
- 	/* Do nothing if the control interface is not turned on */
--	if (iface == NULL)
-+	if (iface == NULL || wpa_s->dbus_path == NULL)
- 		return;
- 
- 	_signal = dbus_message_new_signal(wpa_s->dbus_path,
-@@ -508,7 +508,7 @@ void wpa_supplicant_dbus_notify_wps_cred(struct wpa_supplicant *wpa_s,
- 	if (wpa_s->global == NULL)
- 		return;
- 	iface = wpa_s->global->dbus;
--	if (iface == NULL)
-+	if (iface == NULL || wpa_s->dbus_path == NULL)
- 		return;
- 
- 	_signal = dbus_message_new_signal(wpa_s->dbus_path,
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.7.3-dbus-WPAIE-fix.patch b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.7.3-dbus-WPAIE-fix.patch
deleted file mode 100644
index 3920da63f383..000000000000
--- a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.7.3-dbus-WPAIE-fix.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-diff -up wpa_supplicant-0.7.3/wpa_supplicant/dbus/dbus_new_handlers.c.prop-failure wpa_supplicant-0.7.3/wpa_supplicant/dbus/dbus_new_handlers.c
---- wpa_supplicant-0.7.3/wpa_supplicant/dbus/dbus_new_handlers.c.prop-failure	2011-04-09 14:04:43.108343777 -0400
-+++ wpa_supplicant-0.7.3/wpa_supplicant/dbus/dbus_new_handlers.c	2011-04-09 14:44:09.808372285 -0400
-@@ -33,6 +33,14 @@
- #include "dbus_new_handlers.h"
- #include "dbus_dict_helpers.h"
- 
-+/* The getters in this file can also be invoked when building a signal
-+ * message to send out spontaneously. In this case, no message is passed
-+ * in and if we try to call dbus_message_new_error(), we'll get an
-+ * assertion failure. So, #define dbus_message_new_error() to a more
-+ * tolerant cut-and-paste version
-+ */
-+#define dbus_message_new_error wpa_dbus_message_new_error
-+
- extern int wpa_debug_level;
- extern int wpa_debug_show_keys;
- extern int wpa_debug_timestamp;
-diff -up wpa_supplicant-0.7.3/wpa_supplicant/dbus/dbus_new_handlers.h.prop-failure wpa_supplicant-0.7.3/wpa_supplicant/dbus/dbus_new_handlers.h
-diff -up wpa_supplicant-0.7.3/wpa_supplicant/dbus/dbus_new_helpers.c.prop-failure wpa_supplicant-0.7.3/wpa_supplicant/dbus/dbus_new_helpers.c
---- wpa_supplicant-0.7.3/wpa_supplicant/dbus/dbus_new_helpers.c.prop-failure	2011-04-09 14:04:18.293117234 -0400
-+++ wpa_supplicant-0.7.3/wpa_supplicant/dbus/dbus_new_helpers.c	2011-04-09 14:51:48.464204876 -0400
-@@ -22,6 +22,42 @@
- #include "dbus_new.h"
- #include "dbus_new_helpers.h"
- 
-+/* This is exactly like dbus_message_new_error, but returns a
-+ * (partially filled in) error message in the case reply_to is
-+ * NULL rather than failing with an assertion message. This is
-+ * useful for getters that we recycle when sending out signals.
-+ *
-+ * Contains code cut-and-pasted from dbus_message_new_error()
-+ * Copyright (C) 2002, 2003, 2004, 2005  Red Hat Inc.
-+ * Copyright (C) 2002, 2003  CodeFactory AB
-+ */
-+DBusMessage*
-+wpa_dbus_message_new_error (DBusMessage *reply_to,
-+			    const char  *error_name,
-+			    const char  *error_message)
-+{
-+	if (reply_to) {
-+		return dbus_message_new_error(reply_to, error_name, error_message);
-+	} else {
-+		DBusMessage *message = dbus_message_new(DBUS_MESSAGE_TYPE_ERROR);
-+		DBusMessageIter iter;
-+
-+		dbus_message_set_error_name(message, error_name);
-+		dbus_message_set_no_reply(message, TRUE);
-+
-+		if (error_message != NULL) {
-+			dbus_message_iter_init_append(message, &iter);
-+			if (!dbus_message_iter_append_basic(&iter,
-+							    DBUS_TYPE_STRING,
-+							    &error_message)) {
-+				dbus_message_unref(message);
-+				return NULL;
-+			}
-+		}
-+
-+		return message;
-+	}
-+}
- 
- /**
-  * recursive_iter_copy - Reads arguments from one iterator and
-@@ -86,6 +122,7 @@ static void recursive_iter_copy(DBusMess
- 
- 
- static unsigned int fill_dict_with_properties(
-+	DBusMessage *message,
- 	DBusMessageIter *dict_iter, const struct wpa_dbus_property_desc *props,
- 	const char *interface, const void *user_data)
- {
-@@ -98,7 +135,7 @@ static unsigned int fill_dict_with_prope
- 		if (!os_strncmp(dsc->dbus_interface, interface,
- 				WPAS_DBUS_INTERFACE_MAX) &&
- 		    dsc->access != W && dsc->getter) {
--			reply = dsc->getter(NULL, user_data);
-+			reply = dsc->getter(message, user_data);
- 			if (!reply)
- 				continue;
- 
-@@ -160,7 +197,8 @@ static DBusMessage * get_all_properties(
- 					 DBUS_DICT_ENTRY_END_CHAR_AS_STRING,
- 					 &dict_iter);
- 
--	props_num = fill_dict_with_properties(&dict_iter, obj_dsc->properties,
-+	props_num = fill_dict_with_properties(message,
-+					      &dict_iter, obj_dsc->properties,
- 					      interface, obj_dsc->user_data);
- 
- 	dbus_message_iter_close_container(&iter, &dict_iter);
-@@ -870,6 +908,7 @@ void wpa_dbus_get_object_properties(stru
- 		return;
- 	}
- 
--	fill_dict_with_properties(dict_iter, obj_desc->properties,
-+	fill_dict_with_properties(NULL,
-+				  dict_iter, obj_desc->properties,
- 				  interface, obj_desc->user_data);
- }
-diff -up wpa_supplicant-0.7.3/wpa_supplicant/dbus/dbus_new_helpers.h.prop-failure wpa_supplicant-0.7.3/wpa_supplicant/dbus/dbus_new_helpers.h
---- wpa_supplicant-0.7.3/wpa_supplicant/dbus/dbus_new_helpers.h.prop-failure	2011-04-09 14:04:25.130180461 -0400
-+++ wpa_supplicant-0.7.3/wpa_supplicant/dbus/dbus_new_helpers.h	2011-04-09 14:38:53.092075181 -0400
-@@ -112,6 +112,10 @@ struct wpa_dbus_property_desc {
- #define WPA_DBUS_PROPERTIES_SET "Set"
- #define WPA_DBUS_PROPERTIES_GETALL "GetAll"
- 
-+DBusMessage* wpa_dbus_message_new_error (DBusMessage *reply_to,
-+					 const char  *error_name,
-+					 const char  *error_message);
-+
- void free_dbus_object_desc(struct wpa_dbus_object_desc *obj_dsc);
- 
- int wpa_dbus_ctrl_iface_init(struct wpas_dbus_priv *iface, char *dbus_path,
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.7.3-dbus-api-changes.patch b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.7.3-dbus-api-changes.patch
deleted file mode 100644
index 2ec1a97e9fbc..000000000000
--- a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.7.3-dbus-api-changes.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-Taken from:
-
-https://bugzilla.gnome.org/show_bug.cgi?id=644634
-
-
-From b80b5639935d37b95d00f86b57f2844a9c775f57 Mon Sep 17 00:00:00 2001
-From: Dan Williams <dcbw@redhat.com>
-Date: Fri, 17 Dec 2010 15:56:01 +0200
-Subject: [PATCH] dbus: Emit property changed events when adding/removing BSSes
-
-The supplicant was not emitting property changed events when the BSSs
-property changed.
-
-Signed-off-by: Dan Williams <dcbw@redhat.com>
-(cherry picked from commit 1e6288df6b07a353a9246b77e0de2a840b5f2c72)
----
- wpa_supplicant/dbus/dbus_new.c |    6 ++++++
- wpa_supplicant/dbus/dbus_new.h |    1 +
- 2 files changed, 7 insertions(+), 0 deletions(-)
-
-diff --git a/wpa_supplicant/dbus/dbus_new.c b/wpa_supplicant/dbus/dbus_new.c
-index bdfbbac..c66640a 100644
---- a/wpa_supplicant/dbus/dbus_new.c
-+++ b/wpa_supplicant/dbus/dbus_new.c
-@@ -691,6 +691,10 @@ void wpas_dbus_signal_prop_changed(struct wpa_supplicant *wpa_s,
- 			wpas_dbus_getter_current_network;
- 		prop = "CurrentNetwork";
- 		break;
-+	case WPAS_DBUS_PROP_BSSS:
-+		getter = (WPADBusPropertyAccessor) wpas_dbus_getter_bsss;
-+		prop = "BSSs";
-+		break;
- 	default:
- 		wpa_printf(MSG_ERROR, "dbus: %s: Unknown Property value %d",
- 			   __func__, property);
-@@ -1199,6 +1203,7 @@ int wpas_dbus_unregister_bss(struct wpa_supplicant *wpa_s,
- 	}
- 
- 	wpas_dbus_signal_bss_removed(wpa_s, bss_obj_path);
-+	wpas_dbus_signal_prop_changed(wpa_s, WPAS_DBUS_PROP_BSSS);
- 
- 	return 0;
- }
-@@ -1263,6 +1268,7 @@ int wpas_dbus_register_bss(struct wpa_supplicant *wpa_s,
- 	}
- 
- 	wpas_dbus_signal_bss_added(wpa_s, bss_obj_path);
-+	wpas_dbus_signal_prop_changed(wpa_s, WPAS_DBUS_PROP_BSSS);
- 
- 	return 0;
- 
-diff --git a/wpa_supplicant/dbus/dbus_new.h b/wpa_supplicant/dbus/dbus_new.h
-index 80ea98c..9cdefcb 100644
---- a/wpa_supplicant/dbus/dbus_new.h
-+++ b/wpa_supplicant/dbus/dbus_new.h
-@@ -30,6 +30,7 @@ enum wpas_dbus_prop {
- 	WPAS_DBUS_PROP_STATE,
- 	WPAS_DBUS_PROP_CURRENT_BSS,
- 	WPAS_DBUS_PROP_CURRENT_NETWORK,
-+	WPAS_DBUS_PROP_BSSS,
- };
- 
- enum wpas_dbus_bss_prop {
--- 
-1.7.4-rc1
-
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.7.3-dbus_path_fix.patch b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.7.3-dbus_path_fix.patch
deleted file mode 100644
index ac82943fbe7f..000000000000
--- a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.7.3-dbus_path_fix.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- dbus/fi.epitest.hostap.WPASupplicant.service        2010-09-07 10:43:39.000000000 -0500
-+++ dbus/fi.epitest.hostap.WPASupplicant.service   2011-01-08 19:41:32.969507889 -0500
-@@ -1,4 +1,4 @@
- [D-BUS Service]
- Name=fi.epitest.hostap.WPASupplicant
--Exec=/sbin/wpa_supplicant -u
-+Exec=/usr/sbin/wpa_supplicant -u
- User=root
---- dbus/fi.w1.wpa_supplicant1.service  2010-09-07 10:43:39.000000000 -0500
-+++ dbus/fi.w1.wpa_supplicant1.service     2011-01-08 19:42:12.420246349 -0500
-@@ -1,4 +1,4 @@
- [D-BUS Service]
- Name=fi.w1.wpa_supplicant1
--Exec=/sbin/wpa_supplicant -u
-+Exec=/usr/sbin/wpa_supplicant -u
- User=root
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.7.3-generate-libeap-peer.patch b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.7.3-generate-libeap-peer.patch
deleted file mode 100644
index 52c0e95a5da6..000000000000
--- a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.7.3-generate-libeap-peer.patch
+++ /dev/null
@@ -1,396 +0,0 @@
-From 3de5e59b291b6f58317bb16736f8c0271754378e Mon Sep 17 00:00:00 2001
-From: Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com>
-Date: Sat, 2 Oct 2010 00:11:51 -0700
-Subject: [PATCH] eap_peer: create a libeap library, with header files and pkg-config [v2]
-
-This adds infrastructe in src/eap_peer to make libeap.so and install
-the needed header files and pkg-config files.
-
-Now, this is quite dirty and probably not what we want in the long
-term, but serves as an starting point:
-
- - we don't build from the wpa_supplicant directory because the
-   objects the .so have to be built with -fPIC. So if you need to
-   build both the binary and the library:
-
-   make -C wpa_supplicant
-   make -C src/eap_peer clean
-   make -C src/eap_peer
-
-   As I said, it's dirty -- we'd need either wpa_supplicant linking
-   against the library properly (but that seems not to be desirable)
-   or a multiple object build approach ala automake.
-
- - need to use 'override CFLAGS' in src/eap_peer/Makefile, otherwise
-   any CFLAGS setting will kill the build infrastructure. I miss
-   AM_CFLAGS.
-
- - adds 'eap_register_methods()' that will register every compiled in
-   method.
-
-Signed-off-by: Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com>
----
- build_release              |   12 +++
- src/eap_peer/Makefile      |  191 ++++++++++++++++++++++++++++++++++++++++++--
- src/eap_peer/eap_methods.c |  114 ++++++++++++++++++++++++++
- src/eap_peer/eap_methods.h |    1 +
- src/eap_peer/libeap0.pc    |   10 +++
- 5 files changed, 320 insertions(+), 8 deletions(-)
- create mode 100644 src/eap_peer/libeap0.pc
-
-diff --git a/src/eap_peer/Makefile b/src/eap_peer/Makefile
-index 3651056..58c067a 100644
---- a/src/eap_peer/Makefile
-+++ b/src/eap_peer/Makefile
-@@ -1,11 +1,186 @@
--all:
--	@echo Nothing to be made.
-+LIBEAP_NAME = libeap
-+LIBEAP_CURRENT = 0
-+LIBEAP_REVISION = 0
-+LIBEAP_AGE = 0
-+
-+LIBEAP = $(LIBEAP_NAME).so.$(LIBEAP_CURRENT).$(LIBEAP_REVISION).$(LIBEAP_AGE)
-+LIBEAP_SO = $(LIBEAP_NAME).so.$(LIBEAP_CURRENT)
-+
-+.PHONY: all clean install uninstall
-+
-+all: $(LIBEAP)
-+
-+ifndef CC
-+CC=gcc
-+endif
-+
-+ifndef CFLAGS
-+CFLAGS = -MMD -O0 -Wall -g
-+endif
-+
-+CONFIG_TLS=openssl
-+
-+INCLUDE_INSTALL_DIR=/usr/include/eap_peer
-+
-+# Got to use override all across the board, otherwise a 'make
-+# CFLAGS=XX' will kill us because the command line's CFLAGS will
-+# overwrite Make's and we'll loose all the infrastructure it sets.
-+override CFLAGS += -I. -I.. -I../crypto -I../utils -I../common
-+
-+# at least for now, need to include config_ssid.h and config_blob.h from
-+# wpa_supplicant directory
-+override CFLAGS += -I ../../wpa_supplicant
-+
-+OBJS_both += ../utils/common.o
-+OBJS_both += ../utils/os_unix.o
-+OBJS_both += ../utils/wpa_debug.o
-+OBJS_both += ../utils/base64.o
-+OBJS_both += ../utils/wpabuf.o
-+OBJS_both += ../crypto/md5.o
-+OBJS_both += ../crypto/sha1.o
-+OBJS_both += ../crypto/sha1-tlsprf.o
-+OBJS_both += ../crypto/aes-encblock.o
-+OBJS_both += ../crypto/aes-wrap.o
-+OBJS_both += ../crypto/aes-ctr.o
-+OBJS_both += ../crypto/aes-eax.o
-+OBJS_both += ../crypto/aes-omac1.o
-+OBJS_both += ../crypto/ms_funcs.o
-+OBJS_both += ../crypto/sha256.o
-+
-+
-+OBJS_both += ../eap_common/eap_peap_common.o
-+OBJS_both += ../eap_common/eap_psk_common.o
-+OBJS_both += ../eap_common/eap_pax_common.o
-+OBJS_both += ../eap_common/eap_sake_common.o
-+OBJS_both += ../eap_common/eap_gpsk_common.o
-+OBJS_both += ../eap_common/chap.o
-+
-+OBJS_peer += ../eap_peer/eap_tls.o
-+OBJS_peer += ../eap_peer/eap_peap.o
-+OBJS_peer += ../eap_peer/eap_ttls.o
-+OBJS_peer += ../eap_peer/eap_md5.o
-+OBJS_peer += ../eap_peer/eap_mschapv2.o
-+OBJS_peer += ../eap_peer/mschapv2.o
-+OBJS_peer += ../eap_peer/eap_otp.o
-+OBJS_peer += ../eap_peer/eap_gtc.o
-+OBJS_peer += ../eap_peer/eap_leap.o
-+OBJS_peer += ../eap_peer/eap_psk.o
-+OBJS_peer += ../eap_peer/eap_pax.o
-+OBJS_peer += ../eap_peer/eap_sake.o
-+OBJS_peer += ../eap_peer/eap_gpsk.o
-+OBJS_peer += ../eap_peer/eap.o
-+OBJS_peer += ../eap_common/eap_common.o
-+OBJS_peer += ../eap_peer/eap_methods.o
-+OBJS_peer += ../eap_peer/eap_tls_common.o
-+
-+override CFLAGS += -DEAP_TLS
-+override CFLAGS += -DEAP_PEAP
-+override CFLAGS += -DEAP_TTLS
-+override CFLAGS += -DEAP_MD5
-+override CFLAGS += -DEAP_MSCHAPv2
-+override CFLAGS += -DEAP_GTC
-+override CFLAGS += -DEAP_OTP
-+override CFLAGS += -DEAP_LEAP
-+override CFLAGS += -DEAP_PSK
-+override CFLAGS += -DEAP_PAX
-+override CFLAGS += -DEAP_SAKE
-+override CFLAGS += -DEAP_GPSK -DEAP_GPSK_SHA256
-+override CFLAGS += -DEAP_TLS_FUNCS
-+
-+override CFLAGS += -DIEEE8021X_EAPOL
-+
-+ifeq ($(CONFIG_TLS), openssl)
-+override CFLAGS += -DEAP_TLS_OPENSSL
-+OBJS_both += ../crypto/tls_openssl.o
-+OBJS_both += ../crypto/crypto_openssl.o
-+LIBS += -lssl -lcrypto
-+override CFLAGS += -DINTERNAL_SHA256
-+endif
-+
-+ifeq ($(CONFIG_TLS), internal)
-+OBJS_both += ../crypto/tls_internal.o
-+OBJS_both += ../tls/tlsv1_common.o ../../tls/tlsv1_record.o
-+OBJS_both += ../tls/tlsv1_cred.o
-+OBJS_both += ../tls/asn1.o ../../tls/x509v3.o
-+OBJS_both += ../crypto/crypto_internal.o ../../tls/rsa.o ../../tls/bignum.o
-+
-+OBJS_peer += ../tls/tlsv1_client.o
-+OBJS_peer += ../tls/tlsv1_client_write.o ../../tls/tlsv1_client_read.o
-+override CFLAGS += -DCONFIG_TLS_INTERNAL_CLIENT
-+
-+OBJS_server += ../tls/tlsv1_server.o
-+OBJS_server += ../tls/tlsv1_server_write.o ../../tls/tlsv1_server_read.o
-+override CFLAGS += -DCONFIG_TLS_INTERNAL_SERVER
-+
-+override CFLAGS += -DCONFIG_TLS_INTERNAL
-+override CFLAGS += -DCONFIG_CRYPTO_INTERNAL
-+override CFLAGS += -DCONFIG_INTERNAL_X509
-+override CFLAGS += -DINTERNAL_AES
-+override CFLAGS += -DINTERNAL_SHA1
-+override CFLAGS += -DINTERNAL_SHA256
-+override CFLAGS += -DINTERNAL_MD5
-+override CFLAGS += -DINTERNAL_MD4
-+override CFLAGS += -DINTERNAL_DES
-+ifdef CONFIG_INTERNAL_LIBTOMMATH
-+override CFLAGS += -DCONFIG_INTERNAL_LIBTOMMATH
-+else
-+LIBS += -ltommath
-+endif
-+endif
-+
-+ifndef LDO
-+LDO=$(CC)
-+endif
-+
-+
-+OBJS_lib=$(OBJS_both) $(OBJS_peer)
-+
-+ #$(OBJS_server)
-+
-+override CFLAGS  += -fPIC -DPIC
-+LDFLAGS += -shared
-+
-+$(LIBEAP): $(OBJS_lib)
-+	$(LDO) $(LDFLAGS) $(OBJS_lib) -Wl,-soname -Wl,$(LIBEAP_SO) -o $(LIBEAP) $(LIBS)
-+
-+
-+UTIL_HEADERS = ../utils/includes.h ../utils/common.h \
-+	../utils/wpabuf.h ../utils/build_config.h \
-+	../utils/os.h ../utils/wpa_debug.h
-+COMMON_HEADERS = ../common/defs.h 
-+EAP_COMMON_HEADERS = ../eap_common/eap_defs.h 
-+MAIN_HEADERS = eap.h eap_methods.h eap_config.h
-+CRYPTO_HEADERS =  ../crypto/tls.h  
-+
-+install: 
-+
-+	mkdir -p $(DESTDIR)/usr/lib
-+#	copy the lib file to std lib location
-+	cp $(LIBEAP) $(DESTDIR)/usr/lib
-+	ln -fs $(LIBEAP_SO) $(DESTDIR)/usr/lib/$(LIBEAP_NAME).so
-+	ln -fs $(LIBEAP_NAME).so.0.0.0 $(DESTDIR)/usr/lib/$(LIBEAP_NAME).so.0
-+
-+#	copy the headers reqd by apps using eap peer library in its own subfolder under /usr/include
-+	mkdir -p \
-+		$(DESTDIR)/$(INCLUDE_INSTALL_DIR)/eap_common \
-+		$(DESTDIR)/$(INCLUDE_INSTALL_DIR)/common \
-+		$(DESTDIR)/$(INCLUDE_INSTALL_DIR)/util \
-+		$(DESTDIR)/$(INCLUDE_INSTALL_DIR)/crypto
-+	install -m 0644 $(EAP_COMMON_HEADERS) $(DESTDIR)/$(INCLUDE_INSTALL_DIR)/eap_common
-+	install -m 0644 $(COMMON_HEADERS) $(DESTDIR)/$(INCLUDE_INSTALL_DIR)/common
-+	install -m 0644 $(CRYPTO_HEADERS) $(DESTDIR)/$(INCLUDE_INSTALL_DIR)/crypto
-+	install -m 0644 $(UTIL_HEADERS) $(DESTDIR)/$(INCLUDE_INSTALL_DIR)/util
-+	install -m 0644 $(MAIN_HEADERS) $(DESTDIR)/$(INCLUDE_INSTALL_DIR)/
-+
-+	mkdir -p $(DESTDIR)/usr/lib/pkgconfig
-+	cp libeap0.pc $(DESTDIR)/usr/lib/pkgconfig
-+
-+uninstall: 
-+
-+	rm $(DESTDIR)/usr/lib/$(LIBEAP)
-+	rm -fr $(DESTDIR)/$(INCLUDE_INSTALL_DIR)
-+	rm -f $(DESTDIR)/usr/lib/pkgconfig/libeap0.pc
- 
- clean:
--	rm -f *~ *.o *.so *.d
-+	rm -f *~ *.o *.so *.d libeap.a $(LIBEAP) $(OBJS_lib)
- 
--install:
--	if ls *.so >/dev/null 2>&1; then \
--		install -d $(DESTDIR)$(LIBDIR)/wpa_supplicant && \
--		cp *.so $(DESTDIR)$(LIBDIR)/wpa_supplicant \
--	; fi
-+-include $(OBJS:%.o=%.d)
-diff --git a/src/eap_peer/eap_methods.c b/src/eap_peer/eap_methods.c
-index 3b0af05..092f266 100644
---- a/src/eap_peer/eap_methods.c
-+++ b/src/eap_peer/eap_methods.c
-@@ -340,6 +340,120 @@ int eap_peer_method_register(struct eap_method *method)
- 
- 
- /**
-+ * eap_peer_register_methods - Register all known EAP peer methods
-+ *
-+ * This function is called at program start to register all compiled
-+ * in EAP peer methods.
-+ */
-+int eap_peer_register_methods(void)
-+{
-+	int ret = 0;
-+
-+#ifdef EAP_MD5
-+	if (ret == 0)
-+		ret = eap_peer_md5_register();
-+#endif /* EAP_MD5 */
-+
-+#ifdef EAP_TLS
-+	if (ret == 0)
-+		ret = eap_peer_tls_register();
-+#endif /* EAP_TLS */
-+
-+#ifdef EAP_MSCHAPv2
-+	if (ret == 0)
-+		ret = eap_peer_mschapv2_register();
-+#endif /* EAP_MSCHAPv2 */
-+
-+#ifdef EAP_PEAP
-+	if (ret == 0)
-+		ret = eap_peer_peap_register();
-+#endif /* EAP_PEAP */
-+
-+#ifdef EAP_TTLS
-+	if (ret == 0)
-+		ret = eap_peer_ttls_register();
-+#endif /* EAP_TTLS */
-+
-+#ifdef EAP_GTC
-+	if (ret == 0)
-+		ret = eap_peer_gtc_register();
-+#endif /* EAP_GTC */
-+
-+#ifdef EAP_OTP
-+	if (ret == 0)
-+		ret = eap_peer_otp_register();
-+#endif /* EAP_OTP */
-+
-+#ifdef EAP_SIM
-+	if (ret == 0)
-+		ret = eap_peer_sim_register();
-+#endif /* EAP_SIM */
-+
-+#ifdef EAP_LEAP
-+	if (ret == 0)
-+		ret = eap_peer_leap_register();
-+#endif /* EAP_LEAP */
-+
-+#ifdef EAP_PSK
-+	if (ret == 0)
-+		ret = eap_peer_psk_register();
-+#endif /* EAP_PSK */
-+
-+#ifdef EAP_AKA
-+	if (ret == 0)
-+		ret = eap_peer_aka_register();
-+#endif /* EAP_AKA */
-+
-+#ifdef EAP_AKA_PRIME
-+	if (ret == 0)
-+		ret = eap_peer_aka_prime_register();
-+#endif /* EAP_AKA_PRIME */
-+
-+#ifdef EAP_FAST
-+	if (ret == 0)
-+		ret = eap_peer_fast_register();
-+#endif /* EAP_FAST */
-+
-+#ifdef EAP_PAX
-+	if (ret == 0)
-+		ret = eap_peer_pax_register();
-+#endif /* EAP_PAX */
-+
-+#ifdef EAP_SAKE
-+	if (ret == 0)
-+		ret = eap_peer_sake_register();
-+#endif /* EAP_SAKE */
-+
-+#ifdef EAP_GPSK
-+	if (ret == 0)
-+		ret = eap_peer_gpsk_register();
-+#endif /* EAP_GPSK */
-+
-+#ifdef EAP_WSC
-+	if (ret == 0)
-+		ret = eap_peer_wsc_register();
-+#endif /* EAP_WSC */
-+
-+#ifdef EAP_IKEV2
-+	if (ret == 0)
-+		ret = eap_peer_ikev2_register();
-+#endif /* EAP_IKEV2 */
-+
-+#ifdef EAP_VENDOR_TEST
-+	if (ret == 0)
-+		ret = eap_peer_vendor_test_register();
-+#endif /* EAP_VENDOR_TEST */
-+
-+#ifdef EAP_TNC
-+	if (ret == 0)
-+		ret = eap_peer_tnc_register();
-+#endif /* EAP_TNC */
-+
-+	return ret;
-+}
-+
-+
-+/**
-  * eap_peer_unregister_methods - Unregister EAP peer methods
-  *
-  * This function is called at program termination to unregister all EAP peer
-diff --git a/src/eap_peer/eap_methods.h b/src/eap_peer/eap_methods.h
-index 384c61b..b83a46f 100644
---- a/src/eap_peer/eap_methods.h
-+++ b/src/eap_peer/eap_methods.h
-@@ -32,6 +32,7 @@ EapType eap_peer_get_type(const char *name, int *vendor);
- const char * eap_get_name(int vendor, EapType type);
- size_t eap_get_names(char *buf, size_t buflen);
- char ** eap_get_names_as_string_array(size_t *num);
-+int eap_peer_register_methods(void);
- void eap_peer_unregister_methods(void);
- 
- #else /* IEEE8021X_EAPOL */
-diff --git a/src/eap_peer/libeap0.pc b/src/eap_peer/libeap0.pc
-new file mode 100644
-index 0000000..2f8463a
---- /dev/null
-+++ b/src/eap_peer/libeap0.pc
-@@ -0,0 +1,10 @@
-+prefix=/usr
-+exec_prefix=/usr
-+libdir=${exec_prefix}/lib
-+includedir=${prefix}/include/eap_peer
-+
-+Name: libeap0
-+Description: EAP Peer Library API
-+Version: 0.7.2
-+Libs: -L${libdir} -leap
-+Cflags: -I${includedir}
--- 
-1.6.6.1
-
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-1.1-dbus-path-fix.patch b/net-wireless/wpa_supplicant/files/wpa_supplicant-1.1-dbus-path-fix.patch
deleted file mode 100644
index 976d71b0ec39..000000000000
--- a/net-wireless/wpa_supplicant/files/wpa_supplicant-1.1-dbus-path-fix.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -aurp a/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in b/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in
---- a/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in	2012-05-15 09:00:03.048545044 +0000
-+++ b/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in	2012-05-15 09:01:19.759550509 +0000
-@@ -1,5 +1,5 @@
- [D-BUS Service]
- Name=fi.epitest.hostap.WPASupplicant
--Exec=@BINDIR@/wpa_supplicant -u
-+Exec=/usr/sbin/wpa_supplicant -u
- User=root
- SystemdService=wpa_supplicant.service
-diff -aurp a/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in b/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in
---- a/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in	2012-05-15 09:00:03.048545044 +0000
-+++ b/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in	2012-05-15 09:01:28.727551913 +0000
-@@ -1,5 +1,5 @@
- [D-BUS Service]
- Name=fi.w1.wpa_supplicant1
--Exec=@BINDIR@/wpa_supplicant -u
-+Exec=/usr/sbin/wpa_supplicant -u
- User=root
- SystemdService=wpa_supplicant.service
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-1.1-do-not-call-dbus-functions-with-NULL-path.patch b/net-wireless/wpa_supplicant/files/wpa_supplicant-1.1-do-not-call-dbus-functions-with-NULL-path.patch
deleted file mode 100644
index bbff73e13d42..000000000000
--- a/net-wireless/wpa_supplicant/files/wpa_supplicant-1.1-do-not-call-dbus-functions-with-NULL-path.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -aurp a/wpa_supplicant/dbus/dbus_new_helpers.c b/wpa_supplicant/dbus/dbus_new_helpers.c
---- a/wpa_supplicant/dbus/dbus_new_helpers.c	2012-05-15 07:28:37.616150164 +0000
-+++ b/wpa_supplicant/dbus/dbus_new_helpers.c	2012-05-15 07:30:21.904157611 +0000
-@@ -882,7 +882,7 @@ void wpa_dbus_mark_property_changed(stru
- 	const struct wpa_dbus_property_desc *dsc;
- 	int i = 0;
- 
--	if (iface == NULL)
-+	if (iface == NULL || path == NULL)
- 		return;
- 
- 	dbus_connection_get_object_path_data(iface->con, path,
-diff -aurp a/wpa_supplicant/dbus/dbus_old.c b/wpa_supplicant/dbus/dbus_old.c
---- a/wpa_supplicant/dbus/dbus_old.c	2012-05-15 07:28:29.502149373 +0000
-+++ b/wpa_supplicant/dbus/dbus_old.c	2012-05-15 07:30:48.859162441 +0000
-@@ -379,7 +379,7 @@ void wpa_supplicant_dbus_notify_scan_res
- 	DBusMessage *_signal;
- 
- 	/* Do nothing if the control interface is not turned on */
--	if (iface == NULL)
-+	if (iface == NULL || wpa_s->dbus_path == NULL)
- 		return;
- 
- 	_signal = dbus_message_new_signal(wpa_s->dbus_path,
-@@ -419,7 +419,7 @@ void wpa_supplicant_dbus_notify_state_ch
- 	if (wpa_s->global == NULL)
- 		return;
- 	iface = wpa_s->global->dbus;
--	if (iface == NULL)
-+	if (iface == NULL || wpa_s->dbus_path == NULL)
- 		return;
- 
- 	/* Only send signal if state really changed */
-@@ -478,7 +478,7 @@ void wpa_supplicant_dbus_notify_scanning
- 	dbus_bool_t scanning = wpa_s->scanning ? TRUE : FALSE;
- 
- 	/* Do nothing if the control interface is not turned on */
--	if (iface == NULL)
-+	if (iface == NULL || wpa_s->dbus_path == NULL)
- 		return;
- 
- 	_signal = dbus_message_new_signal(wpa_s->dbus_path,
-@@ -513,7 +513,7 @@ void wpa_supplicant_dbus_notify_wps_cred
- 	if (wpa_s->global == NULL)
- 		return;
- 	iface = wpa_s->global->dbus;
--	if (iface == NULL)
-+	if (iface == NULL || wpa_s->dbus_path == NULL)
- 		return;
- 
- 	_signal = dbus_message_new_signal(wpa_s->dbus_path,
-@@ -564,7 +564,7 @@ void wpa_supplicant_dbus_notify_certific
- 	if (wpa_s->global == NULL)
- 		return;
- 	iface = wpa_s->global->dbus;
--	if (iface == NULL)
-+	if (iface == NULL || wpa_s->dbus_path == NULL)
- 		return;
- 
- 	_signal = dbus_message_new_signal(wpa_s->dbus_path,
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-1.1-generate-libeap-peer.patch b/net-wireless/wpa_supplicant/files/wpa_supplicant-1.1-generate-libeap-peer.patch
deleted file mode 100644
index c84e51dfdecd..000000000000
--- a/net-wireless/wpa_supplicant/files/wpa_supplicant-1.1-generate-libeap-peer.patch
+++ /dev/null
@@ -1,347 +0,0 @@
-diff -Naurp a/src/eap_peer/eap_methods.c b/src/eap_peer/eap_methods.c
---- a/src/eap_peer/eap_methods.c	2012-05-15 08:23:17.151386999 +0000
-+++ b/src/eap_peer/eap_methods.c	2012-05-15 08:23:57.403389760 +0000
-@@ -342,6 +342,120 @@ int eap_peer_method_register(struct eap_
- 
- 
- /**
-+ * eap_peer_register_methods - Register all known EAP peer methods
-+ *
-+ * This function is called at program start to register all compiled
-+ * in EAP peer methods.
-+ */
-+int eap_peer_register_methods(void)
-+{
-+	int ret = 0;
-+
-+#ifdef EAP_MD5
-+	if (ret == 0)
-+		ret = eap_peer_md5_register();
-+#endif /* EAP_MD5 */
-+
-+#ifdef EAP_TLS
-+	if (ret == 0)
-+		ret = eap_peer_tls_register();
-+#endif /* EAP_TLS */
-+
-+#ifdef EAP_MSCHAPv2
-+	if (ret == 0)
-+		ret = eap_peer_mschapv2_register();
-+#endif /* EAP_MSCHAPv2 */
-+
-+#ifdef EAP_PEAP
-+	if (ret == 0)
-+		ret = eap_peer_peap_register();
-+#endif /* EAP_PEAP */
-+
-+#ifdef EAP_TTLS
-+	if (ret == 0)
-+		ret = eap_peer_ttls_register();
-+#endif /* EAP_TTLS */
-+
-+#ifdef EAP_GTC
-+	if (ret == 0)
-+		ret = eap_peer_gtc_register();
-+#endif /* EAP_GTC */
-+
-+#ifdef EAP_OTP
-+	if (ret == 0)
-+		ret = eap_peer_otp_register();
-+#endif /* EAP_OTP */
-+
-+#ifdef EAP_SIM
-+	if (ret == 0)
-+		ret = eap_peer_sim_register();
-+#endif /* EAP_SIM */
-+
-+#ifdef EAP_LEAP
-+	if (ret == 0)
-+		ret = eap_peer_leap_register();
-+#endif /* EAP_LEAP */
-+
-+#ifdef EAP_PSK
-+	if (ret == 0)
-+		ret = eap_peer_psk_register();
-+#endif /* EAP_PSK */
-+
-+#ifdef EAP_AKA
-+	if (ret == 0)
-+		ret = eap_peer_aka_register();
-+#endif /* EAP_AKA */
-+
-+#ifdef EAP_AKA_PRIME
-+	if (ret == 0)
-+		ret = eap_peer_aka_prime_register();
-+#endif /* EAP_AKA_PRIME */
-+
-+#ifdef EAP_FAST
-+	if (ret == 0)
-+		ret = eap_peer_fast_register();
-+#endif /* EAP_FAST */
-+
-+#ifdef EAP_PAX
-+	if (ret == 0)
-+		ret = eap_peer_pax_register();
-+#endif /* EAP_PAX */
-+
-+#ifdef EAP_SAKE
-+	if (ret == 0)
-+		ret = eap_peer_sake_register();
-+#endif /* EAP_SAKE */
-+
-+#ifdef EAP_GPSK
-+	if (ret == 0)
-+		ret = eap_peer_gpsk_register();
-+#endif /* EAP_GPSK */
-+
-+#ifdef EAP_WSC
-+	if (ret == 0)
-+		ret = eap_peer_wsc_register();
-+#endif /* EAP_WSC */
-+
-+#ifdef EAP_IKEV2
-+	if (ret == 0)
-+		ret = eap_peer_ikev2_register();
-+#endif /* EAP_IKEV2 */
-+
-+#ifdef EAP_VENDOR_TEST
-+	if (ret == 0)
-+		ret = eap_peer_vendor_test_register();
-+#endif /* EAP_VENDOR_TEST */
-+
-+#ifdef EAP_TNC
-+	if (ret == 0)
-+		ret = eap_peer_tnc_register();
-+#endif /* EAP_TNC */
-+
-+	return ret;
-+}
-+
-+
-+/**
-  * eap_peer_unregister_methods - Unregister EAP peer methods
-  *
-  * This function is called at program termination to unregister all EAP peer
-diff -Naurp a/src/eap_peer/eap_methods.h b/src/eap_peer/eap_methods.h
---- a/src/eap_peer/eap_methods.h	2012-05-15 08:23:17.151386999 +0000
-+++ b/src/eap_peer/eap_methods.h	2012-05-15 08:23:57.404389735 +0000
-@@ -32,6 +32,7 @@ EapType eap_peer_get_type(const char *na
- const char * eap_get_name(int vendor, EapType type);
- size_t eap_get_names(char *buf, size_t buflen);
- char ** eap_get_names_as_string_array(size_t *num);
-+int eap_peer_register_methods(void);
- void eap_peer_unregister_methods(void);
- 
- #else /* IEEE8021X_EAPOL */
-diff -Naurp a/src/eap_peer/libeap0.pc b/src/eap_peer/libeap0.pc
---- a/src/eap_peer/libeap0.pc	1970-01-01 00:00:00.000000000 +0000
-+++ b/src/eap_peer/libeap0.pc	2012-05-15 08:23:57.404389735 +0000
-@@ -0,0 +1,10 @@
-+prefix=/usr
-+exec_prefix=/usr
-+libdir=${exec_prefix}/lib
-+includedir=${prefix}/include/eap_peer
-+
-+Name: libeap0
-+Description: EAP Peer Library API
-+Version: 0.7.2
-+Libs: -L${libdir} -leap
-+Cflags: -I${includedir}
-diff -Naurp a/src/eap_peer/Makefile b/src/eap_peer/Makefile
---- a/src/eap_peer/Makefile	2012-05-15 08:23:17.152386964 +0000
-+++ b/src/eap_peer/Makefile	2012-05-15 08:23:57.403389760 +0000
-@@ -1,11 +1,186 @@
--all:
--	@echo Nothing to be made.
-+LIBEAP_NAME = libeap
-+LIBEAP_CURRENT = 0
-+LIBEAP_REVISION = 0
-+LIBEAP_AGE = 0
-+
-+LIBEAP = $(LIBEAP_NAME).so.$(LIBEAP_CURRENT).$(LIBEAP_REVISION).$(LIBEAP_AGE)
-+LIBEAP_SO = $(LIBEAP_NAME).so.$(LIBEAP_CURRENT)
-+
-+.PHONY: all clean install uninstall
-+
-+all: $(LIBEAP)
-+
-+ifndef CC
-+CC=gcc
-+endif
-+
-+ifndef CFLAGS
-+CFLAGS = -MMD -O0 -Wall -g
-+endif
-+
-+CONFIG_TLS=openssl
-+
-+INCLUDE_INSTALL_DIR=/usr/include/eap_peer
-+
-+# Got to use override all across the board, otherwise a 'make
-+# CFLAGS=XX' will kill us because the command line's CFLAGS will
-+# overwrite Make's and we'll loose all the infrastructure it sets.
-+override CFLAGS += -I. -I.. -I../crypto -I../utils -I../common
-+
-+# at least for now, need to include config_ssid.h and config_blob.h from
-+# wpa_supplicant directory
-+override CFLAGS += -I ../../wpa_supplicant
-+
-+OBJS_both += ../utils/common.o
-+OBJS_both += ../utils/os_unix.o
-+OBJS_both += ../utils/wpa_debug.o
-+OBJS_both += ../utils/base64.o
-+OBJS_both += ../utils/wpabuf.o
-+OBJS_both += ../crypto/md5.o
-+OBJS_both += ../crypto/sha1.o
-+OBJS_both += ../crypto/sha1-tlsprf.o
-+OBJS_both += ../crypto/aes-encblock.o
-+OBJS_both += ../crypto/aes-wrap.o
-+OBJS_both += ../crypto/aes-ctr.o
-+OBJS_both += ../crypto/aes-eax.o
-+OBJS_both += ../crypto/aes-omac1.o
-+OBJS_both += ../crypto/ms_funcs.o
-+OBJS_both += ../crypto/sha256.o
-+
-+
-+OBJS_both += ../eap_common/eap_peap_common.o
-+OBJS_both += ../eap_common/eap_psk_common.o
-+OBJS_both += ../eap_common/eap_pax_common.o
-+OBJS_both += ../eap_common/eap_sake_common.o
-+OBJS_both += ../eap_common/eap_gpsk_common.o
-+OBJS_both += ../eap_common/chap.o
-+
-+OBJS_peer += ../eap_peer/eap_tls.o
-+OBJS_peer += ../eap_peer/eap_peap.o
-+OBJS_peer += ../eap_peer/eap_ttls.o
-+OBJS_peer += ../eap_peer/eap_md5.o
-+OBJS_peer += ../eap_peer/eap_mschapv2.o
-+OBJS_peer += ../eap_peer/mschapv2.o
-+OBJS_peer += ../eap_peer/eap_otp.o
-+OBJS_peer += ../eap_peer/eap_gtc.o
-+OBJS_peer += ../eap_peer/eap_leap.o
-+OBJS_peer += ../eap_peer/eap_psk.o
-+OBJS_peer += ../eap_peer/eap_pax.o
-+OBJS_peer += ../eap_peer/eap_sake.o
-+OBJS_peer += ../eap_peer/eap_gpsk.o
-+OBJS_peer += ../eap_peer/eap.o
-+OBJS_peer += ../eap_common/eap_common.o
-+OBJS_peer += ../eap_peer/eap_methods.o
-+OBJS_peer += ../eap_peer/eap_tls_common.o
-+
-+override CFLAGS += -DEAP_TLS
-+override CFLAGS += -DEAP_PEAP
-+override CFLAGS += -DEAP_TTLS
-+override CFLAGS += -DEAP_MD5
-+override CFLAGS += -DEAP_MSCHAPv2
-+override CFLAGS += -DEAP_GTC
-+override CFLAGS += -DEAP_OTP
-+override CFLAGS += -DEAP_LEAP
-+override CFLAGS += -DEAP_PSK
-+override CFLAGS += -DEAP_PAX
-+override CFLAGS += -DEAP_SAKE
-+override CFLAGS += -DEAP_GPSK -DEAP_GPSK_SHA256
-+override CFLAGS += -DEAP_TLS_FUNCS
-+
-+override CFLAGS += -DIEEE8021X_EAPOL
-+
-+ifeq ($(CONFIG_TLS), openssl)
-+override CFLAGS += -DEAP_TLS_OPENSSL
-+OBJS_both += ../crypto/tls_openssl.o
-+OBJS_both += ../crypto/crypto_openssl.o
-+LIBS += -lssl -lcrypto
-+override CFLAGS += -DINTERNAL_SHA256
-+endif
-+
-+ifeq ($(CONFIG_TLS), internal)
-+OBJS_both += ../crypto/tls_internal.o
-+OBJS_both += ../tls/tlsv1_common.o ../../tls/tlsv1_record.o
-+OBJS_both += ../tls/tlsv1_cred.o
-+OBJS_both += ../tls/asn1.o ../../tls/x509v3.o
-+OBJS_both += ../crypto/crypto_internal.o ../../tls/rsa.o ../../tls/bignum.o
-+
-+OBJS_peer += ../tls/tlsv1_client.o
-+OBJS_peer += ../tls/tlsv1_client_write.o ../../tls/tlsv1_client_read.o
-+override CFLAGS += -DCONFIG_TLS_INTERNAL_CLIENT
-+
-+OBJS_server += ../tls/tlsv1_server.o
-+OBJS_server += ../tls/tlsv1_server_write.o ../../tls/tlsv1_server_read.o
-+override CFLAGS += -DCONFIG_TLS_INTERNAL_SERVER
-+
-+override CFLAGS += -DCONFIG_TLS_INTERNAL
-+override CFLAGS += -DCONFIG_CRYPTO_INTERNAL
-+override CFLAGS += -DCONFIG_INTERNAL_X509
-+override CFLAGS += -DINTERNAL_AES
-+override CFLAGS += -DINTERNAL_SHA1
-+override CFLAGS += -DINTERNAL_SHA256
-+override CFLAGS += -DINTERNAL_MD5
-+override CFLAGS += -DINTERNAL_MD4
-+override CFLAGS += -DINTERNAL_DES
-+ifdef CONFIG_INTERNAL_LIBTOMMATH
-+override CFLAGS += -DCONFIG_INTERNAL_LIBTOMMATH
-+else
-+LIBS += -ltommath
-+endif
-+endif
-+
-+ifndef LDO
-+LDO=$(CC)
-+endif
-+
-+
-+OBJS_lib=$(OBJS_both) $(OBJS_peer)
-+
-+ #$(OBJS_server)
-+
-+override CFLAGS  += -fPIC -DPIC
-+LDFLAGS += -shared
-+
-+$(LIBEAP): $(OBJS_lib)
-+	$(LDO) $(LDFLAGS) $(OBJS_lib) -Wl,-soname -Wl,$(LIBEAP_SO) -o $(LIBEAP) $(LIBS)
-+
-+
-+UTIL_HEADERS = ../utils/includes.h ../utils/common.h \
-+	../utils/wpabuf.h ../utils/build_config.h \
-+	../utils/os.h ../utils/wpa_debug.h
-+COMMON_HEADERS = ../common/defs.h 
-+EAP_COMMON_HEADERS = ../eap_common/eap_defs.h 
-+MAIN_HEADERS = eap.h eap_methods.h eap_config.h
-+CRYPTO_HEADERS =  ../crypto/tls.h  
-+
-+install: 
-+
-+	mkdir -p $(DESTDIR)/usr/lib
-+#	copy the lib file to std lib location
-+	cp $(LIBEAP) $(DESTDIR)/usr/lib
-+	ln -fs $(LIBEAP_SO) $(DESTDIR)/usr/lib/$(LIBEAP_NAME).so
-+	ln -fs $(LIBEAP_NAME).so.0.0.0 $(DESTDIR)/usr/lib/$(LIBEAP_NAME).so.0
-+
-+#	copy the headers reqd by apps using eap peer library in its own subfolder under /usr/include
-+	mkdir -p \
-+		$(DESTDIR)/$(INCLUDE_INSTALL_DIR)/eap_common \
-+		$(DESTDIR)/$(INCLUDE_INSTALL_DIR)/common \
-+		$(DESTDIR)/$(INCLUDE_INSTALL_DIR)/util \
-+		$(DESTDIR)/$(INCLUDE_INSTALL_DIR)/crypto
-+	install -m 0644 $(EAP_COMMON_HEADERS) $(DESTDIR)/$(INCLUDE_INSTALL_DIR)/eap_common
-+	install -m 0644 $(COMMON_HEADERS) $(DESTDIR)/$(INCLUDE_INSTALL_DIR)/common
-+	install -m 0644 $(CRYPTO_HEADERS) $(DESTDIR)/$(INCLUDE_INSTALL_DIR)/crypto
-+	install -m 0644 $(UTIL_HEADERS) $(DESTDIR)/$(INCLUDE_INSTALL_DIR)/util
-+	install -m 0644 $(MAIN_HEADERS) $(DESTDIR)/$(INCLUDE_INSTALL_DIR)/
-+
-+	mkdir -p $(DESTDIR)/usr/lib/pkgconfig
-+	cp libeap0.pc $(DESTDIR)/usr/lib/pkgconfig
-+
-+uninstall: 
-+
-+	rm $(DESTDIR)/usr/lib/$(LIBEAP)
-+	rm -fr $(DESTDIR)/$(INCLUDE_INSTALL_DIR)
-+	rm -f $(DESTDIR)/usr/lib/pkgconfig/libeap0.pc
- 
- clean:
--	rm -f *~ *.o *.so *.d
-+	rm -f *~ *.o *.so *.d libeap.a $(LIBEAP) $(OBJS_lib)
- 
--install:
--	if ls *.so >/dev/null 2>&1; then \
--		install -d $(DESTDIR)$(LIBDIR)/wpa_supplicant && \
--		cp *.so $(DESTDIR)$(LIBDIR)/wpa_supplicant \
--	; fi
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-1.1-libnl_path_fix.patch b/net-wireless/wpa_supplicant/files/wpa_supplicant-1.1-libnl_path_fix.patch
deleted file mode 100644
index abf15a6e7e07..000000000000
--- a/net-wireless/wpa_supplicant/files/wpa_supplicant-1.1-libnl_path_fix.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -aurp a/src/drivers/drivers.mak b/src/drivers/drivers.mak
---- a/src/drivers/drivers.mak	2012-10-03 19:42:16.387634128 +0000
-+++ b/src/drivers/drivers.mak	2012-10-03 19:43:16.246693744 +0000
-@@ -48,7 +48,7 @@ NEED_RFKILL=y
- ifdef CONFIG_LIBNL32
-   DRV_LIBS += -lnl-3
-   DRV_LIBS += -lnl-genl-3
--  DRV_CFLAGS += -DCONFIG_LIBNL20
-+  DRV_CFLAGS += -DCONFIG_LIBNL20 -I/usr/include/libnl3
- else
-   ifdef CONFIG_LIBNL_TINY
-     DRV_LIBS += -lnl-tiny
-diff -aurp a/src/drivers/drivers.mk b/src/drivers/drivers.mk
---- a/src/drivers/drivers.mk	2012-10-03 19:42:16.385634126 +0000
-+++ b/src/drivers/drivers.mk	2012-10-03 19:43:23.333700780 +0000
-@@ -48,7 +48,7 @@ NEED_RFKILL=y
- ifdef CONFIG_LIBNL32
-   DRV_LIBS += -lnl-3
-   DRV_LIBS += -lnl-genl-3
--  DRV_CFLAGS += -DCONFIG_LIBNL20
-+  DRV_CFLAGS += -DCONFIG_LIBNL20 -I/usr/include/libnl3
- else
-   ifdef CONFIG_LIBNL_TINY
-     DRV_LIBS += -lnl-tiny
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-gcc470.patch b/net-wireless/wpa_supplicant/files/wpa_supplicant-gcc470.patch
deleted file mode 100644
index 947a47665bfb..000000000000
--- a/net-wireless/wpa_supplicant/files/wpa_supplicant-gcc470.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- ./wpa_supplicant/wpa_gui-qt4/wpagui.cpp_old	2012-03-22 10:32:40.397228118 +0000
-+++ ./wpa_supplicant/wpa_gui-qt4/wpagui.cpp	2012-03-22 10:33:04.150228188 +0000
-@@ -12,10 +12,10 @@
-  * See README and COPYING for more details.
-  */
- 
--#ifdef __MINGW32__
-+/* #ifdef __MINGW32__	*/
- /* Need to get getopt() */
- #include <unistd.h>
--#endif
-+/* #endif	*/
- 
- #ifdef CONFIG_NATIVE_WINDOWS
- #include <windows.h>
diff --git a/net-wireless/wpa_supplicant/metadata.xml b/net-wireless/wpa_supplicant/metadata.xml
index 6a63e4e5d0c5..935c73eb3c79 100644
--- a/net-wireless/wpa_supplicant/metadata.xml
+++ b/net-wireless/wpa_supplicant/metadata.xml
@@ -17,7 +17,6 @@
 		<flag name='ap'>Add support for access point mode</flag>
 		<flag name='eap-sim'>Add support for EAP-SIM authentication algorithm</flag>
 		<flag name='fasteap'>Add support for FAST-EAP authentication algorithm</flag>
-		<flag name='madwifi'>Add support for madwifi (Atheros chipset)</flag>
 		<flag name='p2p'>Add support for Wi-Fi Direct mode</flag>
 		<flag name='ps3'>Add support for ps3 hypervisor driven gelic wifi</flag>
 		<flag name='wps'>Add support for Wi-Fi Protected Setup</flag>
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3-r5.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3-r5.ebuild
deleted file mode 100644
index 34347198c803..000000000000
--- a/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3-r5.ebuild
+++ /dev/null
@@ -1,310 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3-r5.ebuild,v 1.19 2013/03/02 23:13:01 hwoarang Exp $
-
-EAPI=4
-
-inherit eutils toolchain-funcs qt4-r2 systemd multilib
-
-DESCRIPTION="IEEE 802.1X/WPA supplicant for secure wireless transfers"
-HOMEPAGE="http://hostap.epitest.fi/wpa_supplicant/"
-SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz"
-LICENSE="|| ( GPL-2 BSD )"
-
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc ppc64 x86 ~x86-fbsd"
-IUSE="dbus debug gnutls eap-sim fasteap madwifi ps3 qt4 readline selinux ssl wimax wps kernel_linux kernel_FreeBSD"
-
-RDEPEND="dbus? ( sys-apps/dbus )
-	kernel_linux? (
-		eap-sim? ( sys-apps/pcsc-lite )
-		madwifi? ( >net-wireless/madwifi-ng-tools-0.9.3 )
-		dev-libs/libnl:1.1
-	)
-	!kernel_linux? ( net-libs/libpcap )
-	qt4? (
-		dev-qt/qtgui:4
-		dev-qt/qtsvg:4
-	)
-	readline? (
-		sys-libs/ncurses
-		sys-libs/readline
-	)
-	ssl? ( dev-libs/openssl )
-	!ssl? ( gnutls? ( net-libs/gnutls ) )
-	!ssl? ( !gnutls? ( dev-libs/libtommath ) )
-	selinux? ( sec-policy/selinux-networkmanager )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${P}/${PN}"
-
-pkg_setup() {
-	if use fasteap && (use gnutls || use ssl) ; then
-		die "If you use fasteap, you must build with wpa_supplicant's internal TLS implementation.  That is, both 'gnutls' and 'ssl' USE flags must be disabled"
-	fi
-
-	if use gnutls && use ssl ; then
-		einfo "You have both 'gnutls' and 'ssl' USE flags enabled: defaulting to USE=\"ssl\""
-	fi
-}
-
-src_prepare() {
-	# net/bpf.h needed for net-libs/libpcap on Gentoo/FreeBSD
-	sed -i \
-		-e "s:\(#include <pcap\.h>\):#include <net/bpf.h>\n\1:" \
-		../src/l2_packet/l2_packet_freebsd.c || die
-
-	# People seem to take the example configuration file too literally (bug #102361)
-	sed -i \
-		-e "s:^\(opensc_engine_path\):#\1:" \
-		-e "s:^\(pkcs11_engine_path\):#\1:" \
-		-e "s:^\(pkcs11_module_path\):#\1:" \
-		wpa_supplicant.conf || die
-
-	# Change configuration to match Gentoo locations (bug #143750)
-	sed -i \
-		-e "s:/usr/lib/opensc:/usr/$(get_libdir):" \
-		-e "s:/usr/lib/pkcs11:/usr/$(get_libdir):" \
-		wpa_supplicant.conf || die
-
-	epatch "${FILESDIR}/${P}-dbus_path_fix.patch"
-
-	# systemd entries to D-Bus service files (bug #372877)
-	echo 'SystemdService=wpa_supplicant.service' \
-		| tee -a dbus/*.service >/dev/null || die
-
-	if use wimax; then
-		cd "${WORKDIR}/${P}"
-		epatch "${FILESDIR}/${P}-generate-libeap-peer.patch"
-
-		# multilib-strict fix (bug #373685)
-		sed -e "s/\/usr\/lib/\/usr\/$(get_libdir)/" -i src/eap_peer/Makefile
-	fi
-
-	# bug (320097)
-	epatch "${FILESDIR}/do-not-call-dbus-functions-with-NULL-path.patch"
-	# https://bugzilla.gnome.org/show_bug.cgi?id=644634
-	epatch "${FILESDIR}/${P}-dbus-api-changes.patch"
-	# bug (374089)
-	epatch "${FILESDIR}/${P}-dbus-WPAIE-fix.patch"
-	# bug (409285)
-	epatch "${FILESDIR}/wpa_supplicant-gcc470.patch"
-}
-
-src_configure() {
-	# Toolchain setup
-	tc-export CC
-
-	# Basic setup
-	echo "CONFIG_CTRL_IFACE=y" >> .config
-	echo "CONFIG_BACKEND=file" >> .config
-
-	# Basic authentication methods
-	# NOTE: we don't set GPSK or SAKE as they conflict
-	# with the below options
-	echo "CONFIG_EAP_GTC=y"         >> .config
-	echo "CONFIG_EAP_MD5=y"         >> .config
-	echo "CONFIG_EAP_OTP=y"         >> .config
-	echo "CONFIG_EAP_PAX=y"         >> .config
-	echo "CONFIG_EAP_PSK=y"         >> .config
-	echo "CONFIG_EAP_TLV=y"         >> .config
-	echo "CONFIG_IEEE8021X_EAPOL=y" >> .config
-	echo "CONFIG_PKCS12=y"          >> .config
-	echo "CONFIG_PEERKEY=y"         >> .config
-	echo "CONFIG_EAP_LEAP=y"        >> .config
-	echo "CONFIG_EAP_MSCHAPV2=y"    >> .config
-	echo "CONFIG_EAP_PEAP=y"        >> .config
-	echo "CONFIG_EAP_TLS=y"         >> .config
-	echo "CONFIG_EAP_TTLS=y"        >> .config
-
-	if use dbus ; then
-		echo "CONFIG_CTRL_IFACE_DBUS=y" >> .config
-		echo "CONFIG_CTRL_IFACE_DBUS_NEW=y" >> .config
-		echo "CONFIG_CTRL_IFACE_DBUS_INTRO=y" >> .config
-	fi
-
-	if use debug ; then
-		echo "CONFIG_DEBUG_FILE=y" >> .config
-	fi
-
-	if use eap-sim ; then
-		# Smart card authentication
-		echo "CONFIG_EAP_SIM=y"       >> .config
-		echo "CONFIG_EAP_AKA=y"       >> .config
-		echo "CONFIG_EAP_AKA_PRIME=y" >> .config
-		echo "CONFIG_PCSC=y"          >> .config
-	fi
-
-	if use fasteap ; then
-		echo "CONFIG_EAP_FAST=y" >> .config
-	fi
-
-	if use readline ; then
-		# readline/history support for wpa_cli
-		echo "CONFIG_READLINE=y" >> .config
-	fi
-
-	# SSL authentication methods
-	if use ssl ; then
-		echo "CONFIG_TLS=openssl"    >> .config
-		echo "CONFIG_SMARTCARD=y"    >> .config
-	elif use gnutls ; then
-		echo "CONFIG_TLS=gnutls"     >> .config
-		echo "CONFIG_GNUTLS_EXTRA=y" >> .config
-	else
-		echo "CONFIG_TLS=internal"   >> .config
-	fi
-
-	if use kernel_linux ; then
-		# Linux specific drivers
-		echo "CONFIG_DRIVER_ATMEL=y"       >> .config
-		#echo "CONFIG_DRIVER_BROADCOM=y"   >> .config
-		#echo "CONFIG_DRIVER_HERMES=y"	   >> .config
-		echo "CONFIG_DRIVER_HOSTAP=y"      >> .config
-		echo "CONFIG_DRIVER_IPW=y"         >> .config
-		echo "CONFIG_DRIVER_NDISWRAPPER=y" >> .config
-		echo "CONFIG_DRIVER_NL80211=y"     >> .config
-		#echo "CONFIG_DRIVER_PRISM54=y"    >> .config
-		echo "CONFIG_DRIVER_RALINK=y"      >> .config
-		echo "CONFIG_DRIVER_WEXT=y"        >> .config
-		echo "CONFIG_DRIVER_WIRED=y"       >> .config
-
-		if use madwifi ; then
-			# Add include path for madwifi-driver headers
-			echo "CFLAGS += -I/usr/include/madwifi" >> .config
-			echo "CONFIG_DRIVER_MADWIFI=y"          >> .config
-		fi
-
-		if use ps3 ; then
-			echo "CONFIG_DRIVER_PS3=y" >> .config
-		fi
-
-	elif use kernel_FreeBSD ; then
-		# FreeBSD specific driver
-		echo "CONFIG_DRIVER_BSD=y" >> .config
-	fi
-
-	# Wi-Fi Protected Setup (WPS)
-	if use wps ; then
-		echo "CONFIG_WPS=y" >> .config
-	fi
-
-	# Enable mitigation against certain attacks against TKIP
-	echo "CONFIG_DELAYED_MIC_ERROR_REPORT=y" >> .config
-
-	# If we are using libnl 2.0 and above, enable support for it
-	# Bug 382159
-	# Removed for now, since the 3.2 version is broken, and we don't
-	# support it.
-	#if has_version ">=dev-libs/libnl-2.0"; then
-	#	echo "CONFIG_LIBNL20=y" >> .config
-	#fi
-
-	if use qt4 ; then
-		pushd "${S}"/wpa_gui-qt4 > /dev/null
-		eqmake4 wpa_gui.pro
-		popd > /dev/null
-	fi
-}
-
-src_compile() {
-	einfo "Building wpa_supplicant"
-	emake
-
-	if use wimax; then
-		emake -C ../src/eap_peer clean
-		emake -C ../src/eap_peer
-	fi
-
-	if use qt4 ; then
-		pushd "${S}"/wpa_gui-qt4 > /dev/null
-		einfo "Building wpa_gui"
-		emake
-		popd > /dev/null
-	fi
-}
-
-src_install() {
-	dosbin wpa_supplicant
-	dobin wpa_cli wpa_passphrase
-
-	# baselayout-1 compat
-	if has_version "<sys-apps/baselayout-2.0.0"; then
-		dodir /sbin
-		dosym /usr/sbin/wpa_supplicant /sbin/wpa_supplicant
-		dodir /bin
-		dosym /usr/bin/wpa_cli /bin/wpa_cli
-	fi
-
-	if has_version ">=sys-apps/openrc-0.5.0"; then
-		newinitd "${FILESDIR}/${PN}-init.d" wpa_supplicant
-		newconfd "${FILESDIR}/${PN}-conf.d" wpa_supplicant
-	fi
-
-	exeinto /etc/wpa_supplicant/
-	newexe "${FILESDIR}/wpa_cli.sh" wpa_cli.sh
-
-	dodoc ChangeLog {eap_testing,todo}.txt README{,-WPS} \
-		wpa_supplicant.conf
-
-	doman doc/docbook/*.{5,8}
-
-	if use qt4 ; then
-		into /usr
-		dobin wpa_gui-qt4/wpa_gui
-		doicon wpa_gui-qt4/icons/wpa_gui.svg
-		make_desktop_entry wpa_gui "WPA Supplicant Administration GUI" "wpa_gui" "Qt;Network;"
-	fi
-
-	use wimax && emake DESTDIR="${D}" -C ../src/eap_peer install
-
-	if use dbus ; then
-		pushd "${S}"/dbus > /dev/null
-		insinto /etc/dbus-1/system.d
-		newins dbus-wpa_supplicant.conf wpa_supplicant.conf
-		insinto /usr/share/dbus-1/system-services
-		doins fi.epitest.hostap.WPASupplicant.service fi.w1.wpa_supplicant1.service
-		keepdir /var/run/wpa_supplicant
-		popd > /dev/null
-	fi
-
-	# systemd stuff
-	systemd_dounit "${FILESDIR}"/wpa_supplicant.service
-	systemd_newunit "${FILESDIR}"/wpa_supplicant_at.service 'wpa_supplicant@.service'
-}
-
-pkg_postinst() {
-	einfo "If this is a clean installation of wpa_supplicant, you"
-	einfo "have to create a configuration file named"
-	einfo "/etc/wpa_supplicant/wpa_supplicant.conf"
-	einfo
-	einfo "An example configuration file is available for reference in"
-	einfo "/usr/share/doc/${PF}/"
-
-	if [[ -e ${ROOT}etc/wpa_supplicant.conf ]] ; then
-		echo
-		ewarn "WARNING: your old configuration file ${ROOT}etc/wpa_supplicant.conf"
-		ewarn "needs to be moved to ${ROOT}etc/wpa_supplicant/wpa_supplicant.conf"
-	fi
-
-	if use madwifi ; then
-		echo
-		einfo "This package compiles against the headers installed by"
-		einfo "madwifi-old, madwifi-ng or madwifi-ng-tools."
-		einfo "You should re-emerge ${PN} after upgrading these packages."
-	fi
-
-	# Mea culpa, feel free to remove that after some time --mgorny.
-	local fn
-	for fn in wpa_supplicant{,@wlan0}.service; do
-		if [[ -e "${ROOT}"/etc/systemd/system/network.target.wants/${fn} ]]
-		then
-			ebegin "Moving ${fn} to multi-user.target"
-			mv "${ROOT}"/etc/systemd/system/network.target.wants/${fn} \
-				"${ROOT}"/etc/systemd/system/multi-user.target.wants/
-			eend ${?} \
-				"Please try to re-enable ${fn}"
-		fi
-	done
-}