Convert RT2500STA.dat to unix format thanks to Kevin Parent <kparent@enersea.net> in bug 98574 and made it fail on SMP kernels thanks to Kevin Parent <kparent@enersea.net> in bug 98578

Package-Manager: portage-1.589-cvs

4 files changed, 60 insertions, 6 deletions

diff --git a/net-wireless/rt2500/ChangeLog b/net-wireless/rt2500/ChangeLog
index 4f2707197579..bc682fd2400a 100644
--- a/net-wireless/rt2500/ChangeLog
+++ b/net-wireless/rt2500/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-wireless/rt2500
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/rt2500/ChangeLog,v 1.12 2005/07/07 05:02:30 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/rt2500/ChangeLog,v 1.13 2005/07/11 17:00:44 genstef Exp $
+
+  11 Jul 2005; Stefan Schweizer <genstef@gentoo.org> +files/RT2500STA.dat,
+  rt2500-1.1.0_beta2-r2.ebuild:
+  Convert RT2500STA.dat to unix format thanks to Kevin Parent
+  <kparent@enersea.net> in bug 98574 and made it fail on SMP kernels thanks to
+  Kevin Parent <kparent@enersea.net> in bug 98578
 
   07 Jul 2005; Caleb Tennis <caleb@gentoo.org> rt2500-1.1.0_beta1-r1.ebuild,
   rt2500-1.1.0_beta2.ebuild, rt2500-1.1.0_beta2-r1.ebuild,
diff --git a/net-wireless/rt2500/Manifest b/net-wireless/rt2500/Manifest
index 400296a930b3..4384700bfe2a 100644
--- a/net-wireless/rt2500/Manifest
+++ b/net-wireless/rt2500/Manifest
@@ -1,10 +1,11 @@
 MD5 20a1097b942e94d9e80d6d3fa931a800 rt2500-1.1.0_beta2-r1.ebuild 1304
 MD5 26597a9b9bdab126ce257819ec773c11 rt2500-1.1.0_beta1-r1.ebuild 1178
 MD5 0be0a88b0eb89eafe13edca01502b1a5 rt2500-1.1.0_beta2.ebuild 1196
-MD5 6cba6f98e36b9a070f7e6d865da0b5e9 rt2500-1.1.0_beta2-r2.ebuild 1719
-MD5 38954f5be56f494bd33187b52d1ab4f6 ChangeLog 2593
+MD5 0ca81eeb3d6add40dc72c043c63fc9e6 rt2500-1.1.0_beta2-r2.ebuild 1807
+MD5 27dac1d78cf4ddf7542aac0fa89160b1 ChangeLog 2894
 MD5 19fd766bac8e110b4620363a1ace26dd metadata.xml 159
 MD5 bf677ef3011aa4643268cda820eb2e3a files/rt2500-pci_name.patch 679
+MD5 28767d6404477b9c63e2c217c5ff6251 files/RT2500STA.dat 1198
 MD5 be67436a50730a2852ae1b401ef49944 files/digest-rt2500-1.1.0_beta2 67
 MD5 a24a553b510e42b038334f8f7c94862f files/digest-rt2500-1.1.0_beta1-r1 67
 MD5 be67436a50730a2852ae1b401ef49944 files/digest-rt2500-1.1.0_beta2-r1 67
diff --git a/net-wireless/rt2500/files/RT2500STA.dat b/net-wireless/rt2500/files/RT2500STA.dat
new file mode 100644
index 000000000000..6957dcba2ddc
--- /dev/null
+++ b/net-wireless/rt2500/files/RT2500STA.dat
@@ -0,0 +1,46 @@
+# Copy this file to /etc/Wireless/RT2500STA/RT2500STA.dat
+# This file is a binary file and will be read on loading rt2500.o module.
+#
+# Use "vi -b RT2500STA.dat" to modify settings according to your need.
+# 
+# 1.) set NetworkType to "Adhoc" for using Adhoc-mode, otherwise using Infrastructure
+# 2.) set Channel to "0" for auto-select on Infrastructure mode
+# 3.) set SSID for connecting to your Accss-point.
+# 4.) AuthMode can be "OPEN", "SHARED", "WPAPSK", "WPANONE"
+# 5.) EncrypType can be "NONE", "WEP", "TKIP", "AES"
+# for more information refer to the Readme file.
+# 
+[Default]
+CountryRegion=0
+WirelessMode=0
+TXBurst=0
+TurboRate=0
+BGProtection=0
+ShortSlot=0
+TxRate=0
+PSMode=CAM
+
+# All parameters below can be set by iwconfig in the if-pre scripts
+# if required or enabled here if you wish
+# Anything enabled here will be used when EVEN the net interface is brought up
+# this will undo any iwconfig pre-up settings.
+
+#SSID=OFFICEWAPG
+#NetworkType=Infra
+#Channel=1
+AuthMode=SHARED
+EncrypType=WEP
+#DefaultKeyID=1
+#Key1Type=0
+#Key1Str=
+#Key2Type=0
+#Key2Str=
+#Key3Type=0
+#Key3Str=
+#Key4Type=0
+#Key4Str=
+#WPAPSK=abcdefghijklmnopqrstuvwxyz
+#RTSThreshold=2312
+#FragThreshold=2312
+PSMode=CAM
+#RFMON=0
diff --git a/net-wireless/rt2500/rt2500-1.1.0_beta2-r2.ebuild b/net-wireless/rt2500/rt2500-1.1.0_beta2-r2.ebuild
index 1399c97f11e2..a097c75b3a0c 100644
--- a/net-wireless/rt2500/rt2500-1.1.0_beta2-r2.ebuild
+++ b/net-wireless/rt2500/rt2500-1.1.0_beta2-r2.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/rt2500/rt2500-1.1.0_beta2-r2.ebuild,v 1.4 2005/07/07 05:02:30 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/rt2500/rt2500-1.1.0_beta2-r2.ebuild,v 1.5 2005/07/11 17:00:44 genstef Exp $
 
 inherit eutils linux-mod kde-functions
 set-qtdir 3
@@ -18,7 +18,8 @@ DEPEND="net-wireless/wireless-tools
 
 S=${WORKDIR}/${MY_P/-b*}
 MODULE_NAMES="rt2500(net:${S}/Module)"
-CONFIG_CHECK="NET_RADIO"
+CONFIG_CHECK="NET_RADIO BROKEN_ON_SMP"
+SMP_ERROR="SMP Processors and Kernels are currently not supported"
 MODULESD_RT2500_ALIASES=('ra? rt2500')
 
 
@@ -53,7 +54,7 @@ src_install() {
 	use qt && dobin ${S}/Utilitys/RaConfig2500
 
 	insinto /etc/Wireless/RT2500STA
-	doins Module/RT2500STA.dat
+	doins ${FILESDIR}/RT2500STA.dat
 
 	dodoc Module/README Module/iwpriv_usage.txt LICENSE FAQ CHANGELOG
 }