QA - fix use invocation

5 files changed, 44 insertions, 40 deletions

diff --git a/x11-base/xfree/ChangeLog b/x11-base/xfree/ChangeLog
index 5f97d91c5812..0fef760c5080 100644
--- a/x11-base/xfree/ChangeLog
+++ b/x11-base/xfree/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-base/xfree
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.347 2004/06/22 13:21:11 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.348 2004/06/23 23:55:35 agriffis Exp $
+
+  23 Jun 2004; Aron Griffis <agriffis@gentoo.org> xfree-4.3.0-r5.ebuild,
+  xfree-4.3.0-r6.ebuild, xfree-4.3.0-r7.ebuild:
+  QA - fix use invocation
 
   22 Jun 2004; Gustavo Zacarias <gustavoz@gentoo.org> xfree-4.3.0-r6.ebuild:
   Keyworded for hppa, bug #53226
diff --git a/x11-base/xfree/Manifest b/x11-base/xfree/Manifest
index c9c43a288d04..9534ece2e42a 100644
--- a/x11-base/xfree/Manifest
+++ b/x11-base/xfree/Manifest
@@ -1,26 +1,26 @@
-MD5 47ea6e47fea055ca56da9346e74cb437 ChangeLog 75913
+MD5 bea142bb76bc7356ffc5809d5ab15bf4 xfree-4.3.0-r5.ebuild 35314
+MD5 e551f50c47f212340b1cde5c99085ec6 xfree-4.3.0-r7.ebuild 39913
+MD5 9c6ff20342c39f333451acd5e7ea0d8b xfree-4.3.0-r6.ebuild 35405
+MD5 970a5e24758b5b05d8773541d7d6fb7d ChangeLog 76061
 MD5 e6ee387a2de6b2fea8e5a3573c48b667 metadata.xml 228
-MD5 b43f495a34fdd2ca971630c250e4cc1f xfree-4.3.0-r5.ebuild 35364
-MD5 eec85b3e3762366929aaaeb75bef4f4d xfree-4.3.0-r6.ebuild 35454
-MD5 d32252d63db88fef345e0c20ca1db7e9 xfree-4.3.0-r7.ebuild 39961
 MD5 7fd6e890f5d2a756eb18123975ad7f49 files/digest-xfree-4.3.0-r5 2002
 MD5 8ef125d85e46c8618cd318e611d8f33c files/digest-xfree-4.3.0-r6 2002
 MD5 252c61d8b687ce1467ff95552c156c48 files/digest-xfree-4.3.0-r7 1528
-MD5 2d22ba49943c630e4299f439d3a0d4cc files/4.3.0/XftConfig 7750
-MD5 c343ee3f0cbca24c7210773d483cfa15 files/4.3.0/10xfree 182
+MD5 4485c7fa46907db803d219218f62a5df files/4.3.0/xinitrc 918
+MD5 9cb44182ea92068b22973bcb0afda322 files/4.3.0/xserver.pamd 284
 MD5 c6dd3e9a9e557b9cba51ff77cb6108a4 files/4.3.0/Xsession 1521
 MD5 0e84cb8a3f7b821072b2a75482b83f97 files/4.3.0/Xsetup_0 880
-MD5 bbaa907f4a3ab1c4d9c618f438471e0a files/4.3.0/chooser.sh 1572
 MD5 e194f962a63f74c674887c9ade54a5ea files/4.3.0/site.def 3731
-MD5 a0a5e3aae53e94496a44e204d6914821 files/4.3.0/startDM.sh 895
 MD5 d0cb338160e3be8790524af8071cc4df files/4.3.0/xdm.pamd 380
-MD5 c0f85066fbeadd9af5963ff5c949f596 files/4.3.0/xdm.start 2833
-MD5 e39ec11eb9006c7c9c5cc46307890fa8 files/4.3.0/xfs.conf.d 787
+MD5 0dbec2e7b832f510fe1c630e4c5392b9 files/4.3.0/xfs.conf.d 788
 MD5 55ed160cbb7076b1292ea8e3772a2761 files/4.3.0/xfs.config 1331
-MD5 9103929a860f5124ebec7d228fce3991 files/4.3.0/xfs.start 6649
-MD5 4485c7fa46907db803d219218f62a5df files/4.3.0/xinitrc 918
-MD5 9cb44182ea92068b22973bcb0afda322 files/4.3.0/xserver.pamd 284
-MD5 a0ce0f1c8a5771a1194f5895211a3f66 files/4.3.0/Sessions/Xsession 2187
-MD5 ee55a387073cca1b14f1b285e1cf33a9 files/4.3.0/lib/libGL.la 777
-MD5 18e1ac4e97a57fdba470897aa2cb452e files/4.3.0/lib/libGLU.la 769
+MD5 36f95fc0dcc26c3f70657560a66c983f files/4.3.0/chooser.sh 1573
+MD5 5a8aa883d4246cc5542379f5de9d52f7 files/4.3.0/startDM.sh 896
+MD5 e5c3b47938e71233fb1cf0611ab12ac6 files/4.3.0/xdm.start 2834
+MD5 e783c6754efd83492961425ffdfe02d2 files/4.3.0/xfs.start 6650
+MD5 2d22ba49943c630e4299f439d3a0d4cc files/4.3.0/XftConfig 7750
+MD5 c343ee3f0cbca24c7210773d483cfa15 files/4.3.0/10xfree 182
 MD5 b2c509837ddfbd12d8f1ed9b50254f01 files/4.3.0/lib/libOSMesa.la 788
