Bumping to 2.4 and removing old version

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x15AE484C

8 files changed, 26 insertions, 348 deletions

diff --git a/net-wireless/wpa_supplicant/ChangeLog b/net-wireless/wpa_supplicant/ChangeLog
index e8d1e56f61ef..0e2768350068 100644
--- a/net-wireless/wpa_supplicant/ChangeLog
+++ b/net-wireless/wpa_supplicant/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for net-wireless/wpa_supplicant
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.228 2015/03/03 09:45:18 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.229 2015/03/21 13:32:11 gurligebis Exp $
+
+*wpa_supplicant-2.4 (21 Mar 2015)
+
+  21 Mar 2015; <gurligebis@gentoo.org> -wpa_supplicant-2.3.ebuild,
+  -wpa_supplicant-2.3-r2.ebuild, +wpa_supplicant-2.4.ebuild,
+  -files/wpa_supplicant-2.3-dbus-path-fix.patch,
+  -files/wpa_supplicant-2.3-do-not-call-dbus-functions-with-NULL-path.patch,
+  -files/wpa_supplicant-2.3-fix-undefined-reference-to-random_get_bytes.patch,
+  -files/wpa_supplicant-2.3-generate-libeap-peer.patch,
+  +files/wpa_supplicant-2.4-dbus-path-fix.patch,
+  +files/wpa_supplicant-2.4-do-not-call-dbus-functions-with-NULL-path.patch,
+  +files/wpa_supplicant-2.4-fix-undefined-reference-to-random_get_bytes.patch,
+  +files/wpa_supplicant-2.4-generate-libeap-peer.patch:
+  Bumping to 2.4 and removing old version
 
   03 Mar 2015; Yixun Lan <dlan@gentoo.org> wpa_supplicant-2.3-r2.ebuild:
   add arm64 support, tested on A53 board
diff --git a/net-wireless/wpa_supplicant/Manifest b/net-wireless/wpa_supplicant/Manifest
index f2544fdfd585..00580ed97d63 100644
--- a/net-wireless/wpa_supplicant/Manifest
+++ b/net-wireless/wpa_supplicant/Manifest
@@ -10,10 +10,10 @@ AUX wpa_supplicant-2.2-dbus-path-fix.patch 1028 SHA256 9d829625bbc8ddc5d9f117726
 AUX wpa_supplicant-2.2-do-not-call-dbus-functions-with-NULL-path.patch 2131 SHA256 05231a2468853898595c6fffc0fd596c66b5d819d423d772ae2073197e9bf14c SHA512 3578594428c0361e5c9bfc80c8d467175082fd1837f026ae46a26bbd5068526a3c800bff474212bad38d7a1924d037e48a1134660332dcbace2245aa6e5f73a4 WHIRLPOOL f03fa121df0f4ffe14e6e65f9698d6cc6daf2454550afed0149a0923888ef5cd42893a3232f8a0aa188d62b45569679855bf4169a7868601b39b83e799ac8654
 AUX wpa_supplicant-2.2-fix-undefined-reference-to-random_get_bytes.patch 633 SHA256 29b9a9ba8d4b53313593c3f56ad13e776ee76fbd04bc33b35e1d6f61e571b496 SHA512 e6e27a982c064bff7c833d33051205ddbaf931f7116724880c9c6e676139ccc69b0302229817d6c618cb3669ec68989b347a1cb40660c4ab124df9841bc7c020 WHIRLPOOL 38950a4044cfb9b9f56852e465297fed94bb9fa76907d4247346a24a7f40457b0c34dd12338d6cff9677da6b6b9d315989f4911242d472d0dbb4f8fcb8a930c9
 AUX wpa_supplicant-2.2-generate-libeap-peer.patch 9820 SHA256 46d81b152ce7bc4905ee6a79ffbf50f6cab3d2df5dfd65314d38aa8a1571a7c8 SHA512 032344070ecf0ec1af362955693fc612031176dd3cac0df0164dab18347b1d2e1f0a4941fe153ed50f329a6fe8b3a4fab6544460b8ad501c7e63acc004eee065 WHIRLPOOL 1a6647b7cdab7919776bb3e95115db2b8e8049cb3ee62b837a937d0261eb72c40dec43950558223427edbfc616b9006af94edbb82057681a027b99b48f9699cd
