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

19 files changed, 72 insertions, 107 deletions

diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index 34f3e124c0e2..634bb9fa2d1e 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -1,57 +1,57 @@
-MD5 cd44fa2fde7ca5f43d5c1d3e47908e6a ChangeLog 12165
-MD5 de66050a65239c5ff6cfb66cdbf106f9 exim-4.10.ebuild 6200
+MD5 07a3e8a8cf202db0224e3a16fcff0d2d exim-4.32-r1.ebuild 7543
+MD5 63def95af6f1e689ae24713d9b67488d exim-4.20-r2.ebuild 6333
+MD5 00c3e05529a17396d53cf51fada83583 exim-4.30.ebuild 6416
+MD5 ac610c2bde1f4dc8a17b225aa2296d68 exim-4.21.ebuild 6156
 MD5 24a6506bc881d3a5caa69e99ef0f55da exim-4.12.ebuild 5442
+MD5 53237fa96d5fb17feced3021364c9e6e exim-4.32.ebuild 7542
 MD5 9f7020ef1d7571e5dab7b036d5eaf57d exim-4.14.ebuild 5490
-MD5 8bf0ad0a7efc2c3976da2c8cc40529d3 exim-4.20-r1.ebuild 6242
-MD5 c2fe2dd30b4184241f05bc08ba3c39d7 exim-4.20-r2.ebuild 6335
+MD5 19e37995d87f119c0247162e0268b2b9 exim-4.24-r1.ebuild 6385
+MD5 8ac10808a0dcbab81662710e43f8f174 exim-4.20-r1.ebuild 6240
+MD5 4f81a30a363f8dee30864633df6649f4 exim-4.34.ebuild 7562
 MD5 7d3cb16381348b25c6d8e8636909a227 exim-4.20.ebuild 5577
-MD5 e28baf39af1837e5baeeefb9c8e6a7be exim-4.21.ebuild 6150
-MD5 5dd974ebcb4c5cc18caf8217aaa5951d exim-4.22.ebuild 6364
-MD5 16d46ea1853de4ed0ccf59d090a0678d exim-4.24-r1.ebuild 6379
-MD5 006ca04d0e9dd7f9b044325c0a6143f2 exim-4.24-r2.ebuild 6390
-MD5 2f8aa6cc4d91cc0033ec3409fd89a5ff exim-4.24-r3.ebuild 6441
-MD5 c7e3c0d981126dc52dd7e82e5d35c5a2 exim-4.24.ebuild 6364
-MD5 dee54ff9b0aef40714b0ff00598399b2 exim-4.30-r1.ebuild 7093
-MD5 05b1e3b4a4c2bda073ad20cd3a490d40 exim-4.30.ebuild 6410
-MD5 bf1b2b212226ded212cd77972c10f42b exim-4.31.ebuild 7089
-MD5 7c48eb3e12ad4d4d1abc50578e854650 exim-4.32-r1.ebuild 7537
-MD5 3e6a2e4eb350171c31fd35f4e5073fd8 exim-4.32.ebuild 7536
-MD5 979b89b879932331dea1a3e79b29cf9d exim-4.33-r1.ebuild 7620
-MD5 58d6d5f8de17876b02a5d4799ddd51f8 exim-4.33.ebuild 7537
-MD5 21ca6c3fa17c2746b3151c09ae481765 exim-4.34-r1.ebuild 7935
-MD5 d9fe4b0568da21ca713c1918b9af363f exim-4.34.ebuild 7556
+MD5 8807b47f2f299eb16a17bf4904c4ca81 exim-4.34-r1.ebuild 7933
+MD5 fe28cf15d4dacf7d18633ab7262e891e exim-4.30-r1.ebuild 7099
+MD5 55393e61777e6713c7298f3f285a7666 exim-4.24-r3.ebuild 6447
+MD5 67244cc2ff22bc65896fddb9e49f8e89 exim-4.31.ebuild 7095
+MD5 9f98fdabf372bb5bfd00d7addace6fb1 exim-4.22.ebuild 6370
+MD5 3faecfffa69ae8404a41a8d39201b3e1 exim-4.33-r1.ebuild 7626
+MD5 7ca071417f6a32f8c3d1900e941037ef exim-4.33.ebuild 7543
+MD5 c9255dc424655f584522ee766fe1d98c exim-4.24.ebuild 6370
+MD5 cd44fa2fde7ca5f43d5c1d3e47908e6a ChangeLog 12165
+MD5 e498dba7d22feb6bef903da80a2aee43 exim-4.10.ebuild 6180
 MD5 33dd717372c0b5d66b421e65dc0e45e3 metadata.xml 1065
-MD5 68fc403ba2c98ccba281939085cb9052 files/auth_conf.sub 775
+MD5 327c630edb4a9308ef6b2bb2258d4a30 exim-4.24-r2.ebuild 6396
+MD5 4c0b8ee742360c08f0bc0b526fcaad10 files/system_filter.exim 8120
 MD5 0cb2ffe88c81fd7ac8429b5a19d58b35 files/configure 16346
