Fix use invocation

10 files changed, 26 insertions, 19 deletions

diff --git a/net-mail/vpopmail/ChangeLog b/net-mail/vpopmail/ChangeLog
index ba5c4e40e96d..f95ca6788da1 100644
--- a/net-mail/vpopmail/ChangeLog
+++ b/net-mail/vpopmail/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-mail/vpopmail
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/ChangeLog,v 1.33 2004/06/03 15:47:38 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/ChangeLog,v 1.34 2004/06/09 22:26:39 agriffis Exp $
+
+  09 Jun 2004; Aron Griffis <agriffis@gentoo.org> vpopmail-5.2.1-r5.ebuild,
+  vpopmail-5.2.1-r6.ebuild, vpopmail-5.2.1-r7.ebuild,
+  vpopmail-5.2.1-r8.ebuild, vpopmail-5.2.1-r9.ebuild,
+  vpopmail-5.2.2-r1.ebuild, vpopmail-5.2.2.ebuild, vpopmail-5.4.0.ebuild,
+  vpopmail-5.4.0_rc1.ebuild:
+  Fix use invocation
 
   03 Jun 2004; David Holm <dholm@gentoo.org> vpopmail-5.4.0.ebuild:
   Added to ~ppc.
diff --git a/net-mail/vpopmail/vpopmail-5.2.1-r5.ebuild b/net-mail/vpopmail/vpopmail-5.2.1-r5.ebuild
index a70d4e704b0c..883863b6aa54 100644
--- a/net-mail/vpopmail/vpopmail-5.2.1-r5.ebuild
+++ b/net-mail/vpopmail/vpopmail-5.2.1-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/net-mail/vpopmail/vpopmail-5.2.1-r5.ebuild,v 1.9 2004/05/30 11:00:03 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/vpopmail-5.2.1-r5.ebuild,v 1.10 2004/06/09 22:26:39 agriffis Exp $
 
 IUSE="mysql ipalias"
 
