Added ebuild patch from Ivo van Doorn <ivdoorn@gmail.com> to work with CVS changes

Package-Manager: portage-2.1.2-r11

diff --git a/net-wireless/rt2x00/ChangeLog b/net-wireless/rt2x00/ChangeLog
index 71d50a070846fee1e82732e3dc459a70b2d41c44..ea22a8a5d4b7fbd311f8c6c1d9426cae39f182df 100644 (file)
--- a/net-wireless/rt2x00/ChangeLog
+++ b/net-wireless/rt2x00/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-wireless/rt2x00
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/rt2x00/ChangeLog,v 1.19 2006/12/19 17:22:29 uberlord Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/rt2x00/ChangeLog,v 1.20 2007/02/25 15:47:48 uberlord Exp $
+
+  25 Feb 2007; Roy Marples <uberlord@gentoo.org> rt2x00-9999.ebuild:
+  Added ebuild patch from Ivo van Doorn <ivdoorn@gmail.com> to work with CVS
+  changes
 
   19 Dec 2006; Roy Marples <uberlord@gentoo.org> rt2x00-9999.ebuild:
   debug USE flag now requires CONFIG_DEBUG_FS to be enabled in the kernel.

diff --git a/net-wireless/rt2x00/Manifest b/net-wireless/rt2x00/Manifest
index 39bf00d64386880c397dc1c2c1711a5472eb3a35..a62eef1c6fd04713c15de20bf9ac5f7bb738425a 100644 (file)
--- a/net-wireless/rt2x00/Manifest
+++ b/net-wireless/rt2x00/Manifest
@@ -7,14 +7,14 @@ EBUILD rt2x00-2.0.0_beta3.ebuild 2364 RMD160 7d239e4fcf69dd60a981d5e468eb59cf7da
 MD5 a9ec3d94486babfbf7460a4ba4b9cf64 rt2x00-2.0.0_beta3.ebuild 2364
 RMD160 7d239e4fcf69dd60a981d5e468eb59cf7da0f868 rt2x00-2.0.0_beta3.ebuild 2364
 SHA256 99a2b3805b2902c0fc1730d55ce0007d4aef86ed22943dbfb35e00f163e6911f rt2x00-2.0.0_beta3.ebuild 2364
-EBUILD rt2x00-9999.ebuild 4127 RMD160 c669e08ab247f784b70f4a58adb16ff92d57fee7 SHA1 03e681a119510ce075fe40247095f8de40f94ec0 SHA256 72af65df31e6ef7c9dffbb80cffff8a38adbfb0059a4648957e70e16ef0b0e37
-MD5 1c6a82a8b987a38ffac92de3e85d2ad8 rt2x00-9999.ebuild 4127
-RMD160 c669e08ab247f784b70f4a58adb16ff92d57fee7 rt2x00-9999.ebuild 4127
-SHA256 72af65df31e6ef7c9dffbb80cffff8a38adbfb0059a4648957e70e16ef0b0e37 rt2x00-9999.ebuild 4127
-MISC ChangeLog 3302 RMD160 c49ec4026e4847685f87104d43c66804ca7dc357 SHA1 34046d6021db6345447cdf90f77aa3a171b9d3de SHA256 c707a539c2ff714bc1442e285a2a9dabdcacd87bbbc157f2cde35c19f2efdaa9
-MD5 032e83653762386d1561c1fe97641c51 ChangeLog 3302
-RMD160 c49ec4026e4847685f87104d43c66804ca7dc357 ChangeLog 3302
-SHA256 c707a539c2ff714bc1442e285a2a9dabdcacd87bbbc157f2cde35c19f2efdaa9 ChangeLog 3302
+EBUILD rt2x00-9999.ebuild 4330 RMD160 0b5b42ef2d35d703eec5e44a4d82fcce72ac9567 SHA1 5b6e1a568d6312ddbd25cbddb7e7623e341b0669 SHA256 81e07ca4172967c4862309704508265cab139f455e7be70f156d3e301165aec6
+MD5 438a33b903ec0fed1bf3a05111d57fb8 rt2x00-9999.ebuild 4330
+RMD160 0b5b42ef2d35d703eec5e44a4d82fcce72ac9567 rt2x00-9999.ebuild 4330
+SHA256 81e07ca4172967c4862309704508265cab139f455e7be70f156d3e301165aec6 rt2x00-9999.ebuild 4330
+MISC ChangeLog 3459 RMD160 26aedd13160e8aa1f12c84b86df17760d0d44f6a SHA1 163c5c8c6cd391bef8bd7da9d3841c9a5e11fcc1 SHA256 a800b6c537ea84759ac92cb09b684cb55513f5c0e89057a30e07dccb113234ea
+MD5 082b2361fb232fb4e610e82df778ab0e ChangeLog 3459
+RMD160 26aedd13160e8aa1f12c84b86df17760d0d44f6a ChangeLog 3459
+SHA256 a800b6c537ea84759ac92cb09b684cb55513f5c0e89057a30e07dccb113234ea ChangeLog 3459
 MISC metadata.xml 315 RMD160 ea1a3437291c10800cf4b14aff8dc354474dfabf SHA1 9b94dc5449046ada499b5b23e93f90926a70c52c SHA256 a99d2151b06a4dff601057b3b582bac32c80563c7567eee64bf5b59865eb6bd6
 MD5 d881dd1c4bfd4e45a852f320b5a973c7 metadata.xml 315
 RMD160 ea1a3437291c10800cf4b14aff8dc354474dfabf metadata.xml 315

