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

Package-Manager: portage-2.1.1_pre4-r4

4 files changed, 68 insertions, 21 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/Manifest b/net-wireless/rtl8187/Manifest
index 55dddf46ff40..e6acd9b823bf 100644
--- a/net-wireless/rtl8187/Manifest
+++ b/net-wireless/rtl8187/Manifest
@@ -1,15 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX module-param-and-isoc.patch 1782 RMD160 c123669b05d642e7f0a815c16a7af211f5f20eba SHA1 ce9544bf43dfe82f98d0b9d4de4a95386bf8d4e0 SHA256 120b1db887036f764421b57b5873e1aa07eec935cb628b0f5438f6b0511cb309
+MD5 99a117110790cba6cc24cc76d070a87b files/module-param-and-isoc.patch 1782
+RMD160 c123669b05d642e7f0a815c16a7af211f5f20eba files/module-param-and-isoc.patch 1782
+SHA256 120b1db887036f764421b57b5873e1aa07eec935cb628b0f5438f6b0511cb309 files/module-param-and-isoc.patch 1782
 DIST rtl8187-1.10.zip 447810
-EBUILD rtl8187-1.10.ebuild 2290 RMD160 5ba3e8a837915c8739e92cd294ac81dbdceea202 SHA1 3920ca990df4a542e35bce7d125d6e3b979e83fa SHA256 5cf63ec7f79afeeb4e11e7115eca2bec6bdfb6063f6fbd845fe469a9eb68fe3f
-MD5 bd2298461c65d94d7f8a74794f4e8067 rtl8187-1.10.ebuild 2290
-RMD160 5ba3e8a837915c8739e92cd294ac81dbdceea202 rtl8187-1.10.ebuild 2290
-SHA256 5cf63ec7f79afeeb4e11e7115eca2bec6bdfb6063f6fbd845fe469a9eb68fe3f rtl8187-1.10.ebuild 2290
-MISC ChangeLog 558 RMD160 66d9c4fd5147fe7366a615425799c223858c117c SHA1 0958e25529e635c215c4334866c21500a6f72ae5 SHA256 c3e1a5aff74418303478f5a5601f66165ff322003a6dd79ea70c37635a7e9fea
-MD5 d7098db6784f49ddf4179f3ec55a332c ChangeLog 558
-RMD160 66d9c4fd5147fe7366a615425799c223858c117c ChangeLog 558
-SHA256 c3e1a5aff74418303478f5a5601f66165ff322003a6dd79ea70c37635a7e9fea ChangeLog 558
+EBUILD rtl8187-1.10.ebuild 2406 RMD160 87704b5df8e135f1e6ae50693bf5756645641f56 SHA1 e38d58e4e5e31a71e39bd51cd0efc9a7f66dfad3 SHA256 c479a0ddafb7621191abc0740569f886535fa1ea2e70da030c4e3f742d6adfec
+MD5 7ab08e5abcc07c29d65d495d0cf71130 rtl8187-1.10.ebuild 2406
+RMD160 87704b5df8e135f1e6ae50693bf5756645641f56 rtl8187-1.10.ebuild 2406
+SHA256 c479a0ddafb7621191abc0740569f886535fa1ea2e70da030c4e3f742d6adfec rtl8187-1.10.ebuild 2406
+MISC ChangeLog 768 RMD160 ab174ab524fde8d4f6a3147c7e9246905ecca086 SHA1 0a2fbbfda52b8aaf45a24723e50453876262aa40 SHA256 5837c9aeacfadf88651db4b1e9bca0ae8720e6076a0472fec3874a56e4b05503
+MD5 fea500bcf198f7bcad5ce933967ef527 ChangeLog 768
+RMD160 ab174ab524fde8d4f6a3147c7e9246905ecca086 ChangeLog 768
+SHA256 5837c9aeacfadf88651db4b1e9bca0ae8720e6076a0472fec3874a56e4b05503 ChangeLog 768
 MISC metadata.xml 159 RMD160 54af1e9a61e5ed1b49b2bbbf3ef2278999c66b13 SHA1 bce3da4745192397c9a08bdbcf7e4914eac9b77b SHA256 ed3a0d440cfa5672284f4172ebde0ea6506c1a38e9a3ed9f14f3d2c093aac42f
 MD5 19fd766bac8e110b4620363a1ace26dd metadata.xml 159
 RMD160 54af1e9a61e5ed1b49b2bbbf3ef2278999c66b13 metadata.xml 159
@@ -17,10 +18,3 @@ SHA256 ed3a0d440cfa5672284f4172ebde0ea6506c1a38e9a3ed9f14f3d2c093aac42f metadata
 MD5 616022f4918d0ed4fd0e0f24a1ad7529 files/digest-rtl8187-1.10 61
 RMD160 ed2adf898c4ba79ca4f7b227964bb0f4790fbbf1 files/digest-rtl8187-1.10 61
 SHA256 54ddbd20e4c4b656a5230dc8e11b91ddcf994ff11250b18d777a108e3ed524b7 files/digest-rtl8187-1.10 61
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
-
-iD8DBQFEg/zmNJowsmZ/PzARAvILAJ4nREyndUTaPyMNs6pd61KppKTaqQCgnIMu
-BSfHIxoJvsCr32nDSXyABTM=
-=UujT
------END PGP SIGNATURE-----
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() {