Fix gcc-4.1 compiling, bug 129493, remove old

Package-Manager: portage-2.1_pre7-r5

7 files changed, 27 insertions, 153 deletions

diff --git a/net-wireless/rt2500/ChangeLog b/net-wireless/rt2500/ChangeLog
index eeb1582b4e11..ef749e61ce9d 100644
--- a/net-wireless/rt2500/ChangeLog
+++ b/net-wireless/rt2500/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-wireless/rt2500
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/rt2500/ChangeLog,v 1.24 2006/04/08 13:29:56 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/rt2500/ChangeLog,v 1.25 2006/04/13 22:34:01 genstef Exp $
+
+  13 Apr 2006; Stefan Schweizer <genstef@gentoo.org> -files/RT2500STA.dat,
+  -files/rt2500-pci_name.patch, -rt2500-1.1.0_beta2-r2.ebuild,
+  rt2500-1.1.0_beta3.ebuild:
+  Fix gcc-4.1 compiling, bug 129493, remove old
 
   08 Apr 2006; Tobias Scherbaum <dertobi123@gentoo.org>
   rt2500-1.1.0_beta3.ebuild:
diff --git a/net-wireless/rt2500/Manifest b/net-wireless/rt2500/Manifest
index d99c98f5fbe9..3f7138752a4b 100644
--- a/net-wireless/rt2500/Manifest
+++ b/net-wireless/rt2500/Manifest
@@ -1,24 +1,22 @@
-MD5 1960fc6f7068eca35d23f0677a584149 ChangeLog 4545
-RMD160 6452df16bd0b3f1b4e098fe8872e302c838cdb4f ChangeLog 4545
-SHA256 e2a48ff02f6e0aed1b2a2f5cf40a915f6270afda3612e6f9b98f683bdee1ca97 ChangeLog 4545
-MD5 28767d6404477b9c63e2c217c5ff6251 files/RT2500STA.dat 1198
-RMD160 760d9bcf1ffb31e612a6babead2787319f0459ff files/RT2500STA.dat 1198
-SHA256 368c4f0f5b70c0c3418bc8edb20be9b63e194966eb83e7ef0af2c0705abc2319 files/RT2500STA.dat 1198
-MD5 be67436a50730a2852ae1b401ef49944 files/digest-rt2500-1.1.0_beta2-r2 67
-RMD160 574b078ba7238d1941c381ea3f87a578de0eed79 files/digest-rt2500-1.1.0_beta2-r2 67
-SHA256 b7fe606b0c6237d327ef430e62019c9c40f09d6af6117f269a3ef782582304eb files/digest-rt2500-1.1.0_beta2-r2 67
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 5b0e90ef8c51130f426bd6e34d226bbd ChangeLog 4758
+RMD160 513f82584d366e2b7e499d1b9d6ddae13064590e ChangeLog 4758
+SHA256 64936930e5678c2218e012296984fee68f4b26788e8c5e91f9697c2c36bbb6fa ChangeLog 4758
 MD5 1eba87ff882304a6590560106a517627 files/digest-rt2500-1.1.0_beta3 67
 RMD160 ef2def0e72fdda7a320a7245764e948d33307729 files/digest-rt2500-1.1.0_beta3 67
 SHA256 f3d043625178dc42ec8ef119efd9233c32be9ceca17445a795f6c83b3fa1f101 files/digest-rt2500-1.1.0_beta3 67
-MD5 bf677ef3011aa4643268cda820eb2e3a files/rt2500-pci_name.patch 679
-RMD160 b7250ea69731392676f7de761d7baa4fbf6025ed files/rt2500-pci_name.patch 679
-SHA256 a476650353ed9f78f1ae4fa55e19c5c9a0fd96609100aca5f81a01646bac4d4a files/rt2500-pci_name.patch 679
 MD5 3998c8189d77acb76d9ff6cc0f54b8eb metadata.xml 318
 RMD160 eb4aa53f6cfed65d48dec9b87e0f83d478211a54 metadata.xml 318
 SHA256 ad618f94828645afcd5850d1ece6eab67648591d5eafa375c1861ffa1b8d0da8 metadata.xml 318