diff --git a/net-wireless/rt2x00/rt2x00-9999.ebuild b/net-wireless/rt2x00/rt2x00-9999.ebuild
index 475988c038abf1b03cc8f11828ae87536adbf516..c895343504d18315e8944e10576e7766c44337c9 100644 (file)
--- a/net-wireless/rt2x00/rt2x00-9999.ebuild
+++ b/net-wireless/rt2x00/rt2x00-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/rt2x00/rt2x00-9999.ebuild,v 1.18 2006/12/19 17:22:29 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/rt2x00/rt2x00-9999.ebuild,v 1.19 2007/02/25 15:47:48 uberlord Exp $
 
 inherit linux-mod cvs
 
@@ -87,10 +87,15 @@ src_compile() {
        echo "# Config file generated by portage" > config
        MODULE_NAMES="80211(rt2x00:) rc80211_simple(rt2x00:)"
 
+       # Enable the rt2x00lib module
+       echo "CONFIG_RT2X00=y" >> config
+       echo "CONFIG_RT2X00_ASM=${asm}" >> config
+       MODULE_NAMES="${MODULE_NAMES} rt2x00lib(rt2x00:)"
+
        # Enable the new DEBUGFS module
        if use debug ; then
+               echo "CONFIG_RT2X00_DEBUG=y" >> config
                echo "CONFIG_RT2X00_DEBUGFS=y" >> config
-               echo "CONFIG_RT2X00_DEBUGFS_ASM=${asm}" >> config
                MODULE_NAMES="${MODULE_NAMES} rt2x00debug(rt2x00:)"
        fi
 
@@ -98,6 +103,7 @@ src_compile() {
        if [[ ${full} == "y" ]] || \
                use rt61pci || use rt73usb ; then
                echo "CONFIG_CRC_ITU_T=y" >> config
+               echo "CONFIG_CRC_ITU_T_ASM=${asm}" >> config
                MODULE_NAMES="${MODULE_NAMES} crc-itu-t(rt2x00:)"
        fi
 
@@ -108,22 +114,25 @@ src_compile() {
                MODULE_NAMES="${MODULE_NAMES} eeprom_93cx6(rt2x00:)"
        fi
 
-       for m in d80211 ${IUSE_RT2X00_EXTRA} ${IUSE_RT2X00_DEVICES} ; do
+       for m in ${IUSE_RT2X00_EXTRA} ${IUSE_RT2X00_DEVICES} ; do
                local yn="n" M=$(echo "${m}" | tr '[:lower:]' '[:upper:]')
 
-               if [[ ${m} == "d80211" || ${full} == "y" ]] || use "${m}" ; then
+               if [[ ${full} == "y" ]] || use "${m}" ; then
                        yn="y"
                fi
                echo "CONFIG_${M}=${yn}" >> config
-               echo "CONFIG_${M}_ASM=${asm}" >> config
-               echo "CONFIG_${M}_DEBUG=${debug}" >> config
                echo "CONFIG_${M}_BUTTON=${button}" >> config
 
-               if [[ ${m} != "d80211" && ${yn} == "y" ]] ; then
+               if [[ ${yn} == "y" ]] ; then
                        MODULE_NAMES="${MODULE_NAMES} ${m}(rt2x00:)"
                fi
        done
 
+       # D80211 module
+       echo "CONFIG_D80211=y" >> config
+       echo "CONFIG_D80211_DEBUG=${debug}" >> config
+       echo "CONFIG_D80211_ASM=${asm}" >> config
+
        linux-mod_src_compile
 }