-MD5 34def7b529693beda5b84c422d25a878 files/digest-exim-4.10 128
-MD5 100ab1bbdfea50083ecce4bf78af5cc9 files/digest-exim-4.12 129
-MD5 091d3610d9a2a0b879f543cc070ef933 files/digest-exim-4.14 128
-MD5 04ba8d65b73d23eb58c6d3e4accbed7f files/digest-exim-4.20 198
+MD5 369b42cafcbe5631c2d03cbbfd4aeddd files/exim-4.10-gentoo.diff 1889
+MD5 f442b68d435598831bab8536ade071b8 files/exim.confd 62
+MD5 5127f4b2ace5cf148e2ac21e101ac967 files/exim-4.33-r1-header-syntax.patch 1017
+MD5 f03fc637e154f9ca79d991e71eb063bf files/exim-4.30-conf.patch 887
 MD5 04ba8d65b73d23eb58c6d3e4accbed7f files/digest-exim-4.20-r1 198
 MD5 0cc15aecabaeace6ff4cdd1a462b9eb0 files/digest-exim-4.20-r2 62
-MD5 e62c9a744fd2c944af3dbc881156574b files/digest-exim-4.21 132
-MD5 9be54e4b44d4b7b6899302a1f3f74007 files/digest-exim-4.22 132
-MD5 117455c076e246e7c02d5fa464dd4be7 files/digest-exim-4.24 132
 MD5 117455c076e246e7c02d5fa464dd4be7 files/digest-exim-4.24-r1 132
 MD5 117455c076e246e7c02d5fa464dd4be7 files/digest-exim-4.24-r2 132
 MD5 117455c076e246e7c02d5fa464dd4be7 files/digest-exim-4.24-r3 132
-MD5 11bc429bd869bdc9709fabe221ac29a7 files/digest-exim-4.30 132
 MD5 56085a2d36e00a6a48cacc7baeb5f451 files/digest-exim-4.30-r1 62
-MD5 1e04cfda5987a9c439533a59dd015050 files/digest-exim-4.31 132
-MD5 63b21a335f1b7603157772f27480f7ad files/digest-exim-4.32 132
 MD5 3aebdc3dd469414ad4c1f0219c9db79a files/digest-exim-4.32-r1 132
-MD5 904b31332322109b4d2a382d6a253412 files/digest-exim-4.33 133
 MD5 904b31332322109b4d2a382d6a253412 files/digest-exim-4.33-r1 133
-MD5 6a964dbcdbca2690ed166e9a59cebe84 files/digest-exim-4.34 133
 MD5 6a964dbcdbca2690ed166e9a59cebe84 files/digest-exim-4.34-r1 133
-MD5 369b42cafcbe5631c2d03cbbfd4aeddd files/exim-4.10-gentoo.diff 1889
-MD5 5d5aabea7d56a91803df1312c04d32c0 files/exim-4.14-tail.patch 446
-MD5 622b726ea7b32aae93a8fe9f3c2af9cd files/exim-4.20-maildir.patch 478
-MD5 f03fc637e154f9ca79d991e71eb063bf files/exim-4.30-conf.patch 887
-MD5 5127f4b2ace5cf148e2ac21e101ac967 files/exim-4.33-r1-header-syntax.patch 1017
-MD5 f442b68d435598831bab8536ade071b8 files/exim.confd 62
-MD5 c0bd93a812cff91362a29d02bacb2b71 files/exim.rc6 512
 MD5 eb249c90af3ab11e5a4d307e184a75ac files/exiscan.conf 22113
+MD5 68fc403ba2c98ccba281939085cb9052 files/auth_conf.sub 775
+MD5 622b726ea7b32aae93a8fe9f3c2af9cd files/exim-4.20-maildir.patch 478
 MD5 7c5952fce79ab58b46b404495e1f1176 files/mailer.conf 1298
+MD5 5d5aabea7d56a91803df1312c04d32c0 files/exim-4.14-tail.patch 446
 MD5 d230e0fa45f2b65d5bc50c0879c40148 files/pam.d-exim 101
-MD5 4c0b8ee742360c08f0bc0b526fcaad10 files/system_filter.exim 8120
+MD5 c0bd93a812cff91362a29d02bacb2b71 files/exim.rc6 512
+MD5 34def7b529693beda5b84c422d25a878 files/digest-exim-4.10 128
+MD5 100ab1bbdfea50083ecce4bf78af5cc9 files/digest-exim-4.12 129
+MD5 091d3610d9a2a0b879f543cc070ef933 files/digest-exim-4.14 128
+MD5 04ba8d65b73d23eb58c6d3e4accbed7f files/digest-exim-4.20 198
+MD5 e62c9a744fd2c944af3dbc881156574b files/digest-exim-4.21 132
+MD5 9be54e4b44d4b7b6899302a1f3f74007 files/digest-exim-4.22 132
+MD5 117455c076e246e7c02d5fa464dd4be7 files/digest-exim-4.24 132
+MD5 11bc429bd869bdc9709fabe221ac29a7 files/digest-exim-4.30 132
+MD5 1e04cfda5987a9c439533a59dd015050 files/digest-exim-4.31 132
+MD5 63b21a335f1b7603157772f27480f7ad files/digest-exim-4.32 132
+MD5 904b31332322109b4d2a382d6a253412 files/digest-exim-4.33 133
+MD5 6a964dbcdbca2690ed166e9a59cebe84 files/digest-exim-4.34 133
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."
 }
-
-