Renamed net-wireless/wpa-supplicant to net-wireless/wpa_supplicant to avoid confusion.

14 files changed, 25 insertions, 21 deletions

diff --git a/net-wireless/wpa-supplicant/Manifest b/net-wireless/wpa-supplicant/Manifest
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/net-wireless/wpa-supplicant/Manifest
+++ /dev/null
diff --git a/net-wireless/wpa-supplicant/ChangeLog b/net-wireless/wpa_supplicant/ChangeLog
index bfa796f9af69..26bb80e68245 100644
--- a/net-wireless/wpa-supplicant/ChangeLog
+++ b/net-wireless/wpa_supplicant/ChangeLog
@@ -1,6 +1,16 @@
 # 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.5 2004/12/04 00:24:17 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.1 2004/12/10 15:45:32 brix Exp $
+
+*wpa_supplicant-0.2.5 (10 Dec 2004)
+
+  10 Dec 2004; Henrik Brix Andersen <brix@gentoo.org> +metadata.xml,
+  +files/wpa_supplicant-0.2.4-config, +files/wpa_supplicant-0.2.5-conf.d,
+  +files/wpa_supplicant-0.2.5-config, +files/wpa_supplicant-0.2.5-init.d,
+  +files/wpa_supplicant-0.2.5-pkg-config.patch, +wpa_supplicant-0.2.4.ebuild,
+  +wpa_supplicant-0.2.5.ebuild:
+  Renamed net-wireless/wpa-supplicant to net-wireless/wpa_supplicant to avoid
+  confusion.
 
   04 Dec 2004; Tom Martin <slarti@gentoo.org> wpa-supplicant-0.2.5.ebuild:
   Marked ~amd64.
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
index 5a3c7ae60a8b..5a3c7ae60a8b 100644
--- a/net-wireless/wpa-supplicant/files/digest-wpa-supplicant-0.2.4
+++ b/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.2.4
diff --git a/net-wireless/wpa-supplicant/files/digest-wpa-supplicant-0.2.5 b/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.2.5
index e427fe8be624..e427fe8be624 100644
--- a/net-wireless/wpa-supplicant/files/digest-wpa-supplicant-0.2.5
+++ b/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.2.5
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
index b179c50e03a7..b179c50e03a7 100644
--- a/net-wireless/wpa-supplicant/files/wpa-supplicant-0.2.4-config
+++ b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.2.4-config
diff --git a/net-wireless/wpa-supplicant/files/wpa_supplicant-0.2.5-conf.d b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.2.5-conf.d
index 50c1c95a678a..d0b6affe5e56 100644
--- a/net-wireless/wpa-supplicant/files/wpa_supplicant-0.2.5-conf.d
+++ b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.2.5-conf.d
@@ -1,6 +1,6 @@
 # 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/files/wpa_supplicant-0.2.5-conf.d,v 1.1 2004/10/16 15:00:34 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/files/wpa_supplicant-0.2.5-conf.d,v 1.1 2004/12/10 15:45:32 brix Exp $
 
 # List of interfaces
 INTERFACES="eth1"
diff --git a/net-wireless/wpa-supplicant/files/wpa-supplicant-0.2.5-config b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.2.5-config
index c43e6e0a6034..c43e6e0a6034 100644
--- a/net-wireless/wpa-supplicant/files/wpa-supplicant-0.2.5-config
+++ b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.2.5-config
diff --git a/net-wireless/wpa-supplicant/files/wpa_supplicant-0.2.5-init.d b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.2.5-init.d
index db3ef964e3e4..aab9a815a41a 100644
--- a/net-wireless/wpa-supplicant/files/wpa_supplicant-0.2.5-init.d
+++ b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.2.5-init.d
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # 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/files/wpa_supplicant-0.2.5-init.d,v 1.1 2004/10/16 15:00:34 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/files/wpa_supplicant-0.2.5-init.d,v 1.1 2004/12/10 15:45:32 brix Exp $
 
 depend() {
 	before net
diff --git a/net-wireless/wpa-supplicant/files/wpa_supplicant-0.2.5-pkg-config.patch b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.2.5-pkg-config.patch
index 607e25054a9a..607e25054a9a 100644
--- a/net-wireless/wpa-supplicant/files/wpa_supplicant-0.2.5-pkg-config.patch
+++ b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.2.5-pkg-config.patch
diff --git a/net-wireless/wpa-supplicant/metadata.xml b/net-wireless/wpa_supplicant/metadata.xml
index 042b87179f01..cfbdff13bd61 100644
--- a/net-wireless/wpa-supplicant/metadata.xml
+++ b/net-wireless/wpa_supplicant/metadata.xml
@@ -4,5 +4,6 @@
 <herd>mobile</herd>
 <maintainer>
   <email>brix@gentoo.org</email>
+  <name>Henrik Brix Andersen</name>
 </maintainer>
 </pkgmetadata>
diff --git a/net-wireless/wpa-supplicant/wpa-supplicant-0.2.4.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.2.4.ebuild
index 1c2b6f8bfac3..92d75027fd3c 100644
--- a/net-wireless/wpa-supplicant/wpa-supplicant-0.2.4.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.2.4.ebuild
@@ -1,13 +1,12 @@
 # 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/09/16 18:19:40 brix Exp $
+# $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 $
 
 inherit eutils
 
-MY_P="${P/wpa-/wpa_}"
 DESCRIPTION="WPA Supplicant for secure wireless transfers"
 HOMEPAGE="http://hostap.epitest.fi/wpa_supplicant/"
-SRC_URI="http://hostap.epitest.fi/releases/${MY_P}.tar.gz
+SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz
 		mirror://gentoo/madwifi-driver-0.1_pre20040906.tar.bz2"
 LICENSE="GPL-2"
 
@@ -20,8 +19,6 @@ DEPEND="gsm? ( sys-apps/pcsc-lite )
 				dev-libs/libdnet )
 		ssl? ( dev-libs/openssl )"
 
