Fix use invocation

27 files changed, 135 insertions, 114 deletions

diff --git a/net-wireless/bluez-utils/ChangeLog b/net-wireless/bluez-utils/ChangeLog
index 7993979d6408..8c0a6be4d30c 100644
--- a/net-wireless/bluez-utils/ChangeLog
+++ b/net-wireless/bluez-utils/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-wireless/bluez-utils
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez-utils/ChangeLog,v 1.20 2004/05/27 14:37:22 puggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez-utils/ChangeLog,v 1.21 2004/06/15 03:13:09 agriffis Exp $
+
+  14 Jun 2004; Aron Griffis <agriffis@gentoo.org> bluez-utils-2.3-r1.ebuild,
+  bluez-utils-2.3-r2.ebuild, bluez-utils-2.3.ebuild, bluez-utils-2.5.ebuild,
+  bluez-utils-2.7.ebuild:
+  Fix use invocation
 
 *bluez-utils-2.7 (27 May 2004)
 
diff --git a/net-wireless/bluez-utils/bluez-utils-2.3-r1.ebuild b/net-wireless/bluez-utils/bluez-utils-2.3-r1.ebuild
index 100cefd17180..0d2eba2b9a58 100644
--- a/net-wireless/bluez-utils/bluez-utils-2.3-r1.ebuild
+++ b/net-wireless/bluez-utils/bluez-utils-2.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez-utils/bluez-utils-2.3-r1.ebuild,v 1.10 2004/04/27 22:09:10 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez-utils/bluez-utils-2.3-r1.ebuild,v 1.11 2004/06/15 03:13:09 agriffis Exp $
 
 inherit eutils
 
