Switched to new qt3/qt4 USE flag scheme, thanks to Cardoe. Fixes bug #137659. Also pruned old ebuilds.

(Portage version: 2.1)
 (Unsigned Manifest commit)

8 files changed, 32 insertions, 513 deletions

diff --git a/net-wireless/wpa_supplicant/Manifest b/net-wireless/wpa_supplicant/Manifest
index 899b2004486b..51aa8353e359 100644
--- a/net-wireless/wpa_supplicant/Manifest
+++ b/net-wireless/wpa_supplicant/Manifest
@@ -10,75 +10,47 @@ AUX wpa_supplicant-0.4.9-wpa_cli.sh 1332 RMD160 cdd2bdc1ca335aabc52182102f827ad0
 MD5 747a829b1a81fc848fcbc38c193adf8a files/wpa_supplicant-0.4.9-wpa_cli.sh 1332
 RMD160 cdd2bdc1ca335aabc52182102f827ad0b99cbea9 files/wpa_supplicant-0.4.9-wpa_cli.sh 1332
 SHA256 0cfcebb214c5526de46c855b817a38b3a84d182cfe8f8f9aac484bd735eaf181 files/wpa_supplicant-0.4.9-wpa_cli.sh 1332
-AUX wpa_supplicant-0.5.2-wpa_cli.sh 1229 RMD160 aaead644980045aac3ac4e60b51fdc2322ec7f3f SHA1 39a163ffb043d5029a81a768075bc458c176c4e1 SHA256 2750c0eb11046b56fd5d06c0eeb554cc6a769af0edc001e991252278e449b4cb
-MD5 7557dcc784bddabf268e1c49eee4fb59 files/wpa_supplicant-0.5.2-wpa_cli.sh 1229
-RMD160 aaead644980045aac3ac4e60b51fdc2322ec7f3f files/wpa_supplicant-0.5.2-wpa_cli.sh 1229
-SHA256 2750c0eb11046b56fd5d06c0eeb554cc6a769af0edc001e991252278e449b4cb files/wpa_supplicant-0.5.2-wpa_cli.sh 1229
-AUX wpa_supplicant-0.5.3-stakey.patch 852 RMD160 41ccfa806efa3597d3ef575b967922266a2fe41f SHA1 8518d6e5c203de23365dd987aba0251b07d62924 SHA256 f4f7515ca66272de71358eff823f422f0dda1603a8adbaa97eada78df728a85e
-MD5 89105436a3302a3551d0f9dbde5dfc2f files/wpa_supplicant-0.5.3-stakey.patch 852
-RMD160 41ccfa806efa3597d3ef575b967922266a2fe41f files/wpa_supplicant-0.5.3-stakey.patch 852
-SHA256 f4f7515ca66272de71358eff823f422f0dda1603a8adbaa97eada78df728a85e files/wpa_supplicant-0.5.3-stakey.patch 852
-AUX wpa_supplicant-0.5.3-wpa_cli.sh 1229 RMD160 7955e9e85fd291697777cd39eb74050aa441cee4 SHA1 54c67268c03db5fa92b507be29d67b18c5da9695 SHA256 5be7b172ec567119bfb4f628cfbd54c0252e98b141ab8d8bc8963d569c29d852
-MD5 236577621d66ea0ffb21b98ea06843f9 files/wpa_supplicant-0.5.3-wpa_cli.sh 1229
-RMD160 7955e9e85fd291697777cd39eb74050aa441cee4 files/wpa_supplicant-0.5.3-wpa_cli.sh 1229
-SHA256 5be7b172ec567119bfb4f628cfbd54c0252e98b141ab8d8bc8963d569c29d852 files/wpa_supplicant-0.5.3-wpa_cli.sh 1229
 AUX wpa_supplicant-0.5.4-wpa_cli.sh 1332 RMD160 d600606f001edfee93a7292ebf51284017300a5a SHA1 d587c8cd8425537c4684ce759da61cc01a464739 SHA256 3022b922947915302f8710a27d844e9bccd3d181725a3a5cb5d8c45f4f4a63d6
 MD5 bec2170f5f1c9456f496183ab0735a4b files/wpa_supplicant-0.5.4-wpa_cli.sh 1332
 RMD160 d600606f001edfee93a7292ebf51284017300a5a files/wpa_supplicant-0.5.4-wpa_cli.sh 1332
 SHA256 3022b922947915302f8710a27d844e9bccd3d181725a3a5cb5d8c45f4f4a63d6 files/wpa_supplicant-0.5.4-wpa_cli.sh 1332
