Fix use invocation

8 files changed, 45 insertions, 37 deletions

diff --git a/net-www/amaya/ChangeLog b/net-www/amaya/ChangeLog
index 99a9e0361b81..c0fc88f93d0d 100644
--- a/net-www/amaya/ChangeLog
+++ b/net-www/amaya/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-www/amaya
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/amaya/ChangeLog,v 1.23 2004/06/08 21:10:09 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/amaya/ChangeLog,v 1.24 2004/06/15 03:23:46 agriffis Exp $
+
+  14 Jun 2004; Aron Griffis <agriffis@gentoo.org> amaya-8.0.ebuild,
+  amaya-8.5.ebuild:
+  Fix use invocation
 
   08 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org> amaya-7.1.ebuild,
   amaya-7.2.ebuild, amaya-8.1a.ebuild, amaya-8.2.ebuild, amaya-8.4.ebuild:
diff --git a/net-www/amaya/amaya-8.0.ebuild b/net-www/amaya/amaya-8.0.ebuild
index 20bda8d1f50b..eab9614bb03a 100644
--- a/net-www/amaya/amaya-8.0.ebuild
+++ b/net-www/amaya/amaya-8.0.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-www/amaya/amaya-8.0.ebuild,v 1.9 2004/03/21 06:29:51 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/amaya/amaya-8.0.ebuild,v 1.10 2004/06/15 03:23:46 agriffis Exp $
 
 inherit libtool
 
