Moved wpa_cli and wpa_passphrase to /usr/bin.

6 files changed, 41 insertions, 42 deletions

diff --git a/net-wireless/wpa_supplicant/ChangeLog b/net-wireless/wpa_supplicant/ChangeLog
index be0121a229f9..9b1c6eafc895 100644
--- a/net-wireless/wpa_supplicant/ChangeLog
+++ b/net-wireless/wpa_supplicant/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-wireless/wpa_supplicant
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.4 2004/12/13 09:24:34 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.5 2004/12/16 19:28:26 brix Exp $
+
+*wpa_supplicant-0.2.5-r1 (16 Dec 2004)
+
+  16 Dec 2004; Henrik Brix Andersen <brix@gentoo.org>
+  -files/wpa_supplicant-0.2.4-config, -wpa_supplicant-0.2.4.ebuild,
+  +wpa_supplicant-0.2.5-r1.ebuild:
+  Moved wpa_cli and wpa_passphrase to /usr/bin.
 
 *wpa_supplicant-0.3.1 (13 Dec 2004)
 
diff --git a/net-wireless/wpa_supplicant/Manifest b/net-wireless/wpa_supplicant/Manifest
index 59780e079675..9ebf43004652 100644
--- a/net-wireless/wpa_supplicant/Manifest
+++ b/net-wireless/wpa_supplicant/Manifest
@@ -1,7 +1,7 @@
+MD5 6f50dd867bc0efda09d3961b14355b40 wpa_supplicant-0.2.5-r1.ebuild 1851
 MD5 434a9cf8d7c405f7bfe3dc8b9a1796f8 wpa_supplicant-0.3.1.ebuild 2843
 MD5 1b0071ea237d4b8c4334ae80fd1e8ddf wpa_supplicant-0.2.5.ebuild 1844
 MD5 c3cec75d7e12b74c46d32639369084e2 wpa_supplicant-0.3.0.ebuild 2872
-MD5 de54ed7b83a5d2ee0324a140c6c7db8b wpa_supplicant-0.2.4.ebuild 1439
 MD5 27922d6240b8ed1d717132083c78a069 ChangeLog 2241
 MD5 b280eebc74d70d85e664debf1adce2c3 metadata.xml 255
 MD5 2bc46403d4bf3ae6e68ae82693a23914 files/wpa_supplicant-0.2.5-pkg-config.patch 1669
@@ -10,10 +10,9 @@ MD5 11ecf21202cd23fc4faa511fec21a85e files/wpa_supplicant-0.3.1-init.d 975
 MD5 8ce172f90e194edc1d06ac18b81a7301 files/wpa_supplicant-0.2.5-conf.d 398
 MD5 b2bb8e6d5a1663945c4ce0d9b4c70ba1 files/wpa_supplicant-0.2.5-config 606
 MD5 4bec60e49c33275fa8e21d27c3909cc5 files/wpa_supplicant-0.2.5-init.d 974
-MD5 1f91b0edd54ee435426f50cd10807c6d files/digest-wpa_supplicant-0.2.4 156
 MD5 a9249a7ed61a912ddd1b561317e76f43 files/digest-wpa_supplicant-0.2.5 235
 MD5 1b08e42f180b3bee6247776212a5fb4f files/digest-wpa_supplicant-0.3.0 156
 MD5 d6b9d13af0f01e8b7fa70b880b8ecdfe files/digest-wpa_supplicant-0.3.1 156
+MD5 a9249a7ed61a912ddd1b561317e76f43 files/digest-wpa_supplicant-0.2.5-r1 235
 MD5 6dbdde5c93f286b00afacc10673e4de7 files/wpa_supplicant-0.3.0-conf.d 398
 MD5 4290cd41db8ead604b3096f53d6795e4 files/wpa_supplicant-0.3.0-init.d 975