-DIST wpa_supplicant-0.4.7.tar.gz 470644
-DIST wpa_supplicant-0.4.8.tar.gz 476091
-DIST wpa_supplicant-0.4.9.tar.gz 483279
-DIST wpa_supplicant-0.5.2.tar.gz 523404
-DIST wpa_supplicant-0.5.3.tar.gz 543322 RMD160 d3911460fcd4b3cc85bfc41bfb98235c447bfd43 SHA1 02f6e0807290b0fd2c9fa7b6e21685cef92889f2 SHA256 cf29745c4c11fd8d7668d9a7ad0f698160b1f8f0988146175908d877dda71236
+DIST wpa_supplicant-0.4.7.tar.gz 470644 RMD160 0a895830905eb232515f8e742775a2da41e54b2b SHA1 11baed902523e86f18b17103f71b582e126a9bbc SHA256 002a5d52c1c8f516efe6a834227d3fe63ecf2588966e44fbde1e72a5844c334f
+DIST wpa_supplicant-0.4.8.tar.gz 476091 RMD160 0dcc7410fee4b41a6ef56440a711142a4d383abb SHA1 eda74e9ebfa7b4154f7b564b83481b72c9c0ab25 SHA256 6d03f514211c9b806fb649e8dc5d0b047aa55b4762ddc7b675cf0bd7de230cf8
+DIST wpa_supplicant-0.4.9.tar.gz 483279 RMD160 627ddb6c12f15e08448606f24b3082b50f814a43 SHA1 e6a5cd6fbb7f12cc0a074da212f4fd7fbde0aec0 SHA256 bc7b0dc81248394d2456ea25059bdf1df2173fa8d178cda7d4570671ab916857
 DIST wpa_supplicant-0.5.4.tar.gz 630779 RMD160 34074a4d1ebab4d455eb021a18ef9012943b1fd9 SHA1 53a03be9c39c783cb83f5e32f7aab493ef8b529e SHA256 6c14c9c6c68acc40aa1c860d4fde58424c57b48ea90700da189e6cf5c1dd6bd7
