Fix use invocation

7 files changed, 76 insertions, 70 deletions

diff --git a/mail-mta/postfix/ChangeLog b/mail-mta/postfix/ChangeLog
index 68778f255ea1..3893d2d78b70 100644
--- a/mail-mta/postfix/ChangeLog
+++ b/mail-mta/postfix/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-mail/postfix
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.4 2004/06/05 12:35:25 g2boojum Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.5 2004/06/07 20:54:05 agriffis Exp $
+
+  07 Jun 2004; Aron Griffis <agriffis@gentoo.org>
+  postfix-1.1.11.20020917-r1.ebuild, postfix-1.1.11.20020917.ebuild,
+  postfix-2.0.11.ebuild, postfix-2.0.16-r1.ebuild, postfix-2.0.18.ebuild,
+  postfix-2.0.19.ebuild:
+  Fix use invocation
 
   05 Jun 2004; Grant Goodyear <g2boojum@gentoo.org> :
   Adding the new postfix to the tree (bug # 48796).  Thanks to
diff --git a/mail-mta/postfix/postfix-1.1.11.20020917-r1.ebuild b/mail-mta/postfix/postfix-1.1.11.20020917-r1.ebuild
index 3c23739778a7..f89938bf22d9 100644
--- a/mail-mta/postfix/postfix-1.1.11.20020917-r1.ebuild
+++ b/mail-mta/postfix/postfix-1.1.11.20020917-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/mail-mta/postfix/postfix-1.1.11.20020917-r1.ebuild,v 1.1 2004/05/30 09:38:31 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-1.1.11.20020917-r1.ebuild,v 1.2 2004/06/07 20:54:05 agriffis Exp $
 
 IUSE="ssl mysql sasl ldap ipv6"
 
@@ -51,13 +51,13 @@ src_unpack() {
 	cd ${WORKDIR}
 	unpack ${DISTFILES}/${PF_P}.tar.gz
 
-	if [ `use ssl` ] && [ `use ipv6` ]
+	if use ssl && use ipv6
 	then
 		cd ${S}
 		bzcat ${FILESDIR}/${IPV6_P}.patch.bz2 | patch -p1 || die "patch failed"
 		CCARGS="${CCARGS} -DHAS_SSL"
 		AUXLIBS="${AUXLIBS} -lssl -lcrypto"
-	elif [ `use ssl` ]
+	elif use ssl
 	then
 		unpack ${DISTFILES}/${TLS_P}.tar.gz
 		cd ${S}
@@ -70,7 +70,7 @@ src_unpack() {
 	cp main.cf main.cf.orig
 	sed -e "s:/usr/libexec/postfix:/usr/lib/postfix:" main.cf.orig > main.cf
 
-	if [ "`use sasl`" ]
+	if use sasl
 	then
 			if [ -e /usr/include/sasl/sasl.h ]
 			then
@@ -151,7 +151,7 @@ src_install () {
 	exeinto /etc/init.d ; newexe ${FILESDIR}/postfix.rc6 postfix
 	insinto /etc/pam.d ; newins ${FILESDIR}/smtp.pam smtp
 
-	if [ "`use sasl`" ]
+	if use sasl
 	then
 			if [ -e /usr/include/sasl.h ]
 			then
diff --git a/mail-mta/postfix/postfix-1.1.11.20020917.ebuild b/mail-mta/postfix/postfix-1.1.11.20020917.ebuild
index f8acda5c22a9..520d2ee647d5 100644
--- a/mail-mta/postfix/postfix-1.1.11.20020917.ebuild
+++ b/mail-mta/postfix/postfix-1.1.11.20020917.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/mail-mta/postfix/postfix-1.1.11.20020917.ebuild,v 1.1 2004/05/30 09:38:31 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-1.1.11.20020917.ebuild,v 1.2 2004/06/07 20:54:05 agriffis Exp $
 
 IUSE="ssl mysql sasl ldap"
 
@@ -51,13 +51,13 @@ src_unpack() {
 	cd ${WORKDIR}
 	unpack ${DISTFILES}/${PF_P}.tar.gz
 
-	if [ `use ssl` ] && [ `use ipv6` ]
+	if use ssl && use ipv6
 	then
 		cd ${S}
 		bzcat ${FILESDIR}/${IPV6_P}.patch.bz2 | patch -p1 || die "patch failed"
 		CCARGS="${CCARGS} -DHAS_SSL"
 		AUXLIBS="${AUXLIBS} -lssl -lcrypto"
-	elif [ `use ssl` ]
+	elif use ssl
 	then
 		unpack ${DISTFILES}/${TLS_P}.tar.gz
 		cd ${S}
@@ -70,7 +70,7 @@ src_unpack() {
 	cp main.cf main.cf.orig
 	sed -e "s:/usr/libexec/postfix:/usr/lib/postfix:" main.cf.orig > main.cf
 
-	if [ "`use sasl`" ]
+	if use sasl
 	then
 			if [ -e /usr/include/sasl/sasl.h ]
 			then
@@ -151,7 +151,7 @@ src_install () {
 	exeinto /etc/init.d ; newexe ${FILESDIR}/postfix.rc6 postfix
 	insinto /etc/pam.d ; newins ${FILESDIR}/smtp.pam smtp
 
-	if [ "`use sasl`" ]
+	if use sasl
 	then
 			if [ -e /usr/include/sasl.h ]
 			then
diff --git a/mail-mta/postfix/postfix-2.0.11.ebuild b/mail-mta/postfix/postfix-2.0.11.ebuild
index ca3edab1fd23..2e25f52ff8b8 100644
--- a/mail-mta/postfix/postfix-2.0.11.ebuild
+++ b/mail-mta/postfix/postfix-2.0.11.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/mail-mta/postfix/postfix-2.0.11.ebuild,v 1.1 2004/05/30 09:38:31 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.0.11.ebuild,v 1.2 2004/06/07 20:54:05 agriffis Exp $
 
 IUSE="ssl mysql sasl ldap ipv6 maildir mbox"
 
@@ -90,8 +90,8 @@ pkg_setup() {
 src_unpack() {
 	unpack ${P}.tar.gz
 	cd ${S}
-	if [ "`use ssl`" ]; then
-		if [ "`use ipv6`" ]; then
+	if use ssl; then
+		if use ipv6; then
 			epatch ${DISTDIR}/${IPV6_TLS_P}.patch.gz
 		else
 			unpack ${TLS_P}.tar.gz
@@ -99,13 +99,13 @@ src_unpack() {
 		fi
 		CCARGS="${CCARGS} -DHAS_SSL"
 		AUXLIBS="${AUXLIBS} -lssl -lcrypto"
-	elif [ "`use ipv6`" ]; then
+	elif use ipv6; then
 		epatch ${DISTDIR}/${IPV6_P}.patch.gz
 	fi
 	cd ${S}/conf
 	sed -i -e "s:/usr/libexec/postfix:/usr/lib/postfix:" main.cf
 
-	if [ "`use sasl`" ] ; then
+	if use sasl ; then
 		# sasl 2
 		if [ -f /usr/include/sasl/sasl.h ]; then
 			AUXLIBS="${AUXLIBS} -lsasl2"
@@ -120,17 +120,17 @@ src_unpack() {
 	cd ${S}/src/global
 	sed -i -e "s:/usr/libexec/postfix:/usr/lib/postfix:" mail_params.h
 
-	if [ "`use mysql`" ] ; then
+	if use mysql ; then
 		CCARGS="${CCARGS} -DHAS_MYSQL -I/usr/include/mysql"
 		AUXLIBS="${AUXLIBS} -lmysqlclient -lm -lz"
 	fi
 
-	if [ "`use ldap`" ] ; then
+	if use ldap ; then
 		CCARGS="${CCARGS} -DHAS_LDAP"
 		AUXLIBS="${AUXLIBS} -lldap -llber"
 	fi
 
-	if [ "`use pam`" ] ; then
+	if use pam ; then
 		AUXLIBS="${AUXLIBS} -lpam"
 	fi
 
@@ -206,15 +206,15 @@ src_install () {
 
 	insinto /etc/sasl2
 	doins ${FILESDIR}/smtpd.conf
-	if [ "`use sasl`" ] ; then
+	if use sasl ; then
 		dodir /usr/lib/sasl2
 		dosym ../../../etc/sasl2/smtpd.conf /usr/lib/sasl2/smtpd.conf
 	fi
 
 	cd ${D}/etc/postfix
-	if [ "`use maildir`" ]; then
+	if use maildir; then
 		sed -i -e "s:^#\(home_mailbox = \)Maildir/:\1.maildir/:" main.cf
-	elif [ "`use mbox`" ]; then
+	elif use mbox; then
 		sed -i -e "s:^#\(mail_spool_directory = /var/spool/mail\):\1:" main.cf
 	fi
 
diff --git a/mail-mta/postfix/postfix-2.0.16-r1.ebuild b/mail-mta/postfix/postfix-2.0.16-r1.ebuild
index 0b2e63577141..76308e990cbb 100644
--- a/mail-mta/postfix/postfix-2.0.16-r1.ebuild
+++ b/mail-mta/postfix/postfix-2.0.16-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/mail-mta/postfix/postfix-2.0.16-r1.ebuild,v 1.1 2004/05/30 09:38:31 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.0.16-r1.ebuild,v 1.2 2004/06/07 20:54:05 agriffis Exp $
 
 inherit eutils ssl-cert
 
@@ -69,17 +69,17 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A} && cd "${S}"
 
-	if [ "`use ssl`" ] ; then
-		if [ "`use ipv6`" ] ; then
+	if use ssl ; then
+		if use ipv6 ; then
 			epatch "${WORKDIR}/${IPV6_TLS_P}.patch"
 		else
 			epatch "${WORKDIR}/${TLS_P}/pfixtls.diff"
 		fi
-	elif [ "`use ipv6`" ]; then
+	elif use ipv6; then
 		epatch "${WORKDIR}/${IPV6_P}.patch"
 	fi
 
-	if [ "`use postgres`" ] ; then
+	if use postgres ; then
 		epatch "${DISTDIR}/${PGSQL_P}.patch"
 	fi
 
@@ -97,18 +97,18 @@ src_unpack() {
 src_compile() {
 	local mycc="-DHAS_PCRE" mylibs="-L/usr/lib -lpcre -ldl -lcrypt -lpthread"
 
-	if [ "`use pam`" ] ; then
+	if use pam ; then
 		mylibs="${mylibs} -lpam"
 	fi
-	if [ "`use ldap`" ] ; then
+	if use ldap ; then
 		mycc="${mycc} -DHAS_LDAP"
 		mylibs="${mylibs} -lldap -llber"
 	fi
-	if [ "`use mysql`" ] ; then
+	if use mysql ; then
 		mycc="${mycc} -DHAS_MYSQL -I/usr/include/mysql"
 		mylibs="${mylibs} -lmysqlclient -lm -lz"
 	fi
-	if [ "`use postgres`" ] ; then
+	if use postgres ; then
 		if [ "`best_version '=dev-db/postgresql-7.3*'`" ] ; then
 			mycc="${mycc} -DHAS_PGSQL -I/usr/include/postgresql"
 		else
@@ -116,11 +116,11 @@ src_compile() {
 		fi
 		mylibs="${mylibs} -lpq"
 	fi
-	if [ "`use ssl`" ] ; then
+	if use ssl ; then
 		mycc="${mycc} -DUSE_SSL"
 		mylibs="${mylibs} -lssl -lcrypto"
 	fi
-	if [ "`use sasl`" ] ; then
+	if use sasl ; then
 		mycc="${mycc} -DUSE_SASL_AUTH -I/usr/include/sasl"
 		mylibs="${mylibs} -lsasl2"
 	fi
@@ -163,9 +163,9 @@ src_install () {
 
 	keepdir /etc/postfix
 	mv "${D}/usr/share/doc/${PF}/defaults/"{*.cf,post*-*} "${D}/etc/postfix"
-	if [ "`use maildir`" ] ; then
+	if use maildir ; then
 		mypostconf="home_mailbox=.maildir/"
-	elif [ "`use mbox`" ] ; then
+	elif use mbox ; then
 		mypostconf="mail_spool_directory=/var/spool/mail"
 	fi
 	"${D}/usr/sbin/postconf" -c "${D}/etc/postfix" -e \
@@ -185,17 +185,17 @@ src_install () {
 	dodoc *README COMPATIBILITY HISTORY INSTALL LICENSE PORTING RELEASE_NOTES*
 	dohtml html/*
 
-	if [ "`use pam`" ] ; then
+	if use pam ; then
 		insinto /etc/pam.d
 		newins "${FILESDIR}/smtp.pam" smtp
 	fi
-	if [ "`use ssl`" ] ; then
+	if use ssl ; then
 		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Postfix SMTP Server}"
 		insinto /etc/ssl/postfix
 		docert server
 		fowners postfix:mail /etc/ssl/postfix/server.{key,pem}
 	fi
-	if [ "`use sasl`" ] ; then
+	if use sasl ; then
 		insinto /etc/sasl2
 		newins "${FILESDIR}/smtp.sasl" smtpd.conf
 	fi
diff --git a/mail-mta/postfix/postfix-2.0.18.ebuild b/mail-mta/postfix/postfix-2.0.18.ebuild
index 13bcc5c1b8ea..6d5489f6130c 100644
--- a/mail-mta/postfix/postfix-2.0.18.ebuild
+++ b/mail-mta/postfix/postfix-2.0.18.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/mail-mta/postfix/postfix-2.0.18.ebuild,v 1.1 2004/05/30 09:38:31 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.0.18.ebuild,v 1.2 2004/06/07 20:54:05 agriffis Exp $
 
 inherit eutils ssl-cert
 
@@ -69,17 +69,17 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A} && cd "${S}"
 
-	if [ "`use ssl`" ] ; then
-		if [ "`use ipv6`" ] ; then
+	if use ssl ; then
+		if use ipv6 ; then
 			epatch "${WORKDIR}/${IPV6_TLS_P}.patch"
 		else
 			epatch "${WORKDIR}/${TLS_P}/pfixtls.diff"
 		fi
-	elif [ "`use ipv6`" ]; then
+	elif use ipv6; then
 		epatch "${WORKDIR}/${IPV6_P}.patch"
 	fi
 
-	if [ "`use postgres`" ] ; then
+	if use postgres ; then
 		epatch "${DISTDIR}/${PGSQL_P}.patch"
 	fi
 
@@ -97,18 +97,18 @@ src_unpack() {
 src_compile() {
 	local mycc="-DHAS_PCRE" mylibs="-L/usr/lib -lpcre -ldl -lcrypt -lpthread"
 
-	if [ "`use pam`" ] ; then
+	if use pam ; then
 		mylibs="${mylibs} -lpam"
 	fi
-	if [ "`use ldap`" ] ; then
+	if use ldap ; then
 		mycc="${mycc} -DHAS_LDAP"
 		mylibs="${mylibs} -lldap -llber"
 	fi
-	if [ "`use mysql`" ] ; then
+	if use mysql ; then
 		mycc="${mycc} -DHAS_MYSQL -I/usr/include/mysql"
 		mylibs="${mylibs} -lmysqlclient -lm -lz"
 	fi
-	if [ "`use postgres`" ] ; then
+	if use postgres ; then
 		if [ "`best_version '=dev-db/postgresql-7.3*'`" ] ; then
 			mycc="${mycc} -DHAS_PGSQL -I/usr/include/postgresql"
 		else
@@ -116,11 +116,11 @@ src_compile() {
 		fi
 		mylibs="${mylibs} -lpq"
 	fi
-	if [ "`use ssl`" ] ; then
+	if use ssl ; then
 		mycc="${mycc} -DUSE_SSL"
 		mylibs="${mylibs} -lssl -lcrypto"
 	fi
-	if [ "`use sasl`" ] ; then
+	if use sasl ; then
 		mycc="${mycc} -DUSE_SASL_AUTH -I/usr/include/sasl"
 		mylibs="${mylibs} -lsasl2"
 	fi
@@ -163,9 +163,9 @@ src_install () {
 
 	keepdir /etc/postfix
 	mv "${D}/usr/share/doc/${PF}/defaults/"{*.cf,post*-*} "${D}/etc/postfix"
-	if [ "`use maildir`" ] ; then
+	if use maildir ; then
 		mypostconf="home_mailbox=.maildir/"
-	elif [ "`use mbox`" ] ; then
+	elif use mbox ; then
 		mypostconf="mail_spool_directory=/var/spool/mail"
 	fi
 	"${D}/usr/sbin/postconf" -c "${D}/etc/postfix" -e \
@@ -185,17 +185,17 @@ src_install () {
 	dodoc *README COMPATIBILITY HISTORY INSTALL LICENSE PORTING RELEASE_NOTES*
 	dohtml html/*
 
-	if [ "`use pam`" ] ; then
+	if use pam ; then
 		insinto /etc/pam.d
 		newins "${FILESDIR}/smtp.pam" smtp
 	fi
-	if [ "`use ssl`" ] ; then
+	if use ssl ; then
 		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Postfix SMTP Server}"
 		insinto /etc/ssl/postfix
 		docert server
 		fowners postfix:mail /etc/ssl/postfix/server.{key,pem}
 	fi
-	if [ "`use sasl`" ] ; then
+	if use sasl ; then
 		insinto /etc/sasl2
 		newins "${FILESDIR}/smtp.sasl" smtpd.conf
 	fi
diff --git a/mail-mta/postfix/postfix-2.0.19.ebuild b/mail-mta/postfix/postfix-2.0.19.ebuild
index 5c3f9b9ea82c..5ce7c73c2c6e 100644
--- a/mail-mta/postfix/postfix-2.0.19.ebuild
+++ b/mail-mta/postfix/postfix-2.0.19.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/mail-mta/postfix/postfix-2.0.19.ebuild,v 1.1 2004/05/30 09:38:31 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.0.19.ebuild,v 1.2 2004/06/07 20:54:05 agriffis Exp $
 
 inherit eutils ssl-cert
 
@@ -69,17 +69,17 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A} && cd "${S}"
 
-	if [ "`use ssl`" ] ; then
-		if [ "`use ipv6`" ] ; then
+	if use ssl ; then
+		if use ipv6 ; then
 			epatch "${WORKDIR}/${IPV6_TLS_P}.patch"
 		else
 			epatch "${WORKDIR}/${TLS_P}/pfixtls.diff"
 		fi
-	elif [ "`use ipv6`" ]; then
+	elif use ipv6; then
 		epatch "${WORKDIR}/${IPV6_P}.patch"
 	fi
 
-	if [ "`use postgres`" ] ; then
+	if use postgres ; then
 		epatch "${DISTDIR}/${PGSQL_P}.patch"
 	fi
 
@@ -97,18 +97,18 @@ src_unpack() {
 src_compile() {
 	local mycc="-DHAS_PCRE" mylibs="-L/usr/lib -lpcre -ldl -lcrypt -lpthread"
 
-	if [ "`use pam`" ] ; then
+	if use pam ; then
 		mylibs="${mylibs} -lpam"
 	fi
-	if [ "`use ldap`" ] ; then
+	if use ldap ; then
 		mycc="${mycc} -DHAS_LDAP"
 		mylibs="${mylibs} -lldap -llber"
 	fi
-	if [ "`use mysql`" ] ; then
+	if use mysql ; then
 		mycc="${mycc} -DHAS_MYSQL -I/usr/include/mysql"
 		mylibs="${mylibs} -lmysqlclient -lm -lz"
 	fi
-	if [ "`use postgres`" ] ; then
+	if use postgres ; then
 		if [ "`best_version '=dev-db/postgresql-7.3*'`" ] ; then
 			mycc="${mycc} -DHAS_PGSQL -I/usr/include/postgresql"
 		else
@@ -116,11 +116,11 @@ src_compile() {
 		fi
 		mylibs="${mylibs} -lpq"
 	fi
-	if [ "`use ssl`" ] ; then
+	if use ssl ; then
 		mycc="${mycc} -DUSE_SSL"
 		mylibs="${mylibs} -lssl -lcrypto"
 	fi
-	if [ "`use sasl`" ] ; then
+	if use sasl ; then
 		mycc="${mycc} -DUSE_SASL_AUTH -I/usr/include/sasl"
 		mylibs="${mylibs} -lsasl2"
 	fi
@@ -166,9 +166,9 @@ src_install () {
 
 	keepdir /etc/postfix
 	mv "${D}/usr/share/doc/${PF}/defaults/"{*.cf,post*-*} "${D}/etc/postfix"
-	if [ "`use maildir`" ] ; then
+	if use maildir ; then
 		mypostconf="home_mailbox=.maildir/"
-	elif [ "`use mbox`" ] ; then
+	elif use mbox ; then
 		mypostconf="mail_spool_directory=/var/spool/mail"
 	fi
 	"${D}/usr/sbin/postconf" -c "${D}/etc/postfix" -e \
@@ -188,17 +188,17 @@ src_install () {
 	dodoc *README COMPATIBILITY HISTORY INSTALL LICENSE PORTING RELEASE_NOTES*
 	dohtml html/*
 
-	if [ "`use pam`" ] ; then
+	if use pam ; then
 		insinto /etc/pam.d
 		newins "${FILESDIR}/smtp.pam" smtp
 	fi
-	if [ "`use ssl`" ] ; then
+	if use ssl ; then
 		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Postfix SMTP Server}"
 		insinto /etc/ssl/postfix
 		docert server
 		fowners postfix:mail /etc/ssl/postfix/server.{key,pem}
 	fi
-	if [ "`use sasl`" ] ; then
+	if use sasl ; then
 		insinto /etc/sasl2
 		newins "${FILESDIR}/smtp.sasl" smtpd.conf
 	fi