-AUX wpa_supplicant-2.3-dbus-path-fix.patch 1028 SHA256 9d829625bbc8ddc5d9f117726ce5b505e87ceab4c42cee4241eba08d04391579 SHA512 7521764830b0ac27046c9030c632fe4f36937452b8352a257eaba28ff7a628b2d5d0b4187a23cdffe54c5adab42352ec9f7907e2606f68164d708cea34be5e45 WHIRLPOOL d36fa9563368e9670241fc2da4864a1cbe5e3190824d9b0d81739642d9e8f56bea1914dd44832df1f7ea7614331302259c6e1bfb668d7519c41a0e227fc05b61
-AUX wpa_supplicant-2.3-do-not-call-dbus-functions-with-NULL-path.patch 2131 SHA256 05231a2468853898595c6fffc0fd596c66b5d819d423d772ae2073197e9bf14c SHA512 3578594428c0361e5c9bfc80c8d467175082fd1837f026ae46a26bbd5068526a3c800bff474212bad38d7a1924d037e48a1134660332dcbace2245aa6e5f73a4 WHIRLPOOL f03fa121df0f4ffe14e6e65f9698d6cc6daf2454550afed0149a0923888ef5cd42893a3232f8a0aa188d62b45569679855bf4169a7868601b39b83e799ac8654
-AUX wpa_supplicant-2.3-fix-undefined-reference-to-random_get_bytes.patch 633 SHA256 29b9a9ba8d4b53313593c3f56ad13e776ee76fbd04bc33b35e1d6f61e571b496 SHA512 e6e27a982c064bff7c833d33051205ddbaf931f7116724880c9c6e676139ccc69b0302229817d6c618cb3669ec68989b347a1cb40660c4ab124df9841bc7c020 WHIRLPOOL 38950a4044cfb9b9f56852e465297fed94bb9fa76907d4247346a24a7f40457b0c34dd12338d6cff9677da6b6b9d315989f4911242d472d0dbb4f8fcb8a930c9
-AUX wpa_supplicant-2.3-generate-libeap-peer.patch 9820 SHA256 46d81b152ce7bc4905ee6a79ffbf50f6cab3d2df5dfd65314d38aa8a1571a7c8 SHA512 032344070ecf0ec1af362955693fc612031176dd3cac0df0164dab18347b1d2e1f0a4941fe153ed50f329a6fe8b3a4fab6544460b8ad501c7e63acc004eee065 WHIRLPOOL 1a6647b7cdab7919776bb3e95115db2b8e8049cb3ee62b837a937d0261eb72c40dec43950558223427edbfc616b9006af94edbb82057681a027b99b48f9699cd
+AUX wpa_supplicant-2.4-dbus-path-fix.patch 1028 SHA256 9d829625bbc8ddc5d9f117726ce5b505e87ceab4c42cee4241eba08d04391579 SHA512 7521764830b0ac27046c9030c632fe4f36937452b8352a257eaba28ff7a628b2d5d0b4187a23cdffe54c5adab42352ec9f7907e2606f68164d708cea34be5e45 WHIRLPOOL d36fa9563368e9670241fc2da4864a1cbe5e3190824d9b0d81739642d9e8f56bea1914dd44832df1f7ea7614331302259c6e1bfb668d7519c41a0e227fc05b61
+AUX wpa_supplicant-2.4-do-not-call-dbus-functions-with-NULL-path.patch 2131 SHA256 05231a2468853898595c6fffc0fd596c66b5d819d423d772ae2073197e9bf14c SHA512 3578594428c0361e5c9bfc80c8d467175082fd1837f026ae46a26bbd5068526a3c800bff474212bad38d7a1924d037e48a1134660332dcbace2245aa6e5f73a4 WHIRLPOOL f03fa121df0f4ffe14e6e65f9698d6cc6daf2454550afed0149a0923888ef5cd42893a3232f8a0aa188d62b45569679855bf4169a7868601b39b83e799ac8654
+AUX wpa_supplicant-2.4-fix-undefined-reference-to-random_get_bytes.patch 633 SHA256 29b9a9ba8d4b53313593c3f56ad13e776ee76fbd04bc33b35e1d6f61e571b496 SHA512 e6e27a982c064bff7c833d33051205ddbaf931f7116724880c9c6e676139ccc69b0302229817d6c618cb3669ec68989b347a1cb40660c4ab124df9841bc7c020 WHIRLPOOL 38950a4044cfb9b9f56852e465297fed94bb9fa76907d4247346a24a7f40457b0c34dd12338d6cff9677da6b6b9d315989f4911242d472d0dbb4f8fcb8a930c9
+AUX wpa_supplicant-2.4-generate-libeap-peer.patch 9820 SHA256 46d81b152ce7bc4905ee6a79ffbf50f6cab3d2df5dfd65314d38aa8a1571a7c8 SHA512 032344070ecf0ec1af362955693fc612031176dd3cac0df0164dab18347b1d2e1f0a4941fe153ed50f329a6fe8b3a4fab6544460b8ad501c7e63acc004eee065 WHIRLPOOL 1a6647b7cdab7919776bb3e95115db2b8e8049cb3ee62b837a937d0261eb72c40dec43950558223427edbfc616b9006af94edbb82057681a027b99b48f9699cd
 AUX wpa_supplicant-conf.d 161 SHA256 61ec59007f66ac5bacc0aa095d1f2ccbc977a687038e161a463d1727223d5a90 SHA512 29103161ec2b9631fca9e8d9a97fafd60ffac3fe78cf613b834395ddcaf8be1e253c22e060d7d9f9b974b2d7ce794caa932a2125e29f6494b75bce475f7b30e1 WHIRLPOOL 5508d1598bd952ec773db0d5e5ab440134337de6e26d7b8c7c6b00789c570559a54457ac507357b65e8604da849f9ab52dff90d27197d9be11ed2cc66eaae1e7
 AUX wpa_supplicant-init.d 1249 SHA256 62a3655ea88b3dfff5243666a4e90d3f0eef6370a7889affb849e178ba4a82b0 SHA512 6b245dad8861f71bab7187d9349464d4ae5986202d097928886e26db9ca9c08dedd82852c52dd72d232bd23139f47a76cd8c87e020596796b403fd0c4ac0ffc7 WHIRLPOOL d5edcd9842d3039cbc9b57e24a770b6443a1e869ab3492a86eac60f920aa2a4537b0fdb3d73cbf4b8f85dd257a529839786e16e98ddd4556445d464c43deb012
 AUX wpa_supplicant.conf 183 SHA256 15082ad37ebd98f57c3733454a0921a79dc2b41007f1b012fb7e67c09d87de3a SHA512 425a5c955d462ea0d0d3f79c3e1bbf68e15b495df04ad03ed7aee12408b52616af05650dfc147ca5940d69e97360c33995d33733820fef8eb8769b31e58434e8 WHIRLPOOL 4615456a07dfc81139d350cb7618fc204008ae9cfa118f5966f923d758d1339a2d17eb79b631d8eb094225fac583a74705ed5ca4d348554f6b2435f166c16548
