Temporarily removed madwifi support until upstream can provide a working version...

Package-Manager: portage-2.0.51.22-r3

diff --git a/net-wireless/wpa_supplicant/ChangeLog b/net-wireless/wpa_supplicant/ChangeLog
index cb1adbfab9e6e1236d33715f6e8ecc3c949e81cd..49c4774d87cb41187a8c1951b16a7b81551ae0d8 100644 (file)
--- a/net-wireless/wpa_supplicant/ChangeLog
+++ b/net-wireless/wpa_supplicant/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-wireless/wpa_supplicant
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.37 2005/10/29 10:41:58 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.38 2005/11/10 09:56:50 brix Exp $
+
+  09 Nov 2005; Henrik Brix Andersen <brix@gentoo.org>
+  wpa_supplicant-0.4.6.ebuild:
+  Temporarily removed madwifi support until upstream can provide a working
+  version, bug #110791.
 
 *wpa_supplicant-0.4.6 (29 Oct 2005)
 

diff --git a/net-wireless/wpa_supplicant/Manifest b/net-wireless/wpa_supplicant/Manifest
index a37b98b81305c2a0608ec121b8fd0870796a4389..5926ef18bfb735239fa25b7147cfc3fe9d34d3a5 100644 (file)
--- a/net-wireless/wpa_supplicant/Manifest
+++ b/net-wireless/wpa_supplicant/Manifest
@@ -1,7 +1,7 @@
 MD5 090212b7ed178b6a7e269f4eb57fdc25 wpa_supplicant-0.3.9-r1.ebuild 3236
-MD5 a7cc26737dfced4b47cfe9d0eeb59f5f wpa_supplicant-0.4.6.ebuild 3712
+MD5 26d56b57978c89eba0f773c8ac29f609 wpa_supplicant-0.4.6.ebuild 3232
 MD5 c49fb2bfb9587a39da2533eea26fdbe8 wpa_supplicant-0.3.8-r1.ebuild 3172
-MD5 9345f2137441a5939eb08a62f29c69b1 ChangeLog 10124
+MD5 5385c8860e2ecce211e8641542888320 ChangeLog 10309
 MD5 b280eebc74d70d85e664debf1adce2c3 metadata.xml 255
 MD5 9bdb65a346416e1a2837456f0d1bc464 wpa_supplicant-0.4.5.ebuild 3707
 MD5 c3e0a211ce07e200426b871069487403 files/wpa_supplicant-0.4.6-wpa_cli.action 1233

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.4.6.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.4.6.ebuild
index 173817170ed18a6be0e692fc524778bd11fd9a5e..256d46d58c91edd4de7e0ab224d691c93ce6361d 100644 (file)
--- a/net-wireless/wpa_supplicant/wpa_supplicant-0.4.6.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.4.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.4.6.ebuild,v 1.1 2005/10/29 10:41:58 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.4.6.ebuild,v 1.2 2005/11/10 09:56:50 brix Exp $
 
 inherit eutils toolchain-funcs
 
@@ -14,14 +14,13 @@ LICENSE="|| ( GPL-2 BSD )"
 
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug gsm madwifi qt readline ssl"
+IUSE="debug gsm qt readline ssl"
 
 DEPEND="gsm? ( sys-apps/pcsc-lite )
                qt? ( =x11-libs/qt-3* )
                readline? ( sys-libs/ncurses
                                        sys-libs/readline )
-               ssl? ( dev-libs/openssl )
-               madwifi? ( >=net-wireless/madwifi-driver-0.1_pre20050420-r1 )"
+               ssl? ( dev-libs/openssl )"
 
 src_unpack() {
        local CONFIG=${S}/.config
@@ -78,12 +77,6 @@ src_unpack() {
        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/usr/include/madwifi" >> ${CONFIG}
-               echo "CONFIG_DRIVER_MADWIFI=y"           >> ${CONFIG}
-       fi
 }
 
 src_compile() {
@@ -129,10 +122,4 @@ pkg_postinst() {
        einfo "An example configuration file has been installed as"
        einfo "/etc/wpa_supplicant.conf.example"
        einfo
-       if use madwifi; then
-               einfo "This package now compiles against the headers installed by"
-               einfo "net-wireless/madwifi-driver. You should remerge ${PN} after"
-               einfo "upgrading net-wireless/madwifi-driver."
-               einfo
-       fi
 }