11 files changed, 43 insertions, 31 deletions
diff --git a/media-gfx/aoi/ChangeLog b/media-gfx/aoi/ChangeLog
index f2991f474b58..5bd644d0b10c 100644
--- a/media-gfx/aoi/ChangeLog
+++ b/media-gfx/aoi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/aoi
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/aoi/ChangeLog,v 1.7 2004/05/05 16:55:16 sejo Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/aoi/ChangeLog,v 1.8 2004/06/07 21:38:00 agriffis Exp $
+
+  07 Jun 2004; Aron Griffis <agriffis@gentoo.org> aoi-1.4.ebuild,
+  aoi-1.6.ebuild:
+  Fix use invocation
 
   05 May 2004; <SeJo@gentoo.org> aoi-1.6.ebuild:
   added ~ppc keyword
diff --git a/media-gfx/aoi/aoi-1.4.ebuild b/media-gfx/aoi/aoi-1.4.ebuild
index efbce2cfa2f5..bbddeb01ed06 100644
--- a/media-gfx/aoi/aoi-1.4.ebuild
+++ b/media-gfx/aoi/aoi-1.4.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/media-gfx/aoi/aoi-1.4.ebuild,v 1.6 2004/03/26 10:51:46 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/aoi/aoi-1.4.ebuild,v 1.7 2004/06/07 21:38:00 agriffis Exp $
 
 inherit java-pkg
 