-MD5 c4add4c4fe4199730b0054f0508b24b0 rt2500-1.1.0_beta2-r2.ebuild 1827
-RMD160 e8cd0c2df59ad173c474755b71f8f25ffd79f168 rt2500-1.1.0_beta2-r2.ebuild 1827
-SHA256 9ec31852ecd336b5df89444d3b2579580042939f203662671e39ababc0082069 rt2500-1.1.0_beta2-r2.ebuild 1827
-MD5 54474046fd48b5e1dff8bf7ca1340cda rt2500-1.1.0_beta3.ebuild 1928
-RMD160 a50b8074e032a95899c27396317fef43f0ee8565 rt2500-1.1.0_beta3.ebuild 1928
-SHA256 8fca846d95a0c6ca0d8484c008c6ae433b5eece0eef684b90f47815e7530f0de rt2500-1.1.0_beta3.ebuild 1928
+MD5 3ee0eee21a3983abad12359240fd810c rt2500-1.1.0_beta3.ebuild 2209
+RMD160 d20f4bcfcf3ab865baf6fcaac3fe5479329a12dd rt2500-1.1.0_beta3.ebuild 2209
+SHA256 dda53c775cb9d2813d1e28e39521265c17e1fee229cc14ba0a0d2d35e60201b7 rt2500-1.1.0_beta3.ebuild 2209
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2.2 (GNU/Linux)
+
+iD8DBQFEPtHxNJowsmZ/PzARAmc1AJ9td5Kaz8ZxkBV0VCP3/nCdSa6geACZAV42
+W4zzDlJp3hxavUSQjUQ4rIs=
+=gspN
+-----END PGP SIGNATURE-----
diff --git a/net-wireless/rt2500/files/RT2500STA.dat b/net-wireless/rt2500/files/RT2500STA.dat
deleted file mode 100644
index 6957dcba2ddc..000000000000
--- a/net-wireless/rt2500/files/RT2500STA.dat
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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/files/digest-rt2500-1.1.0_beta2-r2 b/net-wireless/rt2500/files/digest-rt2500-1.1.0_beta2-r2
deleted file mode 100644
index 99e321716f96..000000000000
--- a/net-wireless/rt2500/files/digest-rt2500-1.1.0_beta2-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8846a055cd05bf71af96645637e5a2d1 rt2500-1.1.0-b2.tar.gz 293702
diff --git a/net-wireless/rt2500/files/rt2500-pci_name.patch b/net-wireless/rt2500/files/rt2500-pci_name.patch
deleted file mode 100644
index b4fd2813c41e..000000000000
--- a/net-wireless/rt2500/files/rt2500-pci_name.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-This patch was pulled from rt2500 cvs by Ulrich Plate <plate@gentoo.org>
-to fix http://bugs.gentoo.org/show_bug.cgi?id=85079
-
-It fixes kernel changes in kernels >2.6.11
-
---- rt2500-1.1.0/Module/rtmp_main.c.orig	2005-05-18 09:22:51.000000000 +0200
-+++ rt2500-1.1.0/Module/rtmp_main.c	2005-05-18 09:23:12.000000000 +0200
-@@ -100,7 +100,7 @@
- 

-     printk("%s %s %s http://rt2x00.serialmonkey.com\n", KERN_INFO DRV_NAME, DRV_VERSION, DRV_RELDATE);

- 

--    print_name = pPci_Dev ? pPci_Dev->slot_name : "rt2500";

-+    print_name = pPci_Dev ? pci_name(pPci_Dev) : "rt2500";

- 

-     // alloc_etherdev() will set net_dev->name

-     net_dev = alloc_etherdev(sizeof(RTMP_ADAPTER));