@@ -56,7 +56,7 @@ src_unpack() {
 	unpack ${P}.tar.gz
 	cd ${S}
 
-	if [ "`use mysql`" ]; then
+	if use mysql; then
 		einfo "Applying MySQL patch..."
 		# Thanks to Nicholas Jones (carpaski@gentoo.org)
 		epatch ${DISTDIR}/vpopmail-5.2.1-mysql.diff
@@ -107,7 +107,7 @@ src_compile() {
 		--enable-logging=y \
 		--enable-log-name=vpopmail || die "econf failed"
 
-	[ "`use mysql`" ] && echo '#define MYSQL_PASSWORD_FILE "/etc/vpopmail.conf"' >> config.h
+	use mysql && echo '#define MYSQL_PASSWORD_FILE "/etc/vpopmail.conf"' >> config.h
 
 	emake || die "Make failed."
 }
@@ -130,11 +130,11 @@ src_install () {
 	for item in `ls -1 ${D}${VPOP_HOME}/bin`; do dosym ${VPOP_HOME}/bin/${item} usr/bin/${item} ; done
 
 	# Create /etc/vpopmail.conf
-	[ "`use mysql`" ] && dodir /etc && cp ${FILESDIR}/vpopmail.conf ${D}/etc/
+	use mysql && dodir /etc && cp ${FILESDIR}/vpopmail.conf ${D}/etc/
 
 	# Configure b0rked. We'll do this manually
 	echo "-I${VPOP_HOME}/include" > ${D}/${VPOP_HOME}/etc/inc_deps
-	if [ "`use mysql`" ]; then
+	if use mysql; then
 		echo "-L${VPOP_HOME}/lib -lvpopmail -L/usr/lib/mysql -lmysqlclient -lz" > ${D}/${VPOP_HOME}/etc/lib_deps
 	else
 		echo "-L${VPOP_HOME}/lib -lvpopmail" > ${D}/${VPOP_HOME}/etc/lib_deps
@@ -155,7 +155,7 @@ pkg_postinst() {
 	einfo "Performing post-installation routines for ${P}."
 	echo "40 * * * * /usr/bin/clearopensmtp 2>&1 > /dev/null" >> /var/spool/cron/crontabs/root
 
-	if [ "`use mysql`" ]; then
+	if use mysql; then
 		einfo ""
 		einfo "You have 'mysql' turned on in your USE"
 		einfo "Vpopmail needs a VALID MySQL USER. Let's call it 'vpopmail'"
diff --git a/net-mail/vpopmail/vpopmail-5.2.1-r6.ebuild b/net-mail/vpopmail/vpopmail-5.2.1-r6.ebuild
index 1e522baf0c7a..79e0865c68cd 100644
--- a/net-mail/vpopmail/vpopmail-5.2.1-r6.ebuild
+++ b/net-mail/vpopmail/vpopmail-5.2.1-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/net-mail/vpopmail/vpopmail-5.2.1-r6.ebuild,v 1.13 2004/05/30 11:00:03 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/vpopmail-5.2.1-r6.ebuild,v 1.14 2004/06/09 22:26:39 agriffis Exp $
 
 IUSE="mysql ipalias clearpasswd"
 
@@ -59,7 +59,7 @@ src_unpack() {
 
 	epatch ${FILESDIR}/vpopmail-5.2.1-showall.patch
 
-	if [ "`use mysql`" ]; then
+	if use mysql; then
 		einfo "Applying MySQL patch..."
 		# Thanks to Nicholas Jones (carpaski@gentoo.org)
 		epatch ${DISTDIR}/vpopmail-5.2.1-mysql.diff
@@ -176,7 +176,7 @@ pkg_preinst() {
 pkg_postinst() {
 	einfo "Performing post-installation routines for ${P}."
 
-	if [ "`use mysql`" ]; then
+	if use mysql; then
 		echo
 		einfo "You have 'mysql' turned on in your USE"
 		einfo "Vpopmail needs a VALID MySQL USER. Let's call it 'vpopmail'"
diff --git a/net-mail/vpopmail/vpopmail-5.2.1-r7.ebuild b/net-mail/vpopmail/vpopmail-5.2.1-r7.ebuild
index 500f88241e1b..1201fc7953d4 100644
--- a/net-mail/vpopmail/vpopmail-5.2.1-r7.ebuild
+++ b/net-mail/vpopmail/vpopmail-5.2.1-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/net-mail/vpopmail/vpopmail-5.2.1-r7.ebuild,v 1.5 2004/05/30 11:00:03 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/vpopmail-5.2.1-r7.ebuild,v 1.6 2004/06/09 22:26:39 agriffis Exp $
 
 IUSE="mysql ipalias clearpasswd"
 
@@ -59,7 +59,7 @@ src_unpack() {
 
 	epatch ${FILESDIR}/vpopmail-5.2.1-showall.patch
 
-	if [ "`use mysql`" ]; then
+	if use mysql; then
 		einfo "Applying MySQL patch..."
 		# Thanks to Nicholas Jones (carpaski@gentoo.org)
 		epatch ${DISTDIR}/vpopmail-5.2.1-mysql.diff
@@ -176,7 +176,7 @@ pkg_preinst() {
 pkg_postinst() {
 	einfo "Performing post-installation routines for ${P}."
 
-	if [ "`use mysql`" ]; then
+	if use mysql; then
 		echo
 		einfo "You have 'mysql' turned on in your USE"
 		einfo "Vpopmail needs a VALID MySQL USER. Let's call it 'vpopmail'"
diff --git a/net-mail/vpopmail/vpopmail-5.2.1-r8.ebuild b/net-mail/vpopmail/vpopmail-5.2.1-r8.ebuild
index ebcc6e5d488f..6ef992ba1a6e 100644
--- a/net-mail/vpopmail/vpopmail-5.2.1-r8.ebuild
+++ b/net-mail/vpopmail/vpopmail-5.2.1-r8.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-mail/vpopmail/vpopmail-5.2.1-r8.ebuild,v 1.6 2004/05/30 11:00:03 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/vpopmail-5.2.1-r8.ebuild,v 1.7 2004/06/09 22:26:39 agriffis Exp $
 
 IUSE="mysql ipalias clearpasswd"
 
diff --git a/net-mail/vpopmail/vpopmail-5.2.1-r9.ebuild b/net-mail/vpopmail/vpopmail-5.2.1-r9.ebuild
index e430a7401413..493687e53e68 100644
--- a/net-mail/vpopmail/vpopmail-5.2.1-r9.ebuild
+++ b/net-mail/vpopmail/vpopmail-5.2.1-r9.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-mail/vpopmail/vpopmail-5.2.1-r9.ebuild,v 1.5 2004/05/30 11:00:03 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/vpopmail-5.2.1-r9.ebuild,v 1.6 2004/06/09 22:26:39 agriffis Exp $
 
 IUSE="mysql ipalias clearpasswd"
 
diff --git a/net-mail/vpopmail/vpopmail-5.2.2-r1.ebuild b/net-mail/vpopmail/vpopmail-5.2.2-r1.ebuild
index 1b6f61312482..3f5f2a098192 100644
--- a/net-mail/vpopmail/vpopmail-5.2.2-r1.ebuild
+++ b/net-mail/vpopmail/vpopmail-5.2.2-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-mail/vpopmail/vpopmail-5.2.2-r1.ebuild,v 1.5 2004/05/30 11:00:03 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/vpopmail-5.2.2-r1.ebuild,v 1.6 2004/06/09 22:26:39 agriffis Exp $
 
 IUSE="mysql ipalias clearpasswd"
 
diff --git a/net-mail/vpopmail/vpopmail-5.2.2.ebuild b/net-mail/vpopmail/vpopmail-5.2.2.ebuild
index 97640c669600..7ba964b16f11 100644
--- a/net-mail/vpopmail/vpopmail-5.2.2.ebuild
+++ b/net-mail/vpopmail/vpopmail-5.2.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-mail/vpopmail/vpopmail-5.2.2.ebuild,v 1.4 2004/05/30 11:00:03 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/vpopmail-5.2.2.ebuild,v 1.5 2004/06/09 22:26:39 agriffis Exp $
 
 IUSE="mysql ipalias clearpasswd"
 
diff --git a/net-mail/vpopmail/vpopmail-5.4.0.ebuild b/net-mail/vpopmail/vpopmail-5.4.0.ebuild
index 2fcbaacd9365..da7083e3a620 100644
--- a/net-mail/vpopmail/vpopmail-5.4.0.ebuild
+++ b/net-mail/vpopmail/vpopmail-5.4.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-mail/vpopmail/vpopmail-5.4.0.ebuild,v 1.6 2004/06/03 15:47:38 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/vpopmail-5.4.0.ebuild,v 1.7 2004/06/09 22:26:39 agriffis Exp $
 
 inherit eutils gnuconfig fixheadtails
 
diff --git a/net-mail/vpopmail/vpopmail-5.4.0_rc1.ebuild b/net-mail/vpopmail/vpopmail-5.4.0_rc1.ebuild
index 4cc3cae48a8d..4a46851a4a4a 100644
--- a/net-mail/vpopmail/vpopmail-5.4.0_rc1.ebuild
+++ b/net-mail/vpopmail/vpopmail-5.4.0_rc1.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-mail/vpopmail/vpopmail-5.4.0_rc1.ebuild,v 1.6 2004/05/30 11:00:03 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/vpopmail-5.4.0_rc1.ebuild,v 1.7 2004/06/09 22:26:39 agriffis Exp $
 
 IUSE="mysql ipalias clearpasswd"