-S=${WORKDIR}/${MY_P}
-
 src_unpack() {
 	unpack ${A}
 
diff --git a/net-wireless/wpa-supplicant/wpa-supplicant-0.2.5.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.2.5.ebuild
index de3fe314bb9d..62b6de5ffac3 100644
--- a/net-wireless/wpa-supplicant/wpa-supplicant-0.2.5.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.2.5.ebuild
@@ -1,19 +1,16 @@
 # 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.5.ebuild,v 1.4 2004/12/04 00:24:17 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.2.5.ebuild,v 1.1 2004/12/10 15:45:32 brix Exp $
 
 inherit toolchain-funcs eutils
 
 MADWIFI_VERSION="0.1_pre20040906"
 
-MY_P="${P/wpa-/wpa_}"
-S=${WORKDIR}/${MY_P}
-
 DESCRIPTION="WPA Supplicant for secure wireless transfers"
 HOMEPAGE="http://hostap.epitest.fi/wpa_supplicant/"
-SRC_URI="http://hostap.epitest.fi/releases/${MY_P}.tar.gz
+SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz
 		mirror://gentoo/madwifi-driver-${MADWIFI_VERSION}.tar.bz2
-		mirror://gentoo/${MY_P}-ipw2100.diff.gz"
+		mirror://gentoo/${P}-ipw2100.diff.gz"
 LICENSE="GPL-2"
 
 SLOT="0"
@@ -31,8 +28,8 @@ src_unpack() {
 	unpack ${A}
 
 	cd ${S}
-	epatch ${WORKDIR}/${MY_P}-ipw2100.diff
-	epatch ${FILESDIR}/${MY_P}-pkg-config.patch
+	epatch ${WORKDIR}/${P}-ipw2100.diff
+	epatch ${FILESDIR}/${P}-pkg-config.patch
 
 	sed -i "s:madwifi/wpa::" ${S}/Makefile
 
@@ -71,8 +68,8 @@ src_install() {
 	newins wpa_supplicant.conf wpa_supplicant.conf.example
 
 	exeinto /etc/init.d
-	newexe ${FILESDIR}/${MY_P}-init.d wpa_supplicant
+	newexe ${FILESDIR}/${P}-init.d wpa_supplicant
 
 	insinto /etc/conf.d
-	newins ${FILESDIR}/${MY_P}-conf.d wpa_supplicant
+	newins ${FILESDIR}/${P}-conf.d wpa_supplicant
 }
diff --git a/profiles/updates/4Q-2004 b/profiles/updates/4Q-2004
index 3756f059c098..f29d2373279e 100644
--- a/profiles/updates/4Q-2004
+++ b/profiles/updates/4Q-2004
@@ -45,3 +45,4 @@ move x11-misc/kgamma kde-misc/kgamma
 move app-misc/mwavem net-dialup/mwavem
 move net-misc/linesrv net-dialup/linesrv
 move net-misc/tftp-hpa net-ftp/tftp-hpa
+move net-wireless/wpa-supplicant net-wireless/wpa_supplicant
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 11760c9b4940..b74ce843cd02 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/use.local.desc,v 1.787 2004/12/10 15:45:13 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/use.local.desc,v 1.788 2004/12/10 15:50:22 brix Exp $
 
 # This file contains descriptions of local USE flags, and the ebuilds which
 # contain them.
@@ -595,8 +595,6 @@ net-wireless/hostap:hostap-nopci - Set to not install hostap_pci driver
 net-wireless/hostap:hostap-noplx - Set to not install hostap_plx driver
 net-wireless/libbtctl:mono - Add Mono Bluetooth bindings
 net-wireless/wireless-tools:multicall - Build the most commonly used tools as one binary
-net-wireless/wpa-supplicant:gsm - Add support for EAP-SIM authentication algorithm
-net-wireless/wpa-supplicant:pcap - Use external libpcap and libdnet for layer2 packet processing
 net-wireless/wpa_supplicant:gsm - Add support for EAP-SIM authentication algorithm
 net-wireless/wpa_supplicant:pcap - Use external libpcap and libdnet for layer2 packet processing
 net-www/apache:distcache - Enable SSL distcache support