+MD5 18e1ac4e97a57fdba470897aa2cb452e files/4.3.0/lib/libGLU.la 769
+MD5 ee55a387073cca1b14f1b285e1cf33a9 files/4.3.0/lib/libGL.la 777
+MD5 a0ce0f1c8a5771a1194f5895211a3f66 files/4.3.0/Sessions/Xsession 2187
diff --git a/x11-base/xfree/xfree-4.3.0-r5.ebuild b/x11-base/xfree/xfree-4.3.0-r5.ebuild
index 11a833c2c427..191e553ab70a 100644
--- a/x11-base/xfree/xfree-4.3.0-r5.ebuild
+++ b/x11-base/xfree/xfree-4.3.0-r5.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/x11-base/xfree/xfree-4.3.0-r5.ebuild,v 1.16 2004/06/08 00:02:18 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.0-r5.ebuild,v 1.17 2004/06/23 23:55:35 agriffis Exp $
 
 inherit eutils flag-o-matic gcc xfree
 
@@ -283,18 +283,18 @@ src_unpack() {
 	fi
 # FIXME: bug #19812, 075 should be deprecated by 076, left as
 # TDFX_RISKY for feedback (put in -r3 if no problems)
-	if [ "`use 3dfx`" -a "${TDFX_RISKY}" = "yes" ]
+	if use 3dfx && [ "${TDFX_RISKY}" = "yes" ]
 	then
 		mv -f ${PATCH_DIR}/5850* ${PATCH_DIR}/excluded
 	else
 		mv -f ${PATCH_DIR}/5851* ${PATCH_DIR}/excluded
 	fi
 
-	if [ -z "`use ipv6`" ]
+	if ! use ipv6
 	then
 		mv -f ${PATCH_DIR}/200* ${PATCH_DIR}/excluded
 	else
-		if [ -z "`use doc`" ]
+		if ! use doc
 		then
 			mv -f ${PATCH_DIR}/2001* ${PATCH_DIR}/excluded
 		fi
@@ -500,7 +500,7 @@ src_unpack() {
 	echo "#define SharedLibXft YES" >> config/cf/host.def
 
 	# disable docs if doc not in USE
-	if [ -z "`use doc`" ]
+	if ! use doc
 	then
 		echo "#define BuildLinuxDocText NO" >> config/cf/host.def
 		echo "#define BuildLinuxDocHtml NO" >> config/cf/host.def
@@ -515,7 +515,7 @@ src_unpack() {
 	fi
 
 	# Native Language Support Fonts
-	if [ -z "`use nls`" ]
+	if ! use nls
 	then
 		echo "#define BuildCyrillicFonts NO" >> config/cf/host.def
 		echo "#define BuildArabicFonts NO" >> config/cf/host.def
@@ -523,7 +523,7 @@ src_unpack() {
 		echo "#define BuildHebrewFonts NO" >> config/cf/host.def
 		echo "#define BuildThaiFonts NO" >> config/cf/host.def
 
-		if [ -z "`use cjk`" ]
+		if ! use cjk
 		then
 			echo "#define BuildCIDFonts NO" >> config/cf/host.def
 			echo "#define BuildJapaneseFonts NO" >> config/cf/host.def
diff --git a/x11-base/xfree/xfree-4.3.0-r6.ebuild b/x11-base/xfree/xfree-4.3.0-r6.ebuild
index e7a80ad0cd36..eabb9a4c7b6e 100644
--- a/x11-base/xfree/xfree-4.3.0-r6.ebuild
+++ b/x11-base/xfree/xfree-4.3.0-r6.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/x11-base/xfree/xfree-4.3.0-r6.ebuild,v 1.41 2004/06/22 13:21:11 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.0-r6.ebuild,v 1.42 2004/06/23 23:55:35 agriffis Exp $
 
 inherit eutils flag-o-matic gcc xfree
 
@@ -283,20 +283,20 @@ src_unpack() {
 	fi
 # FIXME: bug #19812, 075 should be deprecated by 076, left as
 # TDFX_RISKY for feedback (put in -r3 if no problems)
-	if [ "`use 3dfx`" -a "${TDFX_RISKY}" = "yes" ]
+	if use 3dfx && [ "${TDFX_RISKY}" = "yes" ]
 	then
 		mv -f ${PATCH_DIR}/5850* ${PATCH_DIR}/excluded
 	else
 		mv -f ${PATCH_DIR}/5851* ${PATCH_DIR}/excluded
 	fi
 
-	if [ -z "`use ipv6`" ]
+	if ! use ipv6
 	then
 		mv -f ${PATCH_DIR}/200* ${PATCH_DIR}/excluded
 		mv -f ${PATCH_DIR}/9921* ${PATCH_DIR}/excluded
 	else
 		mv -f ${PATCH_DIR}/9920* ${PATCH_DIR}/excluded
-		if [ -z "`use doc`" ]
+		if ! use doc
 		then
 			mv -f ${PATCH_DIR}/2001* ${PATCH_DIR}/excluded
 		fi
@@ -502,7 +502,7 @@ src_unpack() {
 	echo "#define SharedLibXft YES" >> config/cf/host.def
 
 	# disable docs if doc not in USE
-	if [ -z "`use doc`" ]
+	if ! use doc
 	then
 		echo "#define BuildLinuxDocText NO" >> config/cf/host.def
 		echo "#define BuildLinuxDocHtml NO" >> config/cf/host.def
@@ -517,7 +517,7 @@ src_unpack() {
 	fi
 
 	# Native Language Support Fonts
-	if [ -z "`use nls`" ]
+	if ! use nls
 	then
 		echo "#define BuildCyrillicFonts NO" >> config/cf/host.def
 		echo "#define BuildArabicFonts NO" >> config/cf/host.def
@@ -525,7 +525,7 @@ src_unpack() {
 		echo "#define BuildHebrewFonts NO" >> config/cf/host.def
 		echo "#define BuildThaiFonts NO" >> config/cf/host.def
 
-		if [ -z "`use cjk`" ]
+		if ! use cjk
 		then
 			echo "#define BuildCIDFonts NO" >> config/cf/host.def
 			echo "#define BuildJapaneseFonts NO" >> config/cf/host.def
diff --git a/x11-base/xfree/xfree-4.3.0-r7.ebuild b/x11-base/xfree/xfree-4.3.0-r7.ebuild
index 221fc3651286..304447d84d33 100644
--- a/x11-base/xfree/xfree-4.3.0-r7.ebuild
+++ b/x11-base/xfree/xfree-4.3.0-r7.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/x11-base/xfree/xfree-4.3.0-r7.ebuild,v 1.3 2004/06/12 23:40:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.0-r7.ebuild,v 1.4 2004/06/23 23:55:35 agriffis Exp $
 
 # TODO
 # 14 Mar. 2004 <spyderous@gentoo.org>
@@ -177,7 +177,7 @@ pkg_setup() {
 	strip-flags
 
 	# See bug #35468, circular pam-xfree dep
-	if [ "`use pam`" -a "`best_version x11-base/xfree`" ]
+	if use pam && [ -n "`best_version x11-base/xfree`" ]
 	then
 		einfo "Previous XFree86 installation detected"
 		einfo "Enabling PAM features in XFree86..."
@@ -321,18 +321,18 @@ src_unpack() {
 	fi
 # FIXME: bug #19812, 075 should be deprecated by 076, left as
 # TDFX_RISKY for feedback (put in -r3 if no problems)
-	if [ "`use 3dfx`" -a "${TDFX_RISKY}" = "yes" ]
+	if use 3dfx && [ "${TDFX_RISKY}" = "yes" ]
 	then
 		patch_exclude 5850
 	else
 		patch_exclude 5851
 	fi
 
-	if [ -z "`use ipv6`" ]
+	if ! use ipv6
 	then
 		patch_exclude 200*
 	else
-		if [ -z "`use doc`" ]
+		if ! use doc
 		then
 			patch_exclude 2001
 		fi
@@ -344,7 +344,7 @@ src_unpack() {
 	fi
 
 	# Unsure of this patch's effect if other gatos stuff is not used
-	if [ ! "`use gatos`" ]
+	if ! use gatos
 	then
 		patch_exclude 9841_all_4.3.0-gatos-mesa
 	fi
@@ -456,7 +456,7 @@ src_unpack() {
 
 	# Remove circular dep between pam and xfree, bug #35468
 	# If no-pam isn't in USE and we have xfree, then we can enable PAM
-	if [ "`use pam`" -a "`best_version x11-base/xfree`" ]
+	if use pam && [ -n "`best_version x11-base/xfree`" ]
 	then
 		# If you want to have optional pam support, do it properly ...
 		echo "#define HasPam YES" >> config/cf/host.def
@@ -572,7 +572,7 @@ src_unpack() {
 	fi
 
 	# Native Language Support Fonts
-	if [ -z "`use nls`" ]
+	if ! use nls
 	then
 		echo "#define BuildCyrillicFonts NO" >> config/cf/host.def
 		echo "#define BuildArabicFonts NO" >> config/cf/host.def
@@ -580,7 +580,7 @@ src_unpack() {
 		echo "#define BuildHebrewFonts NO" >> config/cf/host.def
 		echo "#define BuildThaiFonts NO" >> config/cf/host.def
 
-		if [ -z "`use cjk`" ]
+		if ! use cjk
 		then
 			echo "#define BuildCIDFonts NO" >> config/cf/host.def
 			echo "#define BuildJapaneseFonts NO" >> config/cf/host.def