@@ -21,27 +21,16 @@ AUX wpa_supplicant.service 264 SHA256 aa76e01677a755270147bcda08dbd8283ba37dc15e
 AUX wpa_supplicant_at.service 314 SHA256 caa0104f7169909d30f0c4ce9fa9a6c27e7ddb743eaf868cd311a5128c13ac0c SHA512 400e2e4b69408a4fe044409fee9639338e1fd6423e00a544b46065fe1d0215717b17b44ce1abadf0ce5da365724977ea0beffbf75d96c0c6ee1f24618c92428d WHIRLPOOL 1603e4651072e0dfb5381c9a063db64bb412c2bc640226137b7cfd56f2525a6c1e198cb042553f5a25fc234773d1d9438eea09d65fdde71d81dddfd86b5273b0
 DIST wpa_supplicant-2.0.tar.gz 2044281 SHA256 2c115609fbb5223d51381084a5c944455a8afcda81d584173ff55ba233379e09 SHA512 c3a599e1dfa5e0bb4b8d35ed49501696ce68c807ff458c1e3bff9ed5619c780f7117c6d8d7cb9a11351e9fad27cf83fc114f255c92552e7ba084de70c5f8e254 WHIRLPOOL 603f9ac54505166690516a0f1e3112a8279a7184a54066699ad24b1f6269ad90c46a01a87d23bb62df782cdf561aa6f8b5a11e7ee59914cb36be8daea470389e
 DIST wpa_supplicant-2.2.tar.gz 2382570 SHA256 e0d8b8fd68a659636eaba246bb2caacbf53d22d53b2b6b90eb4b4fef0993c8ed SHA512 34dd3eb2c7c65baadbd8108cfb879be5b68e70d925fe65cda566bcfb9bcc31b3e2c521ee719d056d2b4f7fd17a8d387ee1217cb4ebbbaf384962bbcbc27ea57a WHIRLPOOL e53c55e23760b8d8a60845e9dcdc926e7c9672ad06c1494f1a931f916f4f6c77b51c13cbcf5f5ffc4c9fd8a0b7ac5292d0ecd6daca4480cbe931ae44857a06a8
