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)

8 files changed, 43 insertions, 35 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/Manifest b/net-mail/cyrus-imapd/Manifest
index 40baf144b0ab..6ab2a5b860c4 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -1,29 +1,29 @@
+MD5 b5e0f41a2cb02b8ebe41bb9c80c2dcbf cyrus-imapd-2.1.12.ebuild 6867
+MD5 33fafe73eefb7e4f12c8580f9c0592f4 cyrus-imapd-2.1.13.ebuild 6874
+MD5 f41d7183f3bf31db5a233ec9d8f4af41 cyrus-imapd-2.1.14.ebuild 7005
+MD5 70b8e78ddf4bb7212d856fbafb94b2a0 cyrus-imapd-2.1.15-r1.ebuild 7043
+MD5 8e382b9647019d53516a116225bc0113 cyrus-imapd-2.1.15.ebuild 6987
+MD5 ee8f63bb13586ed464109e98a4800d43 cyrus-imapd-2.2.3.ebuild 5245
+MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
+MD5 c6fa3dee2047011d2cb7003809890c6b ChangeLog 9076
+MD5 419f3372b21d1eea29593634a57bc134 files/cyrus-imapd-2.1.12-includepath.patch 2721
 MD5 c6c0c19a7fdab57bee419fac05f20f36 files/cyrus-imapd-2.1.14-db4.patch 2756
 MD5 75e1eaf365d192b2992bac8d61595a79 files/cyrus-imapd-2.1.15-db4.patch 2759
-MD5 419f3372b21d1eea29593634a57bc134 files/cyrus-imapd-2.1.12-includepath.patch 2721
 MD5 fe1bbab93ddd6cf3a9c4aacc111154d4 files/cyrus-imapd-2.2.3-db4.patch 1604
-MD5 ccdde444a090ceff231858a2f937e486 files/cyrus.conf 1347
-MD5 9daf0e6a944ec58091a3be171d1ab8df files/cyrus.rc6_2 621
-MD5 8ef2ff8ab18c79ca0fc96e0ec58e084a files/cyrus_2.conf 1340
-MD5 6678b1b72838a7ba2cb5045909ea909f files/digest-cyrus-imapd-2.2.3 70
+MD5 24cfd296507c04e376368f15665041d1 files/cyrus-imapd-libwrap.patch 494
+MD5 4bf2dac8403fcb81390ed61247bd96a0 files/cyrus.conf 1346
+MD5 8398307f8cda50f1e0837af46aa35a43 files/cyrus.rc6 562
+MD5 6775e31bc4de7fcdabc59ebde82fa2c2 files/cyrus.rc6_2 620
+MD5 595fda471333fe2851597871763c6fdd files/cyrus_2.conf 1339
 MD5 a73606d0350e6883a11a4c525af59551 files/digest-cyrus-imapd-2.1.12 71
 MD5 d63d317f0f8fa042638be86b663fffc0 files/digest-cyrus-imapd-2.1.13 71
 MD5 aa678d0f596367397edeea90763ab29e files/digest-cyrus-imapd-2.1.14 155
 MD5 1bf166e9ac57420dc010bddacd3dfe98 files/digest-cyrus-imapd-2.1.15 155
 MD5 1bf166e9ac57420dc010bddacd3dfe98 files/digest-cyrus-imapd-2.1.15-r1 155
-MD5 cbd00df5ef9288b1c830d95fa5e5831f files/gentestcrt.sh 8799
+MD5 6678b1b72838a7ba2cb5045909ea909f files/digest-cyrus-imapd-2.2.3 70
+MD5 98045250a768c6114bd5f6b09b94aad7 files/gentestcrt.sh 8798
 MD5 ef68faa77664a88f939cee2f12019507 files/imap.pam 195
-MD5 df60f59cb6da75d7ca5e71a0d1ad52e7 files/imapd_2.conf 765
+MD5 14372719beb3c5c244c33c9b41e1d0a4 files/imapd.conf 867
+MD5 6ed4ed522dd0b957890653ae26745252 files/imapd_2.conf 764
 MD5 959399de17330ea5f52ef56cb6c5ffcd files/master.8.diff 1280
-MD5 f4074e463596703804133990ab7b00fd files/pam.d-imap 209
-MD5 24cfd296507c04e376368f15665041d1 files/cyrus-imapd-libwrap.patch 494
-MD5 2c12219037539301a8d79b740ac090b0 files/cyrus.rc6 563
-MD5 2ab208e74aeb2017de29d08632d2535b files/imapd.conf 868
-MD5 7e055d1a8ed8bae85188f32105168f31 ChangeLog 8683
-MD5 f6d2321ea1338efbfad33139f0e27ae6 cyrus-imapd-2.1.12.ebuild 6876
-MD5 89553d40ee28cd23e4938f5bfdaf553f cyrus-imapd-2.1.13.ebuild 6883
-MD5 d81de1e1f8c8fc7c99d760fb09953b73 cyrus-imapd-2.1.14.ebuild 7014
-MD5 07c31fe7761d9093891605d9abe5bd7b cyrus-imapd-2.1.15-r1.ebuild 7052
-MD5 eff66c2ce4045f893a0fa28bcd6c9c6c cyrus-imapd-2.1.15.ebuild 6996
-MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
-MD5 86cc2399b26415862ff19ed9c38e6783 cyrus-imapd-2.2.3.ebuild 5277
+MD5 bf5e440847cc343d4004d2d5d3530c6e files/pam.d-imap 208
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