Change from USE flags to USE_EXPAND stuff.

(Portage version: 2.1.1_pre4-r1)

2 files changed, 30 insertions, 22 deletions

diff --git a/net-wireless/rt2x00/ChangeLog b/net-wireless/rt2x00/ChangeLog
index a62adc12ec72..3362a78f6100 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.10 2006/08/01 12:56:21 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/rt2x00/ChangeLog,v 1.11 2006/08/02 12:00:14 uberlord Exp $
+
+  02 Aug 2006; Roy Marples <uberlord@gentoo.org> rt2x00-9999.ebuild:
+  Change from USE flags to USE_EXPAND stuff.
 
   01 Aug 2006; Roy Marples <uberlord@gentoo.org> rt2x00-9999.ebuild:
   Allow drivers to be built by USE flags thanks to Guillaume Pujol, #139982.
diff --git a/net-wireless/rt2x00/rt2x00-9999.ebuild b/net-wireless/rt2x00/rt2x00-9999.ebuild
index 9a66149362f8..478552bebba4 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.8 2006/08/01 12:56:21 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/rt2x00/rt2x00-9999.ebuild,v 1.9 2006/08/02 12:00:14 uberlord Exp $
 
 inherit linux-mod cvs
 
@@ -15,9 +15,13 @@ ECVS_LOCALNAME="${P}"
 KEYWORDS="-* ~amd64 ~x86"
 RDEPEND="net-wireless/wireless-tools"
 
-MODULES="D80211 RFKILL RT2400PCI RT2500PCI RT2500USB RT61PCI RT73USB"
-MODULES_USE="rfkill rt2400 rt2500 rt61 rt73"
-IUSE="asm debug ${MODULES_USE}"
+IUSE_RT2X00_DEVICES="rt2400pci rt2500pci rt2500usb rt61pci rt73usb"
+IUSE_RT2X00_EXTRA="rfkill"
+IUSE="debug"
+
+for x in ${IUSE_RT2X00_DEVICES} ${IUSE_RT2X00_EXTRA} ; do
+	IUSE="${IUSE} rt2x00_devices_${x}"
+done
 
 pkg_setup() {
 	CONFIG_CHECK="NET_RADIO"
@@ -28,19 +32,21 @@ pkg_setup() {
 	ERROR_CRYPTO_AES="${P} requires support for AES Cryptography (CONFIG_CRYPTO_AES)."
 	ERROR_CRYPTO_MICHAEL_MIC="${P} requires support for Michael MIC Cryptography (CONFIG_CRYPTO_MICHAEL_MIC)."
 
-	if use rfkill ; then
+	if use rt2x00_devices_rfkill ; then
 		CONFIG_CHECK="${CONFIG_CHECK} INPUT"
 	fi
 
-	if use rt2400 || use rt2500 || use rt61 ; then
+	if use rt2x00_devices_rt2400pci \
+		|| use rt2x00_devices_rt2500pci \
+		|| use rt2x00_devices_rt61pci ; then
 		CONFIG_CHECK="${CONFIG_CHECK} PCI"
 	fi
 
-	if use rt2500 || use rt73 ; then
+	if use rt2x00_devices_rt2500usb || use rt2x00_devices_rt73usb ; then
 		CONFIG_CHECK="${CONFIG_CHECK} USB"
 	fi
 
-	if use rt61 || use rt73 ; then
+	if use rt2x00_devices_rt61pci || use rt2x00_devices_rt73usb ; then
 		CONFIG_CHECK="${CONFIG_CHECK} FW_LOADER"
 		ERROR_FW_LOADER="${P} requires support for Firmware module loading (CONFIG_FW_LOADER)."
 	fi
@@ -52,19 +58,18 @@ pkg_setup() {
 }
 
 src_compile() {
-	local m= asm="n" button="n" debug="n" full="y" yn= M=
+	local m= button="n" debug="n" full="y" yn= M=
 
-	for m in ${MODULES_USE} ; do
-		if use "${m}" ; then
+	for m in ${IUSE_RT2X00_DEVICES} ; do
+		if use "rt2x00_devices_${m}" ; then
 			full="n"
 			break
 		fi
 	done
 
 	if [[ ${full} == "n" ]] ; then
-		use asm && asm="y"
 		use debug && debug="y"
-		use rfkill && button="y"
+		use rt2x00_devices_rfkill && button="y"
 	else
 		ewarn "No module specified in USE flags - building everything."
 		button="y"
@@ -75,26 +80,26 @@ src_compile() {
 	# Generate the config file now
 	echo "# Config file generated by portage" > config
 
-	for M in ${MODULES} ; do
-		local yn="n" m=$(echo "${M}" | tr '[:upper:]' '[:lower:]')
-		local um="${m//pci/}"
-		um="${um//usb/}"
+	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 "${um}" ; then
+		if [[ ${m} == "d80211" || ${full} == "y" ]] \
+			|| use "rt2x00_devices_${m}" ; then
 			yn="y"
 		fi
 		echo "CONFIG_${M}=${yn}" >> config
-		echo "CONFIG_${M}_ASM=${asm}" >> config
+		echo "CONFIG_${M}_ASM=n" >> config
 		echo "CONFIG_${M}_DEBUG=${debug}" >> config
 		echo "CONFIG_${M}_BUTTON=${button}" >> config
 
-		if [[ ${M} != "D80211" && ${yn} == "y" ]] ; then
+		if [[ ${m} != "d80211" && ${yn} == "y" ]] ; then
 			MODULE_NAMES="${MODULE_NAMES} ${m}(rt2x00:)"
 		fi
 	done
 
 	# RT61 and RT73 require CONFIG_CRC_ITU_T
-	if use rt61 || use rt73 ; then
+	if [[ ${full} == "y" ]] || \
+		use rt2x00_devices_rt61pci || use rt2x00_devices_rt73usb ; then
 		echo "CONFIG_CRC_ITU_T=y" >> config
 	fi