-DIST wpa_supplicant-2.3.tar.gz 2398722 SHA256 eaaa5bf3055270e521b2dff64f2d203ec8040f71958b8588269a82c00c9d7b6a SHA512 dc64c0ff5581ca36e9c41f7663883d5bf6626a4418423233fa69b2c4b57c24fa120e0699c95613152be7775835a45bd9edbe5cc95456ac3ce699b546ddaee71e WHIRLPOOL 015a19f5fcbc144ccf1b695b67aa6d5cf0cd127ed1306808ed94d422224e16978046e4b3cb5edcec46736ddde8926341c8df8f4a5dfa41f52438d6bea3e49e40
+DIST wpa_supplicant-2.4.tar.gz 2525648 SHA256 058dc832c096139a059e6df814080f50251a8d313c21b13364c54a1e70109122 SHA512 03d8199325b3910f77013ddb7edd803ab4444542230484e1cb465dc3df9372b39ee3307d823ce88730e8f5a5231ef3183954c54cf07297b70432f526e45aac2b WHIRLPOOL 092ae97e2c0f55d7055fd4e5d688e2ba538f785089a13c754129829854b20a98de832d9d0925dce5823a060d10a3bb5882b0bf3d6cf55f8de9bbc2b00fbb7392
 EBUILD wpa_supplicant-2.0-r2.ebuild 9086 SHA256 a8b7ce63e9ba7b62487e11139f7de923506f5e8a072a3e452f4be45382b45567 SHA512 9dbe3a9cd9a7e1305ea0666f3f457dfe4f7944eff7cf7b597fe41a16ca6e606f0ce69d467e2c0f767eedb2d5742bed3d8207e8ec922d872e41518dda9699de32 WHIRLPOOL c7e95a15ab9a76f21af1eaf8731d059c8aaed61599013c4468dd6802293b154aa5f28314915d17ebfb5d7640680f2fd51c49f3fad2e1c1f9318512234003fe90
 EBUILD wpa_supplicant-2.2-r1.ebuild 9105 SHA256 b2bfc1d4798d1a0ccb145466bf1422b252a36e4031600ad8a1028a158d6b5db3 SHA512 b40e87ba0de8f2b4c8bf21ef78c2390020413e141963b15932480f1ad16cf804b0b5550f88837c305011382f103e61aa35fea71b350975be24311037823a40ea WHIRLPOOL bbe03798f09331d8ab03cf0e7b99b25b1658657fcb65c08d905f54abe7a4067275edc83e83b7940f990d156eda799272fc83242dd3f3e3588b7ed7958aebc667