-MD5 a0d0816840e412152255c4a62bfde94c files/wpa_supplicant-0.2.4-config 582
diff --git a/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.2.4 b/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.2.4
deleted file mode 100644
index 5a3c7ae60a8b..000000000000
--- a/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.2.4
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 2e209c137656c9a4e2185bf1d3fd6620 wpa_supplicant-0.2.4.tar.gz 190929
-MD5 6c5f62812f30b962e054782b9cec7b9c madwifi-driver-0.1_pre20040906.tar.bz2 1797060
diff --git a/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.2.5-r1 b/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.2.5-r1
new file mode 100644
index 000000000000..e427fe8be624
--- /dev/null
+++ b/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.2.5-r1
@@ -0,0 +1,3 @@
+MD5 6a3bdec50022ce6b56cb874ed55690bf wpa_supplicant-0.2.5.tar.gz 193387
+MD5 6c5f62812f30b962e054782b9cec7b9c madwifi-driver-0.1_pre20040906.tar.bz2 1797060
+MD5 00912391abc208c4c76a0dd0b946a4cd wpa_supplicant-0.2.5-ipw2100.diff.gz 3650
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.2.4-config b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.2.4-config
deleted file mode 100644
index b179c50e03a7..000000000000
--- a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.2.4-config
+++ /dev/null
@@ -1,26 +0,0 @@
-# Needed for the wireless drivers
-CONFIG_WIRELESS_EXTENSION=y
-
-# Drivers which compile out-of-the-box
-CONFIG_DRIVER_ATMEL=y
-CONFIG_DRIVER_HOSTAP=y
-CONFIG_DRIVER_NDISWRAPPER=y
-CONFIG_DRIVER_PRISM54=y
-CONFIG_DRIVER_WEXT=y
-
-# Drivers which doesn't compile out-of-the-box
-#CONFIG_DRIVER_HERMES=y
-
-# Drivers which compiles using patches/external sources
-CONFIG_DRIVER_MADWIFI=y
-
-# Authentication methods
-CONFIG_IEEE8021X_EAPOL=y
-CONFIG_EAP_GTC=y
-CONFIG_EAP_LEAP=y
-CONFIG_EAP_MD5=y
-CONFIG_EAP_OTP=y
-CONFIG_EAP_SIM=y
-CONFIG_MSCHAPV2=y
-
-# ssl and pcap USE flags controls remaining options!
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.2.4.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.2.5-r1.ebuild
index 92d75027fd3c..4de737532358 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-0.2.4.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.2.5-r1.ebuild
@@ -1,20 +1,25 @@
 # Copyright 1999-2004 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.2.4.ebuild,v 1.1 2004/12/10 15:45:32 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.2.5-r1.ebuild,v 1.1 2004/12/16 19:28:26 brix Exp $
 
-inherit eutils
+inherit toolchain-funcs eutils
+
+MADWIFI_VERSION="0.1_pre20040906"
 
 DESCRIPTION="WPA Supplicant for secure wireless transfers"
 HOMEPAGE="http://hostap.epitest.fi/wpa_supplicant/"
 SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz
-		mirror://gentoo/madwifi-driver-0.1_pre20040906.tar.bz2"
+		mirror://gentoo/madwifi-driver-${MADWIFI_VERSION}.tar.bz2
+		mirror://gentoo/${P}-ipw2100.diff.gz"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc ~amd64"
 IUSE="gsm pcap ssl"
 
-DEPEND="gsm? ( sys-apps/pcsc-lite )
+DEPEND="sys-apps/sed
+		dev-util/pkgconfig"
+RDEPEND="gsm? ( sys-apps/pcsc-lite )
 		pcap? ( net-libs/libpcap
 				dev-libs/libdnet )
 		ssl? ( dev-libs/openssl )"
@@ -22,20 +27,26 @@ DEPEND="gsm? ( sys-apps/pcsc-lite )
 src_unpack() {
 	unpack ${A}
 
+	cd ${S}
+	epatch ${WORKDIR}/${P}-ipw2100.diff
+	epatch ${FILESDIR}/${P}-pkg-config.patch
+
 	sed -i "s:madwifi/wpa::" ${S}/Makefile
 
+	sed -i "s:gcc:$(tc-getCC):g" ${S}/Makefile
+
 	# Use pcap and libdnet if we have it.
 	if use pcap; then
-		sed -i "s:^#CFLAGS\(.*\):CFLAGS\1:" ${S}/Makefile
-		sed -i "s:^#LIBS\(.*\):LIBS\1:" ${S}/Makefile
+		sed -i "s:^#\(CFLAGS\):\1:" ${S}/Makefile
+		sed -i "s:^#\(LIBS\):\1:" ${S}/Makefile
 	fi
 
 	cp ${FILESDIR}/${P}-config ${S}/.config || die
 
 	if use ssl; then
 		echo "CONFIG_EAP_TLS=y" >> ${S}/.config
-		echo "CONFIG_EAP_PEAP=y"  >> ${S}/.config
-		echo "CONFIG_EAP_TTLS=y"  >> ${S}/.config
+		echo "CONFIG_EAP_PEAP=y" >> ${S}/.config
+		echo "CONFIG_EAP_TTLS=y" >> ${S}/.config
 	fi
 
 	if use gsm; then
@@ -48,11 +59,18 @@ src_compile() {
 }
 
 src_install() {
-	dosbin wpa_cli wpa_passphrase wpa_supplicant
+	dosbin wpa_supplicant
+	dobin wpa_cli wpa_passphrase
 
 	dodoc ChangeLog COPYING developer.txt eap_testing.txt README todo.txt
 	dodoc doc/wpa_supplicant.fig
 
 	insinto /etc
 	newins wpa_supplicant.conf wpa_supplicant.conf.example
+
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/${P}-init.d wpa_supplicant
+
+	insinto /etc/conf.d
+	newins ${FILESDIR}/${P}-conf.d wpa_supplicant
 }