sync IUSE (+exiscan), don't assign S=${WORKDIR}/${P}, trim trailing whitespace

18 files changed, 32 insertions, 67 deletions

diff --git a/mail-mta/exim/exim-4.10.ebuild b/mail-mta/exim/exim-4.10.ebuild
index 774f951aad58..0ae4df567aea 100644
--- a/mail-mta/exim/exim-4.10.ebuild
+++ b/mail-mta/exim/exim-4.10.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # Updated to exim-4 by Ben Lutgens <lamer@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.10.ebuild,v 1.4 2004/07/01 19:52:50 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.10.ebuild,v 1.5 2004/07/14 16:50:36 agriffis Exp $
 
 IUSE="tcpd ssl postgres mysql ldap pam"
 
-S=${WORKDIR}/${P}
 EXISCAN_VER=${PV}-16
 
 DESCRIPTION="A highly configurable, drop-in replacement for sendmail"
diff --git a/mail-mta/exim/exim-4.20-r1.ebuild b/mail-mta/exim/exim-4.20-r1.ebuild
index 7b08a70d609c..0e4c296c9c55 100644
--- a/mail-mta/exim/exim-4.20-r1.ebuild
+++ b/mail-mta/exim/exim-4.20-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.20-r1.ebuild,v 1.2 2004/06/24 22:23:33 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.20-r1.ebuild,v 1.3 2004/07/14 16:50:36 agriffis Exp $
 
 inherit eutils
 
@@ -213,5 +213,3 @@ pkg_postinst() {
 	einfo "Please create /etc/exim/exim.conf from /etc/exim/exim.conf.dist."
 
 }
-
-
diff --git a/mail-mta/exim/exim-4.20-r2.ebuild b/mail-mta/exim/exim-4.20-r2.ebuild
index e047a88ae26e..9d40feb488cb 100644
--- a/mail-mta/exim/exim-4.20-r2.ebuild
+++ b/mail-mta/exim/exim-4.20-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.20-r2.ebuild,v 1.2 2004/06/24 22:23:33 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.20-r2.ebuild,v 1.3 2004/07/14 16:50:36 agriffis Exp $
 
 inherit eutils
 
@@ -216,5 +216,3 @@ pkg_postinst() {
 	einfo "Please create /etc/exim/exim.conf from /etc/exim/exim.conf.dist."
 
 }
-
-
diff --git a/mail-mta/exim/exim-4.21.ebuild b/mail-mta/exim/exim-4.21.ebuild
index 1c854a8ef417..1b8634d47333 100644
--- a/mail-mta/exim/exim-4.21.ebuild
+++ b/mail-mta/exim/exim-4.21.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.21.ebuild,v 1.2 2004/06/24 22:23:33 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.21.ebuild,v 1.3 2004/07/14 16:50:36 agriffis Exp $
 
 inherit eutils
 
-IUSE="tcpd ssl postgres mysql ldap pam exiscan-acl maildir lmtp ipv6"
+IUSE="exiscan exiscan-acl ipv6 ldap lmtp maildir mysql pam postgres ssl tcpd"
 
 EXISCANACL_VER=${PV}-10
 
@@ -208,5 +208,3 @@ pkg_postinst() {
 	einfo "/etc/exim/auth_conf.sub contains the configuration sub for using smtp auth."
 	einfo "Please create /etc/exim/exim.conf from /etc/exim/exim.conf.dist."
 }
-
-
diff --git a/mail-mta/exim/exim-4.22.ebuild b/mail-mta/exim/exim-4.22.ebuild
index f877936eed66..26d04d814d72 100644
--- a/mail-mta/exim/exim-4.22.ebuild
+++ b/mail-mta/exim/exim-4.22.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.22.ebuild,v 1.2 2004/06/24 22:23:33 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.22.ebuild,v 1.3 2004/07/14 16:50:36 agriffis Exp $
 
 inherit eutils
 
-IUSE="tcpd ssl postgres mysql ldap pam exiscan-acl maildir lmtp ipv6 sasl"
+IUSE="exiscan exiscan-acl ipv6 ldap lmtp maildir mysql pam postgres sasl ssl tcpd"
 
 EXISCANACL_VER=${PV}-10
 
@@ -214,5 +214,3 @@ pkg_postinst() {
 	einfo "/etc/exim/auth_conf.sub contains the configuration sub for using smtp auth."
 	einfo "Please create /etc/exim/exim.conf from /etc/exim/exim.conf.dist."
 }