diff --git a/net-wireless/rt2500/rt2500-1.1.0_beta2-r2.ebuild b/net-wireless/rt2500/rt2500-1.1.0_beta2-r2.ebuild
deleted file mode 100644
index 5f584700e65a..000000000000
--- a/net-wireless/rt2500/rt2500-1.1.0_beta2-r2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# 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.8 2005/10/09 16:48:12 genstef Exp $
-
-inherit eutils linux-mod kde-functions
-set-qtdir 3
-
-MY_P="${P/_beta/-b}"
-DESCRIPTION="Driver for the RaLink RT2500 wireless chipset"
-HOMEPAGE="http://rt2x00.serialmonkey.com"
-SRC_URI="http://rt2x00.serialmonkey.com/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="qt"
-DEPEND="net-wireless/wireless-tools
-	qt? ( =x11-libs/qt-3* )"
-
-S=${WORKDIR}/${MY_P/-b*}
-MODULE_NAMES="rt2500(net:${S}/Module)"
-CONFIG_CHECK="NET_RADIO BROKEN_ON_SMP !4KSTACKS"
-SMP_ERROR="SMP Processors and Kernels are currently not supported"
-MODULESD_RT2500_ALIASES=('ra? rt2500')
-
-
-pkg_setup() {
-	linux-mod_pkg_setup
-	if use_m
-	then BUILD_PARAMS="-C ${KV_DIR} M=${S}/Module"
-		 BUILD_TARGETS="modules"
-	else die "please use a kernel >=2.6.6"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	kernel_is ge 2 6 12 && epatch ${FILESDIR}/rt2500-pci_name.patch
-}
-
-src_compile() {
-	if useq qt; then
-		cd ${S}/Utilitys
-		${QTDIR}/bin/qmake -o Makefile raconfig2500.pro
-		emake || die "make Utilities failed"
-	fi
-
-	linux-mod_src_compile
-}
-
-src_install() {
-	linux-mod_src_install
-
-	use qt && dobin ${S}/Utilitys/RaConfig2500
-
-	insinto /etc/Wireless/RT2500STA
-	doins ${FILESDIR}/RT2500STA.dat
-
-	dodoc Module/README Module/iwpriv_usage.txt LICENSE FAQ CHANGELOG
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	einfo "to set up the card you can use:"
-	einfo "- iwconfig from wireless-tools"
-	einfo "- iwpriv, like described in \"/usr/share/doc/${PF}/iwpriv_usage.txt.gz"\"
-	einfo "- /etc/Wireless/RT2500STA/RT2500STA.dat, like described in \"/usr/share/doc/${PF}/README.gz\""
-	einfo "- RT2500 provided qt API: RaConfig2500"
-}
diff --git a/net-wireless/rt2500/rt2500-1.1.0_beta3.ebuild b/net-wireless/rt2500/rt2500-1.1.0_beta3.ebuild
index 5406baff6956..a35a8926da60 100644
--- a/net-wireless/rt2500/rt2500-1.1.0_beta3.ebuild
+++ b/net-wireless/rt2500/rt2500-1.1.0_beta3.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/rt2500/rt2500-1.1.0_beta3.ebuild,v 1.8 2006/04/08 13:29:56 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/rt2500/rt2500-1.1.0_beta3.ebuild,v 1.9 2006/04/13 22:34:01 genstef Exp $
 
 inherit eutils linux-mod kde-functions
 set-qtdir 3
@@ -35,6 +35,10 @@ pkg_setup() {
 src_compile() {
 	sed -i "s:#if RT2500_DBG:#ifdef RT2500_DBG:" Module/oid.h || die "sed failed"
 
+	# Fix module parameter registration
+	sed -i 's:MODULE_PARM(debug, "i"):module_param(debug, int, 0):'	Module/rtmp_main.c || die "module parameter sed failed"
+	sed -i 's:MODULE_PARM(ifname, "s"):module_param(ifname, charp, 0):'	Module/rtmp_main.c || die "module parameter sed failed"
+
 	if use qt; then
 		cd ${S}/Utilitys
 		${QTDIR}/bin/qmake -o Makefile raconfig2500.pro