-EBUILD wpa_supplicant-0.4.7.ebuild 3564 RMD160 12ea18540f52ebe57113af332e9e6832b444b924 SHA1 509385ce15a7da850b9bd413e51cb1776ffc609f SHA256 4913e305a1901d60da01e212078f89660540d845699b1e396bb3561745863da7
-MD5 e160e685fea1c7c2717acebbe4fe6dff wpa_supplicant-0.4.7.ebuild 3564
-RMD160 12ea18540f52ebe57113af332e9e6832b444b924 wpa_supplicant-0.4.7.ebuild 3564
-SHA256 4913e305a1901d60da01e212078f89660540d845699b1e396bb3561745863da7 wpa_supplicant-0.4.7.ebuild 3564
-EBUILD wpa_supplicant-0.4.8.ebuild 3898 RMD160 5908b2c4ac530ea6bd4ca0ecf5f13d4f283b75df SHA1 ba8abe7fa021a1bd5cd087640e21ad49cd297373 SHA256 68670910917e4ca0dba6b0bd558b622202ed33fa090a62d1683330bc1a26f794
-MD5 79ad4ef85d3756433e248d066e938aa7 wpa_supplicant-0.4.8.ebuild 3898
-RMD160 5908b2c4ac530ea6bd4ca0ecf5f13d4f283b75df wpa_supplicant-0.4.8.ebuild 3898
-SHA256 68670910917e4ca0dba6b0bd558b622202ed33fa090a62d1683330bc1a26f794 wpa_supplicant-0.4.8.ebuild 3898
-EBUILD wpa_supplicant-0.4.9.ebuild 4586 RMD160 58f8696ab375d2744f69878cb3324c048f848a6d SHA1 10d637c3ba0d2f51aeb7dcda3b46efa499f2041d SHA256 79575471abe89b241efb052efc115626ac944594000d3119f23386a020dae60e
-MD5 615e98dc5866f7ad3a8b50047a04c97c wpa_supplicant-0.4.9.ebuild 4586
-RMD160 58f8696ab375d2744f69878cb3324c048f848a6d wpa_supplicant-0.4.9.ebuild 4586
-SHA256 79575471abe89b241efb052efc115626ac944594000d3119f23386a020dae60e wpa_supplicant-0.4.9.ebuild 4586
-EBUILD wpa_supplicant-0.5.2.ebuild 4687 RMD160 66a829b9199ceb04950a0bef666e2e627ca8f32b SHA1 3981fed495a1bdc74ab2b8a99f0a43e31f6bafd6 SHA256 c7a92c123b9150d406c5374387b60ca3d0b629cf05e63e45ef75f6e03897a1f9
-MD5 6a5f32065e686a4bd5acad27f39e2723 wpa_supplicant-0.5.2.ebuild 4687
-RMD160 66a829b9199ceb04950a0bef666e2e627ca8f32b wpa_supplicant-0.5.2.ebuild 4687
-SHA256 c7a92c123b9150d406c5374387b60ca3d0b629cf05e63e45ef75f6e03897a1f9 wpa_supplicant-0.5.2.ebuild 4687
-EBUILD wpa_supplicant-0.5.3.ebuild 4874 RMD160 97aa043e5c8f60de71ef5fb5c1cd08e6901e51d8 SHA1 b5b5fb1c706ce7ee4b3d24efa8cd64f8a54ce8d1 SHA256 a0ba899049c6995941ace069cfc270812754c26491529559ca32d3e09cb25c05
-MD5 eb1bedefec50a4308b63e389b3d65edb wpa_supplicant-0.5.3.ebuild 4874
-RMD160 97aa043e5c8f60de71ef5fb5c1cd08e6901e51d8 wpa_supplicant-0.5.3.ebuild 4874
-SHA256 a0ba899049c6995941ace069cfc270812754c26491529559ca32d3e09cb25c05 wpa_supplicant-0.5.3.ebuild 4874
-EBUILD wpa_supplicant-0.5.4.ebuild 4503 RMD160 5a79bb2683afb464b105fedf6f85cfd6f3063aa9 SHA1 b3572e50bc8bb3d15061f8bc3ed2075b527cfddb SHA256 354bafe9f5ffaec9ca4cbada482aa8a46f9320ff3af43eb88bad499129ddbd81
-MD5 53afea5b9625d399f69cbbd907c820a2 wpa_supplicant-0.5.4.ebuild 4503
-RMD160 5a79bb2683afb464b105fedf6f85cfd6f3063aa9 wpa_supplicant-0.5.4.ebuild 4503
-SHA256 354bafe9f5ffaec9ca4cbada482aa8a46f9320ff3af43eb88bad499129ddbd81 wpa_supplicant-0.5.4.ebuild 4503
-MISC ChangeLog 14998 RMD160 9e8b3144790820504e7aebc6823d766aea090e67 SHA1 be4e1fce39dc6bf3512eaf41795d40fa88f8bcff SHA256 8606ae115457bf51e1eac2e089d718c1675b7e1dbd4853b6a38bcf3f8a3f499d
-MD5 f4eb779924a7508fbe450d0b225460cf ChangeLog 14998
-RMD160 9e8b3144790820504e7aebc6823d766aea090e67 ChangeLog 14998
-SHA256 8606ae115457bf51e1eac2e089d718c1675b7e1dbd4853b6a38bcf3f8a3f499d ChangeLog 14998
+EBUILD wpa_supplicant-0.4.7.ebuild 3659 RMD160 c327de6009268c03b1efad599fa2ff8e0e0e82d3 SHA1 c79aa3ca2b2fad56628560969bc648bef0d6328e SHA256 b0e1e613ab540182e88738dc77f1fa1a0db6fe3a658efbf69be245d7cec8d049
+MD5 d73e347add7a0026eb0283bf43a9b8e2 wpa_supplicant-0.4.7.ebuild 3659
+RMD160 c327de6009268c03b1efad599fa2ff8e0e0e82d3 wpa_supplicant-0.4.7.ebuild 3659
+SHA256 b0e1e613ab540182e88738dc77f1fa1a0db6fe3a658efbf69be245d7cec8d049 wpa_supplicant-0.4.7.ebuild 3659
+EBUILD wpa_supplicant-0.4.8.ebuild 3994 RMD160 03d84ca8ac9206ae93b1cef01add4b7f93ade03a SHA1 4edd483ba9eeb41011bc5ae30be23cd786b8b335 SHA256 eb92e1073bb763b52dc6abf1f04f12fd2e44f3c09182e1c9cdb29adeda98d318
+MD5 b1d60d856404a46b55a9021ca38acbeb wpa_supplicant-0.4.8.ebuild 3994
+RMD160 03d84ca8ac9206ae93b1cef01add4b7f93ade03a wpa_supplicant-0.4.8.ebuild 3994
+SHA256 eb92e1073bb763b52dc6abf1f04f12fd2e44f3c09182e1c9cdb29adeda98d318 wpa_supplicant-0.4.8.ebuild 3994
+EBUILD wpa_supplicant-0.4.9.ebuild 4684 RMD160 abf5800071a26ae8d8188c8c34bcbcd703be42f1 SHA1 ba5da733bbbe4b89cfd2e6794692b309929b64b2 SHA256 4fdb80a930179acd70aa02e93386e1d00d02d0a54e3239301d2e63e65a049a0a
+MD5 785f259beb7ff4859eae0c2ff1080dd9 wpa_supplicant-0.4.9.ebuild 4684
+RMD160 abf5800071a26ae8d8188c8c34bcbcd703be42f1 wpa_supplicant-0.4.9.ebuild 4684
+SHA256 4fdb80a930179acd70aa02e93386e1d00d02d0a54e3239301d2e63e65a049a0a wpa_supplicant-0.4.9.ebuild 4684
+EBUILD wpa_supplicant-0.5.4.ebuild 4875 RMD160 0d079b680d77f6aae33dfeb8e6684a3ac9c7d699 SHA1 0227f490613a3830a16fa842f87c58f207e75fcf SHA256 d852ea9906a56a6b3bc89045b67533305a4a265f6077a1c785bfcf3ea4da3034
+MD5 eaff19490ece5169871d69f5656563c1 wpa_supplicant-0.5.4.ebuild 4875
+RMD160 0d079b680d77f6aae33dfeb8e6684a3ac9c7d699 wpa_supplicant-0.5.4.ebuild 4875
+SHA256 d852ea9906a56a6b3bc89045b67533305a4a265f6077a1c785bfcf3ea4da3034 wpa_supplicant-0.5.4.ebuild 4875
+MISC ChangeLog 15470 RMD160 4179b31cb482888d33651a7132ec2d88e2a2e2e9 SHA1 ba47d55c4ff6eceed7b40c0d944f7b4e2bae1d01 SHA256 a64dd46aba089c133543ee8511cf7cdc44720312947d1fd6026a955e1a499048
+MD5 36da988b96ce81bf691e2f60665f3067 ChangeLog 15470
+RMD160 4179b31cb482888d33651a7132ec2d88e2a2e2e9 ChangeLog 15470
+SHA256 a64dd46aba089c133543ee8511cf7cdc44720312947d1fd6026a955e1a499048 ChangeLog 15470
 MISC metadata.xml 255 RMD160 e6f6333d659d443f0290a257c2b23772ab1cf526 SHA1 1258e0419f1fe7839c4db37602b5999d0e196bca SHA256 255c7b73ddde5e979b6b53de0f9f5b858e22e602e0495f484b2a33cd2987edf9
 MD5 b280eebc74d70d85e664debf1adce2c3 metadata.xml 255
 RMD160 e6f6333d659d443f0290a257c2b23772ab1cf526 metadata.xml 255
 SHA256 255c7b73ddde5e979b6b53de0f9f5b858e22e602e0495f484b2a33cd2987edf9 metadata.xml 255