-
-
diff --git a/mail-mta/exim/exim-4.24-r1.ebuild b/mail-mta/exim/exim-4.24-r1.ebuild
index 9d08e90daf6a..df1f954d7b91 100644
--- a/mail-mta/exim/exim-4.24-r1.ebuild
+++ b/mail-mta/exim/exim-4.24-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.24-r1.ebuild,v 1.2 2004/06/24 22:23:33 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.24-r1.ebuild,v 1.3 2004/07/14 16:50:36 agriffis Exp $
 
 inherit eutils
 
-IUSE="tcpd ssl postgres mysql ldap pam exiscan-acl maildir lmtp ipv6 sasl"
+IUSE="exiscan exiscan-acl ipv6 ldap lmtp maildir mysql pam postgres sasl ssl tcpd"
 
 EXISCANACL_VER=${PV}-13
 
@@ -214,5 +214,3 @@ pkg_postinst() {
 	einfo "/etc/exim/auth_conf.sub contains the configuration sub for using smtp auth."
 	einfo "Please create /etc/exim/exim.conf from /etc/exim/exim.conf.dist."
 }
-
-
diff --git a/mail-mta/exim/exim-4.24-r2.ebuild b/mail-mta/exim/exim-4.24-r2.ebuild
index 9b9f668eae5d..b79c03c6b4d1 100644
--- a/mail-mta/exim/exim-4.24-r2.ebuild
+++ b/mail-mta/exim/exim-4.24-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.24-r2.ebuild,v 1.3 2004/06/24 22:23:33 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.24-r2.ebuild,v 1.4 2004/07/14 16:50:36 agriffis Exp $
 
 inherit eutils
 
-IUSE="tcpd ssl postgres mysql ldap pam exiscan-acl maildir lmtp ipv6 sasl"
+IUSE="exiscan exiscan-acl ipv6 ldap lmtp maildir mysql pam postgres sasl ssl tcpd"
 
 EXISCANACL_VER=${PV}-13
 
@@ -214,5 +214,3 @@ pkg_postinst() {
 	einfo "/etc/exim/auth_conf.sub contains the configuration sub for using smtp auth."
 	einfo "Please create /etc/exim/exim.conf from /etc/exim/exim.conf.dist."
 }
-
-
diff --git a/mail-mta/exim/exim-4.24-r3.ebuild b/mail-mta/exim/exim-4.24-r3.ebuild
index 1c91f85cfd63..a56359955dcd 100644
--- a/mail-mta/exim/exim-4.24-r3.ebuild
+++ b/mail-mta/exim/exim-4.24-r3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.24-r3.ebuild,v 1.3 2004/06/24 22:23:33 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.24-r3.ebuild,v 1.4 2004/07/14 16:50:36 agriffis Exp $
 
 inherit eutils
 
-IUSE="tcpd ssl postgres mysql ldap pam exiscan-acl maildir lmtp ipv6 sasl"
+IUSE="exiscan exiscan-acl ipv6 ldap lmtp maildir mysql pam postgres sasl ssl tcpd"
 
 EXISCANACL_VER=${PV}-13
 
@@ -215,5 +215,3 @@ pkg_postinst() {
 	einfo "/etc/exim/auth_conf.sub contains the configuration sub for using smtp auth."
 	einfo "Please create /etc/exim/exim.conf from /etc/exim/exim.conf.dist."
 }
-
-
diff --git a/mail-mta/exim/exim-4.24.ebuild b/mail-mta/exim/exim-4.24.ebuild
index 6f34744da84c..daab8d9501ba 100644
--- a/mail-mta/exim/exim-4.24.ebuild
+++ b/mail-mta/exim/exim-4.24.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.24.ebuild,v 1.2 2004/06/24 22:23:33 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.24.ebuild,v 1.3 2004/07/14 16:50:36 agriffis Exp $
 
 inherit eutils
 
-IUSE="tcpd ssl postgres mysql ldap pam exiscan-acl maildir lmtp ipv6 sasl"
+IUSE="exiscan exiscan-acl ipv6 ldap lmtp maildir mysql pam postgres sasl ssl tcpd"
 
 EXISCANACL_VER=${PV}-13
 
@@ -214,5 +214,3 @@ pkg_postinst() {
 	einfo "/etc/exim/auth_conf.sub contains the configuration sub for using smtp auth."
 	einfo "Please create /etc/exim/exim.conf from /etc/exim/exim.conf.dist."
 }
-
-
diff --git a/mail-mta/exim/exim-4.30-r1.ebuild b/mail-mta/exim/exim-4.30-r1.ebuild
index 34cdb3f5e2bb..26a8b450bdd1 100644
--- a/mail-mta/exim/exim-4.30-r1.ebuild
+++ b/mail-mta/exim/exim-4.30-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.30-r1.ebuild,v 1.3 2004/06/24 22:23:33 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.30-r1.ebuild,v 1.4 2004/07/14 16:50:36 agriffis Exp $
 
 inherit eutils
 
