Fix use invocation, and fix nasty typo [ use ssl ] (somebody accidentally used normal single quotes instead of back-quotes, so that condition would always be true)

7 files changed, 24 insertions, 16 deletions

diff --git a/net-mail/cyrus-imapd/ChangeLog b/net-mail/cyrus-imapd/ChangeLog
index 3d38780afcd7..f227126405bf 100644
--- a/net-mail/cyrus-imapd/ChangeLog
+++ b/net-mail/cyrus-imapd/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-mail/cyrus-imapd
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v 1.40 2004/05/23 23:41:11 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v 1.41 2004/06/10 21:15:20 agriffis Exp $
+
+  10 Jun 2004; Aron Griffis <agriffis@gentoo.org> cyrus-imapd-2.1.12.ebuild,
+  cyrus-imapd-2.1.13.ebuild, cyrus-imapd-2.1.14.ebuild,
+  cyrus-imapd-2.1.15-r1.ebuild, cyrus-imapd-2.1.15.ebuild,
+  cyrus-imapd-2.2.3.ebuild:
+  Fix use invocation, and fix nasty typo [ use ssl ] (somebody accidentally used
+  normal single quotes instead of back-quotes, so that condition would always be
+  true)
 
   23 May 2004; Jason Wever <weeve@gentoo.org> cyrus-imapd-2.2.3.ebuild:
   Added ~sparc keyword.
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.1.12.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.1.12.ebuild
index 0ebec0e1800c..8e2fbda51968 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-2.1.12.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-2.1.12.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/cyrus-imapd/cyrus-imapd-2.1.12.ebuild,v 1.12 2004/04/26 12:20:45 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.1.12.ebuild,v 1.13 2004/06/10 21:15:20 agriffis Exp $
 
 inherit eutils
 
@@ -165,7 +165,7 @@ src_install() {
 
 	exeinto /etc/init.d ; newexe ${FILESDIR}/cyrus.rc6_2 cyrus
 
-	if [ "'use ssl'" ]; then
+	if use ssl; then
 		# from mod_ssl
 		echo "Generating self-signed test certificate"
 		echo "(Ignore any message from the yes command below)"
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.1.13.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.1.13.ebuild
index bfea96fd23ed..9fbd804a1816 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-2.1.13.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-2.1.13.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/cyrus-imapd/cyrus-imapd-2.1.13.ebuild,v 1.8 2004/04/26 12:20:45 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.1.13.ebuild,v 1.9 2004/06/10 21:15:20 agriffis Exp $
 
 inherit eutils
 
@@ -165,7 +165,7 @@ src_install() {
 
 	exeinto /etc/init.d ; newexe ${FILESDIR}/cyrus.rc6_2 cyrus
 
-	if [ "'use ssl'" ]; then
+	if use ssl; then
 		# from mod_ssl
 		echo "Generating self-signed test certificate"
 		echo "(Ignore any message from the yes command below)"
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.1.14.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.1.14.ebuild
index e762ab70d130..104cdd78b9a4 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-2.1.14.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-2.1.14.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/cyrus-imapd/cyrus-imapd-2.1.14.ebuild,v 1.8 2004/04/26 12:20:45 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.1.14.ebuild,v 1.9 2004/06/10 21:15:20 agriffis Exp $
 
 inherit eutils
 IPV6_P="${P}-ipv6-20030703"
@@ -182,7 +182,7 @@ src_install() {
 
 	exeinto /etc/init.d ; newexe ${FILESDIR}/cyrus.rc6_2 cyrus
 
-	if [ "'use ssl'" ]; then
+	if use ssl; then
 		# from mod_ssl
 		echo "Generating self-signed test certificate"
 		echo "(Ignore any message from the yes command below)"
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.1.15-r1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.1.15-r1.ebuild
index 9e21c4f6e2c5..bdd167797322 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-2.1.15-r1.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-2.1.15-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/cyrus-imapd/cyrus-imapd-2.1.15-r1.ebuild,v 1.5 2004/04/26 12:20:45 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.1.15-r1.ebuild,v 1.6 2004/06/10 21:15:20 agriffis Exp $
 
 inherit eutils fixheadtails
 IPV6_P="${P}-ipv6-20030819"
@@ -184,7 +184,7 @@ src_install() {
 
 	exeinto /etc/init.d ; newexe ${FILESDIR}/cyrus.rc6_2 cyrus
 
-	if [ "'use ssl'" ]; then
+	if use ssl; then
 		# from mod_ssl
 		echo "Generating self-signed test certificate"
 		echo "(Ignore any message from the yes command below)"
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.1.15.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.1.15.ebuild
index 356d5c44af99..b4fb08c7be5f 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-2.1.15.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-2.1.15.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/cyrus-imapd/cyrus-imapd-2.1.15.ebuild,v 1.5 2004/04/26 12:20:45 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.1.15.ebuild,v 1.6 2004/06/10 21:15:20 agriffis Exp $
 
 inherit eutils
 IPV6_P="${P}-ipv6-20030819"
@@ -182,7 +182,7 @@ src_install() {
 
 	exeinto /etc/init.d ; newexe ${FILESDIR}/cyrus.rc6_2 cyrus
 
-	if [ "'use ssl'" ]; then
+	if use ssl; then
 		# from mod_ssl
 		echo "Generating self-signed test certificate"
 		echo "(Ignore any message from the yes command below)"
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.2.3.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.2.3.ebuild
index 95bb006aa86a..7a8321f1ef47 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-2.2.3.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-2.2.3.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/cyrus-imapd/cyrus-imapd-2.2.3.ebuild,v 1.6 2004/05/30 08:30:18 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.2.3.ebuild,v 1.7 2004/06/10 21:15:20 agriffis Exp $
 
 inherit eutils ssl-cert
 
@@ -35,12 +35,12 @@ src_unpack() {
 	unpack ${A} && cd "${S}"
 
 	# Add drac database support.
-	if [ "`use drac`" ] ; then
+	if use drac ; then
 		epatch "${S}/contrib/drac_auth.patch"
 	fi
 
 	# Add libwrap defines as we don't have a dynamicly linked library.
-	if [ "`use tcpd`" ] ; then
+	if use tcpd ; then
 		epatch "${FILESDIR}/${PN}-libwrap.patch"
 	fi
 
@@ -119,12 +119,12 @@ src_install() {
 	exeinto /etc/init.d
 	newexe "${FILESDIR}/cyrus.rc6" cyrus
 
-	if [ "`use pam`" ] ; then
+	if use pam ; then
 		insinto /etc/pam.d
 		newins "${FILESDIR}/imap.pam" imap
 	fi
 
-	if [ "`use ssl`" ] ; then
+	if use ssl ; then
 		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Cyrus IMAP Server}"
 		insinto /etc/ssl/cyrus
 		docert server