fix build problems, bug 143103, thanks to Jack Eids_no_google_me_ness <jack at hh.peril.org>

(Portage version: 2.1.1_pre4-r4)

3 files changed, 56 insertions, 3 deletions

diff --git a/net-wireless/rtl8187/ChangeLog b/net-wireless/rtl8187/ChangeLog
index f82150d53042..0b3ecadf14dd 100644
--- a/net-wireless/rtl8187/ChangeLog
+++ b/net-wireless/rtl8187/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-wireless/rtl8187
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/rtl8187/ChangeLog,v 1.2 2006/06/05 09:44:04 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/rtl8187/ChangeLog,v 1.3 2006/08/08 08:41:31 genstef Exp $
+
+  08 Aug 2006; Stefan Schweizer <genstef@gentoo.org>
+  +files/module-param-and-isoc.patch, rtl8187-1.10.ebuild:
+  fix build problems, bug 143103, thanks to Jack Eids_no_google_me_ness <jack
+  at hh.peril.org>
 
   05 Jun 2006; Stefan Schweizer <genstef@gentoo.org> rtl8187-1.10.ebuild:
   Add !IEEE80211 dep thanks to Thomas Schäfer <t.schaefer@bigfoot.de> in bug
diff --git a/net-wireless/rtl8187/files/module-param-and-isoc.patch b/net-wireless/rtl8187/files/module-param-and-isoc.patch
new file mode 100644
index 000000000000..0d8f184c7e13
--- /dev/null
+++ b/net-wireless/rtl8187/files/module-param-and-isoc.patch
@@ -0,0 +1,45 @@
+--- rtl8187_linuxdrv_V1.1/beta-8187/r8187_core.c.orig	2006-08-08 10:24:24.000000000 +0200
++++ rtl8187_linuxdrv_V1.1/beta-8187/r8187_core.c	2006-08-08 10:25:35.000000000 +0200
+@@ -105,16 +105,16 @@
+ MODULE_AUTHOR("Andrea Merello <andreamrl@tiscali.it>");

+ MODULE_DESCRIPTION("Linux driver for Realtek RTL8187 WiFi cards");

+ 

+-MODULE_PARM(ifname,"s");

++module_param(ifname, charp, 0);

+ MODULE_PARM_DESC(devname," Net interface name, wlan%d=default");

+ #if 0

+-MODULE_PARM(hwseqnum,"i");

++module_param(hwseqnum, int, 0);

+ MODULE_PARM_DESC(hwseqnum," Try to use hardware 802.11 header sequence numbers. Zero=default");

+ 

+-MODULE_PARM(hwwep,"i");

++module_param(hwwep, int, 0);

+ MODULE_PARM_DESC(hwwep," Try to use hardware WEP support. Still broken and not available on all cards");

+ #endif

+-MODULE_PARM(channels,"i");

++module_param(channels, int, 0);

+ MODULE_PARM_DESC(channels," Channel bitmask for specific locales. NYI");

+ 

+ MODULE_VERSION("V 0.q");

+@@ -125,7 +125,6 @@
+ static void __devexit rtl8187_usb_disconnect(struct usb_interface *intf);

+ 

+ static struct usb_driver rtl8187_usb_driver = {

+-	.owner		= THIS_MODULE,

+ 	.name		= RTL8187_MODULE_NAME,	          /* Driver name   */

+ 	.id_table	= rtl8187_usb_id_tbl,	          /* PCI_ID table  */

+ 	.probe		= rtl8187_usb_probe,	          /* probe fn      */

+@@ -2327,11 +2326,11 @@
+ int rtl8180_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)

+ {

+ 	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev);

++	struct iwreq *wrq = (struct iwreq *) rq;

++	int ret=-1;

+ 	

+ 	down(&priv->wx_sem);

+ 	

+-	struct iwreq *wrq = (struct iwreq *) rq;

+-	int ret=-1;

+ 	switch (cmd) {

+ 	    case RTL_IOCTL_WPA_SUPPLICANT:

+ 		ret = ieee80211_wpa_supplicant_ioctl(priv->ieee80211, &wrq->u.data);

diff --git a/net-wireless/rtl8187/rtl8187-1.10.ebuild b/net-wireless/rtl8187/rtl8187-1.10.ebuild
index d65024969973..8d7740003c92 100644
--- a/net-wireless/rtl8187/rtl8187-1.10.ebuild
+++ b/net-wireless/rtl8187/rtl8187-1.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/rtl8187/rtl8187-1.10.ebuild,v 1.2 2006/06/05 09:44:04 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/rtl8187/rtl8187-1.10.ebuild,v 1.3 2006/08/08 08:41:31 genstef Exp $
 
 inherit linux-mod eutils
 
@@ -22,7 +22,7 @@ S=${WORKDIR}/${PN}_linuxdrv_V${PV/0}
 MODULE_NAMES="ieee80211_crypt-rtl(net:${S}/ieee80211) ieee80211_crypt_wep-rtl(net:${S}/ieee80211)
 	ieee80211_crypt_tkip-rtl(net:${S}/ieee80211) ieee80211_crypt_ccmp-rtl(net:${S}/ieee80211)
 	ieee80211-rtl(net:${S}/ieee80211) r8187(net:${S}/beta-8187)"
-CONFIG_CHECK="NET_RADIO CRYPTO CRYPTO_ARC4 CRC32 !IEEE80211"
+#CONFIG_CHECK="NET_RADIO CRYPTO CRYPTO_ARC4 CRC32 !IEEE80211"
 ERROR_IEEE80211="${P} requires the in-kernel version of the IEEE802.11 subsystem to be disabled (CONFIG_IEEE80211)"
 BUILD_TARGETS=" "
 MODULESD_R8187_ALIASES=("wlan0 r8187")
@@ -42,6 +42,9 @@ src_unpack() {
 	cd ${S}
 	tar xzf stack.tar.gz || die "Could not extract IEEE80211 stack."
 	tar xzf drv.tar.gz || die "Could not extract driver."
+
+	sed -i -e 's:MODVERDIR=$(PWD) ::' {beta-8187,ieee80211}/Makefile
+	epatch ${FILESDIR}/module-param-and-isoc.patch
 }
 
 src_install() {