-MD5 399c0ed3e8d999a49b9435a83705f96c files/digest-wpa_supplicant-0.4.7 72
-RMD160 3a80cd37dad65d44a9c0e60d4fa44150ce7c0221 files/digest-wpa_supplicant-0.4.7 72
-SHA256 862342c3f3f6c984ce9963cf86218169d0da0b11ba036ece92e9f95a8112c6ef files/digest-wpa_supplicant-0.4.7 72
-MD5 3c1bdab1affb98719ab98620e2863c8d files/digest-wpa_supplicant-0.4.8 72
-RMD160 9647d5d42b3b1d003e0eaa6ebb81609b88c0ffbf files/digest-wpa_supplicant-0.4.8 72
-SHA256 4ffe01c30c9df1b9bb9a9eb0517e2975fc5498b30d699f64dd15a14e45675868 files/digest-wpa_supplicant-0.4.8 72
-MD5 8bcf0faaf519a1c005317da0ead6cb1b files/digest-wpa_supplicant-0.4.9 72
-RMD160 ca05328cc65e666fcbfc34f880b863325a816938 files/digest-wpa_supplicant-0.4.9 72
-SHA256 811f0a0866895c2134f026ab105f1c55373d6d04c36d71bd58097664fb96406a files/digest-wpa_supplicant-0.4.9 72
-MD5 a9017f6f882a41e700a0a517ef60e964 files/digest-wpa_supplicant-0.5.2 72
-RMD160 0180e3e8bf9cc87e838c1f6b362caef87b666776 files/digest-wpa_supplicant-0.5.2 72
-SHA256 8e77493ac9e266a83cfb7af7915b9d3190bce0a953753bfe01cc0c2e3fa72d66 files/digest-wpa_supplicant-0.5.2 72
-MD5 182250044132a23701f78d207b9cd670 files/digest-wpa_supplicant-0.5.3 262
-RMD160 0bd7b06576b17f007043f0ef9ed65f3fc5525a8b files/digest-wpa_supplicant-0.5.3 262
-SHA256 205ed5e8a86a728b92cee0fcd5555fe60f53c1faa28c7e38ca058ec7ff5ffb6c files/digest-wpa_supplicant-0.5.3 262
+MD5 4fe4ee66b641c8f88494faf32bd46ee9 files/digest-wpa_supplicant-0.4.7 262
+RMD160 ecb0ae942df13a76960473c2aadc15b645373930 files/digest-wpa_supplicant-0.4.7 262
+SHA256 540e9594f3e9b881afa12b477a07004963c9583971813c18e568cf6086f8b455 files/digest-wpa_supplicant-0.4.7 262
+MD5 bf5f5d1b14efd93b9c5a80cacc88eeea files/digest-wpa_supplicant-0.4.8 262
+RMD160 00ee8f6b98eeca4c22aa450cce03d64e61ada94c files/digest-wpa_supplicant-0.4.8 262
+SHA256 71a53ecb9a01759adfa8c93b8af746b849015028ab0e01bb9dcb338bec7b7e47 files/digest-wpa_supplicant-0.4.8 262
+MD5 6d86635cf9e38ef263ca76b67a41b480 files/digest-wpa_supplicant-0.4.9 262
+RMD160 f0bf6444084387154aebb304ea480009668a0179 files/digest-wpa_supplicant-0.4.9 262
+SHA256 89e08134872e00e168ba46e453f08a97f41a4b2c367f22be029e008c75040c8d files/digest-wpa_supplicant-0.4.9 262
 MD5 8bc6186dec3b75eb9acfbc258ac43c4e files/digest-wpa_supplicant-0.5.4 262
 RMD160 baeffb742a55a82a0e766e97ada122560dbe2089 files/digest-wpa_supplicant-0.5.4 262
 SHA256 cf40b2e1294e49fbea6768688eae6922adf0bd1311ffed322301b8a308b2fc0f files/digest-wpa_supplicant-0.5.4 262
