Fix use invocation

25 files changed, 78 insertions, 54 deletions

diff --git a/app-office/gnucash/ChangeLog b/app-office/gnucash/ChangeLog
index cf2b95b2289b..738d2d7f7bbd 100644
--- a/app-office/gnucash/ChangeLog
+++ b/app-office/gnucash/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/gnucash
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/ChangeLog,v 1.44 2004/05/11 17:53:17 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/ChangeLog,v 1.45 2004/06/02 02:31:45 agriffis Exp $
+
+  01 Jun 2004; Aron Griffis <agriffis@gentoo.org> gnucash-1.6.8.ebuild,
+  gnucash-1.8.4.ebuild, gnucash-1.8.5.ebuild, gnucash-1.8.6.ebuild,
+  gnucash-1.8.7.ebuild, gnucash-1.8.8.ebuild, gnucash-1.8.9.ebuild:
+  Fix use invocation
 
   11 May 2004; Seemant Kulleen <seemant@gentoo.org> gnucash-1.8.9.ebuild:
   added quotes local USE flag to enable online stock quote retrieval. Closes
diff --git a/app-office/gnucash/gnucash-1.6.8.ebuild b/app-office/gnucash/gnucash-1.6.8.ebuild
index c0a3732369e3..440ca79cc234 100644
--- a/app-office/gnucash/gnucash-1.6.8.ebuild
+++ b/app-office/gnucash/gnucash-1.6.8.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/app-office/gnucash/gnucash-1.6.8.ebuild,v 1.15 2004/04/26 16:01:06 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/gnucash-1.6.8.ebuild,v 1.16 2004/06/02 02:31:45 agriffis Exp $
 
 inherit flag-o-matic
 
diff --git a/app-office/gnucash/gnucash-1.8.4.ebuild b/app-office/gnucash/gnucash-1.8.4.ebuild
index 6f0751c9a3da..c36955a0208b 100644
--- a/app-office/gnucash/gnucash-1.8.4.ebuild
+++ b/app-office/gnucash/gnucash-1.8.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/app-office/gnucash/gnucash-1.8.4.ebuild,v 1.11 2004/01/01 15:26:02 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/gnucash-1.8.4.ebuild,v 1.12 2004/06/02 02:31:45 agriffis Exp $
 
 inherit flag-o-matic libtool
 