-EBUILD wpa_supplicant-2.3-r2.ebuild 10066 SHA256 4dc1f2c9449ca4bb611e0390fd6a61ed08fe7a21b36d0a96552a665d622b7fe5 SHA512 c3f5b729c08795f6c6ada57cbf3bca08a36775064ac88272a32db7e9f0cbf5ff3801c6436f7a0b1c23b3925186c64b251a8db2d75956f08db7400067b2783e92 WHIRLPOOL 21ae69373e3ca2b96c60096def1c14e01d99303808f4c05f4d71644fbc2b950696d734c7a05914c44ea4027840eb61afd14749bb3c8f3182f1cbc54d81c00f42
-EBUILD wpa_supplicant-2.3.ebuild 9022 SHA256 3b1b05c944840be6b10520f2f34989fb3af48f1e4ce982a4a405199b4bf25c60 SHA512 764809717e60b78ee7964c0b7b597da23fa23447305e69d7e2e7be41263b10d249bfe215a28f007986c11f7feec56dc49e98a6a5fb6fbd344e800ed2a02d4d08 WHIRLPOOL 1913152d6dd112152f2159b887ebbecc4e4980e96919fc04a491832e7191cf1c6f40e17ff172284be4d979ddff60f41090482cad8a7979e1d15f47834aa2a17c
-MISC ChangeLog 46896 SHA256 496ee92c6f2300072c2940d092057b67250d78bdb1aacc31982bacdb367b5477 SHA512 7dbbaeadbc401b075baad5740293a9e510ca8909ae925418ef5f228141d8b240514771f62f4701d6a517a5993b08df18de173502562b57e98f116c897941d7c2 WHIRLPOOL 1d40af6eb94ca8f0664727b40cbf835283022ca5ce545510915e1db18477cf61de82ea8dad0cb2a3f4e450bc8251bb064687e88eb414700549f155587c06fdab
+EBUILD wpa_supplicant-2.4.ebuild 10069 SHA256 85795b57e8fea8df3b432691c245167baa1fc5a866c5892502ab783de40c1050 SHA512 b7ec8a7125e735a7f7e00b418d2c124fca4ff5730b7f082ec5c3ac93cf96e5c5e41f1d6df85326d0f04573d3820d2f9a275af4b893d5c51ff939d3ad823645ab WHIRLPOOL 38772bc118ee1fdaa988941ea08f0ce4fc24a78fd8d6e2770524c8132b88961be78af11635644f52281ff10b516f66df43f1faa8e116125b797023e9f2001876
+MISC ChangeLog 47630 SHA256 161ae099219c9df69d0c01771921b9ed08035c080689f09a542fa33786f997d0 SHA512 3308330a90f4a63a196a1ead3d0bb8aece5fae5b0a9d84f1f04c67f7e02d8f8f11cc22478634926ae051cfd63b8c4deb66dd103534a7bb0fdda22dd2eb9d35d7 WHIRLPOOL e3f357b0b6e07976f979ff50239dbc18a09a7f867e00bba6e472c60e2057736fc417163253b25732e19a6341dc27839147536f683427a18cf9807ccc7a7deba7
 MISC metadata.xml 1253 SHA256 4f58fccaf5db494ac8815c1ca7caf7275e46afe3db674859255bab89ca43837a SHA512 a266e13d347579626be1a28470ab44fc4d47e5c8df1e80166061f6c9bd40eb4a4af7ca0ce007ed5e20be7648b421b57fb13916405af7502d1822b59c7ee9ace4 WHIRLPOOL 56913efc84be9c8ca5bfb82fa5da85771d06358938556c5e6aca6c3e7eb4d922781a6033200ee0d68a764b9c8701dd118c03510cda0c81fa51f3e5df37b3a2bb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJU9RHRAAoJEJIMDbyqvv1VH4IQAOURDv9xtxZW72QWzYSY8j99