-IUSE="tcpd ssl postgres mysql ldap pam exiscan-acl maildir lmtp ipv6 sasl wildlsearch dnsdb"
+IUSE="dnsdb exiscan exiscan-acl ipv6 ldap lmtp maildir mysql pam postgres sasl ssl tcpd wildlsearch"
 
 EXISCANACL_VER=${PV}-16
 
@@ -230,5 +230,3 @@ pkg_postinst() {
 	einfo "/etc/exim/auth_conf.sub contains the configuration sub for using smtp auth."
 	einfo "Please create /etc/exim/exim.conf from /etc/exim/exim.conf.dist."
 }
-
-
diff --git a/mail-mta/exim/exim-4.30.ebuild b/mail-mta/exim/exim-4.30.ebuild
index 8a4d9ef6e690..877e7393d160 100644
--- a/mail-mta/exim/exim-4.30.ebuild
+++ b/mail-mta/exim/exim-4.30.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.30.ebuild,v 1.3 2004/06/24 22:23:33 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.30.ebuild,v 1.4 2004/07/14 16:50:36 agriffis Exp $
 
 inherit eutils
 
-IUSE="tcpd ssl postgres mysql ldap pam exiscan-acl maildir lmtp ipv6 sasl"
+IUSE="exiscan exiscan-acl ipv6 ldap lmtp maildir mysql pam postgres sasl ssl tcpd"
 
 EXISCANACL_VER=${PV}-16
 
@@ -215,5 +215,3 @@ pkg_postinst() {
 	einfo "/etc/exim/auth_conf.sub contains the configuration sub for using smtp auth."
 	einfo "Please create /etc/exim/exim.conf from /etc/exim/exim.conf.dist."
 }
-
-
diff --git a/mail-mta/exim/exim-4.31.ebuild b/mail-mta/exim/exim-4.31.ebuild
index 8a5e93a5a62d..5d95e3300534 100644
--- a/mail-mta/exim/exim-4.31.ebuild
+++ b/mail-mta/exim/exim-4.31.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.31.ebuild,v 1.3 2004/06/24 22:23:33 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.31.ebuild,v 1.4 2004/07/14 16:50:36 agriffis Exp $
 
 inherit eutils
 
-IUSE="tcpd ssl postgres mysql ldap pam exiscan-acl maildir lmtp ipv6 sasl wildlsearch dnsdb"
+IUSE="dnsdb exiscan exiscan-acl ipv6 ldap lmtp maildir mysql pam postgres sasl ssl tcpd wildlsearch"
 
 EXISCANACL_VER=${PV}-16
 
@@ -230,5 +230,3 @@ pkg_postinst() {
 	einfo "/etc/exim/auth_conf.sub contains the configuration sub for using smtp auth."
 	einfo "Please create /etc/exim/exim.conf from /etc/exim/exim.conf.dist."
 }
-
-
diff --git a/mail-mta/exim/exim-4.32-r1.ebuild b/mail-mta/exim/exim-4.32-r1.ebuild
index 3bb6a6630547..99f178096a2c 100644
--- a/mail-mta/exim/exim-4.32-r1.ebuild
+++ b/mail-mta/exim/exim-4.32-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.32-r1.ebuild,v 1.3 2004/06/24 22:23:33 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.32-r1.ebuild,v 1.4 2004/07/14 16:50:36 agriffis Exp $
 
 inherit eutils
 
-IUSE="tcpd ssl postgres mysql ldap pam exiscan-acl maildir lmtp ipv6 sasl wildlsearch dnsdb perl mbox X"
+IUSE="X dnsdb exiscan exiscan-acl ipv6 ldap lmtp maildir mbox mysql pam perl postgres sasl ssl tcpd wildlsearch"
 
 EXISCANACL_VER=${PV}-19
 
@@ -243,5 +243,3 @@ pkg_postinst() {
 	einfo "/etc/exim/auth_conf.sub contains the configuration sub for using smtp auth."
 	einfo "Please create /etc/exim/exim.conf from /etc/exim/exim.conf.dist."
 }
-
-
diff --git a/mail-mta/exim/exim-4.32.ebuild b/mail-mta/exim/exim-4.32.ebuild
index 4cfd1ad4dc75..48d90a919f2d 100644
--- a/mail-mta/exim/exim-4.32.ebuild
+++ b/mail-mta/exim/exim-4.32.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.32.ebuild,v 1.3 2004/06/24 22:23:33 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.32.ebuild,v 1.4 2004/07/14 16:50:36 agriffis Exp $
 
 inherit eutils
 