@@ -31,7 +31,7 @@ src_compile() {
 	local myconf=""
 	mkdir ${S}
 	cd ${S}
-	if [ -n "`use gtk`" ]
+	if use gtk
 	then
 	    myconf="${myconf} --with-gtk"
 
diff --git a/net-www/amaya/amaya-8.5.ebuild b/net-www/amaya/amaya-8.5.ebuild
index 89ddb1cb16ab..ae778e2a0d85 100644
--- a/net-www/amaya/amaya-8.5.ebuild
+++ b/net-www/amaya/amaya-8.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-www/amaya/amaya-8.5.ebuild,v 1.2 2004/05/25 21:51:42 jhuebel Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/amaya/amaya-8.5.ebuild,v 1.3 2004/06/15 03:23:46 agriffis Exp $
 
 inherit libtool
 
@@ -31,7 +31,7 @@ src_compile() {
 	local myconf=""
 	mkdir ${S}
 	cd ${S}
-	if [ -n "`use gtk`" ]
+	if use gtk
 	then
 	    myconf="${myconf} --with-gtk"
 
diff --git a/net-www/w3m/ChangeLog b/net-www/w3m/ChangeLog
index 1b3cb7054419..039d8ea7e018 100644
--- a/net-www/w3m/ChangeLog
+++ b/net-www/w3m/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-www/w3m
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/w3m/ChangeLog,v 1.56 2004/06/06 14:01:44 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/w3m/ChangeLog,v 1.57 2004/06/15 03:23:42 agriffis Exp $
+
+  14 Jun 2004; Aron Griffis <agriffis@gentoo.org> w3m-0.4.2.ebuild,
+  w3m-0.5-r2.ebuild, w3m-0.5.1-r1.ebuild, w3m-0.5.1.ebuild:
+  Fix use invocation
 
   06 Jun 2004; Jason Wever <weeve@gentoo.org> w3m-0.5.1.ebuild:
   Stable on sparc.
diff --git a/net-www/w3m/w3m-0.4.2.ebuild b/net-www/w3m/w3m-0.4.2.ebuild
index 9ffd1822b2be..022474085972 100644
--- a/net-www/w3m/w3m-0.4.2.ebuild
+++ b/net-www/w3m/w3m-0.4.2.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-www/w3m/w3m-0.4.2.ebuild,v 1.5 2004/01/04 18:35:30 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/w3m/w3m-0.4.2.ebuild,v 1.6 2004/06/15 03:23:42 agriffis Exp $
 
 inherit eutils
 
@@ -41,7 +41,7 @@ src_compile() {
 
 	use cjk && myconf="${myconf} --enable-japanese=E"
 
-	if [ -n "`use imlib`" -o -n "`use gtk`" ] ; then
+	if use imlib || use gtk; then
 		myconf="${myconf} --enable-image=x11,fb `use_enable xface`"
 	else
 		myconf="${myconf} --enable-image=no"
@@ -75,7 +75,7 @@ src_install() {
 	doins Bonus/*
 	dodoc README NEWS TODO ChangeLog
 	docinto doc-en ; dodoc doc/*
-	if [ -n "`use cjk`" ] ; then
+	if use cjk ; then
 		docinto doc-jp ; dodoc doc-jp/*
 	else
 		rm -rf ${D}/usr/share/man/ja
diff --git a/net-www/w3m/w3m-0.5-r2.ebuild b/net-www/w3m/w3m-0.5-r2.ebuild
index 2ca0d5c41542..97d8cf78160c 100644
--- a/net-www/w3m/w3m-0.5-r2.ebuild
+++ b/net-www/w3m/w3m-0.5-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-www/w3m/w3m-0.5-r2.ebuild,v 1.3 2004/05/04 03:04:57 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/w3m/w3m-0.5-r2.ebuild,v 1.4 2004/06/15 03:23:42 agriffis Exp $
 
 inherit eutils
 
@@ -49,11 +49,11 @@ src_unpack() {
 	epatch ${FILESDIR}/${PN}-w3mman-gentoo.diff
 	epatch ${FILESDIR}/${PN}-m17n-search-gentoo.diff
 	epatch ${FILESDIR}/${PN}-libwc-gentoo.diff
-	if [ -n "`use nls`" ] ; then
+	if use nls ; then
 		#epatch ${DISTDIR}/${W3M_CVS_P}-bkmknls-1.diff
 		epatch ${DISTDIR}/${W3M_CVS_P}-nlscharset-1.diff
 	fi
-	if [ -n "`use async`" ] ; then
+	if use async ; then
 		epatch ${DISTDIR}/${W3M_CVS_P}-async-1.diff.gz
 		epatch ${FILESDIR}/${PN}-0.4.2-async-m17n-gentoo.diff
 	fi
@@ -64,17 +64,17 @@ src_unpack() {
 src_compile() {
 	local myconf migemo_command imagelib
 
-	if [ -n "`use X`" ] ; then
+	if use X ; then
 		myconf="${myconf} --enable-image=x11,fb `use_enable xface`"
-		if [ -n "`use gtk`" ] ; then
+		if use gtk ; then
 			imagelib="gdk-pixbuf"
-		elif [ -n "`use imlib2`" ] ; then
+		elif use imlib2 ; then
 			imagelib="imlib2"
 		else
 			imagelib="imlib"
 		fi
 	else	# no X
-		if [ -n "`use imlib2`" ] ; then
+		if use imlib2 ; then
 			myconf="${myconf} --enable-image=fb"
 			imagelib="imlib2"
 		else
@@ -83,7 +83,7 @@ src_compile() {
 		fi
 	fi
 
-	if [ -n "`use migemo`" ] ; then
+	if use migemo ; then
 		migemo_command="migemo -t egrep /usr/share/migemo/migemo-dict"
 	else
 		migemo_command="no"
@@ -92,7 +92,7 @@ src_compile() {
 	# emacs-w3m doesn't like "--enable-m17n --disable-unicode,"
 	# so we better enable or disable both. Default to enable
 	# m17n and unicode, see bug #47046.
-	if [ -n "`use cjk`" ] ; then
+	if use cjk ; then
 		myconf="${myconf}
 			--enable-japanese=E
 			--with-charset=EUC-JP"
@@ -129,7 +129,7 @@ src_install() {
 	doins Bonus/*
 	dodoc README NEWS TODO ChangeLog
 	docinto doc-en ; dodoc doc/*
-	if [ -n "`use cjk`" ] ; then
+	if use cjk ; then
 		docinto doc-jp ; dodoc doc-jp/*
 	else
 		rm -rf ${D}/usr/share/man/ja
diff --git a/net-www/w3m/w3m-0.5.1-r1.ebuild b/net-www/w3m/w3m-0.5.1-r1.ebuild
index a9aff41187c7..9cc4757f7a1e 100644
--- a/net-www/w3m/w3m-0.5.1-r1.ebuild
+++ b/net-www/w3m/w3m-0.5.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-www/w3m/w3m-0.5.1-r1.ebuild,v 1.1 2004/05/30 07:25:58 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/w3m/w3m-0.5.1-r1.ebuild,v 1.2 2004/06/15 03:23:42 agriffis Exp $
 
 inherit eutils
 
@@ -47,7 +47,7 @@ src_unpack() {
 	unpack ${P}.tar.gz
 	cd ${S}
 	epatch ${FILESDIR}/${PN}-w3mman-gentoo.diff
-	if [ -n "`use async`" ] ; then
+	if use async ; then
 		epatch ${DISTDIR}/${P}-async-1.diff.gz
 	#	epatch ${FILESDIR}/${PN}-0.4.2-async-m17n-gentoo.diff
 	fi
@@ -59,17 +59,17 @@ src_compile() {
 
 	local myconf migemo_command imagelib
 
-	if [ -n "`use X`" ] ; then
+	if use X ; then
 		myconf="${myconf} --enable-image=x11,fb `use_enable xface`"
-		if [ -n "`use gtk`" ] ; then
+		if use gtk ; then
 			imagelib="gdk-pixbuf"
-		elif [ -n "`use imlib2`" ] ; then
+		elif use imlib2 ; then
 			imagelib="imlib2"
 		else
 			imagelib="imlib"
 		fi
 	else	# no X
-		if [ -n "`use imlib2`" ] ; then
+		if use imlib2 ; then
 			myconf="${myconf} --enable-image=fb"
 			imagelib="imlib2"
 		else
@@ -78,7 +78,7 @@ src_compile() {
 		fi
 	fi
 
-	if [ -n "`use migemo`" ] ; then
+	if use migemo ; then
 		migemo_command="migemo -t egrep /usr/share/migemo/migemo-dict"
 	else
 		migemo_command="no"
@@ -87,7 +87,7 @@ src_compile() {
 	# emacs-w3m doesn't like "--enable-m17n --disable-unicode,"
 	# so we better enable or disable both. Default to enable
 	# m17n and unicode, see bug #47046.
-	if [ -n "`use cjk`" ] ; then
+	if use cjk ; then
 		myconf="${myconf}
 			--enable-japanese=E
 			--with-charset=EUC-JP"
@@ -131,7 +131,7 @@ src_install() {
 	doins Bonus/*
 	dodoc README NEWS TODO ChangeLog
 	docinto doc-en ; dodoc doc/*
-	if [ -n "`use cjk`" ] ; then
+	if use cjk ; then
 		docinto doc-jp ; dodoc doc-jp/*
 	else
 		rm -rf ${D}/usr/share/man/ja
diff --git a/net-www/w3m/w3m-0.5.1.ebuild b/net-www/w3m/w3m-0.5.1.ebuild
index 35163f8dacff..ba4c032fcad9 100644
--- a/net-www/w3m/w3m-0.5.1.ebuild
+++ b/net-www/w3m/w3m-0.5.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-www/w3m/w3m-0.5.1.ebuild,v 1.3 2004/06/06 14:01:44 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/w3m/w3m-0.5.1.ebuild,v 1.4 2004/06/15 03:23:42 agriffis Exp $
 
 inherit eutils
 
@@ -47,7 +47,7 @@ src_unpack() {
 	unpack ${P}.tar.gz
 	cd ${S}
 	epatch ${FILESDIR}/${PN}-w3mman-gentoo.diff
-	#if [ -n "`use async`" ] ; then
+	#if use async ; then
 	#	epatch ${DISTDIR}/w3m-cvs-1.912-async-1.diff.gz
 	#	epatch ${FILESDIR}/${PN}-0.4.2-async-m17n-gentoo.diff
 	#fi
@@ -59,17 +59,17 @@ src_compile() {
 
 	local myconf migemo_command imagelib
 
-	if [ -n "`use X`" ] ; then
+	if use X ; then
 		myconf="${myconf} --enable-image=x11,fb `use_enable xface`"
-		if [ -n "`use gtk`" ] ; then
+		if use gtk ; then
 			imagelib="gdk-pixbuf"
-		elif [ -n "`use imlib2`" ] ; then
+		elif use imlib2 ; then
 			imagelib="imlib2"
 		else
 			imagelib="imlib"
 		fi
 	else	# no X
-		if [ -n "`use imlib2`" ] ; then
+		if use imlib2 ; then
 			myconf="${myconf} --enable-image=fb"
 			imagelib="imlib2"
 		else
@@ -78,7 +78,7 @@ src_compile() {
 		fi
 	fi
 
-	if [ -n "`use migemo`" ] ; then
+	if use migemo ; then
 		migemo_command="migemo -t egrep /usr/share/migemo/migemo-dict"
 	else
 		migemo_command="no"
@@ -87,7 +87,7 @@ src_compile() {
 	# emacs-w3m doesn't like "--enable-m17n --disable-unicode,"
 	# so we better enable or disable both. Default to enable
 	# m17n and unicode, see bug #47046.
-	if [ -n "`use cjk`" ] ; then
+	if use cjk ; then
 		myconf="${myconf}
 			--enable-japanese=E
 			--with-charset=EUC-JP"
@@ -131,7 +131,7 @@ src_install() {
 	doins Bonus/*
 	dodoc README NEWS TODO ChangeLog
 	docinto doc-en ; dodoc doc/*
-	if [ -n "`use cjk`" ] ; then
+	if use cjk ; then
 		docinto doc-jp ; dodoc doc-jp/*
 	else
 		rm -rf ${D}/usr/share/man/ja