Don't use config.h on 2.6.19 kernels, fixes #154652 thanks to Bernd

Steinhauser.
Package-Manager: portage-2.1.2_rc2-r4

diff --git a/net-wireless/rt2500/ChangeLog b/net-wireless/rt2500/ChangeLog
index 2ed9b3e378717578c0f7760871ddd85315aeb6e2..c70c8b1d98725e239b24cdb2f5ebfcddfd698c3a 100644 (file)
--- a/net-wireless/rt2500/ChangeLog
+++ b/net-wireless/rt2500/ChangeLog
@@ -1,6 +1,10 @@
 # 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.33 2006/11/19 16:55:29 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/rt2500/ChangeLog,v 1.34 2006/12/03 20:33:00 uberlord Exp $
+
+  03 Dec 2006; Roy Marples <uberlord@gentoo.org> rt2500-1.1.0_beta4.ebuild:
+  Don't use config.h on 2.6.19 kernels, fixes #154652 thanks to Bernd
+  Steinhauser.
 
   19 Nov 2006; Guy Martin <gmsoft@gentoo.org> rt2500-1.1.0_beta4.ebuild:
   Stable on hppa.

diff --git a/net-wireless/rt2500/Manifest b/net-wireless/rt2500/Manifest
index 2e6cc811c64e67149eef37fc693564fc52cc89f0..19d66e29f1e916b82062d5876505f42a7c4c8f2c 100644 (file)
--- a/net-wireless/rt2500/Manifest
+++ b/net-wireless/rt2500/Manifest
@@ -4,14 +4,14 @@ EBUILD rt2500-1.1.0_beta3.ebuild 2213 RMD160 f9cbe834869600e3a2b078123ba5ca3dfae
 MD5 ed395a96f4daa4a9b40895927315ee40 rt2500-1.1.0_beta3.ebuild 2213
 RMD160 f9cbe834869600e3a2b078123ba5ca3dfaed99ba rt2500-1.1.0_beta3.ebuild 2213
 SHA256 1ef09bc098c919e7b913c1a7e67c3858b62f1ffc863474a71f836701666f595d rt2500-1.1.0_beta3.ebuild 2213
-EBUILD rt2500-1.1.0_beta4.ebuild 1415 RMD160 10358cf8a632be8acb79ef0d4607d8bc9bd55330 SHA1 caae7b0ba1204ccad0f531252e18c44ef30cc418 SHA256 53f6568538c18981ea8c8e1ba5f8df277399a5628033110d54419b65d4a64415
-MD5 c540ccfea81d8e8ac0b54360bb25303d rt2500-1.1.0_beta4.ebuild 1415
-RMD160 10358cf8a632be8acb79ef0d4607d8bc9bd55330 rt2500-1.1.0_beta4.ebuild 1415
-SHA256 53f6568538c18981ea8c8e1ba5f8df277399a5628033110d54419b65d4a64415 rt2500-1.1.0_beta4.ebuild 1415
-MISC ChangeLog 5805 RMD160 e68572044e19ee6f481eb85788a9f409acd510d9 SHA1 54c7001afd16ebe600f88d147df2797e47993144 SHA256 6ea4c8ea225a12e2578aaeb9ae9dd3e99c90a3f564524c309ccd3d94cf0e6860
-MD5 803406c3584f87a54ec45dd8bccfa858 ChangeLog 5805
-RMD160 e68572044e19ee6f481eb85788a9f409acd510d9 ChangeLog 5805
-SHA256 6ea4c8ea225a12e2578aaeb9ae9dd3e99c90a3f564524c309ccd3d94cf0e6860 ChangeLog 5805
+EBUILD rt2500-1.1.0_beta4.ebuild 1570 RMD160 84bf6fabd536886d6f926f09ba758bab014900e4 SHA1 9a6e67b22fec29f6545118b42afabc77bbe0e39e SHA256 b4a7738cc52e17a2bf71f5110b82f84cf7afa460f788045ff8e23de3e72f5ba5
+MD5 6080c6c62e0f26a406becffaa0dc94fb rt2500-1.1.0_beta4.ebuild 1570
+RMD160 84bf6fabd536886d6f926f09ba758bab014900e4 rt2500-1.1.0_beta4.ebuild 1570
+SHA256 b4a7738cc52e17a2bf71f5110b82f84cf7afa460f788045ff8e23de3e72f5ba5 rt2500-1.1.0_beta4.ebuild 1570
+MISC ChangeLog 5969 RMD160 375424955f70e6d9e557f5dc3d8d85f792808fe8 SHA1 2905e973dbfd2cdb336ca1cc381fba8950ddd28a SHA256 de507e979ca467a82cf8c205de7cf324002a70d84cb0f2320b2ba31c1956968e
+MD5 a2d2fc0d3072e4311dcb5644b4562571 ChangeLog 5969
+RMD160 375424955f70e6d9e557f5dc3d8d85f792808fe8 ChangeLog 5969
+SHA256 de507e979ca467a82cf8c205de7cf324002a70d84cb0f2320b2ba31c1956968e ChangeLog 5969
 MISC metadata.xml 344 RMD160 2f79bcc1b00bc5044034f74427538a1c0829f408 SHA1 7ab30e72fdf815e078229880fc82e4816b0277df SHA256 315758d6bea25daed93d8dafff181b2ec3d5b759d77724d7b31efb2ba59cdeb4
 MD5 2b5e62280e51f48cf22deee6f03a7fa4 metadata.xml 344
 RMD160 2f79bcc1b00bc5044034f74427538a1c0829f408 metadata.xml 344

diff --git a/net-wireless/rt2500/rt2500-1.1.0_beta4.ebuild b/net-wireless/rt2500/rt2500-1.1.0_beta4.ebuild
index 2163494e74af9778385b50188d2f3eb37ed8b767..8514610e9b1d41a064c8597762c0295d86a0cf29 100644 (file)
--- a/net-wireless/rt2500/rt2500-1.1.0_beta4.ebuild
+++ b/net-wireless/rt2500/rt2500-1.1.0_beta4.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_beta4.ebuild,v 1.5 2006/11/19 16:55:29 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/rt2500/rt2500-1.1.0_beta4.ebuild,v 1.6 2006/12/03 20:33:00 uberlord Exp $
 
 inherit eutils linux-mod kde-functions
 set-qtdir 3
@@ -32,6 +32,15 @@ pkg_setup() {
        fi
 }
 
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
+
+       if kernel_is ge 2 6 19 ; then
+               sed -i -e '/^#include <linux\/config.h> .*/ d' Module/rt_config.h || die
+       fi
+}
+
 src_compile() {
        linux-mod_src_compile