From 67679acbd79075eafdc3fd277ce55d3071ff521c Mon Sep 17 00:00:00 2001 From: Roy Marples Date: Thu, 23 Nov 2006 14:53:03 +0000 Subject: [PATCH] Drop the eeprom USE flag and build the module when any pci devices are built. Package-Manager: portage-2.1.2_rc2-r1 --- net-wireless/rt2x00/ChangeLog | 5 ++++- net-wireless/rt2x00/Manifest | 16 ++++++++-------- net-wireless/rt2x00/rt2x00-9999.ebuild | 15 +++++++++------ 3 files changed, 21 insertions(+), 15 deletions(-) diff --git a/net-wireless/rt2x00/ChangeLog b/net-wireless/rt2x00/ChangeLog index 1704d7477dce..2fb5044b2149 100644 --- a/net-wireless/rt2x00/ChangeLog +++ b/net-wireless/rt2x00/ChangeLog @@ -1,6 +1,9 @@ # 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.17 2006/11/17 20:08:46 uberlord Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/rt2x00/ChangeLog,v 1.18 2006/11/23 14:53:03 uberlord Exp $ + + 23 Nov 2006; Roy Marples rt2x00-9999.ebuild: + Drop the eeprom USE flag and build the module when any pci devices are built. 17 Nov 2006; Roy Marples rt2x00-9999.ebuild: Add eeprom USE flag for reading EEPROM settings from PCI cards. diff --git a/net-wireless/rt2x00/Manifest b/net-wireless/rt2x00/Manifest index 95289167c9e0..d8c1b57b4f09 100644 --- 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 3593 RMD160 7df1f828b0ffcbc0909fe244b81155fe3cf5d0c4 SHA1 bdb58701248ccab0356f8c9bccdc5dd75c601b42 SHA256 e642eaf8a7d87503a7fd2b5df06fd559cd506d01696d6f5b1d509a5f6da1b6f9 -MD5 7c60a60f06b3c50a228d59c7f85ce9d9 rt2x00-9999.ebuild 3593 -RMD160 7df1f828b0ffcbc0909fe244b81155fe3cf5d0c4 rt2x00-9999.ebuild 3593 -SHA256 e642eaf8a7d87503a7fd2b5df06fd559cd506d01696d6f5b1d509a5f6da1b6f9 rt2x00-9999.ebuild 3593 -MISC ChangeLog 3007 RMD160 7ac0a897ffffda54bdb3f91dc7c5cbf300d08b86 SHA1 238670fb36e97b416efb373530f5554922c8ed84 SHA256 c6d025170b572f0b20eaa2988f02b14ba6bcb10de3ffc063cec3fd91102dbcbb -MD5 5f0e137e2ac077522d29ee4a1532f89d ChangeLog 3007 -RMD160 7ac0a897ffffda54bdb3f91dc7c5cbf300d08b86 ChangeLog 3007 -SHA256 c6d025170b572f0b20eaa2988f02b14ba6bcb10de3ffc063cec3fd91102dbcbb ChangeLog 3007 +EBUILD rt2x00-9999.ebuild 3776 RMD160 b527850d763cff97ee4984b24dfc87a8afd6b200 SHA1 98eca9a8ccd259a009d96800603692bd6a445a52 SHA256 e97a6947949eb2918249b5f68eced22b4b1f1da420e04306b855f806de2c8c40 +MD5 a0607d24cbf9d3ac8449c2848aa8739f rt2x00-9999.ebuild 3776 +RMD160 b527850d763cff97ee4984b24dfc87a8afd6b200 rt2x00-9999.ebuild 3776 +SHA256 e97a6947949eb2918249b5f68eced22b4b1f1da420e04306b855f806de2c8c40 rt2x00-9999.ebuild 3776 +MISC ChangeLog 3157 RMD160 2581b58b9d5c60ac8a9ce3f1ceba8bf99caa3092 SHA1 513784291395036cb6b724c47654dd645fe41834 SHA256 d10925978c7f0bda3b24f2c02f68dd52881032a513e8f67dcca1be0ea5906087 +MD5 8ddd58cc4867ec4756a27c5883fad975 ChangeLog 3157 +RMD160 2581b58b9d5c60ac8a9ce3f1ceba8bf99caa3092 ChangeLog 3157 +SHA256 d10925978c7f0bda3b24f2c02f68dd52881032a513e8f67dcca1be0ea5906087 ChangeLog 3157 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 7eb413d4a705..90894aec0f07 100644 --- a/net-wireless/rt2x00/rt2x00-9999.ebuild +++ b/net-wireless/rt2x00/rt2x00-9999.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/rt2x00/rt2x00-9999.ebuild,v 1.16 2006/11/17 20:08:46 uberlord Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/rt2x00/rt2x00-9999.ebuild,v 1.17 2006/11/23 14:53:03 uberlord Exp $ inherit linux-mod cvs @@ -16,7 +16,7 @@ KEYWORDS="-* ~amd64 ~x86" RDEPEND="net-wireless/wireless-tools" IUSE_RT2X00_DEVICES="rt2400pci rt2500pci rt2500usb rt61pci rt73usb" -IUSE_RT2X00_EXTRA="eeprom rfkill" +IUSE_RT2X00_EXTRA="rfkill" IUSE="asm debug" for x in ${IUSE_RT2X00_DEVICES} ${IUSE_RT2X00_EXTRA} ; do @@ -89,16 +89,19 @@ src_compile() { MODULE_NAMES="${MODULE_NAMES} crc-itu-t(rt2x00:)" fi + # rt2400pci, rt2500pci and rt61pci require the EEPROM module + if use rt2400pci || use rt2500pci || use rt61pci ; then + echo "CONFIG_EEPROM_93CX6=y" >> config + echo "CONFIG_EEPROM_93CX6_ASM=${asm}" >> config + MODULE_NAMES="${MODULE_NAMES} eeprom_93cx6(rt2x00:)" + fi + for m in d80211 ${IUSE_RT2X00_EXTRA} ${IUSE_RT2X00_DEVICES} ; do local yn="n" M=$(echo "${m}" | tr '[:lower:]' '[:upper:]') if [[ ${m} == "d80211" || ${full} == "y" ]] || use "${m}" ; then yn="y" fi - if [[ ${m} == "eeprom" ]] ; then - m="eeprom_93cx6" - M="EEPROM_93CX6" - fi echo "CONFIG_${M}=${yn}" >> config echo "CONFIG_${M}_ASM=${asm}" >> config echo "CONFIG_${M}_DEBUG=${debug}" >> config -- 2.26.2