-LZpLgIEdm1pn1FnHlOMMOyCR0HxYOrCTjxtb9tz8VrmSzgeN8KrPQo+I/cn/VSyY
-1ajaaQGIlfV0mAN3m2qrKR4Q4OvZFTN6l1Ubm7v4ZMbOVdAlTTCkfaZvd+MsJoPQ
-rk3Izknt79fFq2ZX8Aalc0X3H8wOAfdjdjcmlTp6Ae1ZGdUuRyP3uyGEV7iIOEi6
-PvyL1/Yfxv+N5jq9NTpJKQYAMRZtoNxF/mV2abKOAClMi4fSG6bzLtfB4lMsyZ9J
-58gejSyhUbJb+7zjVCvU+8eY+lKZ3bRA/+Y8yjxnfGE0bAK2ErBoAczz58PpABpP
-4wLRguw1MqONf+QnXIsMokhFyskRWD+x0WMUNCTVy2SywTQP+wH7ZTNH4RKqkjI3
-wlM3GzcdRSu/qImjpghvXAXukviV8XfdtHTK8sEBwQbHTp1wFNW8kx9A9S9mFtS7
-CM3PKizBCdZDIlh/OdOPb1ZO+2iOfnZQQso0l9u6nf8kPsHWtF1vj/tFeaoJZyxv
-L9SYbdlqFwwm64+5vIIl/PrUTJWCw625Nf5oIbZ/Y0IVhDJY1YCxAOg7fFtUDTGH
-n6Ia597Nt8YX4E5Z3D1wnBrMHb2zTOWsKo6RawgpLZQZa3GDMZcmvIgF+kbR0PEO
-VDDEpIFS1k5HOVtG+xBq
-=/HcW
+iEYEAREIAAYFAlUNctwACgkQsR7PQhRXYElMLQCfcGv4MNs6KnsfRqgRi4ewBR63
+/NsAnjxg3feRwZXPqX40HWOBkMjZ7Jae
+=6kEV
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-2.3-dbus-path-fix.patch b/net-wireless/wpa_supplicant/files/wpa_supplicant-2.4-dbus-path-fix.patch
index 976d71b0ec39..976d71b0ec39 100644
--- a/net-wireless/wpa_supplicant/files/wpa_supplicant-2.3-dbus-path-fix.patch
+++ b/net-wireless/wpa_supplicant/files/wpa_supplicant-2.4-dbus-path-fix.patch
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-2.3-do-not-call-dbus-functions-with-NULL-path.patch b/net-wireless/wpa_supplicant/files/wpa_supplicant-2.4-do-not-call-dbus-functions-with-NULL-path.patch
index bbff73e13d42..bbff73e13d42 100644
--- a/net-wireless/wpa_supplicant/files/wpa_supplicant-2.3-do-not-call-dbus-functions-with-NULL-path.patch
+++ b/net-wireless/wpa_supplicant/files/wpa_supplicant-2.4-do-not-call-dbus-functions-with-NULL-path.patch
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-2.3-fix-undefined-reference-to-random_get_bytes.patch b/net-wireless/wpa_supplicant/files/wpa_supplicant-2.4-fix-undefined-reference-to-random_get_bytes.patch
index def43a2ae314..def43a2ae314 100644
--- a/net-wireless/wpa_supplicant/files/wpa_supplicant-2.3-fix-undefined-reference-to-random_get_bytes.patch
+++ b/net-wireless/wpa_supplicant/files/wpa_supplicant-2.4-fix-undefined-reference-to-random_get_bytes.patch
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-2.3-generate-libeap-peer.patch b/net-wireless/wpa_supplicant/files/wpa_supplicant-2.4-generate-libeap-peer.patch
index 391338b302cd..391338b302cd 100644
--- a/net-wireless/wpa_supplicant/files/wpa_supplicant-2.3-generate-libeap-peer.patch
+++ b/net-wireless/wpa_supplicant/files/wpa_supplicant-2.4-generate-libeap-peer.patch
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.3.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-2.3.ebuild
deleted file mode 100644
index 2fa2b86d4d59..000000000000
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.3.ebuild
+++ /dev/null
@@ -1,325 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-2.3.ebuild,v 1.3 2014/11/02 09:40:03 swift 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="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="ap dbus gnutls eap-sim fasteap p2p ps3 qt4 readline selinux smartcard ssl wimax wps kernel_linux kernel_FreeBSD"
-REQUIRED_USE="fasteap? ( !gnutls !ssl ) smartcard? ( ssl )"
-
-CDEPEND="dbus? ( sys-apps/dbus )
-	kernel_linux? (
-		eap-sim? ( sys-apps/pcsc-lite )
-		dev-libs/libnl:3
-		net-wireless/crda
-	)
-	!kernel_linux? ( net-libs/libpcap )
-	qt4? (
-		dev-qt/qtcore:4
-		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 ) )
-"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-networkmanager )
-"
-
-S="${WORKDIR}/${P}/${PN}"
-
-pkg_setup() {
-	if use gnutls && use ssl ; then
-		elog "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
-
-	if use dbus; then
-		epatch "${FILESDIR}/${P}-dbus-path-fix.patch"
-	fi
-
-	# systemd entries to D-Bus service files (bug #372877)
-	echo 'SystemdService=wpa_supplicant.service' \
-		| tee -a dbus/*.service >/dev/null || die
-
-	cd "${WORKDIR}/${P}"
-
-	if use wimax; then
-		# generate-libeap-peer.patch comes before
-		# fix-undefined-reference-to-random_get_bytes.patch
-		epatch "${FILESDIR}/${P}-generate-libeap-peer.patch"
-		epatch "${FILESDIR}/${P}-fix-undefined-reference-to-random_get_bytes.patch"
-
-		# multilib-strict fix (bug #373685)
-		sed -e "s/\/usr\/lib/\/usr\/$(get_libdir)/" -i src/eap_peer/Makefile
-	fi
-
-	# bug (320097)
-	epatch "${FILESDIR}/${P}-do-not-call-dbus-functions-with-NULL-path.patch"
-
-	# TODO - NEED TESTING TO SEE IF STILL NEEDED, NOT COMPATIBLE WITH 1.0 OUT OF THE BOX,
-	# SO WOULD BE NICE TO JUST DROP IT, IF IT IS NOT NEEDED.
-	# bug (374089)
-	#epatch "${FILESDIR}/${P}-dbus-WPAIE-fix.patch"
-}
-
-src_configure() {
-	# Toolchain setup
-	tc-export CC
-
-	# Basic setup
-	echo "CONFIG_CTRL_IFACE=y" >> .config
-	echo "CONFIG_BACKEND=file" >> .config
-	echo "CONFIG_IBSS_RSN=y"   >> .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_EAP_EXE=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
-
-	# Enabling background scanning.
-	echo "CONFIG_BGSCAN_SIMPLE=y"	>> .config
-	echo "CONFIG_BGSCAN_LEARN=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
-
-	# Enable support for writing debug info to a log file.
-	echo "CONFIG_DEBUG_FILE=y" >> .config
-
-	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
-	elif use gnutls ; then
-		echo "CONFIG_TLS=gnutls"     >> .config
-		echo "CONFIG_GNUTLS_EXTRA=y" >> .config
-	else
-		echo "CONFIG_TLS=internal"   >> .config
-	fi
-
-	if use smartcard ; then
-		echo "CONFIG_SMARTCARD=y"    >> .config
-	fi
-
-	if use kernel_linux ; then
-		# Linux specific drivers
-		echo "CONFIG_DRIVER_ATMEL=y"       >> .config
-		echo "CONFIG_DRIVER_HOSTAP=y"      >> .config
-		echo "CONFIG_DRIVER_IPW=y"         >> .config
-		echo "CONFIG_DRIVER_NL80211=y"     >> .config
-		echo "CONFIG_DRIVER_RALINK=y"      >> .config
-		echo "CONFIG_DRIVER_WEXT=y"        >> .config
-		echo "CONFIG_DRIVER_WIRED=y"       >> .config
-
-		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
-		echo "CONFIG_WPS2=y" >> .config
-		# USB Flash Drive
-		echo "CONFIG_WPS_UFD=y" >> .config
-		# External Registrar
-		echo "CONFIG_WPS_ER=y" >> .config
-		# Universal Plug'n'Play
-		echo "CONFIG_WPS_UPNP=y" >> .config
-		# Near Field Communication
-		echo "CONFIG_WPS_NFC=y" >> .config
-	fi
-
-	# Wi-Fi Direct (WiDi)
-	if use p2p ; then
-		echo "CONFIG_P2P=y" >> .config
-	fi
-
-	# Access Point Mode
-	if use ap ; then
-		echo "CONFIG_AP=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-3.2"; then
-		echo "CONFIG_LIBNL32=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 V=1 BINDIR=/usr/sbin
-
-	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
-		popd > /dev/null
-	fi
-
-	# systemd stuff
-	systemd_dounit systemd/*.service
-}
-
-pkg_postinst() {
-	elog "If this is a clean installation of wpa_supplicant, you"
-	elog "have to create a configuration file named"
-	elog "/etc/wpa_supplicant/wpa_supplicant.conf"
-	elog
-	elog "An example configuration file is available for reference in"
-	elog "/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
-
-	# 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
-}
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.3-r2.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-2.4.ebuild
index a65aab8a67c0..b78a32f0798d 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.3-r2.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-2.3-r2.ebuild,v 1.6 2015/03/03 09:45:18 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-2.4.ebuild,v 1.1 2015/03/21 13:32:11 gurligebis Exp $
 
 EAPI=5