Fix compile problem with newer kernels thanks to Nuno Alexandre <ikaro@fluxbox.org> and Ulrich Plate <plate@gentoo.org> and Henning Ryll <henning.ryll@web.de> in bug 85079

Package-Manager: portage-1.589-cvs

5 files changed, 86 insertions, 2 deletions

diff --git a/net-wireless/rt2500/ChangeLog b/net-wireless/rt2500/ChangeLog
index 2a62ced10ccb..3201e10ed109 100644
--- a/net-wireless/rt2500/ChangeLog
+++ b/net-wireless/rt2500/ChangeLog
@@ -1,6 +1,14 @@
 # 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.7 2005/03/05 07:22:16 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/rt2500/ChangeLog,v 1.8 2005/05/18 07:30:23 genstef Exp $
+
+*rt2500-1.1.0_beta2-r1 (18 May 2005)
+
+  18 May 2005; Stefan Schweizer <genstef@gentoo.org>
+  +files/rt2500-pci_name.patch, +rt2500-1.1.0_beta2-r1.ebuild:
+  Fix compile problem with newer kernels thanks to Nuno Alexandre
+  <ikaro@fluxbox.org> and Ulrich Plate <plate@gentoo.org> and Henning Ryll
+  <henning.ryll@web.de> in bug 85079
 
   05 Mar 2005; Stefan Schweizer <genstef@gentoo.org>
   rt2500-1.1.0_beta2.ebuild:
diff --git a/net-wireless/rt2500/Manifest b/net-wireless/rt2500/Manifest
index 8c2ec301858a..fda9e63c238f 100644
--- a/net-wireless/rt2500/Manifest
+++ b/net-wireless/rt2500/Manifest
@@ -1,6 +1,9 @@
+MD5 9f8a6a463b8d045e385604cdb01f460f rt2500-1.1.0_beta2-r1.ebuild 1293
 MD5 e0be6f7307b60c849c6766f25c06ce99 rt2500-1.1.0_beta1-r1.ebuild 1167
 MD5 1cf11c341b5fe0534ebb595217aff131 rt2500-1.1.0_beta2.ebuild 1185
-MD5 a6615a1df9b99321c4b0961ae71ae69c ChangeLog 1557
+MD5 34cd5b3898f937756950f30b2ffe0037 ChangeLog 1890
 MD5 19fd766bac8e110b4620363a1ace26dd metadata.xml 159
+MD5 bf677ef3011aa4643268cda820eb2e3a files/rt2500-pci_name.patch 679
 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/digest-rt2500-1.1.0_beta2-r1 b/net-wireless/rt2500/files/digest-rt2500-1.1.0_beta2-r1
new file mode 100644
index 000000000000..99e321716f96
--- /dev/null
+++ b/net-wireless/rt2500/files/digest-rt2500-1.1.0_beta2-r1
@@ -0,0 +1 @@
+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
new file mode 100644
index 000000000000..b4fd2813c41e
--- /dev/null
+++ b/net-wireless/rt2500/files/rt2500-pci_name.patch
@@ -0,0 +1,16 @@
+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-r1.ebuild b/net-wireless/rt2500/rt2500-1.1.0_beta2-r1.ebuild
new file mode 100644
index 000000000000..fdab950bc3ea
--- /dev/null
+++ b/net-wireless/rt2500/rt2500-1.1.0_beta2-r1.ebuild
@@ -0,0 +1,56 @@
+# 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-r1.ebuild,v 1.1 2005/05/18 07:30:23 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="~x86 ~amd64"
+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"
+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
+		qmake -o Makefile raconfig2500.pro
+		emake || die "make Utilities failed"
+	fi
+
+	linux-mod_src_compile
+}
+
+src_install() {
+	linux-mod_src_install
+
+	useq qt && dobin ${S}/Utilitys/RaConfig2500
+
+	dodoc Module/README Module/iwpriv_usage.txt LICENSE FAQ CHANGELOG
+}