@@ -72,7 +72,7 @@ src_compile() {
 
 	emake || die "make failed"
 
-	if [ -n "`use doc`" ]; then
+	if use doc; then
 		cd ${WORKDIR}/${PN}-docs-${DOC_VER}
 		econf --localstatedir=/var/lib || die "doc configure failed"
 		emake || die "doc make failed"
@@ -84,7 +84,7 @@ src_install() {
 	dodoc ABOUT-NLS AUTHORS COPYING ChangeLog HACKING NEWS README* TODO
 	dodoc docs/README*
 
-	if [ -n "`use doc`" ]; then
+	if use doc; then
 		cd ${WORKDIR}/${PN}-docs-${DOC_VER}
 		make DESTDIR=${D} \
 			scrollkeeper_localstate_dir=${D}/var/lib/scrollkeeper \
diff --git a/app-office/gnucash/gnucash-1.8.5.ebuild b/app-office/gnucash/gnucash-1.8.5.ebuild
index 104985fbb143..08f98bd222b8 100644
--- a/app-office/gnucash/gnucash-1.8.5.ebuild
+++ b/app-office/gnucash/gnucash-1.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/app-office/gnucash/gnucash-1.8.5.ebuild,v 1.6 2004/01/01 15:26:02 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/gnucash-1.8.5.ebuild,v 1.7 2004/06/02 02:31:45 agriffis Exp $
 
 inherit flag-o-matic libtool
 
diff --git a/app-office/gnucash/gnucash-1.8.6.ebuild b/app-office/gnucash/gnucash-1.8.6.ebuild
index fc117fc2e3be..09fe200e5176 100644
--- a/app-office/gnucash/gnucash-1.8.6.ebuild
+++ b/app-office/gnucash/gnucash-1.8.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/app-office/gnucash/gnucash-1.8.6.ebuild,v 1.2 2004/01/01 15:26:02 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/gnucash-1.8.6.ebuild,v 1.3 2004/06/02 02:31:45 agriffis Exp $
 
 inherit flag-o-matic libtool
 
diff --git a/app-office/gnucash/gnucash-1.8.7.ebuild b/app-office/gnucash/gnucash-1.8.7.ebuild
index d5fd4d024c9a..67ab984492c7 100644
--- a/app-office/gnucash/gnucash-1.8.7.ebuild
+++ b/app-office/gnucash/gnucash-1.8.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/app-office/gnucash/gnucash-1.8.7.ebuild,v 1.3 2004/01/01 15:26:02 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/gnucash-1.8.7.ebuild,v 1.4 2004/06/02 02:31:45 agriffis Exp $
 
 inherit flag-o-matic libtool
 
diff --git a/app-office/gnucash/gnucash-1.8.8.ebuild b/app-office/gnucash/gnucash-1.8.8.ebuild
index b61eeaa29911..c9d81afdad0a 100644
--- a/app-office/gnucash/gnucash-1.8.8.ebuild
+++ b/app-office/gnucash/gnucash-1.8.8.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/app-office/gnucash/gnucash-1.8.8.ebuild,v 1.4 2004/04/10 21:34:17 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/gnucash-1.8.8.ebuild,v 1.5 2004/06/02 02:31:45 agriffis Exp $
 
 inherit flag-o-matic libtool
 
diff --git a/app-office/gnucash/gnucash-1.8.9.ebuild b/app-office/gnucash/gnucash-1.8.9.ebuild
index 4125d210879c..6eda84a92f0b 100644
--- a/app-office/gnucash/gnucash-1.8.9.ebuild
+++ b/app-office/gnucash/gnucash-1.8.9.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/app-office/gnucash/gnucash-1.8.9.ebuild,v 1.2 2004/05/11 17:53:17 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/gnucash-1.8.9.ebuild,v 1.3 2004/06/02 02:31:45 agriffis Exp $
 
 inherit flag-o-matic libtool
 
@@ -96,7 +96,7 @@ pkg_postinst() {
 		scrollkeeper-update -q -p ${ROOT}/var/lib/scrollkeeper
 	fi
 
-	if [ -z "`use quotes`" ]; then
+	if ! use quotes; then
 		ewarn
 		einfo "If you wish to enable Online Stock Quotes Retrieval,"
 		einfo "Please re-emerge gnucash with USE=\"quotes\""
diff --git a/app-office/openoffice-bin/ChangeLog b/app-office/openoffice-bin/ChangeLog
index f1dfce0a42a4..4c25a47da502 100644
--- a/app-office/openoffice-bin/ChangeLog
+++ b/app-office/openoffice-bin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/openoffice-bin
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.42 2004/05/12 07:14:06 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.43 2004/06/02 02:31:03 agriffis Exp $
+
+  01 Jun 2004; Aron Griffis <agriffis@gentoo.org>
+  openoffice-bin-1.0.3.1.ebuild, openoffice-bin-1.1.0.ebuild,
+  openoffice-bin-1.1.1.ebuild:
+  Fix use invocation
 
   11 May 2004; Travis Tilley <lv@gentoo.org> openoffice-bin-1.1.1.ebuild:
   added back in amd64 support and added ~amd64 keyword
diff --git a/app-office/openoffice-bin/openoffice-bin-1.0.3.1.ebuild b/app-office/openoffice-bin/openoffice-bin-1.0.3.1.ebuild
index bf3aa4a50249..c985e1fe44c9 100644
--- a/app-office/openoffice-bin/openoffice-bin-1.0.3.1.ebuild
+++ b/app-office/openoffice-bin/openoffice-bin-1.0.3.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/app-office/openoffice-bin/openoffice-bin-1.0.3.1.ebuild,v 1.5 2004/05/12 07:14:06 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-1.0.3.1.ebuild,v 1.6 2004/06/02 02:31:03 agriffis Exp $
 
 IUSE="kde gnome"
 
@@ -15,7 +15,7 @@ LOC="/opt"
 INSTDIR="${LOC}/OpenOffice.org${PV//.1/}"
 MY_PV="`echo ${PV//.1/} | gawk '{ print toupper($1) }'`"
 
-if [ `use ppc` ]; then
+if use ppc; then
 	MY_P="OOo_${MY_PV}_LinuxPowerPC_installer"
 	S="${WORKDIR}/${MY_P}"
 else
@@ -135,7 +135,7 @@ src_install() {
 	dosym ooffice /usr/bin/oopadmin
 
 	einfo "Installing Menu shortcuts (need \"gnome\" or \"kde\" in USE)..."
-	if [ -n "`use gnome`" ]
+	if use gnome
 	then
 		insinto /usr/share/gnome/apps/OpenOffice.org
 		# Install the files needed for the catagory
@@ -152,7 +152,7 @@ src_install() {
 		done
 	fi
 
-	if [ -n "`use kde`" ]
+	if use kde
 	then
 		local kdeloc="${D}${INSTDIR}/share/kde/net/applnk/OpenOffice.org${PV//.1/}"
 
diff --git a/app-office/openoffice-bin/openoffice-bin-1.1.0.ebuild b/app-office/openoffice-bin/openoffice-bin-1.1.0.ebuild
index 1e8eb9248f42..e7136380ad24 100644
--- a/app-office/openoffice-bin/openoffice-bin-1.1.0.ebuild
+++ b/app-office/openoffice-bin/openoffice-bin-1.1.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/app-office/openoffice-bin/openoffice-bin-1.1.0.ebuild,v 1.8 2004/01/24 13:54:07 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-1.1.0.ebuild,v 1.9 2004/06/02 02:31:03 agriffis Exp $
 
 IUSE="kde gnome"
 
@@ -126,7 +126,7 @@ src_install() {
 	done
 
 	einfo "Installing Menu shortcuts (need \"gnome\" or \"kde\" in USE)..."
-	if [ -n "`use gnome`" ]
+	if use gnome
 	then
 		insinto /usr/share/gnome/apps/OpenOffice.org
 		# Install the files needed for the catagory
@@ -147,7 +147,7 @@ src_install() {
 		done
 	fi
 
-	if [ -n "`use kde`" ]
+	if use kde
 	then
 		local kdeloc="${D}${INSTDIR}/share/kde/net/"
 
diff --git a/app-office/openoffice-bin/openoffice-bin-1.1.1.ebuild b/app-office/openoffice-bin/openoffice-bin-1.1.1.ebuild
index 1679ab48b233..a06411e496aa 100644
--- a/app-office/openoffice-bin/openoffice-bin-1.1.1.ebuild
+++ b/app-office/openoffice-bin/openoffice-bin-1.1.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/app-office/openoffice-bin/openoffice-bin-1.1.1.ebuild,v 1.8 2004/05/12 07:14:06 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-1.1.1.ebuild,v 1.9 2004/06/02 02:31:03 agriffis Exp $
 
 IUSE="kde gnome"
 
@@ -131,7 +131,7 @@ src_install() {
 	done
 
 	einfo "Installing Menu shortcuts (need \"gnome\" or \"kde\" in USE)..."
-	if [ -n "`use gnome`" ]
+	if use gnome
 	then
 		insinto /usr/share/gnome/apps/OpenOffice.org
 		# Install the files needed for the catagory
@@ -152,7 +152,7 @@ src_install() {
 		done
 	fi
 
-	if [ -n "`use kde`" ]
+	if use kde
 	then
 		local kdeloc="${D}${INSTDIR}/share/kde/net/"
 
diff --git a/app-office/openoffice-ximian-bin/ChangeLog b/app-office/openoffice-ximian-bin/ChangeLog
index cae1a770145b..60d944d5c349 100644
--- a/app-office/openoffice-ximian-bin/ChangeLog
+++ b/app-office/openoffice-ximian-bin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/openoffice-ximian-bin
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian-bin/ChangeLog,v 1.1 2004/04/02 14:15:43 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian-bin/ChangeLog,v 1.2 2004/06/02 02:32:17 agriffis Exp $
+
+  01 Jun 2004; Aron Griffis <agriffis@gentoo.org>
+  openoffice-ximian-bin-1.1.52.ebuild:
+  Fix use invocation
 
 *openoffice-ximian-bin-1.1.52 (02 Apr 2004)
 
diff --git a/app-office/openoffice-ximian-bin/openoffice-ximian-bin-1.1.52.ebuild b/app-office/openoffice-ximian-bin/openoffice-ximian-bin-1.1.52.ebuild
index 9c76091e7fbc..41ce83f51a06 100644
--- a/app-office/openoffice-ximian-bin/openoffice-ximian-bin-1.1.52.ebuild
+++ b/app-office/openoffice-ximian-bin/openoffice-ximian-bin-1.1.52.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/app-office/openoffice-ximian-bin/openoffice-ximian-bin-1.1.52.ebuild,v 1.3 2004/04/05 14:03:36 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian-bin/openoffice-ximian-bin-1.1.52.ebuild,v 1.4 2004/06/02 02:32:17 agriffis Exp $
 
 inherit rpm
 
@@ -140,7 +140,7 @@ src_install() {
 	sed -i -e s/'=oo'/'=xoo'/g *.desktop
 
 	einfo "Installing Menu shortcuts and mime info (need \"gnome\" or \"kde\" in USE)..."
-	if [ -n "`use gnome`" ]
+	if use gnome
 	then
 		insinto /usr/share/applications
 		doins *.desktop
@@ -150,7 +150,7 @@ src_install() {
 		doins ${FILESDIR}/${OO_VER}/ximian-openoffice.keys
 	fi
 
-	if [ -n "`use kde`" ]
+	if use kde
 	then
 		insinto /usr/share/applnk/Ximian-OpenOffice.org
 		doins *.desktop
diff --git a/app-office/openoffice-ximian/ChangeLog b/app-office/openoffice-ximian/ChangeLog
index d6e16b4cc08d..0fd7b5773a14 100644
--- a/app-office/openoffice-ximian/ChangeLog
+++ b/app-office/openoffice-ximian/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/openoffice-ximian
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/ChangeLog,v 1.43 2004/05/28 21:45:54 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/ChangeLog,v 1.44 2004/06/02 02:30:26 agriffis Exp $
+
+  01 Jun 2004; Aron Griffis <agriffis@gentoo.org>
+  openoffice-ximian-1.1.51-r1.ebuild, openoffice-ximian-1.1.53.ebuild,
+  openoffice-ximian-1.1.54.ebuild, openoffice-ximian-1.1.55-r1.ebuild,
+  openoffice-ximian-1.1.55.ebuild, openoffice-ximian-1.1.57.ebuild:
+  Fix use invocation
 
 *openoffice-ximian-1.1.57 (28 May 2004)
 
diff --git a/app-office/openoffice-ximian/openoffice-ximian-1.1.51-r1.ebuild b/app-office/openoffice-ximian/openoffice-ximian-1.1.51-r1.ebuild
index b81268d2c286..ece5e2d1ab76 100644
--- a/app-office/openoffice-ximian/openoffice-ximian-1.1.51-r1.ebuild
+++ b/app-office/openoffice-ximian/openoffice-ximian-1.1.51-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/app-office/openoffice-ximian/openoffice-ximian-1.1.51-r1.ebuild,v 1.4 2004/05/07 06:29:31 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.1.51-r1.ebuild,v 1.5 2004/06/02 02:30:26 agriffis Exp $
 
 # IMPORTANT:  This is extremely alpha!!!
 
@@ -465,7 +465,7 @@ src_install() {
 	sed -i -e s/'=oo'/'=xoo'/g *.desktop
 
 	einfo "Installing Menu shortcuts and mime info (need \"gnome\" or \"kde\" in USE)..."
-	if [ -n "`use gnome`" ]
+	if use gnome
 	then
 		insinto /usr/share/applications
 		doins *.desktop
@@ -475,7 +475,7 @@ src_install() {
 		doins ${FILESDIR}/${OO_VER}/ximian-openoffice.keys
 	fi
 
-	if [ -n "`use kde`" ]
+	if use kde
 	then
 		insinto /usr/share/applnk/Ximian-OpenOffice.org
 		doins *.desktop
diff --git a/app-office/openoffice-ximian/openoffice-ximian-1.1.53.ebuild b/app-office/openoffice-ximian/openoffice-ximian-1.1.53.ebuild
index b16cb465684f..498b4ec9cd7b 100644
--- a/app-office/openoffice-ximian/openoffice-ximian-1.1.53.ebuild
+++ b/app-office/openoffice-ximian/openoffice-ximian-1.1.53.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/app-office/openoffice-ximian/openoffice-ximian-1.1.53.ebuild,v 1.7 2004/05/23 21:34:21 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.1.53.ebuild,v 1.8 2004/06/02 02:30:26 agriffis Exp $
 
 # IMPORTANT:  This is extremely alpha!!!
 
@@ -460,7 +460,7 @@ src_install() {
 	sed -i -e s/'=oo'/'=xoo'/g *.desktop
 
 	einfo "Installing Menu shortcuts and mime info (need \"gnome\" or \"kde\" in USE)..."
-	if [ -n "`use gnome`" ]
+	if use gnome
 	then
 		insinto /usr/share/applications
 		doins *.desktop
@@ -470,7 +470,7 @@ src_install() {
 		doins ${FILESDIR}/${OO_VER}/ximian-openoffice.keys
 	fi
 
-	if [ -n "`use kde`" ]
+	if use kde
 	then
 		insinto /usr/share/applnk/Ximian-OpenOffice.org
 		doins *.desktop
diff --git a/app-office/openoffice-ximian/openoffice-ximian-1.1.54.ebuild b/app-office/openoffice-ximian/openoffice-ximian-1.1.54.ebuild
index 7162ac1fb61d..0faa1c630f21 100644
--- a/app-office/openoffice-ximian/openoffice-ximian-1.1.54.ebuild
+++ b/app-office/openoffice-ximian/openoffice-ximian-1.1.54.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/app-office/openoffice-ximian/openoffice-ximian-1.1.54.ebuild,v 1.9 2004/05/23 21:34:21 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.1.54.ebuild,v 1.10 2004/06/02 02:30:26 agriffis Exp $
 
 # IMPORTANT:  This is extremely alpha!!!
 
@@ -460,7 +460,7 @@ src_install() {
 	sed -i -e s/'=oo'/'=xoo'/g *.desktop
 
 	einfo "Installing Menu shortcuts and mime info (need \"gnome\" or \"kde\" in USE)..."
-	if [ -n "`use gnome`" ]
+	if use gnome
 	then
 		insinto /usr/share/applications
 		doins *.desktop
@@ -470,7 +470,7 @@ src_install() {
 		doins ${FILESDIR}/${OO_VER}/ximian-openoffice.keys
 	fi
 
-	if [ -n "`use kde`" ]
+	if use kde
 	then
 		insinto /usr/share/applnk/Ximian-OpenOffice.org
 		doins *.desktop
diff --git a/app-office/openoffice-ximian/openoffice-ximian-1.1.55-r1.ebuild b/app-office/openoffice-ximian/openoffice-ximian-1.1.55-r1.ebuild
index 4512594b68af..326e02711fa2 100644
--- a/app-office/openoffice-ximian/openoffice-ximian-1.1.55-r1.ebuild
+++ b/app-office/openoffice-ximian/openoffice-ximian-1.1.55-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/app-office/openoffice-ximian/openoffice-ximian-1.1.55-r1.ebuild,v 1.6 2004/05/19 00:13:10 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.1.55-r1.ebuild,v 1.7 2004/06/02 02:30:26 agriffis Exp $
 
 # IMPORTANT:  This is extremely alpha!!!
 
@@ -247,7 +247,7 @@ src_unpack() {
 		epatch ${FILESDIR}/${OO_VER}/openoffice-1.1.0-sparc64-fix.patch
 	fi
 
-	if [ `use ooo-kde` ]; then
+	if use ooo-kde; then
 		DISTRO=KDE
 		ICONDIR=${WORKDIR}/ooo-KDE_icons-${KDE_ICON_VER}
 		WIDGETSET=kde
@@ -480,7 +480,7 @@ src_install() {
 	sed -i -e s/'=oo'/'=xoo'/g *.desktop
 
 	einfo "Installing Menu shortcuts and mime info (need \"gnome\" or \"kde\" in USE)..."
-	if [ -n "`use gnome`" ]
+	if use gnome
 	then
 		insinto /usr/share/applications
 		doins *.desktop
@@ -490,7 +490,7 @@ src_install() {
 		doins ${FILESDIR}/${OO_VER}/ximian-openoffice.keys
 	fi
 
-	if [ -n "`use kde`" ]
+	if use kde
 	then
 		insinto /usr/share/applnk/Ximian-OpenOffice.org
 		doins *.desktop
diff --git a/app-office/openoffice-ximian/openoffice-ximian-1.1.55.ebuild b/app-office/openoffice-ximian/openoffice-ximian-1.1.55.ebuild
index 860fb080548f..fd15eb4111a7 100644
--- a/app-office/openoffice-ximian/openoffice-ximian-1.1.55.ebuild
+++ b/app-office/openoffice-ximian/openoffice-ximian-1.1.55.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/app-office/openoffice-ximian/openoffice-ximian-1.1.55.ebuild,v 1.6 2004/05/23 21:34:21 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.1.55.ebuild,v 1.7 2004/06/02 02:30:26 agriffis Exp $
 
 # IMPORTANT:  This is extremely alpha!!!
 
@@ -464,7 +464,7 @@ src_install() {
 	sed -i -e s/'=oo'/'=xoo'/g *.desktop
 
 	einfo "Installing Menu shortcuts and mime info (need \"gnome\" or \"kde\" in USE)..."
-	if [ -n "`use gnome`" ]
+	if use gnome
 	then
 		insinto /usr/share/applications
 		doins *.desktop
@@ -474,7 +474,7 @@ src_install() {
 		doins ${FILESDIR}/${OO_VER}/ximian-openoffice.keys
 	fi
 
-	if [ -n "`use kde`" ]
+	if use kde
 	then
 		insinto /usr/share/applnk/Ximian-OpenOffice.org
 		doins *.desktop
diff --git a/app-office/openoffice-ximian/openoffice-ximian-1.1.57.ebuild b/app-office/openoffice-ximian/openoffice-ximian-1.1.57.ebuild
index a63b37bbbb81..32744b245917 100644
--- a/app-office/openoffice-ximian/openoffice-ximian-1.1.57.ebuild
+++ b/app-office/openoffice-ximian/openoffice-ximian-1.1.57.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/app-office/openoffice-ximian/openoffice-ximian-1.1.57.ebuild,v 1.1 2004/05/28 21:45:54 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.1.57.ebuild,v 1.2 2004/06/02 02:30:26 agriffis Exp $
 
 # IMPORTANT:  This is extremely alpha!!!
 
@@ -247,7 +247,7 @@ src_unpack() {
 		epatch ${FILESDIR}/${OO_VER}/openoffice-1.1.0-sparc64-fix.patch
 	fi
 
-	if [ `use ooo-kde` ]; then
+	if use ooo-kde; then
 		DISTRO=KDE
 		ICONDIR=${WORKDIR}/ooo-KDE_icons-${KDE_ICON_VER}
 		WIDGETSET=kde
@@ -481,7 +481,7 @@ src_install() {
 	sed -i -e s/'=oo'/'=xoo'/g *.desktop
 
 	einfo "Installing Menu shortcuts and mime info (need \"gnome\" or \"kde\" in USE)..."
-	if [ -n "`use gnome`" ]
+	if use gnome
 	then
 		insinto /usr/share/applications
 		doins *.desktop
@@ -491,7 +491,7 @@ src_install() {
 		doins ${FILESDIR}/${OO_VER}/ximian-openoffice.keys
 	fi
 
-	if [ -n "`use kde`" ]
+	if use kde
 	then
 		insinto /usr/share/applnk/Ximian-OpenOffice.org
 		doins *.desktop
diff --git a/app-office/scribus/ChangeLog b/app-office/scribus/ChangeLog
index 4084877975ff..da9eb9235795 100644
--- a/app-office/scribus/ChangeLog
+++ b/app-office/scribus/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/scribus
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/ChangeLog,v 1.34 2004/04/28 23:45:13 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/ChangeLog,v 1.35 2004/06/02 02:28:47 agriffis Exp $
+
+  01 Jun 2004; Aron Griffis <agriffis@gentoo.org> scribus-1.1.4.ebuild,
+  scribus-1.1.5.ebuild, scribus-1.1.6.ebuild:
+  Fix use invocation
 
   28 Apr 2004; Jon Portnoy <avenj@gentoo.org> scribus-1.1.6.ebuild :
   Stable on AMD64.
diff --git a/app-office/scribus/scribus-1.1.4.ebuild b/app-office/scribus/scribus-1.1.4.ebuild
index 0498b1b14605..29c109cb349c 100644
--- a/app-office/scribus/scribus-1.1.4.ebuild
+++ b/app-office/scribus/scribus-1.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/app-office/scribus/scribus-1.1.4.ebuild,v 1.5 2004/02/26 12:28:10 bazik Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.1.4.ebuild,v 1.6 2004/06/02 02:28:47 agriffis Exp $
 
 DESCRIPTION="Desktop Publishing (DTP) and Layout program for Linux."
 HOMEPAGE="http://web2.altmuehlnet.de/fschmid/"
@@ -31,7 +31,7 @@ src_install() {
 	dodoc AUTHORS ChangeLog README TODO
 
 	# Fixing desktop.scribus
-	if [ `use kde` ] ; then
+	if use kde ; then
 		inherit kde-functions
 		set-kdedir 3
 		sed -e 's/local\///' scribus.desktop > desktop.scribus.2
diff --git a/app-office/scribus/scribus-1.1.5.ebuild b/app-office/scribus/scribus-1.1.5.ebuild
index 9be90f1cc860..c2a68742bede 100644
--- a/app-office/scribus/scribus-1.1.5.ebuild
+++ b/app-office/scribus/scribus-1.1.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/app-office/scribus/scribus-1.1.5.ebuild,v 1.5 2004/04/28 23:45:13 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.1.5.ebuild,v 1.6 2004/06/02 02:28:47 agriffis Exp $
 
 inherit kde-functions
 need-qt 3
@@ -36,7 +36,7 @@ src_install() {
 	dodoc AUTHORS ChangeLog README TODO
 
 	# Fixing desktop.scribus
-	if [ `use kde` ] ; then
+	if use kde ; then
 		inherit kde-functions
 		set-kdedir 3
 		sed -e 's/local\///' scribus.desktop > desktop.scribus.2
diff --git a/app-office/scribus/scribus-1.1.6.ebuild b/app-office/scribus/scribus-1.1.6.ebuild
index 70e73b10ef1d..4f02eecdc0c6 100644
--- a/app-office/scribus/scribus-1.1.6.ebuild
+++ b/app-office/scribus/scribus-1.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/app-office/scribus/scribus-1.1.6.ebuild,v 1.1 2004/03/28 13:06:18 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.1.6.ebuild,v 1.2 2004/06/02 02:28:47 agriffis Exp $
 
 inherit kde-functions
 need-qt 3
@@ -36,7 +36,7 @@ src_install() {
 	dodoc AUTHORS ChangeLog README TODO
 
 	# Fixing desktop.scribus
-	if [ `use kde` ] ; then
+	if use kde ; then
 		inherit kde-functions
 		set-kdedir 3
 		sed -e 's/local\///' scribus.desktop > desktop.scribus.2