@@ -40,7 +40,7 @@ src_unpack() {
 	sed -e "s:\$(prefix)/etc/bluetooth:/etc/bluetooth:" \
 		${T}/Makefile.in > hcid/Makefile.in
 
-	if [ ! `use gtk` ]; then
+	if ! use gtk; then
 		mv -f scripts/Makefile.in ${T}/Makefile.in
 		sed -e "s:= bluepin:= :" \
 			${T}/Makefile.in > scripts/Makefile.in
diff --git a/net-wireless/bluez-utils/bluez-utils-2.3-r2.ebuild b/net-wireless/bluez-utils/bluez-utils-2.3-r2.ebuild
index 1134a749fb65..1c12991038b0 100644
--- a/net-wireless/bluez-utils/bluez-utils-2.3-r2.ebuild
+++ b/net-wireless/bluez-utils/bluez-utils-2.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez-utils/bluez-utils-2.3-r2.ebuild,v 1.7 2004/04/27 22:09:11 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez-utils/bluez-utils-2.3-r2.ebuild,v 1.8 2004/06/15 03:13:09 agriffis Exp $
 
 inherit eutils
 
@@ -43,7 +43,7 @@ src_unpack() {
 	sed -e "s:\$(prefix)/etc/bluetooth:/etc/bluetooth:" \
 		${T}/Makefile.in > hcid/Makefile.in
 
-	if [ ! `use gtk` ]; then
+	if ! use gtk; then
 		mv -f scripts/Makefile.in ${T}/Makefile.in
 		sed -e "s:= bluepin:= :" \
 			${T}/Makefile.in > scripts/Makefile.in
@@ -62,7 +62,7 @@ src_install() {
 	sed -e "s:security auto;:security user;:" \
 		-i ${D}/etc/bluetooth/hcid.conf
 
-	if [ -n "`use gtk`" ]; then
+	if use gtk; then
 		sed -e "s:\(pin_helper \).*:\1/usr/bin/bluepin;:" \
 			-i ${D}/etc/bluetooth/hcid.conf
 	else
@@ -84,7 +84,7 @@ pkg_postinst() {
 	einfo "RFComm devices are found in /dev/bluetooh/rfcomm/* instead of /dev/rfcomm*"
 	einfo "If you need to set a default PIN, edit /etc/bluetooth/pin, and change"
 	einfo "/etc/bluetooth/hcid.conf option 'pin_helper' to /etc/bluetooth/pin."
-	if [ -n "`use gtk`" ]; then
+	if use gtk; then
 		einfo "By default, /usr/bin/bluepin will be launched on the desktop display"
 		einfo "for pin number input."
 	fi
diff --git a/net-wireless/bluez-utils/bluez-utils-2.3.ebuild b/net-wireless/bluez-utils/bluez-utils-2.3.ebuild
index 0db5f38ead78..b2d5b1be9ffa 100644
--- a/net-wireless/bluez-utils/bluez-utils-2.3.ebuild
+++ b/net-wireless/bluez-utils/bluez-utils-2.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez-utils/bluez-utils-2.3.ebuild,v 1.5 2004/01/30 16:52:06 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez-utils/bluez-utils-2.3.ebuild,v 1.6 2004/06/15 03:13:09 agriffis Exp $
 
 DESCRIPTION="bluetooth utilities"
 HOMEPAGE="http://bluez.sourceforge.net/"
@@ -30,7 +30,7 @@ src_unpack() {
 	sed -e "s:\$(prefix)/etc/bluetooth:/etc/bluetooth:" \
 		${T}/Makefile.in > hcid/Makefile.in
 
-	if [ ! `use gtk` ]; then
+	if ! use gtk; then
 		mv -f scripts/Makefile.in ${T}/Makefile.in
 		sed -e "s:= bluepin:= :" \
 			${T}/Makefile.in > scripts/Makefile.in
diff --git a/net-wireless/bluez-utils/bluez-utils-2.5.ebuild b/net-wireless/bluez-utils/bluez-utils-2.5.ebuild
index 86bead2d70e8..d45eddc7199f 100644
--- a/net-wireless/bluez-utils/bluez-utils-2.5.ebuild
+++ b/net-wireless/bluez-utils/bluez-utils-2.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez-utils/bluez-utils-2.5.ebuild,v 1.4 2004/05/26 15:43:03 jhuebel Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez-utils/bluez-utils-2.5.ebuild,v 1.5 2004/06/15 03:13:09 agriffis Exp $
 
 inherit eutils
 
@@ -36,7 +36,7 @@ src_unpack() {
 	sed -e "s:\$(prefix)/etc/bluetooth:/etc/bluetooth:" \
 		${T}/Makefile.in > hcid/Makefile.in
 
-	if [ ! `use gtk` ]; then
+	if ! use gtk; then
 		mv -f scripts/Makefile.in ${T}/Makefile.in
 		sed -e "s:= bluepin:= :" \
 			${T}/Makefile.in > scripts/Makefile.in
@@ -55,7 +55,7 @@ src_install() {
 	sed -e "s:security auto;:security user;:" \
 		-i ${D}/etc/bluetooth/hcid.conf
 
-	if [ -n "`use gtk`" ]; then
+	if use gtk; then
 		sed -e "s:\(pin_helper \).*:\1/usr/bin/bluepin;:" \
 			-i ${D}/etc/bluetooth/hcid.conf
 	else
@@ -77,7 +77,7 @@ pkg_postinst() {
 	einfo "RFComm devices are found in /dev/bluetooh/rfcomm/* instead of /dev/rfcomm*"
 	einfo "If you need to set a default PIN, edit /etc/bluetooth/pin, and change"
 	einfo "/etc/bluetooth/hcid.conf option 'pin_helper' to /etc/bluetooth/pin."
-	if [ -n "`use gtk`" ]; then
+	if use gtk; then
 		einfo "By default, /usr/bin/bluepin will be launched on the desktop display"
 		einfo "for pin number input."
 	fi
diff --git a/net-wireless/bluez-utils/bluez-utils-2.7.ebuild b/net-wireless/bluez-utils/bluez-utils-2.7.ebuild
index 4dda6d26d02c..c3cd6428bae7 100644
--- a/net-wireless/bluez-utils/bluez-utils-2.7.ebuild
+++ b/net-wireless/bluez-utils/bluez-utils-2.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez-utils/bluez-utils-2.7.ebuild,v 1.1 2004/05/27 14:23:44 puggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez-utils/bluez-utils-2.7.ebuild,v 1.2 2004/06/15 03:13:09 agriffis Exp $
 
 inherit eutils
 
@@ -38,7 +38,7 @@ src_unpack() {
 	sed -e "s:\$(prefix)/etc/bluetooth:/etc/bluetooth:" \
 		${T}/Makefile.in > hcid/Makefile.in
 
-	if [ ! `use gtk` ]; then
+	if ! use gtk; then
 		mv -f scripts/Makefile.in ${T}/Makefile.in
 		sed -e "s:= bluepin:= :" \
 			${T}/Makefile.in > scripts/Makefile.in
@@ -57,7 +57,7 @@ src_install() {
 	sed -e "s:security auto;:security user;:" \
 		-i ${D}/etc/bluetooth/hcid.conf
 
-	if [ -n "`use gtk`" ]; then
+	if use gtk; then
 		sed -e "s:\(pin_helper \).*:\1/usr/bin/bluepin;:" \
 			-i ${D}/etc/bluetooth/hcid.conf
 	else
@@ -79,7 +79,7 @@ pkg_postinst() {
 	einfo "RFComm devices are found in /dev/bluetooh/rfcomm/* instead of /dev/rfcomm*"
 	einfo "If you need to set a default PIN, edit /etc/bluetooth/pin, and change"
 	einfo "/etc/bluetooth/hcid.conf option 'pin_helper' to /etc/bluetooth/pin."
-	if [ -n "`use gtk`" ]; then
+	if use gtk; then
 		einfo "By default, /usr/bin/bluepin will be launched on the desktop display"
 		einfo "for pin number input."
 	fi
diff --git a/net-wireless/hostap/ChangeLog b/net-wireless/hostap/ChangeLog
index 1c7be0ccb05e..a180344b821b 100644
--- a/net-wireless/hostap/ChangeLog
+++ b/net-wireless/hostap/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-wireless/hostap
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostap/ChangeLog,v 1.19 2004/06/08 21:41:56 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostap/ChangeLog,v 1.20 2004/06/15 03:14:35 agriffis Exp $
+
+  14 Jun 2004; Aron Griffis <agriffis@gentoo.org> hostap-0.0.4.ebuild:
+  Fix use invocation
 
   08 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org> hostap-0.0.1.ebuild,
   hostap-0.0.2-r1.ebuild, hostap-0.0.2.ebuild, hostap-0.0.3-r1.ebuild,
diff --git a/net-wireless/hostap/hostap-0.0.4.ebuild b/net-wireless/hostap/hostap-0.0.4.ebuild
index a01846dfa1f4..49fb4ea1b12b 100644
--- a/net-wireless/hostap/hostap-0.0.4.ebuild
+++ b/net-wireless/hostap/hostap-0.0.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostap/hostap-0.0.4.ebuild,v 1.2 2003/09/07 00:19:18 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostap/hostap-0.0.4.ebuild,v 1.3 2004/06/15 03:14:35 agriffis Exp $
 
 inherit eutils
 
@@ -33,7 +33,7 @@ src_unpack() {
 	check_KV
 	unpack ${P}.tar.gz
 
-	if [ -n "`use pcmcia`" ]; then
+	if use pcmcia; then
 		unpack ${MY_PCMCIA}.tar.gz
 		cd ${WORKDIR}/${MY_PCMCIA}
 		if [ -z "`has_version =sys-apps/pcmcia-cs-3.2.4*`" ]; then
@@ -53,7 +53,7 @@ src_unpack() {
 		-e "s:\$(EXTRA_CFLAGS):\$(EXTRA_CFLAGS) -DPRISM2_HOSTAPD:" \
 		${T}/Makefile > Makefile
 
-	if [ -n "`use pcmcia`" ] || [[ "${HOSTAP_DRIVERS}" == *pccard* ]]; then
+	if use pcmcia || [[ "${HOSTAP_DRIVERS}" == *pccard* ]]; then
 		mv Makefile ${T}
 		sed -e "s:^PCMCIA_PATH=:PCMCIA_PATH=${WORKDIR}/${MY_PCMCIA}:" \
 			${T}/Makefile > Makefile
@@ -92,7 +92,7 @@ src_install() {
 	cp ${S}/driver/modules/{hostap.o,hostap_crypt.o,hostap_crypt_wep.o}\
 		${D}${LIB_PATH}/net/
 
-	if [ -n "`use pcmcia`" ]; then
+	if use pcmcia; then
 		dodir ${LIB_PATH}/pcmcia
 		dodir /etc/pcmcia
 		cp ${S}/driver/modules/hostap_cs.o ${D}/${LIB_PATH}/pcmcia/
@@ -104,12 +104,12 @@ src_install() {
 		fi
 	fi
 
-	if [ -z "`use hostap-nopci`" ]; then
+	if ! use hostap-nopci; then
 		cp ${S}/driver/modules/hostap_pci.o\
 			${D}${LIB_PATH}/net/
 	fi
 
-	if [ -z "`use hostap-noplx`" ]; then
+	if ! use hostap-noplx; then
 		cp ${S}/driver/modules/hostap_plx.o\
 			${D}${LIB_PATH}/net/
 	fi
diff --git a/net-wireless/kismet/ChangeLog b/net-wireless/kismet/ChangeLog
index 7d0855eb2465..8e670059005c 100644
--- a/net-wireless/kismet/ChangeLog
+++ b/net-wireless/kismet/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-wireless/kismet
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/ChangeLog,v 1.32 2004/05/01 21:44:15 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/ChangeLog,v 1.33 2004/06/15 03:17:15 agriffis Exp $
+
+  14 Jun 2004; Aron Griffis <agriffis@gentoo.org> kismet-2.8.0b-r1.ebuild,
+  kismet-2.8.1-r1.ebuild, kismet-2.8.1.ebuild, kismet-2004.02.01.ebuild,
+  kismet-2004.04.1.ebuild, kismet-3.0.1-r1.ebuild, kismet-3.0.1.ebuild:
+  Fix use invocation
 
   01 May 2004; Bryan Østergaard <kloeri@gentoo.org> kismet-2004.02.01.ebuild,
   kismet-3.0.1-r1.ebuild, kismet-3.0.1.ebuild:
diff --git a/net-wireless/kismet/kismet-2.8.0b-r1.ebuild b/net-wireless/kismet/kismet-2.8.0b-r1.ebuild
index 69ea0d79d964..9490f7176da8 100644
--- a/net-wireless/kismet/kismet-2.8.0b-r1.ebuild
+++ b/net-wireless/kismet/kismet-2.8.0b-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/kismet-2.8.0b-r1.ebuild,v 1.12 2004/02/29 02:50:22 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/kismet-2.8.0b-r1.ebuild,v 1.13 2004/06/15 03:17:15 agriffis Exp $
 
 DESCRIPTION="Kismet is a 802.11b wireless network sniffer."
 HOMEPAGE="http://www.kismetwireless.net/"
@@ -22,7 +22,7 @@ src_compile() {
 		`use_enable ipv6`
 		`use_enable gps`"
 
-	if [ -n "`use ethereal`" ]; then
+	if use ethereal; then
 		myconf="${myconf} --with-ethereal=${WORKDIR}/ethereal-0.9.8"
 
 		cd ${WORKDIR}/ethereal-0.9.8/wiretap
diff --git a/net-wireless/kismet/kismet-2.8.1-r1.ebuild b/net-wireless/kismet/kismet-2.8.1-r1.ebuild
index cf044f6a7756..d4f4233d5ad0 100644
--- a/net-wireless/kismet/kismet-2.8.1-r1.ebuild
+++ b/net-wireless/kismet/kismet-2.8.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/kismet-2.8.1-r1.ebuild,v 1.7 2004/02/29 02:50:22 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/kismet-2.8.1-r1.ebuild,v 1.8 2004/06/15 03:17:15 agriffis Exp $
 
 DESCRIPTION="Kismet is a 802.11b wireless network sniffer."
 HOMEPAGE="http://www.kismetwireless.net/"
@@ -25,7 +25,7 @@ src_compile() {
 			`use_enable acpi`"
 	use gps || myconf="${myconf} --disable-gps"
 
-	if [ -n "`use ethereal`" ]; then
+	if use ethereal; then
 		myconf="${myconf} --with-ethereal=${WORKDIR}/ethereal-0.9.8"
 
 		cd ${WORKDIR}/ethereal-0.9.8/wiretap
diff --git a/net-wireless/kismet/kismet-2.8.1.ebuild b/net-wireless/kismet/kismet-2.8.1.ebuild
index 69a24e4e861c..79e6043d7a58 100644
--- a/net-wireless/kismet/kismet-2.8.1.ebuild
+++ b/net-wireless/kismet/kismet-2.8.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/kismet-2.8.1.ebuild,v 1.11 2004/02/29 02:50:22 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/kismet-2.8.1.ebuild,v 1.12 2004/06/15 03:17:15 agriffis Exp $
 
 DESCRIPTION="Kismet is a 802.11b wireless network sniffer."
 HOMEPAGE="http://www.kismetwireless.net/"
@@ -22,7 +22,7 @@ src_compile() {
 		`use_enable ipv6`
 		`use_enable gps`"
 
-	if [ -n "`use ethereal`" ]; then
+	if use ethereal; then
 		myconf="${myconf} --with-ethereal=${WORKDIR}/ethereal-0.9.8"
 
 		cd ${WORKDIR}/ethereal-0.9.8/wiretap
diff --git a/net-wireless/kismet/kismet-2004.02.01.ebuild b/net-wireless/kismet/kismet-2004.02.01.ebuild
index ef2799dde89f..4227a2de1f25 100644
--- a/net-wireless/kismet/kismet-2004.02.01.ebuild
+++ b/net-wireless/kismet/kismet-2004.02.01.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/kismet-2004.02.01.ebuild,v 1.2 2004/05/01 21:44:15 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/kismet-2004.02.01.ebuild,v 1.3 2004/06/15 03:17:15 agriffis Exp $
 
 MY_P=${P/2004.02/feb.04}
 ETHEREAL_VERSION="0.9.13"
@@ -29,7 +29,7 @@ src_compile() {
 	myconf="`use_enable acpi`"
 	use gps || myconf="${myconf} --disable-gps"
 
-	if [ -n "`use ethereal`" ]; then
+	if use ethereal; then
 		myconf="${myconf} --with-ethereal=${WORKDIR}/ethereal-${ETHEREAL_VERSION}"
 
 		cd ${WORKDIR}/ethereal-${ETHEREAL_VERSION}/wiretap
diff --git a/net-wireless/kismet/kismet-2004.04.1.ebuild b/net-wireless/kismet/kismet-2004.04.1.ebuild
index fb288b927498..7b255681c306 100644
--- a/net-wireless/kismet/kismet-2004.04.1.ebuild
+++ b/net-wireless/kismet/kismet-2004.04.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/kismet-2004.04.1.ebuild,v 1.1 2004/04/10 00:09:20 swtaylor Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/kismet-2004.04.1.ebuild,v 1.2 2004/06/15 03:17:15 agriffis Exp $
 
 MY_P=${P/\./-}
 MY_P=${MY_P/./-R}
@@ -30,7 +30,7 @@ src_compile() {
 	myconf="`use_enable acpi`"
 	use gps || myconf="${myconf} --disable-gps"
 
-	if [ -n "`use ethereal`" ]; then
+	if use ethereal; then
 		myconf="${myconf} --with-ethereal=${WORKDIR}/ethereal-${ETHEREAL_VERSION}"
 
 		cd ${WORKDIR}/ethereal-${ETHEREAL_VERSION}/wiretap
@@ -70,7 +70,7 @@ src_install () {
 	make prefix=${D}/usr \
 		ETC=${D}/etc/kismet MAN=${D}/usr/share/man \
 		SHARE=${D}/usr/share/${PN} install || die
-	 [ -n $(use gps) ] && cp ${S}/scripts/gpsmap* ${D}/usr/bin/
+	 use gps && cp ${S}/scripts/gpsmap* ${D}/usr/bin/
 	 dodoc CHANGELOG FAQ README docs/*
 
 	exeinto /etc/init.d
diff --git a/net-wireless/kismet/kismet-3.0.1-r1.ebuild b/net-wireless/kismet/kismet-3.0.1-r1.ebuild
index 1b014bdc4c3a..cb89b3611184 100644
--- a/net-wireless/kismet/kismet-3.0.1-r1.ebuild
+++ b/net-wireless/kismet/kismet-3.0.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/kismet-3.0.1-r1.ebuild,v 1.4 2004/05/01 21:44:15 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/kismet-3.0.1-r1.ebuild,v 1.5 2004/06/15 03:17:15 agriffis Exp $
 
 ETHEREAL_VERSION="0.9.13"
 DESCRIPTION="Kismet is a 802.11b wireless network sniffer."
@@ -26,7 +26,7 @@ src_compile() {
 	myconf="`use_enable acpi`"
 	use gps || myconf="${myconf} --disable-gps"
 
-	if [ -n "`use ethereal`" ]; then
+	if use ethereal; then
 		myconf="${myconf} --with-ethereal=${WORKDIR}/ethereal-${ETHEREAL_VERSION}"
 
 		cd ${WORKDIR}/ethereal-${ETHEREAL_VERSION}/wiretap
diff --git a/net-wireless/kismet/kismet-3.0.1.ebuild b/net-wireless/kismet/kismet-3.0.1.ebuild
index 86908a87e279..1a493f04b04f 100644
--- a/net-wireless/kismet/kismet-3.0.1.ebuild
+++ b/net-wireless/kismet/kismet-3.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/kismet-3.0.1.ebuild,v 1.10 2004/05/01 21:44:15 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/kismet-3.0.1.ebuild,v 1.11 2004/06/15 03:17:15 agriffis Exp $
 
 ETHEREAL_VERSION="0.9.13"
 DESCRIPTION="Kismet is a 802.11b wireless network sniffer."
@@ -26,7 +26,7 @@ src_compile() {
 	myconf="`use_enable acpi`"
 	use gps || myconf="${myconf} --disable-gps"
 
-	if [ -n "`use ethereal`" ]; then
+	if use ethereal; then
 		myconf="${myconf} --with-ethereal=${WORKDIR}/ethereal-${ETHEREAL_VERSION}"
 
 		cd ${WORKDIR}/ethereal-${ETHEREAL_VERSION}/wiretap
diff --git a/net-wireless/linux-wlan-ng/ChangeLog b/net-wireless/linux-wlan-ng/ChangeLog
index ac2e70b884ea..7d445b6093bf 100644
--- a/net-wireless/linux-wlan-ng/ChangeLog
+++ b/net-wireless/linux-wlan-ng/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-wireless/linux-wlan-ng
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/linux-wlan-ng/ChangeLog,v 1.38 2004/04/27 22:12:06 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/linux-wlan-ng/ChangeLog,v 1.39 2004/06/15 03:16:17 agriffis Exp $
+
+  14 Jun 2004; Aron Griffis <agriffis@gentoo.org>
+  linux-wlan-ng-0.2.0-r1.ebuild, linux-wlan-ng-0.2.0-r2.ebuild,
+  linux-wlan-ng-0.2.0-r3.ebuild, linux-wlan-ng-0.2.1_pre11.ebuild,
+  linux-wlan-ng-0.2.1_pre16.ebuild, linux-wlan-ng-0.2.1_pre17-r1.ebuild,
+  linux-wlan-ng-0.2.1_pre17.ebuild, linux-wlan-ng-0.2.1_pre19.ebuild,
+  linux-wlan-ng-0.2.1_pre20.ebuild, linux-wlan-ng-0.2.1_pre8.ebuild:
+  Fix use invocation
 
   27 Apr 2004; Aron Griffis <agriffis@gentoo.org>
   linux-wlan-ng-0.2.1_pre19.ebuild:
diff --git a/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.0-r1.ebuild b/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.0-r1.ebuild
index a35a4109c96d..e59f132569ea 100644
--- a/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.0-r1.ebuild
+++ b/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.0-r1.ebuild,v 1.6 2004/02/01 23:33:51 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.0-r1.ebuild,v 1.7 2004/06/15 03:16:17 agriffis Exp $
 
 
 inherit eutils
@@ -45,7 +45,7 @@ fi
 src_unpack() {
 
 	unpack ${P}.tar.gz
-	if [ -n "`use pcmcia`" ]; then
+	if use pcmcia; then
 		check_KV
 		unpack ${PCMCIA_CS}.tar.gz
 		cd ${PCMCIA_DIR}
@@ -94,28 +94,28 @@ src_compile() {
 	# the kernel tree.
 	#
 
-	if [ -n "`use pcmcia`" ]; then
+	if use pcmcia; then
 		cd ${WORKDIR}/${PCMCIA_CS}
 		local myconf
-		if [ -n "`use trusted`" ] ; then
+		if use trusted ; then
 			myconf="--trust"
 		else
 			myconf="--notrust"
 		fi
 
-		if [ -n "`use apm`" ] ; then
+		if use apm ; then
 			myconf="$myconf --apm"
 		else
 			myconf="$myconf --noapm"
 		fi
 
-		if [ -n "`use pnp`" ] ; then
+		if use pnp ; then
 			myconf="$myconf --pnp"
 		else
 			myconf="$myconf --nopnp"
 		fi
 
-		if [ -n "`use nocardbus`" ] ; then
+		if use nocardbus ; then
 			myconf="$myconf --nocardbus"
 		else
 			myconf="$myconf --cardbus"
@@ -140,7 +140,7 @@ src_compile() {
 		config.in > default.config
 	mv default.config config.in
 
-	if [ -n "`use pcmcia`" ]; then
+	if use pcmcia; then
 		export PCMCIA_CS=${PCMCIA_CS}
 		sed -e 's:PCMCIA_SRC=:PCMCIA_SRC=${WORKDIR}/${PCMCIA_CS}:' \
 			-e 's:PRISM2_PLX=n:PRISM2_PLX=y:' \
@@ -151,7 +151,7 @@ src_compile() {
 	fi
 	mv default.config config.in
 
-	if [ -n "`use usb`" ]; then
+	if use usb; then
 		sed -e 's:PRISM2_USB=n:PRISM2_USB=y:' \
 			config.in > default.config
 		mv default.config config.in
@@ -176,7 +176,7 @@ src_install () {
 	dodir etc/wlan
 	mv ${D}/etc/conf.d/shared ${D}/etc/wlan/
 
-	if [ -z "`use build`" ]; then
+	if ! use build; then
 
 		dodir /usr/share/man/man1
 		newman ${S}/man/nwepgen.man nwepgen.1
diff --git a/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.0-r2.ebuild b/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.0-r2.ebuild
index 30b3b795b2a0..86f7c459ca9b 100644
--- a/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.0-r2.ebuild
+++ b/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.0-r2.ebuild,v 1.5 2004/02/01 23:33:51 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.0-r2.ebuild,v 1.6 2004/06/15 03:16:17 agriffis Exp $
 
 
 inherit eutils
@@ -52,7 +52,7 @@ src_unpack() {
 
 	cp ${PN}-gentoo-init ${S}/etc/rc.wlan
 
-	if [ -n "`use pcmcia`" ]; then
+	if use pcmcia; then
 		check_KV
 		unpack ${PCMCIA_CS}.tar.gz
 		cd ${PCMCIA_DIR}
@@ -101,28 +101,28 @@ src_compile() {
 	# the kernel tree.
 	#
 
-	if [ -n "`use pcmcia`" ]; then
+	if use pcmcia; then
 		cd ${WORKDIR}/${PCMCIA_CS}
 		local myconf
-		if [ -n "`use trusted`" ] ; then
+		if use trusted ; then
 			myconf="--trust"
 		else
 			myconf="--notrust"
 		fi
 
-		if [ -n "`use apm`" ] ; then
+		if use apm ; then
 			myconf="$myconf --apm"
 		else
 			myconf="$myconf --noapm"
 		fi
 
-		if [ -n "`use pnp`" ] ; then
+		if use pnp ; then
 			myconf="$myconf --pnp"
 		else
 			myconf="$myconf --nopnp"
 		fi
 
-		if [ -n "`use nocardbus`" ] ; then
+		if use nocardbus ; then
 			myconf="$myconf --nocardbus"
 		else
 			myconf="$myconf --cardbus"
@@ -147,7 +147,7 @@ src_compile() {
 		config.in > default.config
 	mv default.config config.in
 
-	if [ -n "`use pcmcia`" ]; then
+	if use pcmcia; then
 		export PCMCIA_CS=${PCMCIA_CS}
 		sed -e 's:PCMCIA_SRC=:PCMCIA_SRC=${WORKDIR}/${PCMCIA_CS}:' \
 			-e 's:PRISM2_PLX=n:PRISM2_PLX=y:' \
@@ -158,7 +158,7 @@ src_compile() {
 	fi
 	mv default.config config.in
 
-	if [ -n "`use usb`" ]; then
+	if use usb; then
 		sed -e 's:PRISM2_USB=n:PRISM2_USB=y:' \
 			config.in > default.config
 		mv default.config config.in
@@ -183,7 +183,7 @@ src_install () {
 	dodir etc/wlan
 	mv ${D}/etc/conf.d/shared ${D}/etc/wlan/
 
-	if [ -z "`use build`" ]; then
+	if ! use build; then
 
 		dodir /usr/share/man/man1
 		newman ${S}/man/nwepgen.man nwepgen.1
diff --git a/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.0-r3.ebuild b/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.0-r3.ebuild
index 17aa6bfc41e6..51952f2e6d7b 100644
--- a/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.0-r3.ebuild
+++ b/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.0-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.0-r3.ebuild,v 1.3 2004/02/08 19:32:16 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.0-r3.ebuild,v 1.4 2004/06/15 03:16:17 agriffis Exp $
 
 inherit pcmcia
 
@@ -87,7 +87,7 @@ src_compile() {
 			config.in
 	#mv default.config config.in
 
-	if [ -n "`use pcmcia`" ]; then
+	if use pcmcia; then
 		if [ -n "${PCMCIA_SOURCE_DIR}" ]
 		then
 			export PCMCIA_SOURCE_DIR=${PCMCIA_SOURCE_DIR}
@@ -102,7 +102,7 @@ src_compile() {
 	fi
 	#mv default.config config.in
 
-	if [ -n "`use usb`" ]; then
+	if use usb; then
 		sed -i -e 's:PRISM2_USB=n:PRISM2_USB=y:' \
 			config.in
 		#mv default.config config.in
@@ -127,7 +127,7 @@ src_install () {
 	dodir etc/wlan
 	mv ${D}/etc/conf.d/shared ${D}/etc/wlan/
 
-	if [ -z "`use build`" ]; then
+	if ! use build; then
 
 		dodir /usr/share/man/man1
 		newman ${S}/man/nwepgen.man nwepgen.1
diff --git a/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.1_pre11.ebuild b/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.1_pre11.ebuild
index e4d1a0637a44..a05a2f255e82 100644
--- a/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.1_pre11.ebuild
+++ b/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.1_pre11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.1_pre11.ebuild,v 1.4 2004/02/01 23:33:51 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.1_pre11.ebuild,v 1.5 2004/06/15 03:16:17 agriffis Exp $
 
 
 inherit eutils
@@ -51,7 +51,7 @@ src_unpack() {
 	unpack ${PN}-gentoo-init.gz
 	cp ${WORKDIR}/${PN}-gentoo-init ${S}/etc/rc.wlan
 
-	if [ -n "`use pcmcia`" ]; then
+	if use pcmcia; then
 		unpack ${PCMCIA_CS}.tar.gz
 		cd ${PCMCIA_DIR}
 		if [ -z "`has_version =sys-apps/pcmcia-cs-3.2.4*`" ]; then
@@ -99,28 +99,28 @@ src_compile() {
 	# the kernel tree.
 	#
 
-	if [ -n "`use pcmcia`" ]; then
+	if use pcmcia; then
 		cd ${WORKDIR}/${PCMCIA_CS}
 		local myconf
-		if [ -n "`use trusted`" ] ; then
+		if use trusted ; then
 			myconf="--trust"
 		else
 			myconf="--notrust"
 		fi
 
-		if [ -n "`use apm`" ] ; then
+		if use apm ; then
 			myconf="$myconf --apm"
 		else
 			myconf="$myconf --noapm"
 		fi
 
-		if [ -n "`use pnp`" ] ; then
+		if use pnp ; then
 			myconf="$myconf --pnp"
 		else
 			myconf="$myconf --nopnp"
 		fi
 
-		if [ -n "`use nocardbus`" ] ; then
+		if use nocardbus ; then
 			myconf="$myconf --nocardbus"
 		else
 			myconf="$myconf --cardbus"
@@ -145,7 +145,7 @@ src_compile() {
 		config.in > default.config
 	mv default.config config.in
 
-	if [ -n "`use pcmcia`" ]; then
+	if use pcmcia; then
 		export PCMCIA_CS=${PCMCIA_CS}
 		sed -e 's:PCMCIA_SRC=:PCMCIA_SRC=${WORKDIR}/${PCMCIA_CS}:' \
 			-e 's:PRISM2_PLX=n:PRISM2_PLX=y:' \
@@ -156,7 +156,7 @@ src_compile() {
 	fi
 	mv default.config config.in
 
-	if [ -n "`use usb`" ]; then
+	if use usb; then
 		sed -e 's:PRISM2_USB=n:PRISM2_USB=y:' \
 			config.in > default.config
 		mv default.config config.in
@@ -182,7 +182,7 @@ src_install () {
 	dodir etc/wlan
 	mv ${D}/etc/conf.d/shared ${D}/etc/wlan/
 
-	if [ -z "`use build`" ]; then
+	if ! use build; then
 
 		dodir /usr/share/man/man1
 		newman ${S}/man/nwepgen.man nwepgen.1
diff --git a/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.1_pre16.ebuild b/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.1_pre16.ebuild
index 4d861a90e8df..f4591e8128fe 100644
--- a/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.1_pre16.ebuild
+++ b/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.1_pre16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.1_pre16.ebuild,v 1.1 2004/01/24 22:59:20 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.1_pre16.ebuild,v 1.2 2004/06/15 03:16:17 agriffis Exp $
 
 inherit eutils
 
@@ -50,7 +50,7 @@ src_unpack() {
 	unpack ${PN}-gentoo-init.gz
 	cp ${WORKDIR}/${PN}-gentoo-init ${S}/etc/rc.wlan
 
-	if [ -n "`use pcmcia`" ]; then
+	if use pcmcia; then
 		unpack ${PCMCIA_CS}.tar.gz
 		cd ${PCMCIA_DIR}
 		if [ -z "`has_version =sys-apps/pcmcia-cs-3.2.4*`" ]; then
@@ -98,28 +98,28 @@ src_compile() {
 	# the kernel tree.
 	#
 
-	if [ -n "`use pcmcia`" ]; then
+	if use pcmcia; then
 		cd ${WORKDIR}/${PCMCIA_CS}
 		local myconf
-		if [ -n "`use trusted`" ] ; then
+		if use trusted ; then
 			myconf="--trust"
 		else
 			myconf="--notrust"
 		fi
 
-		if [ -n "`use apm`" ] ; then
+		if use apm ; then
 			myconf="$myconf --apm"
 		else
 			myconf="$myconf --noapm"
 		fi
 
-		if [ -n "`use pnp`" ] ; then
+		if use pnp ; then
 			myconf="$myconf --pnp"
 		else
 			myconf="$myconf --nopnp"
 		fi
 
-		if [ -n "`use nocardbus`" ] ; then
+		if use nocardbus ; then
 			myconf="$myconf --nocardbus"
 		else
 			myconf="$myconf --cardbus"
@@ -144,7 +144,7 @@ src_compile() {
 		config.in > default.config
 	mv default.config config.in
 
-	if [ -n "`use pcmcia`" ]; then
+	if use pcmcia; then
 		export PCMCIA_CS=${PCMCIA_CS}
 		sed -e 's:PCMCIA_SRC=:PCMCIA_SRC=${WORKDIR}/${PCMCIA_CS}:' \
 			-e 's:PRISM2_PLX=n:PRISM2_PLX=y:' \
@@ -155,7 +155,7 @@ src_compile() {
 	fi
 	mv default.config config.in
 
-	if [ -n "`use usb`" ]; then
+	if use usb; then
 		sed -e 's:PRISM2_USB=n:PRISM2_USB=y:' \
 			config.in > default.config
 		mv default.config config.in
@@ -181,7 +181,7 @@ src_install () {
 	dodir etc/wlan
 	mv ${D}/etc/conf.d/shared ${D}/etc/wlan/
 
-	if [ -z "`use build`" ]; then
+	if ! use build; then
 
 		dodir /usr/share/man/man1
 		newman ${S}/man/nwepgen.man nwepgen.1
diff --git a/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.1_pre17-r1.ebuild b/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.1_pre17-r1.ebuild
index d78747e3bdde..39333ac057df 100644
--- a/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.1_pre17-r1.ebuild
+++ b/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.1_pre17-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.1_pre17-r1.ebuild,v 1.3 2004/02/29 22:47:54 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.1_pre17-r1.ebuild,v 1.4 2004/06/15 03:16:17 agriffis Exp $
 
 inherit pcmcia kernel-mod
 
@@ -66,7 +66,7 @@ src_compile() {
 		-e 's:PRISM2_PCI=n:PRISM2_PCI=y:' \
 		config.in
 
-	if [ -n "`use pcmcia`" ]; then
+	if use pcmcia; then
 		if [ -n "${PCMCIA_SOURCE_DIR}" ];
 		then
 			export PCMCIA_SOURCE_DIR=${PCMCIA_SOURCE_DIR}
@@ -80,7 +80,7 @@ src_compile() {
 		config.in
 	fi
 
-	if [ -n "`use usb`" ]; then
+	if use usb; then
 		sed -i -e 's:PRISM2_USB=n:PRISM2_USB=y:' \
 			config.in
 	fi
@@ -111,7 +111,7 @@ src_install () {
 	dodir etc/wlan
 	mv ${D}/etc/conf.d/shared ${D}/etc/wlan/
 
-	if [ -z "`use build`" ]; then
+	if ! use build; then
 
 		dodir /usr/share/man/man1
 		newman ${S}/man/nwepgen.man nwepgen.1
diff --git a/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.1_pre17.ebuild b/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.1_pre17.ebuild
index 279b20d2a969..ee4aebf6fe9a 100644
--- a/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.1_pre17.ebuild
+++ b/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.1_pre17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.1_pre17.ebuild,v 1.1 2004/02/04 00:14:28 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.1_pre17.ebuild,v 1.2 2004/06/15 03:16:17 agriffis Exp $
 
 inherit eutils
 
@@ -40,7 +40,7 @@ src_unpack() {
 
 	cd ${S}
 
-	if [ -n "`use pcmcia`" ]; then
+	if use pcmcia; then
 		if egrep '^CONFIG_PCMCIA=[ym]' /usr/src/linux/.config >&/dev/null
 		then
 			# Sadly, we still need to download these sources in SRC_URI
@@ -108,7 +108,7 @@ src_compile() {
 		kernelpcmcia="no"
 	fi
 
-	if [ -n "`use pcmcia`" ]; then
+	if use pcmcia; then
 		if [ "${kernelpcmcia}" = "no" ]; then
 			local myarch myconf
 
@@ -140,7 +140,7 @@ src_compile() {
 		-e 's:PRISM2_PCI=n:PRISM2_PCI=y:' \
 		config.in
 
-	if [ -n "`use pcmcia`" ]; then
+	if use pcmcia; then
 		if [ "${kernelpcmcia}" = "no" ];
 		then
 			export PCMCIA_CS=${PCMCIA_CS}
@@ -154,7 +154,7 @@ src_compile() {
 		config.in
 	fi
 
-	if [ -n "`use usb`" ]; then
+	if use usb; then
 		sed -i -e 's:PRISM2_USB=n:PRISM2_USB=y:' \
 			config.in
 	fi
@@ -180,7 +180,7 @@ src_install () {
 	dodir etc/wlan
 	mv ${D}/etc/conf.d/shared ${D}/etc/wlan/
 
-	if [ -z "`use build`" ]; then
+	if ! use build; then
 
 		dodir /usr/share/man/man1
 		newman ${S}/man/nwepgen.man nwepgen.1
diff --git a/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.1_pre19.ebuild b/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.1_pre19.ebuild
index 2a88db7ebef5..9017b38f20dd 100644
--- a/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.1_pre19.ebuild
+++ b/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.1_pre19.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.1_pre19.ebuild,v 1.2 2004/04/27 22:12:06 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.1_pre19.ebuild,v 1.3 2004/06/15 03:16:17 agriffis Exp $
 
 inherit pcmcia eutils
 
@@ -73,7 +73,7 @@ src_compile() {
 		-e 's:PRISM2_PCI=n:PRISM2_PCI=y:' \
 		config.in
 
-	if [ -n "`use pcmcia`" ]; then
+	if use pcmcia; then
 		if [ -n "${PCMCIA_SOURCE_DIR}" ];
 		then
 			export PCMCIA_SOURCE_DIR=${PCMCIA_SOURCE_DIR}
@@ -87,7 +87,7 @@ src_compile() {
 		config.in
 	fi
 
-	if [ -n "`use usb`" ]; then
+	if use usb; then
 		sed -i -e 's:PRISM2_USB=n:PRISM2_USB=y:' \
 			config.in
 	fi
@@ -113,7 +113,7 @@ src_install () {
 	dodir etc/wlan
 	mv ${D}/etc/conf.d/shared ${D}/etc/wlan/
 
-	if [ -z "`use build`" ]; then
+	if ! use build; then
 
 		dodir /usr/share/man/man1
 		newman ${S}/man/nwepgen.man nwepgen.1
diff --git a/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.1_pre20.ebuild b/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.1_pre20.ebuild
index 22bdbdeff3bb..57e799f6a88d 100644
--- a/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.1_pre20.ebuild
+++ b/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.1_pre20.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.1_pre20.ebuild,v 1.1 2004/03/01 05:42:22 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.1_pre20.ebuild,v 1.2 2004/06/15 03:16:17 agriffis Exp $
 
 inherit pcmcia
 
@@ -65,7 +65,7 @@ src_compile() {
 		-e 's:PRISM2_PCI=n:PRISM2_PCI=y:' \
 		config.in
 
-	if [ -n "`use pcmcia`" ]; then
+	if use pcmcia; then
 		if [ -n "${PCMCIA_SOURCE_DIR}" ];
 		then
 			export PCMCIA_SOURCE_DIR=${PCMCIA_SOURCE_DIR}
@@ -79,7 +79,7 @@ src_compile() {
 		config.in
 	fi
 
-	if [ -n "`use usb`" ]; then
+	if use usb; then
 		sed -i -e 's:PRISM2_USB=n:PRISM2_USB=y:' \
 			config.in
 	fi
@@ -105,7 +105,7 @@ src_install () {
 	dodir etc/wlan
 	mv ${D}/etc/conf.d/shared ${D}/etc/wlan/
 
-	if [ -z "`use build`" ]; then
+	if ! use build; then
 
 		dodir /usr/share/man/man1
 		newman ${S}/man/nwepgen.man nwepgen.1
diff --git a/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.1_pre8.ebuild b/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.1_pre8.ebuild
index ebc9993180fb..99ec425ba090 100644
--- a/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.1_pre8.ebuild
+++ b/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.1_pre8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.1_pre8.ebuild,v 1.4 2004/02/01 23:33:51 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.1_pre8.ebuild,v 1.5 2004/06/15 03:16:17 agriffis Exp $
 
 
 inherit eutils
@@ -51,7 +51,7 @@ src_unpack() {
 	unpack ${PN}-gentoo-init.gz
 	cp ${WORKDIR}/${PN}-gentoo-init ${S}/etc/rc.wlan
 
-	if [ -n "`use pcmcia`" ]; then
+	if use pcmcia; then
 		unpack ${PCMCIA_CS}.tar.gz
 		cd ${PCMCIA_DIR}
 		if [ -z "`has_version =sys-apps/pcmcia-cs-3.2.4*`" ]; then
@@ -99,28 +99,28 @@ src_compile() {
 	# the kernel tree.
 	#
 
-	if [ -n "`use pcmcia`" ]; then
+	if use pcmcia; then
 		cd ${WORKDIR}/${PCMCIA_CS}
 		local myconf
-		if [ -n "`use trusted`" ] ; then
+		if use trusted ; then
 			myconf="--trust"
 		else
 			myconf="--notrust"
 		fi
 
-		if [ -n "`use apm`" ] ; then
+		if use apm ; then
 			myconf="$myconf --apm"
 		else
 			myconf="$myconf --noapm"
 		fi
 
-		if [ -n "`use pnp`" ] ; then
+		if use pnp ; then
 			myconf="$myconf --pnp"
 		else
 			myconf="$myconf --nopnp"
 		fi
 
-		if [ -n "`use nocardbus`" ] ; then
+		if use nocardbus ; then
 			myconf="$myconf --nocardbus"
 		else
 			myconf="$myconf --cardbus"
@@ -145,7 +145,7 @@ src_compile() {
 		config.in > default.config
 	mv default.config config.in
 
-	if [ -n "`use pcmcia`" ]; then
+	if use pcmcia; then
 		export PCMCIA_CS=${PCMCIA_CS}
 		sed -e 's:PCMCIA_SRC=:PCMCIA_SRC=${WORKDIR}/${PCMCIA_CS}:' \
 			-e 's:PRISM2_PLX=n:PRISM2_PLX=y:' \
@@ -156,7 +156,7 @@ src_compile() {
 	fi
 	mv default.config config.in
 
-	if [ -n "`use usb`" ]; then
+	if use usb; then
 		sed -e 's:PRISM2_USB=n:PRISM2_USB=y:' \
 			config.in > default.config
 		mv default.config config.in
@@ -182,7 +182,7 @@ src_install () {
 	dodir etc/wlan
 	mv ${D}/etc/conf.d/shared ${D}/etc/wlan/
 
-	if [ -z "`use build`" ]; then
+	if ! use build; then
 
 		dodir /usr/share/man/man1
 		newman ${S}/man/nwepgen.man nwepgen.1