diff --git a/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.5.2 b/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.5.2
deleted file mode 100644
index 087075f19971..000000000000
--- a/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.5.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a73b5b1be3f20f3e2c4d325f0a7a38e4 wpa_supplicant-0.5.2.tar.gz 523404
diff --git a/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.5.3 b/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.5.3
deleted file mode 100644
index a210581e2059..000000000000
--- a/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.5.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 f30cd996ebdd9f1f6aeab65f8cfac3c3 wpa_supplicant-0.5.3.tar.gz 543322
-RMD160 d3911460fcd4b3cc85bfc41bfb98235c447bfd43 wpa_supplicant-0.5.3.tar.gz 543322
-SHA256 cf29745c4c11fd8d7668d9a7ad0f698160b1f8f0988146175908d877dda71236 wpa_supplicant-0.5.3.tar.gz 543322
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.5.2-wpa_cli.sh b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.5.2-wpa_cli.sh
deleted file mode 100644
index 5d162694a642..000000000000
--- a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.5.2-wpa_cli.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/sh
-# Copyright 1999-2006 Gentoo Foundation
-# Written by Roy Marples <uberlord@gentoo.org>
-# Distributed under the terms of the GNU General Public License v2
-# Alternatively, this file may be distributed under the terms of the BSD License
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/files/wpa_supplicant-0.5.2-wpa_cli.sh,v 1.1 2006/03/20 08:16:34 brix Exp $
-
-if [ -z "$1" -o -z "$2" ]; then
-	echo "Insufficient parameters" > /dev/stderr
-	exit 1
-fi
-
-INTERFACE="$1"
-ACTION="$2"
-
-# Note, the below action must NOT mark the interface down via ifconfig, ip or
-# similar. Addresses can be removed, changed and daemons can be stopped, but
-# the interface must remain up for wpa_supplicant to work.
-
-if [ -f /etc/gentoo-release ]; then
-	EXEC="/etc/init.d/net.${INTERFACE} --quiet"
-else
-	echo "I don't know what to do with this distro!" > /dev/stderr
-	exit 1
-fi
-
-case ${ACTION} in
-	CONNECTED)
-		EXEC="${EXEC} start"
-		;;
-	DISCONNECTED)
-		EXEC="${EXEC} stop"
-		;;
-	*)
-		echo "Unknown action ${ACTION}" > /dev/stderr
-		exit 1
-		;;
-esac
-
-# ${EXEC} can use ${IN_BACKGROUND} so that it knows that the user isn't
-# stopping the interface and a background process - like wpa_cli - is.
-export IN_BACKGROUND=true
-
-${EXEC}
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.5.3-stakey.patch b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.5.3-stakey.patch
deleted file mode 100644
index 299f0d5e7d1d..000000000000
--- a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.5.3-stakey.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -urp wpa_supplicant-0.5.3/wpa.c wpa_supplicant-0.5.3-stakey/wpa.c
---- wpa_supplicant-0.5.3/wpa.c	2006-04-25 05:18:58.000000000 +0200
-+++ wpa_supplicant-0.5.3-stakey/wpa.c	2006-04-29 16:06:21.000000000 +0200
-@@ -1849,6 +1849,8 @@ static int wpa_supplicant_process_stakey
- 
- 
- static int wpa_supplicant_process_1_of_2_rsn(struct wpa_sm *sm,
-+					     const unsigned char *src_addr,
-+					     const struct wpa_eapol_key *key,
- 					     const u8 *keydata,
- 					     size_t keydatalen,
- 					     u16 key_info,
-@@ -2036,7 +2038,7 @@ static void wpa_supplicant_process_1_of_
- 	keydatalen = WPA_GET_BE16(key->key_data_length);
- 
- 	if (sm->proto == WPA_PROTO_RSN) {
--		ret = wpa_supplicant_process_1_of_2_rsn(sm,
-+		ret = wpa_supplicant_process_1_of_2_rsn(sm, src_addr, key,
- 							(const u8 *) (key + 1),
- 							keydatalen, key_info,
- 							&gd);
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.5.3-wpa_cli.sh b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.5.3-wpa_cli.sh
deleted file mode 100644
index 3e2642e1aa2c..000000000000
--- a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.5.3-wpa_cli.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/sh
-# Copyright 1999-2006 Gentoo Foundation
-# Written by Roy Marples <uberlord@gentoo.org>
-# Distributed under the terms of the GNU General Public License v2
-# Alternatively, this file may be distributed under the terms of the BSD License
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/files/wpa_supplicant-0.5.3-wpa_cli.sh,v 1.1 2006/04/29 14:28:48 brix Exp $
-
-if [ -z "$1" -o -z "$2" ]; then
-	echo "Insufficient parameters" > /dev/stderr
-	exit 1
-fi
-
-INTERFACE="$1"
-ACTION="$2"
-
-# Note, the below action must NOT mark the interface down via ifconfig, ip or
-# similar. Addresses can be removed, changed and daemons can be stopped, but
-# the interface must remain up for wpa_supplicant to work.
-
-if [ -f /etc/gentoo-release ]; then
-	EXEC="/etc/init.d/net.${INTERFACE} --quiet"
-else
-	echo "I don't know what to do with this distro!" > /dev/stderr
-	exit 1
-fi
-
-case ${ACTION} in
-	CONNECTED)
-		EXEC="${EXEC} start"
-		;;
-	DISCONNECTED)
-		EXEC="${EXEC} stop"
-		;;
-	*)
-		echo "Unknown action ${ACTION}" > /dev/stderr
-		exit 1
-		;;
-esac
-
-# ${EXEC} can use ${IN_BACKGROUND} so that it knows that the user isn't
-# stopping the interface and a background process - like wpa_cli - is.
-export IN_BACKGROUND=true
-
-${EXEC}
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.5.2.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.5.2.ebuild
deleted file mode 100644
index 0fa83322a64d..000000000000
--- a/net-wireless/wpa_supplicant/wpa_supplicant-0.5.2.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2006 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.5.2.ebuild,v 1.4 2006/04/22 16:33:34 brix Exp $
-
-inherit eutils toolchain-funcs
-
-MY_P=${PN}-${PV/_/-}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="IEEE 802.1X/WPA supplicant for secure wireless transfers"
-HOMEPAGE="http://hostap.epitest.fi/wpa_supplicant/"
-SRC_URI="http://hostap.epitest.fi/releases/${MY_P}.tar.gz"
-LICENSE="|| ( GPL-2 BSD )"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="gsm madwifi qt readline ssl"
-
-RDEPEND="gsm? ( sys-apps/pcsc-lite )
-		qt? ( || ( =x11-libs/qt-3* =x11-libs/qt-4* ) )
-		readline? ( sys-libs/ncurses
-					sys-libs/readline )
-		ssl? ( dev-libs/openssl )
-		kernel_linux? ( madwifi? ( || ( net-wireless/madwifi-ng net-wireless/madwifi-old ) ) )
-		!kernel_linux? ( net-libs/libpcap )"
-DEPEND="sys-apps/sed
-		${RDEPEND}"
-
-src_unpack() {
-	local CONFIG=${S}/.config
-
-	unpack ${A}
-
-	# net/bpf.h needed for net-libs/libpcap on Gentoo FreeBSD
-	sed -i \
-		-e "s:\(#include <pcap\.h>\):#include <net/bpf.h>\n\1:" \
-		${S}/l2_packet_freebsd.c
-
-	# toolchain setup
-	echo "CC = $(tc-getCC)" > ${CONFIG}
-
-	# basic setup
-	echo "CONFIG_CTRL_IFACE=y" >> ${CONFIG}
-	echo "CONFIG_BACKEND=file" >> ${CONFIG}
-
-	# basic authentication methods
-	echo "CONFIG_EAP_GTC=y"         >> ${CONFIG}
-	echo "CONFIG_EAP_MD5=y"         >> ${CONFIG}
-	echo "CONFIG_EAP_OTP=y"         >> ${CONFIG}
-	echo "CONFIG_EAP_PSK=y"         >> ${CONFIG}
-	echo "CONFIG_IEEE8021X_EAPOL=y" >> ${CONFIG}
-	echo "CONFIG_PKCS12=y"          >> ${CONFIG}
-	echo "CONFIG_STAKEY=y"          >> ${CONFIG}
-
-	if use gsm; then
-		# smart card authentication
-		echo "CONFIG_EAP_SIM=y" >> ${CONFIG}
-		echo "CONFIG_EAP_AKA=y" >> ${CONFIG}
-		echo "CONFIG_PCSC=y"    >> ${CONFIG}
-	fi
-
-	if use readline; then
-		# readline/history support for wpa_cli
-		echo "CONFIG_READLINE=y" >> ${CONFIG}
-	fi
-
-	if use ssl; then
-		# SSL authentication methods
-		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}
-		echo "CONFIG_SMARTCARD=y"    >> ${CONFIG}
-	fi
-
-	if use kernel_linux; then
-		# Linux specific drivers
-		echo "CONFIG_WIRELESS_EXTENSION=y" >> ${CONFIG}
-		echo "CONFIG_DRIVER_ATMEL=y"       >> ${CONFIG}
-		echo "CONFIG_DRIVER_HOSTAP=y"      >> ${CONFIG}
-		echo "CONFIG_DRIVER_IPW=y"         >> ${CONFIG}
-		echo "CONFIG_DRIVER_NDISWRAPPER=y" >> ${CONFIG}
-		echo "CONFIG_DRIVER_PRISM54=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${ROOT}/usr/include/madwifi" >> ${CONFIG}
-			echo "CONFIG_DRIVER_MADWIFI=y"                 >> ${CONFIG}
-		fi
-	fi
-
-	if use kernel_FreeBSD; then
-		# FreeBSD specific driver
-		echo "CONFIG_DRIVER_BSD=y" >> ${CONFIG}
-	fi
-
-	# 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:" \
-		${S}/wpa_supplicant.conf || die
-}
-
-src_compile() {
-	emake || die "emake failed"
-
-	if use qt; then
-		if has_version '=x11-libs/qt-4*'; then
-			qmake -o "${S}"/wpa_gui-qt4/Makefile "${S}"/wpa_gui-qt4/wpa_gui.pro
-			cd "${S}"/wpa_gui-qt4
-			emake || die "emake wpa_gui-qt4 failed"
-		else
-			[[ -d ${QTDIR}/etc/settings ]] && addwrite ${QTDIR}/etc/settings
-			emake wpa_gui || die "emake wpa_gui failed"
-		fi
-	fi
-}
-
-src_install() {
-	into /
-	dosbin wpa_supplicant
-	dobin wpa_cli wpa_passphrase
-
-	exeinto /etc/wpa_supplicant/
-	newexe ${FILESDIR}/${MY_P}-wpa_cli.sh wpa_cli.sh
-
-	# compatibility symlink for older baselayout
-	dosym /etc/wpa_supplicant/wpa_cli.sh /sbin/wpa_cli.action
-
-	if use qt; then
-		into /usr
-
-		if has_version '=x11-libs/qt-4*'; then
-			dobin wpa_gui-qt4/wpa_gui
-		else
-			dobin wpa_gui/wpa_gui
-		fi
-	fi
-
-	dodoc ChangeLog COPYING eap_testing.txt README todo.txt
-	newdoc wpa_supplicant.conf wpa_supplicant.conf.example
-
-	doman doc/docbook/*.8
-	doman doc/docbook/*.5
-}
-
-pkg_postinst() {
-	einfo
-	einfo "To use ${MY_P} you must create the configuration file"
-	einfo "/etc/wpa_supplicant/wpa_supplicant.conf"
-	einfo
-	einfo "An example configuration file is available as"
-	einfo "/usr/share/doc/${PF}/wpa_supplicant.conf.example.gz"
-	einfo
-	if use madwifi; then
-		einfo "This package now compiles against the headers installed by"
-		einfo "the madwifi driver. You should reemerge ${PN} after"
-		einfo "upgrading your madwifi driver."
-		einfo
-	fi
-}
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.5.3.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.5.3.ebuild
deleted file mode 100644
index fbd0a6117acc..000000000000
--- a/net-wireless/wpa_supplicant/wpa_supplicant-0.5.3.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2006 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.5.3.ebuild,v 1.1 2006/04/29 14:28:48 brix Exp $
-
-inherit eutils toolchain-funcs
-
-MY_P=${PN}-${PV/_/-}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="IEEE 802.1X/WPA supplicant for secure wireless transfers"
-HOMEPAGE="http://hostap.epitest.fi/wpa_supplicant/"
-SRC_URI="http://hostap.epitest.fi/releases/${MY_P}.tar.gz"
-LICENSE="|| ( GPL-2 BSD )"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="dbus gsm madwifi qt readline ssl"
-
-RDEPEND="dbus? ( sys-apps/dbus )
-		gsm? ( sys-apps/pcsc-lite )
-		qt? ( || ( =x11-libs/qt-3* =x11-libs/qt-4* ) )
-		readline? ( sys-libs/ncurses sys-libs/readline )
-		ssl? ( dev-libs/openssl )
-		kernel_linux? ( madwifi? ( || ( net-wireless/madwifi-ng net-wireless/madwifi-old ) ) )
-		!kernel_linux? ( net-libs/libpcap )"
-DEPEND="sys-apps/sed
-		${RDEPEND}"
-
-src_unpack() {
-	local CONFIG=${S}/.config
-
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${P}-stakey.patch
-
-	# net/bpf.h needed for net-libs/libpcap on Gentoo FreeBSD
-	sed -i \
-		-e "s:\(#include <pcap\.h>\):#include <net/bpf.h>\n\1:" \
-		${S}/l2_packet_freebsd.c
-
-	# toolchain setup
-	echo "CC = $(tc-getCC)" > ${CONFIG}
-
-	# basic setup
-	echo "CONFIG_CTRL_IFACE=y" >> ${CONFIG}
-	echo "CONFIG_BACKEND=file" >> ${CONFIG}
-
-	# basic authentication methods
-	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_STAKEY=y"          >> ${CONFIG}
-
-	if use dbus; then
-		echo "CONFIG_CTRL_IFACE_DBUS=y" >> ${CONFIG}
-	fi
-
-	if use gsm; then
-		# smart card authentication
-		echo "CONFIG_EAP_SIM=y" >> ${CONFIG}
-		echo "CONFIG_EAP_AKA=y" >> ${CONFIG}
-		echo "CONFIG_PCSC=y"    >> ${CONFIG}
-	fi
-
-	if use readline; then
-		# readline/history support for wpa_cli
-		echo "CONFIG_READLINE=y" >> ${CONFIG}
-	fi
-
-	if use ssl; then
-		# SSL authentication methods
-		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}
-		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_NDISWRAPPER=y" >> ${CONFIG}
-		echo "CONFIG_DRIVER_PRISM54=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${ROOT}/usr/include/madwifi" >> ${CONFIG}
-			echo "CONFIG_DRIVER_MADWIFI=y"                 >> ${CONFIG}
-		fi
-	fi
-
-	if use kernel_FreeBSD; then
-		# FreeBSD specific driver
-		echo "CONFIG_DRIVER_BSD=y" >> ${CONFIG}
-	fi
-
-	# 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:" \
-		${S}/wpa_supplicant.conf || die
-}
-
-src_compile() {
-	emake || die "emake failed"
-
-	if use qt; then
-		if has_version '=x11-libs/qt-4*'; then
-			qmake -o "${S}"/wpa_gui-qt4/Makefile "${S}"/wpa_gui-qt4/wpa_gui.pro
-			cd "${S}"/wpa_gui-qt4
-			emake || die "emake wpa_gui-qt4 failed"
-		else
-			[[ -d ${QTDIR}/etc/settings ]] && addwrite ${QTDIR}/etc/settings
-			emake wpa_gui || die "emake wpa_gui failed"
-		fi
-	fi
-}
-
-src_install() {
-	into /
-	dosbin wpa_supplicant
-	dobin wpa_cli wpa_passphrase
-
-	exeinto /etc/wpa_supplicant/
-	newexe ${FILESDIR}/${MY_P}-wpa_cli.sh wpa_cli.sh
-
-	# compatibility symlink for older baselayout
-	dosym /etc/wpa_supplicant/wpa_cli.sh /sbin/wpa_cli.action
-
-	if use qt; then
-		into /usr
-
-		if has_version '=x11-libs/qt-4*'; then
-			dobin wpa_gui-qt4/wpa_gui
-		else
-			dobin wpa_gui/wpa_gui
-		fi
-	fi
-
-	dodoc ChangeLog COPYING eap_testing.txt README todo.txt
-	newdoc wpa_supplicant.conf wpa_supplicant.conf.example
-
-	doman doc/docbook/*.8
-	doman doc/docbook/*.5
-}
-
-pkg_postinst() {
-	einfo
-	einfo "To use ${MY_P} you must create the configuration file"
-	einfo "/etc/wpa_supplicant/wpa_supplicant.conf"
-	einfo
-	einfo "An example configuration file is available as"
-	einfo "/usr/share/doc/${PF}/wpa_supplicant.conf.example.gz"
-	einfo
-	if use madwifi; then
-		einfo "This package now compiles against the headers installed by"
-		einfo "the madwifi driver. You should reemerge ${PN} after"
-		einfo "upgrading your madwifi driver."
-		einfo
-	fi
-}