-IUSE="tcpd ssl postgres mysql ldap pam exiscan-acl maildir lmtp ipv6 sasl wildlsearch dnsdb perl mbox X"
+IUSE="X dnsdb exiscan exiscan-acl ipv6 ldap lmtp maildir mbox mysql pam perl postgres sasl ssl tcpd wildlsearch"
 
 EXISCANACL_VER=${PV}-18
 
@@ -243,5 +243,3 @@ pkg_postinst() {
 	einfo "/etc/exim/auth_conf.sub contains the configuration sub for using smtp auth."
 	einfo "Please create /etc/exim/exim.conf from /etc/exim/exim.conf.dist."
 }
-
-
diff --git a/mail-mta/exim/exim-4.33-r1.ebuild b/mail-mta/exim/exim-4.33-r1.ebuild
index a206e1429904..1f816e0296f6 100644
--- a/mail-mta/exim/exim-4.33-r1.ebuild
+++ b/mail-mta/exim/exim-4.33-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.33-r1.ebuild,v 1.3 2004/06/24 22:23:33 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.33-r1.ebuild,v 1.4 2004/07/14 16:50:36 agriffis Exp $
 
 inherit eutils
 
-IUSE="tcpd ssl postgres mysql ldap pam exiscan-acl maildir lmtp ipv6 sasl wildlsearch dnsdb perl mbox X"
+IUSE="X dnsdb exiscan exiscan-acl ipv6 ldap lmtp maildir mbox mysql pam perl postgres sasl ssl tcpd wildlsearch"
 
 EXISCANACL_VER=${PV}-20
 
@@ -245,5 +245,3 @@ pkg_postinst() {
 	einfo "/etc/exim/auth_conf.sub contains the configuration sub for using smtp auth."
 	einfo "Please create /etc/exim/exim.conf from /etc/exim/exim.conf.dist."
 }
-
-
diff --git a/mail-mta/exim/exim-4.33.ebuild b/mail-mta/exim/exim-4.33.ebuild
index df496fb8c6bf..3d25917c1153 100644
--- a/mail-mta/exim/exim-4.33.ebuild
+++ b/mail-mta/exim/exim-4.33.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.33.ebuild,v 1.3 2004/06/24 22:23:33 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.33.ebuild,v 1.4 2004/07/14 16:50:36 agriffis Exp $
 
 inherit eutils
 
-IUSE="tcpd ssl postgres mysql ldap pam exiscan-acl maildir lmtp ipv6 sasl wildlsearch dnsdb perl mbox X"
+IUSE="X dnsdb exiscan exiscan-acl ipv6 ldap lmtp maildir mbox mysql pam perl postgres sasl ssl tcpd wildlsearch"
 
 EXISCANACL_VER=${PV}-20
 
@@ -243,5 +243,3 @@ pkg_postinst() {
 	einfo "/etc/exim/auth_conf.sub contains the configuration sub for using smtp auth."
 	einfo "Please create /etc/exim/exim.conf from /etc/exim/exim.conf.dist."
 }
-
-
diff --git a/mail-mta/exim/exim-4.34-r1.ebuild b/mail-mta/exim/exim-4.34-r1.ebuild
index e2046daaab0f..f8351eebe179 100644
--- a/mail-mta/exim/exim-4.34-r1.ebuild
+++ b/mail-mta/exim/exim-4.34-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.34-r1.ebuild,v 1.3 2004/06/24 22:23:33 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.34-r1.ebuild,v 1.4 2004/07/14 16:50:36 agriffis Exp $
 
 inherit eutils
 
@@ -260,5 +260,3 @@ pkg_postinst() {
 		einfo
 	fi
 }
-
-
diff --git a/mail-mta/exim/exim-4.34.ebuild b/mail-mta/exim/exim-4.34.ebuild
index db1e93c9486a..fa76bf951d17 100644
--- a/mail-mta/exim/exim-4.34.ebuild
+++ b/mail-mta/exim/exim-4.34.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.34.ebuild,v 1.3 2004/06/24 22:23:33 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.34.ebuild,v 1.4 2004/07/14 16:50:36 agriffis Exp $
 
 inherit eutils
 
-IUSE="tcpd ssl postgres mysql ldap pam exiscan-acl maildir lmtp ipv6 sasl wildlsearch dnsdb perl mbox X"
+IUSE="X dnsdb exiscan exiscan-acl ipv6 ldap lmtp maildir mbox mysql pam perl postgres sasl ssl tcpd wildlsearch"
 
 EXISCANACL_VER=${PV}-21
 
@@ -243,5 +243,3 @@ pkg_postinst() {
 	einfo "/etc/exim/auth_conf.sub contains the configuration sub for using smtp auth."
 	einfo "Please create /etc/exim/exim.conf from /etc/exim/exim.conf.dist."
 }
-
-