@@ -33,7 +33,7 @@ src_install() {
 	use quicktime && DEP_APPEND="jmf"
 	dobin ${FILESDIR}/aoi
 	dodoc HISTORY LICENSE README
-	if [ -n "`use doc`" ] ; then
+	if use doc ; then
 		mv ${WORKDIR}/AoI\ Manual/ ${WORKDIR}/aoi_manual/
 		dohtml -r ${WORKDIR}/aoi_manual/
 	fi
diff --git a/media-gfx/aoi/aoi-1.6.ebuild b/media-gfx/aoi/aoi-1.6.ebuild
index e622d11792c8..1c8b66e40be4 100644
--- a/media-gfx/aoi/aoi-1.6.ebuild
+++ b/media-gfx/aoi/aoi-1.6.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/media-gfx/aoi/aoi-1.6.ebuild,v 1.6 2004/05/05 16:55:16 sejo Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/aoi/aoi-1.6.ebuild,v 1.7 2004/06/07 21:38:00 agriffis Exp $
 
 inherit java-pkg
 
@@ -39,7 +39,7 @@ src_install() {
 	DEP_APPEND="jmf"
 	dobin ${FILESDIR}/aoi
 	dodoc HISTORY LICENSE README-source
-	if [ -n "`use doc`" ] ; then
+	if use doc ; then
 		mv ${WORKDIR}/AoI\ Manual/ ${WORKDIR}/aoi_manual/
 		dohtml -r ${WORKDIR}/aoi_manual/
 	fi
diff --git a/media-gfx/gimp-print/ChangeLog b/media-gfx/gimp-print/ChangeLog
index 27bfe0988dcb..9ec3d2703d19 100644
--- a/media-gfx/gimp-print/ChangeLog
+++ b/media-gfx/gimp-print/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/gimp-print
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp-print/ChangeLog,v 1.41 2004/06/05 09:52:07 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp-print/ChangeLog,v 1.42 2004/06/07 21:43:50 agriffis Exp $
+
+  07 Jun 2004; Aron Griffis <agriffis@gentoo.org> gimp-print-4.2.5-r2.ebuild,
+  gimp-print-4.2.6.ebuild, gimp-print-5.0.0_alpha2.ebuild:
+  Fix use invocation
 
   05 Jun 2004; Bryan �stergaard <kloeri@gentoo.org> gimp-print-4.2.6.ebuild:
   Stable on alpha.
diff --git a/media-gfx/gimp-print/gimp-print-4.2.5-r2.ebuild b/media-gfx/gimp-print/gimp-print-4.2.5-r2.ebuild
index aceb0d55c7ef..ce21e2fc3334 100644
--- a/media-gfx/gimp-print/gimp-print-4.2.5-r2.ebuild
+++ b/media-gfx/gimp-print/gimp-print-4.2.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/media-gfx/gimp-print/gimp-print-4.2.5-r2.ebuild,v 1.8 2004/03/02 14:05:16 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp-print/gimp-print-4.2.5-r2.ebuild,v 1.9 2004/06/07 21:43:50 agriffis Exp $
 
 inherit libtool
 
@@ -43,7 +43,7 @@ src_compile() {
 		&& myconf="${myconf} --with-gimp" \
 		|| myconf="${myconf} --without-gimp"
 
-	if [ "`use cups`" ]; then
+	if use cups; then
 		myconf="${myconf} --with-cups"
 	else
 		myconf="${myconf} --without-cups"
@@ -71,7 +71,7 @@ src_compile() {
 src_install () {
 	make install DESTDIR=${D} || die
 
-	if [ ! "`use ppds`" ]; then
+	if ! use ppds; then
 		rm -fR ${D}/usr/share/cups/model/
 	fi
 
diff --git a/media-gfx/gimp-print/gimp-print-4.2.6.ebuild b/media-gfx/gimp-print/gimp-print-4.2.6.ebuild
index 05141b1b0021..aa6ec65bebcf 100644
--- a/media-gfx/gimp-print/gimp-print-4.2.6.ebuild
+++ b/media-gfx/gimp-print/gimp-print-4.2.6.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/media-gfx/gimp-print/gimp-print-4.2.6.ebuild,v 1.9 2004/06/05 09:52:07 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp-print/gimp-print-4.2.6.ebuild,v 1.10 2004/06/07 21:43:50 agriffis Exp $
 
 inherit libtool
 
@@ -43,7 +43,7 @@ src_compile() {
 		&& myconf="${myconf} --with-gimp" \
 		|| myconf="${myconf} --without-gimp"
 
-	if [ "`use cups`" ]; then
+	if use cups; then
 		myconf="${myconf} --with-cups"
 	else
 		myconf="${myconf} --without-cups"
@@ -71,7 +71,7 @@ src_compile() {
 src_install () {
 	make install DESTDIR=${D} || die
 
-	if [ ! "`use ppds`" ]; then
+	if ! use ppds; then
 		rm -fR ${D}/usr/share/cups/model/
 	fi
 
diff --git a/media-gfx/gimp-print/gimp-print-5.0.0_alpha2.ebuild b/media-gfx/gimp-print/gimp-print-5.0.0_alpha2.ebuild
index 278583b83c8b..274865fca67b 100644
--- a/media-gfx/gimp-print/gimp-print-5.0.0_alpha2.ebuild
+++ b/media-gfx/gimp-print/gimp-print-5.0.0_alpha2.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/media-gfx/gimp-print/gimp-print-5.0.0_alpha2.ebuild,v 1.1 2004/04/17 11:54:41 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp-print/gimp-print-5.0.0_alpha2.ebuild,v 1.2 2004/06/07 21:43:50 agriffis Exp $
 
 inherit flag-o-matic libtool
 
@@ -47,13 +47,13 @@ src_compile() {
 		&& myconf="${myconf} --with-gimp" \
 		|| myconf="${myconf} --without-gimp"
 
-	if [ `use cups` ]; then
+	if use cups; then
 		myconf="${myconf} --with-cups"
 	else
 		myconf="${myconf} --without-cups"
 	fi
 
-	if [ "`use cups`" -a "`use ppds`" ]; then
+	if use cups && use ppds; then
 		myconf="${myconf} --enable-cups-ppds"
 	else
 		myconf="${myconf} --disable-cups-ppds"
diff --git a/media-gfx/gimp/ChangeLog b/media-gfx/gimp/ChangeLog
index f6affd8d5ad2..1f99993645d6 100644
--- a/media-gfx/gimp/ChangeLog
+++ b/media-gfx/gimp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/gimp
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.80 2004/06/05 09:50:02 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.81 2004/06/07 21:40:36 agriffis Exp $
+
+  07 Jun 2004; Aron Griffis <agriffis@gentoo.org> gimp-1.2.3-r3.ebuild,
+  gimp-1.2.4.ebuild, gimp-1.2.5.ebuild:
+  Fix use invocation
 
   05 Jun 2004; Bryan �stergaard <kloeri@gentoo.org> gimp-1.2.5.ebuild:
   Stable on alpha.
diff --git a/media-gfx/gimp/gimp-1.2.3-r3.ebuild b/media-gfx/gimp/gimp-1.2.3-r3.ebuild
index 7a66c77b1270..f74fc7646db4 100644
--- a/media-gfx/gimp/gimp-1.2.3-r3.ebuild
+++ b/media-gfx/gimp/gimp-1.2.3-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/media-gfx/gimp/gimp-1.2.3-r3.ebuild,v 1.14 2004/01/30 05:52:20 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-1.2.3-r3.ebuild,v 1.15 2004/06/07 21:40:36 agriffis Exp $
 
 inherit eutils flag-o-matic
 
@@ -27,7 +27,7 @@ DEPEND="nls? ( sys-devel/gettext )
 	${RDEPEND}"
 
 src_unpack() {
-	if [ "`use threads`" ]; then
+	if use threads; then
 		eerror "I'm sorry I can't build against a threaded perl,"
 		eerror "please remerge perl and libperl without"
 		eerror "'USE=threads' and try again.  (Note: this message"
@@ -88,28 +88,28 @@ src_compile() {
 	local myconf=""
 	local mymake=""
 	local myvars=""
-	if [ -z "`use nls`" ] ; then
+	if ! use nls ; then
 		myconf="${myconf} --disable-nls"
 	fi
 
-	if [ -z "`use perl`" ] ; then
+	if ! use perl ; then
 		myconf="${myconf} --disable-perl"
 	else
 		export  PERL_MM_OPT=' PREFIX=${D}/usr'
 		myconf="${myconf} --enable-perl"
 	fi
 
-	if [ -z "`use python`" ] ; then
+	if ! use python ; then
 		myconf="${myconf} --disable-python"
 	else
 		myconf="${myconf} --enable-python"
 	fi
 
-	if [ -z "`use aalib`" ] ; then
+	if ! use aalib ; then
 		mymake="LIBAA= AA="
 	fi
 
-	if [ -z "`use gnome`" ] ; then
+	if ! use gnome ; then
 		mymake="${mymake} HELPBROWSER="
 	fi
 
@@ -119,7 +119,7 @@ src_compile() {
 		--disable-debug \
 		${myconf} || die
 
-	if [ -z "`use aalib`" ] ; then
+	if ! use aalib ; then
 		# Horrible automake brokenness
 		cp plug-ins/common/Makefile plug-ins/common/Makefile.orig
 		cat plug-ins/common/Makefile.orig | \
@@ -134,11 +134,11 @@ src_compile() {
 src_install() {
 
 	local mymake=""
-	if [ -z "`use aalib`" ] ; then
+	if ! use aalib ; then
 		mymake="LIBAA= AA="
 	fi
 
-	if [ -z "`use gnome`" ] ; then
+	if ! use gnome ; then
 		mymake="${mymake} HELPBROWSER="
 	fi
 
@@ -160,7 +160,7 @@ src_install() {
 	#this next line closes bug #810
 	dosym gimptool-1.2 /usr/bin/gimptool
 
-	if [ "`use gnome`" ] && [ -d ${ROOT}/usr/share/applications ]
+	if use gnome && [ -d ${ROOT}/usr/share/applications ]
 	then
 		insinto /usr/share/applications
 		doins ${FILESDIR}/gimp.desktop
diff --git a/media-gfx/gimp/gimp-1.2.4.ebuild b/media-gfx/gimp/gimp-1.2.4.ebuild
index 3c72c097b150..1e938a61467a 100644
--- a/media-gfx/gimp/gimp-1.2.4.ebuild
+++ b/media-gfx/gimp/gimp-1.2.4.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/media-gfx/gimp/gimp-1.2.4.ebuild,v 1.12 2004/03/19 13:08:49 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-1.2.4.ebuild,v 1.13 2004/06/07 21:40:36 agriffis Exp $
 
 inherit eutils flag-o-matic
 
@@ -65,7 +65,7 @@ src_compile() {
 		`use_enable doc gtk-doc` \
 		${myconf} || die
 
-	if [ -z "`use aalib`" ] ; then
+	if ! use aalib ; then
 		# Horrible automake brokenness
 		cp plug-ins/common/Makefile plug-ins/common/Makefile.orig
 		cat plug-ins/common/Makefile.orig | \
diff --git a/media-gfx/gimp/gimp-1.2.5.ebuild b/media-gfx/gimp/gimp-1.2.5.ebuild
index 7a84eda2b8cd..c5ce2c92b130 100644
--- a/media-gfx/gimp/gimp-1.2.5.ebuild
+++ b/media-gfx/gimp/gimp-1.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/media-gfx/gimp/gimp-1.2.5.ebuild,v 1.18 2004/06/05 09:50:02 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-1.2.5.ebuild,v 1.19 2004/06/07 21:40:36 agriffis Exp $
 
 inherit eutils flag-o-matic
 
@@ -67,7 +67,7 @@ src_compile() {
 		`use_enable doc gtk-doc` \
 		${myconf} || die
 
-	if [ -z "`use aalib`" ] ; then
+	if ! use aalib ; then
 		# Horrible automake brokenness
 		cp plug-ins/common/Makefile plug-ins/common/Makefile.orig
 		cat plug-ins/common/Makefile.orig | \