stable on s390 on behalf of vapier. remove old ebuilds.

26 files changed, 13 insertions, 2718 deletions

diff --git a/mail-mta/postfix/ChangeLog b/mail-mta/postfix/ChangeLog
index eb2496e5c6a0..8641d34e272d 100644
--- a/mail-mta/postfix/ChangeLog
+++ b/mail-mta/postfix/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for mail-mta/postfix
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.32 2004/10/26 19:02:08 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.33 2004/11/01 17:05:03 langthang Exp $
+
+  01 Nov 2004; Tuan Van <langthang@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-r1.ebuild, -postfix-2.0.19-r2.ebuild,
+  -postfix-2.0.19-r3.ebuild, -postfix-2.0.19-r4.ebuild,
+  -postfix-2.0.20.ebuild, -postfix-2.1.1.ebuild, -postfix-2.1.4.ebuild,
+  postfix-2.1.5-r1.ebuild:
+  stable on s390 on behalf of vapier.
+  remove old ebuilds.
 
   26 Oct 2004; Luca Barbato <lu_zero@gentoo.org> postfix-2.1.5-r1.ebuild:
   Marked ppc
diff --git a/mail-mta/postfix/files/digest-postfix-1.1.11.20020917 b/mail-mta/postfix/files/digest-postfix-1.1.11.20020917
deleted file mode 100644
index 01d2b9027adb..000000000000
--- a/mail-mta/postfix/files/digest-postfix-1.1.11.20020917
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 d5c4edd83db08a4306840fef321bb42a postfix-1.1.11-20020917.tar.gz 1287821
-MD5 1fc29989315ab5570486929c24187626 pfixtls-0.8.11a-1.1.11-20020917-0.9.6g.tar.gz 196206
diff --git a/mail-mta/postfix/files/digest-postfix-1.1.11.20020917-r1 b/mail-mta/postfix/files/digest-postfix-1.1.11.20020917-r1
deleted file mode 100644
index 01d2b9027adb..000000000000
--- a/mail-mta/postfix/files/digest-postfix-1.1.11.20020917-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 d5c4edd83db08a4306840fef321bb42a postfix-1.1.11-20020917.tar.gz 1287821
-MD5 1fc29989315ab5570486929c24187626 pfixtls-0.8.11a-1.1.11-20020917-0.9.6g.tar.gz 196206
diff --git a/mail-mta/postfix/files/digest-postfix-2.0.11 b/mail-mta/postfix/files/digest-postfix-2.0.11
deleted file mode 100644
index d7c0b57edce0..000000000000
--- a/mail-mta/postfix/files/digest-postfix-2.0.11
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 a6bb9809a29c7e00a576491e1b57b79a postfix-2.0.11.tar.gz 1349765
-MD5 31f1e830882025957f735e5e9b7dd2fd pfixtls-0.8.13-2.0.10-0.9.7b.tar.gz 226122
-MD5 f338521aaccd7a15deaf606c1bab4d16 ipv6-1.14-pf-2.0.11.patch.gz 36029
-MD5 c33700d22bd1bc612413a48899bd7896 tls+ipv6-1.14-pf-2.0.11.patch.gz 99562
diff --git a/mail-mta/postfix/files/digest-postfix-2.0.16-r1 b/mail-mta/postfix/files/digest-postfix-2.0.16-r1
deleted file mode 100644
index f430e5510bb2..000000000000
--- a/mail-mta/postfix/files/digest-postfix-2.0.16-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 ac13776442ba7708e683bc1bfbadab2f postfix-2.0.16.tar.gz 1353520
-MD5 55a3d76d52fddd5cd0365004957a1160 postfix-2.0-ns-mx-acl-patch.gz 4673
-MD5 b39c08eabe807db4af5bcb1cafc9761e pfixtls-0.8.16-2.0.16-0.9.7b.tar.gz 234105
-MD5 8e0b85c6c131d367dc5b0d0d95e7e2c1 ipv6-1.18a-pf-2.0.16.patch.gz 45398
-MD5 d029e85aba3f7610ca3437aefa9c1e60 tls+ipv6-1.18a-pf-2.0.16.patch.gz 253429
-MD5 5a0aa5ef6a231a593eb6c5628236a3e4 postfix-pg.postfix-2.0.0.2.patch 27419
diff --git a/mail-mta/postfix/files/digest-postfix-2.0.18 b/mail-mta/postfix/files/digest-postfix-2.0.18
deleted file mode 100644
index fdec3fc613ce..000000000000
--- a/mail-mta/postfix/files/digest-postfix-2.0.18
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 3e5baf2cc497a5fb1aaa6ba11aa6491e postfix-2.0.18.tar.gz 1353649
-MD5 55a3d76d52fddd5cd0365004957a1160 postfix-2.0-ns-mx-acl-patch.gz 4673
-MD5 2d9b07d3847a06b77db3be25973acf14 pfixtls-0.8.16-2.0.18-0.9.7c.tar.gz 234300
-MD5 f30495d44b140239df02a0599d280d68 ipv6-1.21-pf-2.0.18.patch.gz 47266
-MD5 8d273f922352a0ff32c57c29bec26b46 tls+ipv6-1.21-pf-2.0.18.patch.gz 254862
-MD5 5a0aa5ef6a231a593eb6c5628236a3e4 postfix-pg.postfix-2.0.0.2.patch 27419
diff --git a/mail-mta/postfix/files/digest-postfix-2.0.19-r1 b/mail-mta/postfix/files/digest-postfix-2.0.19-r1
deleted file mode 100644
index 64cc417361b7..000000000000
--- a/mail-mta/postfix/files/digest-postfix-2.0.19-r1
+++ /dev/null
@@ -1,7 +0,0 @@
-MD5 3515ba531b0fadd0e54ef688797d393e postfix-2.0.19.tar.gz 1355184
-MD5 55a3d76d52fddd5cd0365004957a1160 postfix-2.0-ns-mx-acl-patch.gz 4673
-MD5 8fe4bee5b9f221a6d71c6fc888c37569 postfix-2.0.18.patch.gz 6738
-MD5 2d9b07d3847a06b77db3be25973acf14 pfixtls-0.8.16-2.0.18-0.9.7c.tar.gz 234300
-MD5 f30495d44b140239df02a0599d280d68 ipv6-1.21-pf-2.0.18.patch.gz 47266
-MD5 8d273f922352a0ff32c57c29bec26b46 tls+ipv6-1.21-pf-2.0.18.patch.gz 254862
-MD5 5a0aa5ef6a231a593eb6c5628236a3e4 postfix-pg.postfix-2.0.0.2.patch 27419
diff --git a/mail-mta/postfix/files/digest-postfix-2.0.19-r2 b/mail-mta/postfix/files/digest-postfix-2.0.19-r2
deleted file mode 100644
index 64cc417361b7..000000000000
--- a/mail-mta/postfix/files/digest-postfix-2.0.19-r2
+++ /dev/null
@@ -1,7 +0,0 @@
-MD5 3515ba531b0fadd0e54ef688797d393e postfix-2.0.19.tar.gz 1355184
-MD5 55a3d76d52fddd5cd0365004957a1160 postfix-2.0-ns-mx-acl-patch.gz 4673
-MD5 8fe4bee5b9f221a6d71c6fc888c37569 postfix-2.0.18.patch.gz 6738
-MD5 2d9b07d3847a06b77db3be25973acf14 pfixtls-0.8.16-2.0.18-0.9.7c.tar.gz 234300
-MD5 f30495d44b140239df02a0599d280d68 ipv6-1.21-pf-2.0.18.patch.gz 47266
-MD5 8d273f922352a0ff32c57c29bec26b46 tls+ipv6-1.21-pf-2.0.18.patch.gz 254862
-MD5 5a0aa5ef6a231a593eb6c5628236a3e4 postfix-pg.postfix-2.0.0.2.patch 27419
diff --git a/mail-mta/postfix/files/digest-postfix-2.0.19-r3 b/mail-mta/postfix/files/digest-postfix-2.0.19-r3
deleted file mode 100644
index 64cc417361b7..000000000000
--- a/mail-mta/postfix/files/digest-postfix-2.0.19-r3
+++ /dev/null
@@ -1,7 +0,0 @@
-MD5 3515ba531b0fadd0e54ef688797d393e postfix-2.0.19.tar.gz 1355184
-MD5 55a3d76d52fddd5cd0365004957a1160 postfix-2.0-ns-mx-acl-patch.gz 4673
-MD5 8fe4bee5b9f221a6d71c6fc888c37569 postfix-2.0.18.patch.gz 6738
-MD5 2d9b07d3847a06b77db3be25973acf14 pfixtls-0.8.16-2.0.18-0.9.7c.tar.gz 234300
-MD5 f30495d44b140239df02a0599d280d68 ipv6-1.21-pf-2.0.18.patch.gz 47266
-MD5 8d273f922352a0ff32c57c29bec26b46 tls+ipv6-1.21-pf-2.0.18.patch.gz 254862
-MD5 5a0aa5ef6a231a593eb6c5628236a3e4 postfix-pg.postfix-2.0.0.2.patch 27419
diff --git a/mail-mta/postfix/files/digest-postfix-2.0.19-r4 b/mail-mta/postfix/files/digest-postfix-2.0.19-r4
deleted file mode 100644
index 64cc417361b7..000000000000
--- a/mail-mta/postfix/files/digest-postfix-2.0.19-r4
+++ /dev/null
@@ -1,7 +0,0 @@
-MD5 3515ba531b0fadd0e54ef688797d393e postfix-2.0.19.tar.gz 1355184
-MD5 55a3d76d52fddd5cd0365004957a1160 postfix-2.0-ns-mx-acl-patch.gz 4673
-MD5 8fe4bee5b9f221a6d71c6fc888c37569 postfix-2.0.18.patch.gz 6738
-MD5 2d9b07d3847a06b77db3be25973acf14 pfixtls-0.8.16-2.0.18-0.9.7c.tar.gz 234300
-MD5 f30495d44b140239df02a0599d280d68 ipv6-1.21-pf-2.0.18.patch.gz 47266
-MD5 8d273f922352a0ff32c57c29bec26b46 tls+ipv6-1.21-pf-2.0.18.patch.gz 254862
-MD5 5a0aa5ef6a231a593eb6c5628236a3e4 postfix-pg.postfix-2.0.0.2.patch 27419
diff --git a/mail-mta/postfix/files/digest-postfix-2.0.20 b/mail-mta/postfix/files/digest-postfix-2.0.20
deleted file mode 100644
index 0b4696e7982a..000000000000
--- a/mail-mta/postfix/files/digest-postfix-2.0.20
+++ /dev/null
@@ -1,7 +0,0 @@
-MD5 92479b64d132262be505a17ec02bc2a8 postfix-2.0.20.tar.gz 1354414
-MD5 55a3d76d52fddd5cd0365004957a1160 postfix-2.0-ns-mx-acl-patch.gz 4673
-MD5 6eac2527bca4371a2745d6ce8f330b4f postfix-2.0.20.patch.gz 6736
-MD5 2d9b07d3847a06b77db3be25973acf14 pfixtls-0.8.16-2.0.18-0.9.7c.tar.gz 234300
-MD5 a7682a9fcda314e6d1e12e88eb3f9cba ipv6-1.25-pf-2.0.20.patch.gz 50271
-MD5 894cbd83c941e4d3ab147e2785ff6e69 tls+ipv6-1.25-pf-2.0.20.patch.gz 259419
-MD5 5a0aa5ef6a231a593eb6c5628236a3e4 postfix-pg.postfix-2.0.0.2.patch 27419
diff --git a/mail-mta/postfix/files/digest-postfix-2.1.1 b/mail-mta/postfix/files/digest-postfix-2.1.1
deleted file mode 100644
index 13863fc80eea..000000000000
--- a/mail-mta/postfix/files/digest-postfix-2.1.1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 286856c9597cfa244c3b6133dce12749 postfix-2.1.0.tar.gz 1992845
-MD5 8c4fe863f3c11b6e89181ff208af88b6 postfix-2.1-patch01.gz 1599
-MD5 97565b1405a471dafc0c752fca266e2c postfix-2.1.1.patch.gz 6907
-MD5 01785d9636bdae51a906320e581b1e6b pfixtls-0.8.18-2.1.0-0.9.7d.tar.gz 239141
-MD5 9170e8efda9341c6e5b7ac1bb1a9b323 ipv6-1.24-pf-2.1.1.patch.gz 52007
-MD5 22c7feb237ef35a0761fb5bdc5c6ff2c tls+ipv6-1.24-pf-2.1.1.patch.gz 256320
diff --git a/mail-mta/postfix/files/digest-postfix-2.1.4 b/mail-mta/postfix/files/digest-postfix-2.1.4
deleted file mode 100644
index 05b0f4ba5939..000000000000
--- a/mail-mta/postfix/files/digest-postfix-2.1.4
+++ /dev/null
@@ -1,5 +0,0 @@
-MD5 f96fc9e7cbf9750d4a91475fcbd02a81 postfix-2.1.4.tar.gz 1970068
-MD5 6602396fcf82a5bff508109d0224ffe8 postfix-2.1.4-trash.patch.gz 7081
-MD5 d3211ebd4d2fbbc9c78235666ed355ac pfixtls-0.8.18-2.1.3-0.9.7d.tar.gz 239141
-MD5 b419e47ac11fbdd4bc15064d186928b6 ipv6-1.25-pf-2.1.4.patch.gz 52299
-MD5 32f87bd794ac526482f410c93e7812c4 tls+ipv6-1.25-pf-2.1.4.patch.gz 256600
diff --git a/mail-mta/postfix/postfix-1.1.11.20020917-r1.ebuild b/mail-mta/postfix/postfix-1.1.11.20020917-r1.ebuild
deleted file mode 100644
index 59b7f7a2db68..000000000000
--- a/mail-mta/postfix/postfix-1.1.11.20020917-r1.ebuild
+++ /dev/null
@@ -1,188 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# 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.4 2004/07/14 16:53:02 agriffis Exp $
-
-IUSE="ipv6 ldap mysql pam sasl ssl"
-
-PF_PV=1.1.11-20020917
-PF_P=postfix-${PF_PV}
-S=${WORKDIR}/${PF_P}
-TLS_P=pfixtls-0.8.11a-${PF_PV}-0.9.6g
-IPV6_P=tls+ipv6-1.4-pf-${PF_PV}
-
-DESCRIPTION="A fast and secure drop-in replacement for sendmail"
-HOMEPAGE="http://www.postfix.org/"
-SRC_URI="ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/related/postfix/${PF_P}.tar.gz
-	ssl? ( ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/${TLS_P}.tar.gz )"
-
-LICENSE="IPL-1"
-SLOT="0"
-KEYWORDS="x86 ~sparc ~alpha ~ppc"
-
-PROVIDE="virtual/mta
-	 virtual/mda"
-DEPEND=">=sys-libs/db-3.2
-	>=dev-libs/libpcre-3.4
-	ldap? ( >=net-nds/openldap-1.2 )
-	mysql? ( >=dev-db/mysql-3.23.51 )
-	ssl? ( >=dev-libs/openssl-0.9.6g )
-	sasl? ( dev-libs/cyrus-sasl )"
-
-RDEPEND="${DEPEND}
-	>=net-mail/mailbase-0.00
-	!virtual/mta"
-
-postfix_installed=no
-
-pkg_setup() {
-
-	if ! grep -q ^postdrop: /etc/group ; then
-		groupadd postdrop || die "problem adding group postdrop"
-	fi
-
-	if [ -d /etc/postfix ] ; then
-		postfix_installed=yes
-	fi
-
-}
-
-src_unpack() {
-
-	cd ${WORKDIR}
-	unpack ${DISTFILES}/${PF_P}.tar.gz
-
-	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
-	then
-		unpack ${DISTFILES}/${TLS_P}.tar.gz
-		cd ${S}
-		patch -p1 < ${WORKDIR}/${TLS_P}/pfixtls.diff || die "patch failed"
-		CCARGS="${CCARGS} -DHAS_SSL"
-		AUXLIBS="${AUXLIBS} -lssl -lcrypto"
-	fi
-
-	cd ${S}/conf
-	cp main.cf main.cf.orig
-	sed -e "s:/usr/libexec/postfix:/usr/lib/postfix:" main.cf.orig > main.cf
-
-	if use sasl
-	then
-			if [ -e /usr/include/sasl/sasl.h ]
-			then
-					# saslv2
-					AUXLIBS="${AUXLIBS} -lsasl2"
-					CCARGS="${CCARGS} -I/usr/include/sasl -DUSE_SASL_AUTH"
-			else
-					# saslv1
-					AUXLIBS="${AUXLIBS} -lsasl"
-					CCARGS="${CCARGS} -DUSE_SASL_AUTH"
-			fi
-	fi
-
-	cd ${S}/src/global
-	cp mail_params.h mail_params.h.orig
-	sed -e "s:/usr/libexec/postfix:/usr/lib/postfix:" mail_params.h.orig > mail_params.h
-
-	use mysql && CCARGS="${CCARGS} -DHAS_MYSQL -I/usr/include/mysql" \
-		&& AUXLIBS="${AUXLIBS} -lmysqlclient -lm"
-
-	use ldap && CCARGS="${CCARGS} -DHAS_LDAP" \
-		&& AUXLIBS="${AUXLIBS} -lldap -llber"
-
-	use pam && AUXLIBS="${AUXLIBS} -lpam"
-
-	CCARGS="${CCARGS} -DHAS_PCRE"
-	AUXLIBS="${AUXLIBS} -L/usr/lib -lpcre -ldl -lcrypt"
-	DEBUG=""
-
-	cd ${S}
-	make tidy || die
-	make makefiles CC="cc" OPT="${CFLAGS}" DEBUG="${DEBUG}" \
-		CCARGS="${CCARGS}" AUXLIBS="${AUXLIBS}" || die
-}
-
-src_compile() {
-
-	emake || die "compile problem"
-
-}
-
-src_install () {
-
-	dodir /usr/bin /usr/sbin /usr/lib/postfix /etc/postfix/sample \
-		/var/spool/postfix/hold
-
-	cd ${S}/bin
-	dosbin post* sendmail
-	chown root:postdrop ${D}/usr/sbin/{postdrop,postqueue}
-	chmod 2755 ${D}/usr/sbin/{postdrop,postqueue}
-
-	dosym /usr/sbin/sendmail /usr/bin/mailq
-	dosym /usr/sbin/sendmail /usr/bin/newaliases
-	dosym /usr/sbin/sendmail /usr/lib/sendmail
-
-	cd ${S}/libexec
-	exeinto /usr/lib/postfix
-	doexe *
-
-	cd ${S}/man
-	doman man*/*
-
-	cd ${S}
-	dodoc *README COMPATIBILITY HISTORY LICENSE PORTING RELEASE_NOTES INSTALL
-	dohtml html/*
-
-	cd ${S}/conf
-	insinto /etc/postfix/sample
-	doins access aliases canonical relocated transport \
-		pcre_table regexp_table postfix-script* *.cf
-
-	exeinto /etc/postfix
-	doexe postfix-script post-install postfix-files || die
-
-	insinto /etc/postfix
-	doins ${FILESDIR}/main.cf ${S}/conf/master.cf ${FILESDIR}/saslpass || die
-
-	exeinto /etc/init.d ; newexe ${FILESDIR}/postfix.rc6 postfix
-	insinto /etc/pam.d ; newins ${FILESDIR}/smtp.pam smtp
-
-	if use sasl
-	then
-			if [ -e /usr/include/sasl.h ]
-			then
-					# saslv1
-					insinto /etc/sasl ; doins ${FILESDIR}/smtpd.conf
-			fi
-			if [ -e /usr/include/sasl/sasl.h ]
-			then
-					# saslv2
-					insinto /usr/lib/sasl2 ; doins ${FILESDIR}/smtpd.conf
-			fi
-	fi
-
-}
-
-pkg_postinst() {
-
-	install -d -m 0755 ${ROOT}/var/spool/postfix
-
-	if [ "${postfix_installed}" = "yes" ] ; then
-		ewarn "If you have upgraded from <postfix-1.1.8, you must update"
-		ewarn "/etc/postfix/master.cf to the latest version"
-		ewarn "(/etc/postfix/._cfg*_master.cf). Otherwise Postfix will"
-		ewarn "not work correctly."
-	fi
-
-	if [ ! -e /etc/mail/aliases.db ] ; then
-		echo
-		ewarn "You must edit /etc/mail/aliases to suit your needs"
-		ewarn "and then run /usr/bin/newaliases. Postfix will not"
-		ewarn "work correctly without it."
-	fi
-
-}
diff --git a/mail-mta/postfix/postfix-1.1.11.20020917.ebuild b/mail-mta/postfix/postfix-1.1.11.20020917.ebuild
deleted file mode 100644
index f3ffa9d15a92..000000000000
--- a/mail-mta/postfix/postfix-1.1.11.20020917.ebuild
+++ /dev/null
@@ -1,188 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# 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.4 2004/07/14 16:53:02 agriffis Exp $
-
-IUSE="ipv6 ldap mysql pam sasl ssl"
-
-PF_PV=1.1.11-20020917
-PF_P=postfix-${PF_PV}
-S=${WORKDIR}/${PF_P}
-TLS_P=pfixtls-0.8.11a-${PF_PV}-0.9.6g
-IPV6_P=tls+ipv6-1.4-pf-${PF_PV}
-
-DESCRIPTION="A fast and secure drop-in replacement for sendmail"
-HOMEPAGE="http://www.postfix.org/"
-SRC_URI="ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/related/postfix/${PF_P}.tar.gz
-	ssl? ( ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/${TLS_P}.tar.gz )"
-
-LICENSE="IPL-1"
-SLOT="0"
-KEYWORDS="x86 sparc ppc"
-
-PROVIDE="virtual/mta
-	 virtual/mda"
-DEPEND=">=sys-libs/db-3.2
-	>=dev-libs/libpcre-3.4
-	ldap? ( >=net-nds/openldap-1.2 )
-	mysql? ( >=dev-db/mysql-3.23.51 )
-	ssl? ( >=dev-libs/openssl-0.9.6g )
-	sasl? ( dev-libs/cyrus-sasl )"
-
-RDEPEND="${DEPEND}
-	>=net-mail/mailbase-0.00
-	!virtual/mta"
-
-postfix_installed=no
-
-pkg_setup() {
-
-	if ! grep -q ^postdrop: /etc/group ; then
-		groupadd postdrop || die "problem adding group postdrop"
-	fi
-
-	if [ -d /etc/postfix ] ; then
-		postfix_installed=yes
-	fi
-
-}
-
-src_unpack() {
-
-	cd ${WORKDIR}
-	unpack ${DISTFILES}/${PF_P}.tar.gz
-
-	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
-	then
-		unpack ${DISTFILES}/${TLS_P}.tar.gz
-		cd ${S}
-		patch -p1 < ${WORKDIR}/${TLS_P}/pfixtls.diff || die "patch failed"
-		CCARGS="${CCARGS} -DHAS_SSL"
-		AUXLIBS="${AUXLIBS} -lssl -lcrypto"
-	fi
-
-	cd ${S}/conf
-	cp main.cf main.cf.orig
-	sed -e "s:/usr/libexec/postfix:/usr/lib/postfix:" main.cf.orig > main.cf
-
-	if use sasl
-	then
-			if [ -e /usr/include/sasl/sasl.h ]
-			then
-					# saslv2
-					AUXLIBS="${AUXLIBS} -lsasl2"
-					CCARGS="${CCARGS} -I/usr/include/sasl -DUSE_SASL_AUTH"
-			else
-					# saslv1
-					AUXLIBS="${AUXLIBS} -lsasl"
-					CCARGS="${CCARGS} -DUSE_SASL_AUTH"
-			fi
-	fi
-
-	cd ${S}/src/global
-	cp mail_params.h mail_params.h.orig
-	sed -e "s:/usr/libexec/postfix:/usr/lib/postfix:" mail_params.h.orig > mail_params.h
-
-	use mysql && CCARGS="${CCARGS} -DHAS_MYSQL -I/usr/include/mysql" \
-		&& AUXLIBS="${AUXLIBS} -lmysqlclient -lm"
-
-	use ldap && CCARGS="${CCARGS} -DHAS_LDAP" \
-		&& AUXLIBS="${AUXLIBS} -lldap -llber"
-
-	use pam && AUXLIBS="${AUXLIBS} -lpam"
-
-	CCARGS="${CCARGS} -DHAS_PCRE"
-	AUXLIBS="${AUXLIBS} -L/usr/lib -lpcre -ldl -lcrypt"
-	DEBUG=""
-
-	cd ${S}
-	make tidy || die
-	make makefiles CC="cc" OPT="${CFLAGS}" DEBUG="${DEBUG}" \
-		CCARGS="${CCARGS}" AUXLIBS="${AUXLIBS}" || die
-}
-
-src_compile() {
-
-	emake || die "compile problem"
-
-}
-
-src_install () {
-
-	dodir /usr/bin /usr/sbin /usr/lib/postfix /etc/postfix/sample \
-		/var/spool/postfix/hold
-
-	cd ${S}/bin
-	dosbin post* sendmail
-	chown root:postdrop ${D}/usr/sbin/{postdrop,postqueue}
-	chmod 2755 ${D}/usr/sbin/{postdrop,postqueue}
-
-	dosym /usr/sbin/sendmail /usr/bin/mailq
-	dosym /usr/sbin/sendmail /usr/bin/newaliases
-	dosym /usr/sbin/sendmail /usr/lib/sendmail
-
-	cd ${S}/libexec
-	exeinto /usr/lib/postfix
-	doexe *
-
-	cd ${S}/man
-	doman man*/*
-
-	cd ${S}
-	dodoc *README COMPATIBILITY HISTORY LICENSE PORTING RELEASE_NOTES INSTALL
-	dohtml html/*
-
-	cd ${S}/conf
-	insinto /etc/postfix/sample
-	doins access aliases canonical relocated transport \
-		pcre_table regexp_table postfix-script* *.cf
-
-	exeinto /etc/postfix
-	doexe postfix-script post-install postfix-files || die
-
-	insinto /etc/postfix
-	doins ${FILESDIR}/main.cf ${S}/conf/master.cf ${FILESDIR}/saslpass || die
-
-	exeinto /etc/init.d ; newexe ${FILESDIR}/postfix.rc6 postfix
-	insinto /etc/pam.d ; newins ${FILESDIR}/smtp.pam smtp
-
-	if use sasl
-	then
-			if [ -e /usr/include/sasl.h ]
-			then
-					# saslv1
-					insinto /etc/sasl ; doins ${FILESDIR}/smtpd.conf
-			fi
-			if [ -e /usr/include/sasl/sasl.h ]
-			then
-					# saslv2
-					insinto /etc/sasl2 ; doins ${FILESDIR}/smtpd.conf
-			fi
-	fi
-
-}
-
-pkg_postinst() {
-
-	install -d -m 0755 ${ROOT}/var/spool/postfix
-
-	if [ "${postfix_installed}" = "yes" ] ; then
-		ewarn "If you have upgraded from <postfix-1.1.8, you must update"
-		ewarn "/etc/postfix/master.cf to the latest version"
-		ewarn "(/etc/postfix/._cfg*_master.cf). Otherwise Postfix will"
-		ewarn "not work correctly."
-	fi
-
-	if [ ! -e /etc/mail/aliases.db ] ; then
-		echo
-		ewarn "You must edit /etc/mail/aliases to suit your needs"
-		ewarn "and then run /usr/bin/newaliases. Postfix will not"
-		ewarn "work correctly without it."
-	fi
-
-}
diff --git a/mail-mta/postfix/postfix-2.0.11.ebuild b/mail-mta/postfix/postfix-2.0.11.ebuild
deleted file mode 100644
index e1abe2349dc4..000000000000
--- a/mail-mta/postfix/postfix-2.0.11.ebuild
+++ /dev/null
@@ -1,229 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# 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.6 2004/07/14 16:53:02 agriffis Exp $
-
-IUSE="ipv6 ldap maildir mbox mysql pam sasl ssl"
-
-inherit eutils
-
-TLS_P="pfixtls-0.8.13-2.0.10-0.9.7b"
-IPV6="1.14"
-IPV6_P="ipv6-${IPV6}-pf-${PV}"
-IPV6_TLS_P="tls+${IPV6_P}"
-
-DESCRIPTION="A fast and secure drop-in replacement for sendmail"
-HOMEPAGE="http://www.postfix.org"
-SRC_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official/${P}.tar.gz
-	ssl? ( ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/old/${TLS_P}.tar.gz )
-	ipv6? ( ftp://ftp.stack.nl/pub/postfix/tls+ipv6/${IPV6}/${IPV6_P}.patch.gz )
-	ipv6? ( ftp://ftp.stack.nl/pub/postfix/tls+ipv6/${IPV6}/${IPV6_TLS_P}.patch.gz )"
-
-SLOT="0"
-LICENSE="IPL-1"
-KEYWORDS="x86 sparc ppc amd64 ~alpha"
-
-PROVIDE="virtual/mta
-	virtual/mda"
-
-DEPEND=">=sys-libs/db-3.2
-	>=sys-apps/sed-4
-	>=dev-libs/libpcre-3.4
-	ldap? ( >=net-nds/openldap-1.2 )
-	mysql? ( >=dev-db/mysql-3.23.51 )
-	ssl? ( >=dev-libs/openssl-0.9.6g )
-	sasl? ( dev-libs/cyrus-sasl )"
-
-RDEPEND="${DEPEND}
-	>=net-mail/mailbase-0.00
-	!virtual/mta"
-
-pkg_setup() {
-	if ! grep -q ^postdrop: /etc/group ; then
-		groupadd postdrop || die "problem adding group postdrop"
-	fi
-
-	if ! grep -q ^mail:.*postfix /etc/group ; then
-		usermod -G mail postfix || die "problem adding user postfix to group mail"
-	fi
-
-	# Prevent mangling the smtpd.conf file
-	if [ ! -L ${ROOT}/usr/lib/sasl2/smtpd.conf ]
-	then
-		if [ -f ${ROOT}/usr/lib/sasl2/smtpd.conf ]
-		then
-			ebegin "Protecting your smtpd.conf file"
-			if [ ! -d ${ROOT}/etc/sasl2 ]
-			then
-				mkdir -p ${ROOT}/etc/sasl2
-			fi
-
-			# This shouldn't be necessary, but apparently
-			# Without it things can still get messy.
-			if [ -L ${ROOT}/etc/sasl2/smtpd.conf ]
-			then
-				rm ${ROOT}/etc/sasl2/smtpd.conf
-			fi
-
-			# If both files exist, make sure that we
-			# preserve a copy of each with the ._cfg
-			# system
-			if [ -f ${ROOT}/etc/sasl2/smtpd.conf ]
-			then
-				mv ${ROOT}/etc/sasl2/smtpd.conf \
-					${ROOT}/etc/sasl2/._cfg0000_smtpd.conf
-			fi
-			mv ${ROOT}/usr/lib/sasl2/smtpd.conf ${ROOT}/etc/sasl2
-			eend
-		fi
-	fi
-
-}
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd ${S}
-	if use ssl; then
-		if use ipv6; then
-			epatch ${DISTDIR}/${IPV6_TLS_P}.patch.gz
-		else
-			unpack ${TLS_P}.tar.gz
-			epatch ${WORKDIR}/${P}/${TLS_P}/pfixtls.diff
-		fi
-		CCARGS="${CCARGS} -DHAS_SSL"
-		AUXLIBS="${AUXLIBS} -lssl -lcrypto"
-	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
-		# sasl 2
-		if [ -f /usr/include/sasl/sasl.h ]; then
-			AUXLIBS="${AUXLIBS} -lsasl2"
-			CCARGS="${CCARGS} -I/usr/include/sasl -DUSE_SASL_AUTH"
-		# sasl 1
-		elif [ -f /usr/include/sasl.h ]; then
-			AUXLIBS="${AUXLIBS} -lsasl"
-			CCARGS="${CCARGS} -DUSE_SASL_AUTH"
-		fi
-	fi
-
-	cd ${S}/src/global
-	sed -i -e "s:/usr/libexec/postfix:/usr/lib/postfix:" mail_params.h
-
-	if use mysql ; then
-		CCARGS="${CCARGS} -DHAS_MYSQL -I/usr/include/mysql"
-		AUXLIBS="${AUXLIBS} -lmysqlclient -lm -lz"
-	fi
-
-	if use ldap ; then
-		CCARGS="${CCARGS} -DHAS_LDAP"
-		AUXLIBS="${AUXLIBS} -lldap -llber"
-	fi
-
-	if use pam ; then
-		AUXLIBS="${AUXLIBS} -lpam"
-	fi
-
-	CCARGS="${CCARGS} -DHAS_PCRE"
-	AUXLIBS="${AUXLIBS} -L/usr/lib -lpcre -ldl -lcrypt"
-
-	DEBUG=""
-
-	cd ${S}
-	make makefiles CC="${CC}" OPT="${CFLAGS}" DEBUG="${DEBUG}" \
-		CCARGS="${CCARGS}" AUXLIBS="${AUXLIBS}" \
-		|| die "creating makefiles failed"
-
-	# Postfix do not get the FQDN if no hostname is configured
-	epatch ${FILESDIR}/${PN}-2.0.9-get-FQDN.patch
-}
-
-src_compile() {
-	#this is a bug fix for gcc-2.95.3-r5 (bug 16547)
-	export CC=gcc
-	emake || die "compile problem"
-}
-
-src_install () {
-	dodir /usr/bin /usr/sbin /usr/lib/postfix /etc/postfix/sample
-	keepdir /var/spool/postfix/tmp
-
-	cd ${S}/bin
-	dosbin post* sendmail
-	fowners root:postdrop /usr/sbin/{postdrop,postqueue}
-	fperms 2755 /usr/sbin/{postdrop,postqueue}
-
-	dosym /usr/sbin/sendmail /usr/bin/mailq
-	dosym /usr/sbin/sendmail /usr/bin/newaliases
-	dosym /usr/sbin/sendmail /usr/lib/sendmail
-
-	cd ${S}/libexec
-	exeinto /usr/lib/postfix
-	doexe *
-
-	cd ${S}/man
-	doman man*/*
-
-	cd ${S}
-	dodoc *README COMPATIBILITY HISTORY INSTALL LICENSE PORTING RELEASE_NOTES*
-	cd README_FILES
-	find . -type l |xargs rm
-	dodoc *
-
-	cd ${S}
-	dohtml html/*
-
-	cd ${S}/conf
-	insinto /etc/postfix/sample
-	doins access aliases canonical pcre_table regexp_table \
-		relocated transport virtual *.cf
-
-	exeinto /etc/postfix
-	doexe postfix-script post-install postfix-files
-
-	insinto /etc/postfix
-	doins ${S}/conf/{main,master}.cf
-	newins ${FILESDIR}/smtp.pass saslpass
-	cd ${D}/etc/postfix
-	epatch ${FILESDIR}/postfix-2.0.0/main.cf.diff
-	sed -i -e "s|/usr/share/doc/POSTFIX|/usr/share/doc/${PF}|" main.cf
-	chmod 644 main.cf
-	rm -f main.cf~
-	fperms 600 /etc/postfix/saslpass
-
-	exeinto /etc/init.d ; newexe "${FILESDIR}/postfix.rc6" postfix
-	insinto /etc/pam.d ; newins ${FILESDIR}/smtp.pam smtp
-
-	insinto /etc/sasl2
-	doins ${FILESDIR}/smtpd.conf
-	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
-		sed -i -e "s:^#\(home_mailbox = \)Maildir/:\1.maildir/:" main.cf
-	elif use mbox; then
-		sed -i -e "s:^#\(mail_spool_directory = /var/spool/mail\):\1:" main.cf
-	fi
-
-	#install an rmail for UUCP, closing bug #19127
-	cd ${S}/auxiliary/rmail
-	dobin rmail
-}
-
-pkg_postinst() {
-	install -d -m 0755 ${ROOT}/var/spool/postfix
-
-	ewarn "If you upgraded from <postfix-2, you must revisit your configuration files."
-	ewarn "See /usr/share/doc/${PF}/RELEASE_NOTES for a list of changes."
-
-	if [ ! -e /etc/mail/aliases.db ] ; then
-		echo
-		ewarn "You must edit /etc/mail/aliases to suit your needs and then run"
-		ewarn "/usr/bin/newaliases. Postfix will not work correctly without it."
-	fi
-}
diff --git a/mail-mta/postfix/postfix-2.0.16-r1.ebuild b/mail-mta/postfix/postfix-2.0.16-r1.ebuild
deleted file mode 100644
index 75bfe15d52d4..000000000000
--- a/mail-mta/postfix/postfix-2.0.16-r1.ebuild
+++ /dev/null
@@ -1,221 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# 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.3 2004/06/24 22:24:27 agriffis Exp $
-
-inherit eutils ssl-cert
-
-TLS_P="pfixtls-0.8.16-2.0.16-0.9.7b"
-IPV6="1.18a"
-IPV6_P="ipv6-${IPV6}-pf-2.0.16"
-IPV6_TLS_P="tls+${IPV6_P}"
-PGSQL_P="postfix-pg.postfix-2.0.0.2"
-
-DESCRIPTION="A fast and secure drop-in replacement for sendmail."
-HOMEPAGE="http://www.postfix.org/"
-SRC_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official/${P}.tar.gz
-	ftp://ftp.porcupine.org/mirrors/postfix-release/official/${PN}-2.0-ns-mx-acl-patch.gz
-	ssl? ( ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/old/${TLS_P}.tar.gz )
-	ipv6? ( ftp://ftp.stack.nl/pub/postfix/tls+ipv6/${IPV6}/${IPV6_P}.patch.gz )
-	ipv6? ( ftp://ftp.stack.nl/pub/postfix/tls+ipv6/${IPV6}/${IPV6_TLS_P}.patch.gz )
-	postgres? ( http://www.mat.cc/postfix/${PGSQL_P}.patch )"
-
-LICENSE="IPL-1"
-SLOT="0"
-KEYWORDS="x86 sparc ~ppc"
-IUSE="ipv6 pam ldap mysql postgres ssl sasl maildir mbox"
-
-PROVIDE="virtual/mta virtual/mda"
-DEPEND=">=sys-libs/db-3.2
-	>=dev-libs/libpcre-3.4
-	>=sys-apps/sed-4
-	ldap? ( >=net-nds/openldap-1.2 )
-	mysql? ( >=dev-db/mysql-3.23.51 )
-	postgres? ( >=dev-db/postgresql-7.1 )
-	ssl? ( >=dev-libs/openssl-0.9.6g )
-	sasl? ( >=dev-libs/cyrus-sasl-2 )"
-RDEPEND="${DEPEND}
-	>=net-mail/mailbase-0.00
-	!virtual/mta"
-
-# Is this still necessary since gentoo sasl looks
-# in /etc/sasl2 for it's config files?
-pkg_setup() {
-	# Prevent mangling the smtpd.conf file.
-	if [ ! -L "${ROOT}/usr/lib/sasl2/smtpd.conf" ] ; then
-		if [ -f "${ROOT}/usr/lib/sasl2/smtpd.conf" ] ; then
-			ebegin "Protecting your smtpd.conf file"
-			if [ ! -d "${ROOT}/etc/sasl2" ] ; then
-				mkdir -p "${ROOT}/etc/sasl2"
-			fi
-
-			# This shouldn't be necessary, but apparently
-			# without it things can still get messy.
-			if [ -L "${ROOT}/etc/sasl2/smtpd.conf" ] ; then
-				rm "${ROOT}/etc/sasl2/smtpd.conf"
-			fi
-
-			# If both files exist, make sure that we preserve
-			# a copy of each with the ._cfg system.
-			if [ -f "${ROOT}/etc/sasl2/smtpd.conf" ] ; then
-				mv "${ROOT}/etc/sasl2/smtpd.conf" \
-					"${ROOT}/etc/sasl2/._cfg0000_smtpd.conf"
-			fi
-			mv "${ROOT}/usr/lib/sasl2/smtpd.conf" "${ROOT}/etc/sasl2"
-			eend
-		fi
-	fi
-}
-
-src_unpack() {
-	unpack ${A} && cd "${S}"
-
-	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
-		epatch "${WORKDIR}/${IPV6_P}.patch"
-	fi
-
-	if use postgres ; then
-		epatch "${DISTDIR}/${PGSQL_P}.patch"
-	fi
-
-	# Verisign name services fixes.
-	epatch "${WORKDIR}/${PN}-2.0-ns-mx-acl-patch"
-
-	# Postfix does not get the FQDN if no hostname is configured.
-	epatch "${FILESDIR}/${PN}-2.0.9-get-FQDN.patch"
-
-	# Fix install paths.
-	sed -e "s:/usr/libexec/postfix:/usr/lib/postfix:" \
-		-i src/global/mail_params.h -i conf/main.cf || die "sed failed"
-}
-
-src_compile() {
-	local mycc="-DHAS_PCRE" mylibs="-L/usr/lib -lpcre -ldl -lcrypt -lpthread"
-
-	if use pam ; then
-		mylibs="${mylibs} -lpam"
-	fi
-	if use ldap ; then
-		mycc="${mycc} -DHAS_LDAP"
-		mylibs="${mylibs} -lldap -llber"
-	fi
-	if use mysql ; then
-		mycc="${mycc} -DHAS_MYSQL -I/usr/include/mysql"
-		mylibs="${mylibs} -lmysqlclient -lm -lz"
-	fi
-	if use postgres ; then
-		if [ "`best_version '=dev-db/postgresql-7.3*'`" ] ; then
-			mycc="${mycc} -DHAS_PGSQL -I/usr/include/postgresql"
-		else
-			mycc="${mycc} -DHAS_PGSQL -I/usr/include/postgresql/pgsql"
-		fi
-		mylibs="${mylibs} -lpq"
-	fi
-	if use ssl ; then
-		mycc="${mycc} -DUSE_SSL"
-		mylibs="${mylibs} -lssl -lcrypto"
-	fi
-	if use sasl ; then
-		mycc="${mycc} -DUSE_SASL_AUTH -I/usr/include/sasl"
-		mylibs="${mylibs} -lsasl2"
-	fi
-
-	mycc="${mycc} -DDEF_CONFIG_DIR=\\\"/etc/postfix\\\""
-	mycc="${mycc} -DDEF_DAEMON_DIR=\\\"/usr/lib/postfix\\\""
-	mycc="${mycc} -DDEF_PROGRAM_DIR=\\\"/usr/lib/postfix\\\""
-	mycc="${mycc} -DDEF_MANPAGE_DIR=\\\"/usr/share/man\\\""
-	mycc="${mycc} -DDEF_README_DIR=\\\"/usr/share/doc/${PF}/readme\\\""
-	mycc="${mycc} -DDEF_SAMPLE_DIR=\\\"/usr/share/doc/${PF}/sample\\\""
-
-	make CC="${CC:=gcc}" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \
-		makefiles || die "configure problem"
-
-	emake || die "compile problem"
-}
-
-src_install () {
-	/bin/sh postfix-install \
-		-non-interactive \
-		install_root="${D}" \
-		daemon_directory="/usr/lib/postfix" \
-		program_directory="/usr/lib/postfix" \
-		config_directory="/usr/share/doc/${PF}/defaults" \
-		readme_directory="/usr/share/doc/${PF}/readme" \
-		sample_directory="/usr/share/doc/${PF}/sample" \
-		manpage_directory="/usr/share/man" \
-		mail_owner="postfix" \
-		setgid_group="postdrop" || die "postfix-install failed"
-
-	# Provide another link for legacy FSH.
-	dosym /usr/sbin/sendmail /usr/lib/sendmail
-
-	# Install an rmail for UUCP, closing bug #19127.
-	dobin auxiliary/rmail/rmail
-
-	# Set proper permissions on required files/directories.
-	fowners root:postdrop /usr/sbin/post{drop,queue}
-	fperms 02711 /usr/sbin/post{drop,queue}
-
-	keepdir /etc/postfix
-	mv "${D}/usr/share/doc/${PF}/defaults/"{*.cf,post*-*} "${D}/etc/postfix"
-	if use maildir ; then
-		mypostconf="home_mailbox=.maildir/"
-	elif use mbox ; then
-		mypostconf="mail_spool_directory=/var/spool/mail"
-	fi
-	"${D}/usr/sbin/postconf" -c "${D}/etc/postfix" -e \
-		"alias_maps=hash:/etc/mail/aliases" \
-		"alias_database=hash:/etc/mail/aliases" \
-		"local_destination_concurrency_limit=2" \
-		"default_destination_concurrency_limit=2" \
-		${mypostconf} || die "postconf failed"
-
-	insinto /etc/postfix
-	newins "${FILESDIR}/smtp.pass" saslpass
-	fperms 600 /etc/postfix/saslpass
-
-	exeinto /etc/init.d
-	newexe "${FILESDIR}/postfix.rc6" postfix
-
-	dodoc *README COMPATIBILITY HISTORY INSTALL LICENSE PORTING RELEASE_NOTES*
-	dohtml html/*
-
-	if use pam ; then
-		insinto /etc/pam.d
-		newins "${FILESDIR}/smtp.pam" smtp
-	fi
-	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
-		insinto /etc/sasl2
-		newins "${FILESDIR}/smtp.sasl" smtpd.conf
-	fi
-}
-
-pkg_postinst() {
-	ebegin "Fixing queue directories and permissions"
-	"${ROOT}/etc/postfix/post-install" upgrade-permissions
-	eend $?
-	echo
-
-	ewarn "If you upgraded from postfix-1.x, you must revisit"
-	ewarn "your configuration files.  See"
-	ewarn "  /usr/share/doc/${PF}/RELEASE_NOTES"
-	ewarn "for a list of changes."
-
-	if [ ! -e /etc/mail/aliases.db ] ; then
-		echo
-		ewarn "You must edit /etc/mail/aliases to suit your needs"
-		ewarn "and then run /usr/bin/newaliases. Postfix will not"
-		ewarn "work correctly without it."
-	fi
-}
diff --git a/mail-mta/postfix/postfix-2.0.18.ebuild b/mail-mta/postfix/postfix-2.0.18.ebuild
deleted file mode 100644
index 2a163d7a2d01..000000000000
--- a/mail-mta/postfix/postfix-2.0.18.ebuild
+++ /dev/null
@@ -1,221 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# 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.3 2004/06/24 22:24:27 agriffis Exp $
-
-inherit eutils ssl-cert
-
-TLS_P="pfixtls-0.8.16-2.0.18-0.9.7c"
-IPV6="1.21"
-IPV6_P="ipv6-${IPV6}-pf-2.0.18"
-IPV6_TLS_P="tls+${IPV6_P}"
-PGSQL_P="postfix-pg.postfix-2.0.0.2"
-
-DESCRIPTION="A fast and secure drop-in replacement for sendmail."
-HOMEPAGE="http://www.postfix.org/"
-SRC_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official/${P}.tar.gz
-	ftp://ftp.porcupine.org/mirrors/postfix-release/official/${PN}-2.0-ns-mx-acl-patch.gz
-	ssl? ( ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/${TLS_P}.tar.gz )
-	ipv6? ( ftp://ftp.stack.nl/pub/postfix/tls+ipv6/${IPV6}/${IPV6_P}.patch.gz )
-	ipv6? ( ftp://ftp.stack.nl/pub/postfix/tls+ipv6/${IPV6}/${IPV6_TLS_P}.patch.gz )
-	postgres? ( http://www.mat.cc/postfix/${PGSQL_P}.patch )"
-
-LICENSE="IPL-1"
-SLOT="0"
-KEYWORDS="~x86 ~sparc ~ppc ~alpha"
-IUSE="ipv6 pam ldap mysql postgres ssl sasl maildir mbox"
-
-PROVIDE="virtual/mta virtual/mda"
-DEPEND=">=sys-libs/db-3.2
-	>=dev-libs/libpcre-3.4
-	>=sys-apps/sed-4
-	ldap? ( >=net-nds/openldap-1.2 )
-	mysql? ( >=dev-db/mysql-3.23.51 )
-	postgres? ( >=dev-db/postgresql-7.1 )
-	ssl? ( >=dev-libs/openssl-0.9.6g )
-	sasl? ( >=dev-libs/cyrus-sasl-2 )"
-RDEPEND="${DEPEND}
-	>=net-mail/mailbase-0.00
-	!virtual/mta"
-
-# Is this still necessary since gentoo sasl looks
-# in /etc/sasl2 for it's config files?
-pkg_setup() {
-	# Prevent mangling the smtpd.conf file.
-	if [ ! -L "${ROOT}/usr/lib/sasl2/smtpd.conf" ] ; then
-		if [ -f "${ROOT}/usr/lib/sasl2/smtpd.conf" ] ; then
-			ebegin "Protecting your smtpd.conf file"
-			if [ ! -d "${ROOT}/etc/sasl2" ] ; then
-				mkdir -p "${ROOT}/etc/sasl2"
-			fi
-
-			# This shouldn't be necessary, but apparently
-			# without it things can still get messy.
-			if [ -L "${ROOT}/etc/sasl2/smtpd.conf" ] ; then
-				rm "${ROOT}/etc/sasl2/smtpd.conf"
-			fi
-
-			# If both files exist, make sure that we preserve
-			# a copy of each with the ._cfg system.
-			if [ -f "${ROOT}/etc/sasl2/smtpd.conf" ] ; then
-				mv "${ROOT}/etc/sasl2/smtpd.conf" \
-					"${ROOT}/etc/sasl2/._cfg0000_smtpd.conf"
-			fi
-			mv "${ROOT}/usr/lib/sasl2/smtpd.conf" "${ROOT}/etc/sasl2"
-			eend
-		fi
-	fi
-}
-
-src_unpack() {
-	unpack ${A} && cd "${S}"
-
-	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
-		epatch "${WORKDIR}/${IPV6_P}.patch"
-	fi
-
-	if use postgres ; then
-		epatch "${DISTDIR}/${PGSQL_P}.patch"
-	fi
-
-	# Verisign name services fixes.
-	epatch "${WORKDIR}/${PN}-2.0-ns-mx-acl-patch"
-
-	# Postfix does not get the FQDN if no hostname is configured.
-	epatch "${FILESDIR}/${PN}-2.0.9-get-FQDN.patch"
-
-	# Fix install paths.
-	sed -e "s:/usr/libexec/postfix:/usr/lib/postfix:" \
-		-i src/global/mail_params.h -i conf/main.cf || die "sed failed"
-}
-
-src_compile() {
-	local mycc="-DHAS_PCRE" mylibs="-L/usr/lib -lpcre -ldl -lcrypt -lpthread"
-
-	if use pam ; then
-		mylibs="${mylibs} -lpam"
-	fi
-	if use ldap ; then
-		mycc="${mycc} -DHAS_LDAP"
-		mylibs="${mylibs} -lldap -llber"
-	fi
-	if use mysql ; then
-		mycc="${mycc} -DHAS_MYSQL -I/usr/include/mysql"
-		mylibs="${mylibs} -lmysqlclient -lm -lz"
-	fi
-	if use postgres ; then
-		if [ "`best_version '=dev-db/postgresql-7.3*'`" ] ; then
-			mycc="${mycc} -DHAS_PGSQL -I/usr/include/postgresql"
-		else
-			mycc="${mycc} -DHAS_PGSQL -I/usr/include/postgresql/pgsql"
-		fi
-		mylibs="${mylibs} -lpq"
-	fi
-	if use ssl ; then
-		mycc="${mycc} -DUSE_SSL"
-		mylibs="${mylibs} -lssl -lcrypto"
-	fi
-	if use sasl ; then
-		mycc="${mycc} -DUSE_SASL_AUTH -I/usr/include/sasl"
-		mylibs="${mylibs} -lsasl2"
-	fi
-
-	mycc="${mycc} -DDEF_CONFIG_DIR=\\\"/etc/postfix\\\""
-	mycc="${mycc} -DDEF_DAEMON_DIR=\\\"/usr/lib/postfix\\\""
-	mycc="${mycc} -DDEF_PROGRAM_DIR=\\\"/usr/lib/postfix\\\""
-	mycc="${mycc} -DDEF_MANPAGE_DIR=\\\"/usr/share/man\\\""
-	mycc="${mycc} -DDEF_README_DIR=\\\"/usr/share/doc/${PF}/readme\\\""
-	mycc="${mycc} -DDEF_SAMPLE_DIR=\\\"/usr/share/doc/${PF}/sample\\\""
-
-	make CC="${CC:=gcc}" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \
-		makefiles || die "configure problem"
-
-	emake || die "compile problem"
-}
-
-src_install () {
-	/bin/sh postfix-install \
-		-non-interactive \
-		install_root="${D}" \
-		daemon_directory="/usr/lib/postfix" \
-		program_directory="/usr/lib/postfix" \
-		config_directory="/usr/share/doc/${PF}/defaults" \
-		readme_directory="/usr/share/doc/${PF}/readme" \
-		sample_directory="/usr/share/doc/${PF}/sample" \
-		manpage_directory="/usr/share/man" \
-		mail_owner="postfix" \
-		setgid_group="postdrop" || die "postfix-install failed"
-
-	# Provide another link for legacy FSH.
-	dosym /usr/sbin/sendmail /usr/lib/sendmail
-
-	# Install an rmail for UUCP, closing bug #19127.
-	dobin auxiliary/rmail/rmail
-
-	# Set proper permissions on required files/directories.
-	fowners root:postdrop /usr/sbin/post{drop,queue}
-	fperms 02711 /usr/sbin/post{drop,queue}
-
-	keepdir /etc/postfix
-	mv "${D}/usr/share/doc/${PF}/defaults/"{*.cf,post*-*} "${D}/etc/postfix"
-	if use maildir ; then
-		mypostconf="home_mailbox=.maildir/"
-	elif use mbox ; then
-		mypostconf="mail_spool_directory=/var/spool/mail"
-	fi
-	"${D}/usr/sbin/postconf" -c "${D}/etc/postfix" -e \
-		"alias_maps=hash:/etc/mail/aliases" \
-		"alias_database=hash:/etc/mail/aliases" \
-		"local_destination_concurrency_limit=2" \
-		"default_destination_concurrency_limit=2" \
-		${mypostconf} || die "postconf failed"
-
-	insinto /etc/postfix
-	newins "${FILESDIR}/smtp.pass" saslpass
-	fperms 600 /etc/postfix/saslpass
-
-	exeinto /etc/init.d
-	newexe "${FILESDIR}/postfix.rc6" postfix
-
-	dodoc *README COMPATIBILITY HISTORY INSTALL LICENSE PORTING RELEASE_NOTES*
-	dohtml html/*
-
-	if use pam ; then
-		insinto /etc/pam.d
-		newins "${FILESDIR}/smtp.pam" smtp
-	fi
-	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
-		insinto /etc/sasl2
-		newins "${FILESDIR}/smtp.sasl" smtpd.conf
-	fi
-}
-
-pkg_postinst() {
-	ebegin "Fixing queue directories and permissions"
-	"${ROOT}/etc/postfix/post-install" upgrade-permissions
-	eend $?
-	echo
-
-	ewarn "If you upgraded from postfix-1.x, you must revisit"
-	ewarn "your configuration files.  See"
-	ewarn "  /usr/share/doc/${PF}/RELEASE_NOTES"
-	ewarn "for a list of changes."
-
-	if [ ! -e /etc/mail/aliases.db ] ; then
-		echo
-		ewarn "You must edit /etc/mail/aliases to suit your needs"
-		ewarn "and then run /usr/bin/newaliases. Postfix will not"
-		ewarn "work correctly without it."
-	fi
-}
diff --git a/mail-mta/postfix/postfix-2.0.19-r1.ebuild b/mail-mta/postfix/postfix-2.0.19-r1.ebuild
deleted file mode 100644
index c8a14798d09e..000000000000
--- a/mail-mta/postfix/postfix-2.0.19-r1.ebuild
+++ /dev/null
@@ -1,201 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.0.19-r1.ebuild,v 1.2 2004/06/24 22:24:27 agriffis Exp $
-
-inherit eutils ssl-cert
-
-VDA_P="${PN}-2.0.18"
-TLS_P="pfixtls-0.8.16-2.0.18-0.9.7c"
-IPV6="1.21"
-IPV6_P="ipv6-${IPV6}-pf-2.0.18"
-IPV6_TLS_P="tls+${IPV6_P}"
-PGSQL_P="postfix-pg.postfix-2.0.0.2"
-
-DESCRIPTION="A fast and secure drop-in replacement for sendmail."
-HOMEPAGE="http://www.postfix.org/"
-SRC_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official/${P}.tar.gz
-	ftp://ftp.porcupine.org/mirrors/postfix-release/official/${PN}-2.0-ns-mx-acl-patch.gz
-	vda? ( http://web.onda.com.br/nadal/postfix/VDA/${VDA_P}.patch.gz )
-	ssl? ( ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/${TLS_P}.tar.gz )
-	ipv6? ( ftp://ftp.stack.nl/pub/postfix/tls+ipv6/${IPV6}/${IPV6_P}.patch.gz )
-	ipv6? ( ftp://ftp.stack.nl/pub/postfix/tls+ipv6/${IPV6}/${IPV6_TLS_P}.patch.gz )
-	postgres? ( http://www.mat.cc/postfix/${PGSQL_P}.patch )"
-
-LICENSE="IPL-1"
-SLOT="0"
-KEYWORDS="~x86 ~sparc ~ppc ~alpha"
-IUSE="ipv6 pam ldap mysql postgres ssl sasl vda maildir mbox"
-
-PROVIDE="virtual/mta virtual/mda"
-DEPEND=">=sys-libs/db-3.2
-	>=dev-libs/libpcre-3.4
-	>=sys-apps/sed-4
-	ldap? ( >=net-nds/openldap-1.2 )
-	mysql? ( >=dev-db/mysql-3.23.51 )
-	postgres? ( >=dev-db/postgresql-7.1 )
-	ssl? ( >=dev-libs/openssl-0.9.6g )
-	sasl? ( >=dev-libs/cyrus-sasl-2 )"
-RDEPEND="${DEPEND}
-	>=net-mail/mailbase-0.00
-	!virtual/mta"
-
-src_unpack() {
-	unpack ${A} && cd "${S}"
-
-	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
-		epatch "${WORKDIR}/${IPV6_P}.patch"
-	fi
-
-	if use vda ; then
-		epatch "${WORKDIR}/${VDA_P}.patch"
-	fi
-
-	if use postgres ; then
-		epatch "${DISTDIR}/${PGSQL_P}.patch"
-	fi
-
-	# Verisign name services fixes.
-	epatch "${WORKDIR}/${PN}-2.0-ns-mx-acl-patch"
-
-	# Postfix does not get the FQDN if no hostname is configured.
-	epatch "${FILESDIR}/${PN}-2.0.9-get-FQDN.patch"
-
-	# Fix install paths.
-	sed -e "s:/usr/libexec/postfix:/usr/lib/postfix:" \
-		-i src/global/mail_params.h -i conf/main.cf || die "sed failed"
-}
-
-src_compile() {
-	local mycc="-DHAS_PCRE" mylibs="-L/usr/lib -lpcre -ldl -lcrypt -lpthread"
-
-	if use pam ; then
-		mylibs="${mylibs} -lpam"
-	fi
-	if use ldap ; then
-		mycc="${mycc} -DHAS_LDAP"
-		mylibs="${mylibs} -lldap -llber"
-	fi
-	if use mysql ; then
-		mycc="${mycc} -DHAS_MYSQL -I/usr/include/mysql"
-		mylibs="${mylibs} -lmysqlclient -lm -lz"
-	fi
-	if use postgres ; then
-		if best_version '=dev-db/postgresql-7.3*' ; then
-			mycc="${mycc} -DHAS_PGSQL -I/usr/include/postgresql"
-		else
-			mycc="${mycc} -DHAS_PGSQL -I/usr/include/postgresql/pgsql"
-		fi
-		mylibs="${mylibs} -lpq"
-	fi
-	if use ssl ; then
-		mycc="${mycc} -DUSE_SSL"
-		mylibs="${mylibs} -lssl -lcrypto"
-	fi
-	if use sasl ; then
-		mycc="${mycc} -DUSE_SASL_AUTH -I/usr/include/sasl"
-		mylibs="${mylibs} -lsasl2"
-	fi
-
-	mycc="${mycc} -DDEF_CONFIG_DIR=\\\"/etc/postfix\\\""
-	mycc="${mycc} -DDEF_DAEMON_DIR=\\\"/usr/lib/postfix\\\""
-	mycc="${mycc} -DDEF_PROGRAM_DIR=\\\"/usr/lib/postfix\\\""
-	mycc="${mycc} -DDEF_MANPAGE_DIR=\\\"/usr/share/man\\\""
-	mycc="${mycc} -DDEF_README_DIR=\\\"/usr/share/doc/${PF}/readme\\\""
-	mycc="${mycc} -DDEF_SAMPLE_DIR=\\\"/usr/share/doc/${PF}/sample\\\""
-
-	make CC="${CC:=gcc}" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \
-		makefiles || die "configure problem"
-
-	emake || die "compile problem"
-}
-
-src_install () {
-	/bin/sh postfix-install \
-		-non-interactive \
-		install_root="${D}" \
-		daemon_directory="/usr/lib/postfix" \
-		program_directory="/usr/lib/postfix" \
-		config_directory="/usr/share/doc/${PF}/defaults" \
-		readme_directory="/usr/share/doc/${PF}/readme" \
-		sample_directory="/usr/share/doc/${PF}/sample" \
-		manpage_directory="/usr/share/man" \
-		mail_owner="postfix" \
-		setgid_group="postdrop" || die "postfix-install failed"
-
-	rm -rf "${D}/var"
-	keepdir /var/spool/postfix
-
-	# Provide another link for legacy FSH.
-	dosym /usr/sbin/sendmail /usr/lib/sendmail
-
-	# Install an rmail for UUCP, closing bug #19127.
-	dobin auxiliary/rmail/rmail
-
-	# Set proper permissions on required files/directories.
-	fowners root:postdrop /usr/sbin/post{drop,queue}
-	fperms 02711 /usr/sbin/post{drop,queue}
-
-	keepdir /etc/postfix
-	mv "${D}/usr/share/doc/${PF}/defaults/"{*.cf,post*-*} "${D}/etc/postfix"
-	if use maildir ; then
-		mypostconf="home_mailbox=.maildir/"
-	elif use mbox ; then
-		mypostconf="mail_spool_directory=/var/spool/mail"
-	fi
-	"${D}/usr/sbin/postconf" -c "${D}/etc/postfix" -e \
-		"alias_maps=hash:/etc/mail/aliases" \
-		"alias_database=hash:/etc/mail/aliases" \
-		"local_destination_concurrency_limit=2" \
-		"default_destination_concurrency_limit=2" \
-		${mypostconf} || die "postconf failed"
-
-	insinto /etc/postfix
-	newins "${FILESDIR}/smtp.pass" saslpass
-	fperms 600 /etc/postfix/saslpass
-
-	exeinto /etc/init.d
-	newexe "${FILESDIR}/postfix.rc6" postfix
-
-	dodoc *README COMPATIBILITY HISTORY INSTALL LICENSE PORTING RELEASE_NOTES*
-	dohtml html/*
-
-	if use pam ; then
-		insinto /etc/pam.d
-		newins "${FILESDIR}/smtp.pam" smtp
-	fi
-	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
-		insinto /etc/sasl2
-		newins "${FILESDIR}/smtp.sasl" smtpd.conf
-	fi
-}
-
-pkg_postinst() {
-	ebegin "Fixing queue directories and permissions"
-	"${ROOT}/etc/postfix/post-install" upgrade-permissions
-	eend $?
-	echo
-
-	ewarn "If you upgraded from postfix-1.x, you must revisit"
-	ewarn "your configuration files.  See"
-	ewarn "  /usr/share/doc/${PF}/RELEASE_NOTES"
-	ewarn "for a list of changes."
-
-	if [ ! -e /etc/mail/aliases.db ] ; then
-		echo
-		ewarn "You must edit /etc/mail/aliases to suit your needs"
-		ewarn "and then run /usr/bin/newaliases. Postfix will not"
-		ewarn "work correctly without it."
-	fi
-}
diff --git a/mail-mta/postfix/postfix-2.0.19-r2.ebuild b/mail-mta/postfix/postfix-2.0.19-r2.ebuild
deleted file mode 100644
index 644624a2ac25..000000000000
--- a/mail-mta/postfix/postfix-2.0.19-r2.ebuild
+++ /dev/null
@@ -1,208 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.0.19-r2.ebuild,v 1.4 2004/06/24 22:24:27 agriffis Exp $
-
-inherit eutils ssl-cert
-
-VDA_P="${PN}-2.0.18"
-TLS_P="pfixtls-0.8.16-2.0.18-0.9.7c"
-IPV6="1.21"
-IPV6_P="ipv6-${IPV6}-pf-2.0.18"
-IPV6_TLS_P="tls+${IPV6_P}"
-PGSQL_P="postfix-pg.postfix-2.0.0.2"
-
-DESCRIPTION="A fast and secure drop-in replacement for sendmail."
-HOMEPAGE="http://www.postfix.org/"
-SRC_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official/${P}.tar.gz
-	ftp://ftp.porcupine.org/mirrors/postfix-release/official/${PN}-2.0-ns-mx-acl-patch.gz
-	vda? ( http://web.onda.com.br/nadal/postfix/VDA/${VDA_P}.patch.gz )
-	ssl? ( ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/${TLS_P}.tar.gz )
-	ipv6? ( ftp://ftp.stack.nl/pub/postfix/tls+ipv6/${IPV6}/${IPV6_P}.patch.gz )
-	ipv6? ( ftp://ftp.stack.nl/pub/postfix/tls+ipv6/${IPV6}/${IPV6_TLS_P}.patch.gz )
-	postgres? ( http://www.mat.cc/postfix/${PGSQL_P}.patch )"
-
-LICENSE="IPL-1"
-SLOT="0"
-KEYWORDS="~x86 ~sparc ~ppc alpha ~amd64 s390"
-IUSE="ipv6 pam ldap mysql postgres ssl sasl vda maildir mbox"
-
-PROVIDE="virtual/mta virtual/mda"
-DEPEND=">=sys-libs/db-3.2
-	>=dev-libs/libpcre-3.4
-	>=sys-apps/sed-4
-	ldap? ( >=net-nds/openldap-1.2 )
-	mysql? ( >=dev-db/mysql-3.23.51 )
-	postgres? ( >=dev-db/postgresql-7.1 )
-	ssl? ( >=dev-libs/openssl-0.9.6g )
-	sasl? ( >=dev-libs/cyrus-sasl-2 )"
-RDEPEND="${DEPEND}
-	>=net-mail/mailbase-0.00
-	=net-mail/mailwrapper-0.1"
-
-src_unpack() {
-	unpack ${A} && cd "${S}"
-
-	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
-		epatch "${WORKDIR}/${IPV6_P}.patch"
-	fi
-
-	if use vda ; then
-		epatch "${WORKDIR}/${VDA_P}.patch"
-	fi
-
-	if use postgres ; then
-		epatch "${DISTDIR}/${PGSQL_P}.patch"
-	fi
-
-	# Verisign name services fixes.
-	epatch "${WORKDIR}/${PN}-2.0-ns-mx-acl-patch"
-
-	# Postfix does not get the FQDN if no hostname is configured.
-	epatch "${FILESDIR}/${PN}-2.0.9-get-FQDN.patch"
-
-	# Fix install paths.
-	sed -e "s:/usr/libexec/postfix:/usr/lib/postfix:" \
-		-i src/global/mail_params.h -i conf/main.cf || die "sed failed"
-}
-
-src_compile() {
-	local mycc="-DHAS_PCRE" mylibs="-L/usr/lib -lpcre -ldl -lcrypt -lpthread"
-
-	if use pam ; then
-		mylibs="${mylibs} -lpam"
-	fi
-	if use ldap ; then
-		mycc="${mycc} -DHAS_LDAP"
-		mylibs="${mylibs} -lldap -llber"
-	fi
-	if use mysql ; then
-		mycc="${mycc} -DHAS_MYSQL -I/usr/include/mysql"
-		mylibs="${mylibs} -lmysqlclient -lm -lz"
-	fi
-	if use postgres ; then
-		if best_version '=dev-db/postgresql-7.3*' ; then
-			mycc="${mycc} -DHAS_PGSQL -I/usr/include/postgresql"
-		else
-			mycc="${mycc} -DHAS_PGSQL -I/usr/include/postgresql/pgsql"
-		fi
-		mylibs="${mylibs} -lpq"
-	fi
-	if use ssl ; then
-		mycc="${mycc} -DUSE_SSL"
-		mylibs="${mylibs} -lssl -lcrypto"
-	fi
-	if use sasl ; then
-		mycc="${mycc} -DUSE_SASL_AUTH -I/usr/include/sasl"
-		mylibs="${mylibs} -lsasl2"
-	fi
-
-	mycc="${mycc} -DDEF_CONFIG_DIR=\\\"/etc/postfix\\\""
-	mycc="${mycc} -DDEF_DAEMON_DIR=\\\"/usr/lib/postfix\\\""
-	mycc="${mycc} -DDEF_PROGRAM_DIR=\\\"/usr/lib/postfix\\\""
-	mycc="${mycc} -DDEF_MANPAGE_DIR=\\\"/usr/share/man\\\""
-	mycc="${mycc} -DDEF_README_DIR=\\\"/usr/share/doc/${PF}/readme\\\""
-	mycc="${mycc} -DDEF_SAMPLE_DIR=\\\"/usr/share/doc/${PF}/sample\\\""
-
-	make CC="${CC:=gcc}" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \
-		makefiles || die "configure problem"
-
-	emake || die "compile problem"
-}
-
-src_install () {
-	/bin/sh postfix-install \
-		-non-interactive \
-		install_root="${D}" \
-		daemon_directory="/usr/lib/postfix" \
-		program_directory="/usr/lib/postfix" \
-		config_directory="/usr/share/doc/${PF}/defaults" \
-		readme_directory="/usr/share/doc/${PF}/readme" \
-		sample_directory="/usr/share/doc/${PF}/sample" \
-		manpage_directory="/usr/share/man" \
-		mail_owner="postfix" \
-		setgid_group="postdrop" || die "postfix-install failed"
-
-	# Fix spool removal on upgrade.
-	rm -rf "${D}/var"
-	keepdir /var/spool/postfix
-
-	# Remove the /usr/sbin/sendmail symlink
-	mv "${D}/usr/sbin/sendmail" "${D}/usr/sbin/sendmail.postfix"
-
-	# Provide another link for legacy FSH.
-	dosym /usr/sbin/sendmail /usr/lib/sendmail
-
-	# Install an rmail for UUCP, closing bug #19127.
-	dobin auxiliary/rmail/rmail
-
-	# Set proper permissions on required files/directories.
-	fowners root:postdrop /usr/sbin/post{drop,queue}
-	fperms 02711 /usr/sbin/post{drop,queue}
-
-	keepdir /etc/postfix
-	mv "${D}/usr/share/doc/${PF}/defaults/"{*.cf,post*-*} "${D}/etc/postfix"
-	if use maildir ; then
-		mypostconf="home_mailbox=.maildir/"
-	elif use mbox ; then
-		mypostconf="mail_spool_directory=/var/spool/mail"
-	fi
-	"${D}/usr/sbin/postconf" -c "${D}/etc/postfix" -e \
-		"alias_maps=hash:/etc/mail/aliases" \
-		"alias_database=hash:/etc/mail/aliases" \
-		"local_destination_concurrency_limit=2" \
-		"default_destination_concurrency_limit=2" \
-		${mypostconf} || die "postconf failed"
-
-	insinto /etc
-	doins "${FILESDIR}/mailer.conf"
-
-	insinto /etc/postfix
-	newins "${FILESDIR}/smtp.pass" saslpass
-	fperms 600 /etc/postfix/saslpass
-
-	exeinto /etc/init.d
-	newexe "${FILESDIR}/postfix.rc6" postfix
-
-	dodoc *README COMPATIBILITY HISTORY INSTALL LICENSE PORTING RELEASE_NOTES*
-	dohtml html/*
-
-	if use pam ; then
-		insinto /etc/pam.d
-		newins "${FILESDIR}/smtp.pam" smtp
-	fi
-	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
-		insinto /etc/sasl2
-		newins "${FILESDIR}/smtp.sasl" smtpd.conf
-	fi
-}
-
-pkg_postinst() {
-	ebegin "Fixing queue directories and permissions"
-	"${ROOT}/etc/postfix/post-install" upgrade-permissions
-	eend $?
-	echo
-
-	ewarn "If you upgraded from postfix-1.x, you must revisit"
-	ewarn "your configuration files.  See"
-	ewarn "  /usr/share/doc/${PF}/RELEASE_NOTES"
-	ewarn "for a list of changes."
-
-	if [ ! -e /etc/mail/aliases.db ] ; then
-		echo
-		ewarn "You must edit /etc/mail/aliases to suit your needs"
-		ewarn "and then run /usr/bin/newaliases. Postfix will not"
-		ewarn "work correctly without it."
-	fi
-}
diff --git a/mail-mta/postfix/postfix-2.0.19-r3.ebuild b/mail-mta/postfix/postfix-2.0.19-r3.ebuild
deleted file mode 100644
index 26971ded55a8..000000000000
--- a/mail-mta/postfix/postfix-2.0.19-r3.ebuild
+++ /dev/null
@@ -1,222 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.0.19-r3.ebuild,v 1.2 2004/06/24 22:24:27 agriffis Exp $
-
-inherit eutils ssl-cert
-
-VDA_P="${PN}-2.0.18"
-TLS_P="pfixtls-0.8.16-2.0.18-0.9.7c"
-IPV6="1.21"
-IPV6_P="ipv6-${IPV6}-pf-2.0.18"
-IPV6_TLS_P="tls+${IPV6_P}"
-PGSQL_P="postfix-pg.postfix-2.0.0.2"
-
-DESCRIPTION="A fast and secure drop-in replacement for sendmail."
-HOMEPAGE="http://www.postfix.org/"
-SRC_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official/${P}.tar.gz
-	ftp://ftp.porcupine.org/mirrors/postfix-release/official/${PN}-2.0-ns-mx-acl-patch.gz
-	vda? ( http://web.onda.com.br/nadal/postfix/VDA/${VDA_P}.patch.gz )
-	ssl? ( ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/${TLS_P}.tar.gz )
-	ipv6? ( ftp://ftp.stack.nl/pub/postfix/tls+ipv6/${IPV6}/${IPV6_P}.patch.gz )
-	ipv6? ( ftp://ftp.stack.nl/pub/postfix/tls+ipv6/${IPV6}/${IPV6_TLS_P}.patch.gz )
-	postgres? ( http://www.mat.cc/postfix/${PGSQL_P}.patch )"
-
-LICENSE="IPL-1"
-SLOT="0"
-KEYWORDS="~x86 ~sparc ~ppc ~alpha ~amd64 s390"
-IUSE="ipv6 pam ldap mysql postgres ssl sasl vda mailwrapper mbox"
-
-PROVIDE="virtual/mta virtual/mda"
-DEPEND=">=sys-libs/db-3.2
-	>=dev-libs/libpcre-3.4
-	>=sys-apps/sed-4
-	ldap? ( >=net-nds/openldap-1.2 )
-	mysql? ( >=dev-db/mysql-3.23.51 )
-	postgres? ( >=dev-db/postgresql-7.1 )
-	ssl? ( >=dev-libs/openssl-0.9.6g )
-	sasl? ( >=dev-libs/cyrus-sasl-2 )"
-RDEPEND="${DEPEND}
-	>=net-mail/mailbase-0.00
-	!mailwrapper? ( !virtual/mta )
-	mailwrapper? ( >=net-mail/mailwrapper-0.2 )"
-
-src_unpack() {
-	unpack ${A} && cd "${S}"
-
-	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
-		epatch "${WORKDIR}/${IPV6_P}.patch"
-	fi
-
-	if use vda ; then
-		epatch "${WORKDIR}/${VDA_P}.patch"
-	fi
-
-	if use postgres ; then
-		epatch "${DISTDIR}/${PGSQL_P}.patch"
-	fi
-
-	# Verisign name services fixes.
-	epatch "${WORKDIR}/${PN}-2.0-ns-mx-acl-patch"
-
-	# Postfix does not get the FQDN if no hostname is configured.
-	epatch "${FILESDIR}/${PN}-2.0.9-get-FQDN.patch"
-
-	# Fix install paths.
-	sed -e "s:/usr/libexec/postfix:/usr/lib/postfix:" \
-		-i src/global/mail_params.h -i conf/main.cf || die "sed failed"
-}
-
-src_compile() {
-	local mycc="-DHAS_PCRE" mylibs="-L/usr/lib -lpcre -ldl -lcrypt -lpthread"
-
-	if use pam ; then
-		mylibs="${mylibs} -lpam"
-	fi
-	if use ldap ; then
-		mycc="${mycc} -DHAS_LDAP"
-		mylibs="${mylibs} -lldap -llber"
-	fi
-	if use mysql ; then
-		mycc="${mycc} -DHAS_MYSQL -I/usr/include/mysql"
-		mylibs="${mylibs} -lmysqlclient -lm -lz"
-	fi
-	if use postgres ; then
-		if best_version '=dev-db/postgresql-7.3*' ; then
-			mycc="${mycc} -DHAS_PGSQL -I/usr/include/postgresql"
-		else
-			mycc="${mycc} -DHAS_PGSQL -I/usr/include/postgresql/pgsql"
-		fi
-		mylibs="${mylibs} -lpq"
-	fi
-	if use ssl ; then
-		mycc="${mycc} -DUSE_SSL"
-		mylibs="${mylibs} -lssl -lcrypto"
-	fi
-	if use sasl ; then
-		mycc="${mycc} -DUSE_SASL_AUTH -I/usr/include/sasl"
-		mylibs="${mylibs} -lsasl2"
-	fi
-
-	mycc="${mycc} -DDEF_CONFIG_DIR=\\\"/etc/postfix\\\""
-	mycc="${mycc} -DDEF_DAEMON_DIR=\\\"/usr/lib/postfix\\\""
-	mycc="${mycc} -DDEF_PROGRAM_DIR=\\\"/usr/lib/postfix\\\""
-	mycc="${mycc} -DDEF_MANPAGE_DIR=\\\"/usr/share/man\\\""
-	mycc="${mycc} -DDEF_README_DIR=\\\"/usr/share/doc/${PF}/readme\\\""
-	mycc="${mycc} -DDEF_SAMPLE_DIR=\\\"/usr/share/doc/${PF}/sample\\\""
-
-	make CC="${CC:=gcc}" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \
-		makefiles || die "configure problem"
-
-	emake || die "compile problem"
-}
-
-src_install () {
-	/bin/sh postfix-install \
-		-non-interactive \
-		install_root="${D}" \
-		daemon_directory="/usr/lib/postfix" \
-		program_directory="/usr/lib/postfix" \
-		config_directory="/usr/share/doc/${PF}/defaults" \
-		readme_directory="/usr/share/doc/${PF}/readme" \
-		sample_directory="/usr/share/doc/${PF}/sample" \
-		manpage_directory="/usr/share/man" \
-		mail_owner="postfix" \
-		setgid_group="postdrop" || die "postfix-install failed"
-
-	# Fix spool removal on upgrade.
-	rm -rf "${D}/var"
-	keepdir /var/spool/postfix
-
-	# mailwrapper stuff
-	if use mailwrapper
-	then
-		mv "${D}/usr/sbin/sendmail" "${D}/usr/sbin/sendmail.postfix"
-		insinto /etc/mail
-		doins "${FILESDIR}/mailer.conf"
-	fi
-
-
-	# Provide another link for legacy FSH.
-	dosym /usr/sbin/sendmail /usr/lib/sendmail
-
-	# Install an rmail for UUCP, closing bug #19127.
-	dobin auxiliary/rmail/rmail
-
-	# Set proper permissions on required files/directories.
-	fowners root:postdrop /usr/sbin/post{drop,queue}
-	fperms 02711 /usr/sbin/post{drop,queue}
-
-	keepdir /etc/postfix
-	mv "${D}/usr/share/doc/${PF}/defaults/"{*.cf,post*-*} "${D}/etc/postfix"
-	if use mbox
-	then
-		mypostconf="mail_spool_directory=/var/spool/mail"
-	else
-		mypostconf="home_mailbox=.maildir/"
-	fi
-
-	"${D}/usr/sbin/postconf" -c "${D}/etc/postfix" -e \
-		"alias_maps=hash:/etc/mail/aliases" \
-		"alias_database=hash:/etc/mail/aliases" \
-		"local_destination_concurrency_limit=2" \
-		"default_destination_concurrency_limit=2" \
-		${mypostconf} || die "postconf failed"
-
-	insinto /etc/postfix
-	newins "${FILESDIR}/smtp.pass" saslpass
-	fperms 600 /etc/postfix/saslpass
-
-	exeinto /etc/init.d
-	newexe "${FILESDIR}/postfix.rc6" postfix
-
-	dodoc *README COMPATIBILITY HISTORY INSTALL LICENSE PORTING RELEASE_NOTES*
-	dohtml html/*
-
-	if use pam ; then
-		insinto /etc/pam.d
-		newins "${FILESDIR}/smtp.pam" smtp
-	fi
-	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
-		insinto /etc/sasl2
-		newins "${FILESDIR}/smtp.sasl" smtpd.conf
-	fi
-}
-
-pkg_postinst() {
-	ebegin "Fixing queue directories and permissions"
-	"${ROOT}/etc/postfix/post-install" upgrade-permissions
-	eend $?
-	echo
-
-	ewarn "If you upgraded from postfix-1.x, you must revisit"
-	ewarn "your configuration files.  See"
-	ewarn "  /usr/share/doc/${PF}/RELEASE_NOTES"
-	ewarn "for a list of changes."
-
-	if [ ! -e /etc/mail/aliases.db ] ; then
-		echo
-		ewarn "You must edit /etc/mail/aliases to suit your needs"
-		ewarn "and then run /usr/bin/newaliases. Postfix will not"
-		ewarn "work correctly without it."
-	fi
-
-	if ! use mailwrapper && [[ -e /etc/mailer.conf ]]
-	then
-		einfo
-		einfo "Since you emerged $PN without mailwrapper in USE,"
-		einfo "you probably want to 'emerge -C mailwrapper' now."
-		einfo
-	fi
-}
diff --git a/mail-mta/postfix/postfix-2.0.19-r4.ebuild b/mail-mta/postfix/postfix-2.0.19-r4.ebuild
deleted file mode 100644
index f83bda1616e6..000000000000
--- a/mail-mta/postfix/postfix-2.0.19-r4.ebuild
+++ /dev/null
@@ -1,229 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.0.19-r4.ebuild,v 1.2 2004/07/16 10:15:53 kloeri Exp $
-
-inherit eutils ssl-cert
-
-VDA_P="${PN}-2.0.18"
-TLS_P="pfixtls-0.8.16-2.0.18-0.9.7c"
-IPV6="1.21"
-IPV6_P="ipv6-${IPV6}-pf-2.0.18"
-IPV6_TLS_P="tls+${IPV6_P}"
-PGSQL_P="postfix-pg.postfix-2.0.0.2"
-
-DESCRIPTION="A fast and secure drop-in replacement for sendmail."
-HOMEPAGE="http://www.postfix.org/"
-SRC_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official/${P}.tar.gz
-	ftp://ftp.porcupine.org/mirrors/postfix-release/official/${PN}-2.0-ns-mx-acl-patch.gz
-	vda? ( http://web.onda.com.br/nadal/postfix/VDA/${VDA_P}.patch.gz )
-	ssl? ( ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/${TLS_P}.tar.gz )
-	ipv6? ( ftp://ftp.stack.nl/pub/postfix/tls+ipv6/${IPV6}/${IPV6_P}.patch.gz )
-	ipv6? ( ftp://ftp.stack.nl/pub/postfix/tls+ipv6/${IPV6}/${IPV6_TLS_P}.patch.gz )
-	postgres? ( http://www.mat.cc/postfix/${PGSQL_P}.patch )"
-
-LICENSE="IPL-1"
-SLOT="0"
-KEYWORDS="~x86 ~sparc ~ppc alpha ~amd64 ~s390"
-IUSE="ipv6 pam ldap mysql postgres ssl sasl vda mailwrapper mbox"
-
-PROVIDE="virtual/mta virtual/mda"
-DEPEND=">=sys-libs/db-3.2
-	>=dev-libs/libpcre-3.4
-	>=sys-apps/sed-4
-	ldap? ( >=net-nds/openldap-1.2 )
-	mysql? ( >=dev-db/mysql-3.23.51 )
-	postgres? ( >=dev-db/postgresql-7.1 )
-	ssl? ( >=dev-libs/openssl-0.9.6g )
-	sasl? ( >=dev-libs/cyrus-sasl-2 )"
-RDEPEND="${DEPEND}
-	>=net-mail/mailbase-0.00
-	!mailwrapper? ( !virtual/mta )
-	mailwrapper? ( >=net-mail/mailwrapper-0.2 )"
-
-src_unpack() {
-	unpack ${A} && cd "${S}"
-
-	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
-		epatch "${WORKDIR}/${IPV6_P}.patch"
-	fi
-
-	if use vda ; then
-		epatch "${WORKDIR}/${VDA_P}.patch"
-	fi
-
-	if use postgres ; then
-		epatch "${DISTDIR}/${PGSQL_P}.patch"
-	fi
-
-	# Verisign name services fixes.
-	epatch "${WORKDIR}/${PN}-2.0-ns-mx-acl-patch"
-
-	# Postfix does not get the FQDN if no hostname is configured.
-	epatch "${FILESDIR}/${PN}-2.0.9-get-FQDN.patch"
-
-	# Fix install paths.
-	sed -e "s:/usr/libexec/postfix:/usr/lib/postfix:" \
-		-i src/global/mail_params.h -i conf/main.cf || die "sed failed"
-}
-
-src_compile() {
-	local mycc="-DHAS_PCRE" mylibs="-L/usr/lib -lpcre -ldl -lcrypt -lpthread"
-
-	if use pam ; then
-		mylibs="${mylibs} -lpam"
-	fi
-	if use ldap ; then
-		mycc="${mycc} -DHAS_LDAP"
-		mylibs="${mylibs} -lldap -llber"
-	fi
-	if use mysql ; then
-		mycc="${mycc} -DHAS_MYSQL -I/usr/include/mysql"
-		mylibs="${mylibs} -lmysqlclient -lm -lz"
-	fi
-	if use postgres ; then
-		if best_version '=dev-db/postgresql-7.3*' ; then
-			mycc="${mycc} -DHAS_PGSQL -I/usr/include/postgresql"
-		else
-			mycc="${mycc} -DHAS_PGSQL -I/usr/include/postgresql/pgsql"
-		fi
-		mylibs="${mylibs} -lpq"
-	fi
-	if use ssl ; then
-		mycc="${mycc} -DUSE_SSL"
-		mylibs="${mylibs} -lssl -lcrypto"
-	fi
-	if use sasl ; then
-		mycc="${mycc} -DUSE_SASL_AUTH -I/usr/include/sasl"
-		mylibs="${mylibs} -lsasl2"
-	fi
-
-	mycc="${mycc} -DDEF_CONFIG_DIR=\\\"/etc/postfix\\\""
-	mycc="${mycc} -DDEF_DAEMON_DIR=\\\"/usr/lib/postfix\\\""
-	mycc="${mycc} -DDEF_PROGRAM_DIR=\\\"/usr/lib/postfix\\\""
-	mycc="${mycc} -DDEF_MANPAGE_DIR=\\\"/usr/share/man\\\""
-	mycc="${mycc} -DDEF_README_DIR=\\\"/usr/share/doc/${PF}/readme\\\""
-	mycc="${mycc} -DDEF_SAMPLE_DIR=\\\"/usr/share/doc/${PF}/sample\\\""
-
-	make CC="${CC:=gcc}" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \
-		makefiles || die "configure problem"
-
-	emake || die "compile problem"
-}
-
-src_install () {
-	/bin/sh postfix-install \
-		-non-interactive \
-		install_root="${D}" \
-		daemon_directory="/usr/lib/postfix" \
-		program_directory="/usr/lib/postfix" \
-		config_directory="/usr/share/doc/${PF}/defaults" \
-		readme_directory="/usr/share/doc/${PF}/readme" \
-		sample_directory="/usr/share/doc/${PF}/sample" \
-		manpage_directory="/usr/share/man" \
-		mail_owner="postfix" \
-		setgid_group="postdrop" || die "postfix-install failed"
-
-	# Fix spool removal on upgrade.
-	rm -rf "${D}/var"
-	keepdir /var/spool/postfix
-
-	# mailwrapper stuff
-	if use mailwrapper
-	then
-		mv "${D}/usr/sbin/sendmail" "${D}/usr/sbin/sendmail.postfix"
-		insinto /etc/mail
-		doins "${FILESDIR}/mailer.conf"
-	fi
-
-
-	# Provide another link for legacy FSH.
-	dosym /usr/sbin/sendmail /usr/lib/sendmail
-
-	# Install an rmail for UUCP, closing bug #19127.
-	dobin auxiliary/rmail/rmail
-
-	# Set proper permissions on required files/directories.
-	fowners root:postdrop /usr/sbin/post{drop,queue}
-	fperms 02711 /usr/sbin/post{drop,queue}
-
-	keepdir /etc/postfix
-	mv "${D}/usr/share/doc/${PF}/defaults/"{*.cf,post*-*} "${D}/etc/postfix"
-	if use mbox
-	then
-		mypostconf="mail_spool_directory=/var/spool/mail"
-	else
-		mypostconf="home_mailbox=.maildir/"
-	fi
-
-	"${D}/usr/sbin/postconf" -c "${D}/etc/postfix" -e \
-		"alias_maps=hash:/etc/mail/aliases" \
-		"alias_database=hash:/etc/mail/aliases" \
-		"local_destination_concurrency_limit=2" \
-		"default_destination_concurrency_limit=2" \
-		"queue_minfree=10000000" \
-		${mypostconf} || die "postconf failed"
-
-	insinto /etc/postfix
-	newins "${FILESDIR}/smtp.pass" saslpass
-	fperms 600 /etc/postfix/saslpass
-
-	exeinto /etc/init.d
-	newexe "${FILESDIR}/postfix.rc6" postfix
-
-	dodoc *README COMPATIBILITY HISTORY INSTALL LICENSE PORTING RELEASE_NOTES*
-	dohtml html/*
-
-	if use pam ; then
-		insinto /etc/pam.d
-		newins "${FILESDIR}/smtp.pam" smtp
-	fi
-	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
-		insinto /etc/sasl2
-		newins "${FILESDIR}/smtp.sasl" smtpd.conf
-	fi
-}
-
-pkg_postinst() {
-	ebegin "Fixing queue directories and permissions"
-	"${ROOT}/etc/postfix/post-install" upgrade-permissions
-	eend $?
-	echo
-
-	ewarn "If you upgraded from postfix-1.x, you must revisit"
-	ewarn "your configuration files.  See"
-	ewarn "  /usr/share/doc/${PF}/RELEASE_NOTES"
-	ewarn "for a list of changes."
-
-	if [ ! -e /etc/mail/aliases.db ] ; then
-		echo
-		ewarn "You must edit /etc/mail/aliases to suit your needs"
-		ewarn "and then run /usr/bin/newaliases. Postfix will not"
-		ewarn "work correctly without it."
-	fi
-
-	if ! use mailwrapper && [[ -e /etc/mailer.conf ]]
-	then
-		einfo
-		einfo "Since you emerged $PN without mailwrapper in USE,"
-		einfo "you probably want to 'emerge -C mailwrapper' now."
-		einfo
-	fi
-
-	echo
-	einfo "Update configs using 'etc-update' please. Maintaining current configs"
-	einfo "for some postfix configuration files is fairly important for the"
-	einfo "continued health of your system."
-	echo
-}
diff --git a/mail-mta/postfix/postfix-2.0.20.ebuild b/mail-mta/postfix/postfix-2.0.20.ebuild
deleted file mode 100644
index fcd826459c7f..000000000000
--- a/mail-mta/postfix/postfix-2.0.20.ebuild
+++ /dev/null
@@ -1,261 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.0.20.ebuild,v 1.2 2004/09/06 19:53:08 ciaranm Exp $
-
-inherit eutils ssl-cert
-
-VDA_P="${PN}-2.0.20"
-TLS_P="pfixtls-0.8.16-2.0.18-0.9.7c"
-IPV6="1.25"
-IPV6_P="ipv6-${IPV6}-pf-2.0.20"
-IPV6_TLS_P="tls+${IPV6_P}"
-PGSQL_P="postfix-pg.postfix-2.0.0.2"
-
-DESCRIPTION="A fast and secure drop-in replacement for sendmail."
-HOMEPAGE="http://www.postfix.org/"
-SRC_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official/${P}.tar.gz
-	ftp://ftp.porcupine.org/mirrors/postfix-release/official/${PN}-2.0-ns-mx-acl-patch.gz
-	vda? ( http://web.onda.com.br/nadal/postfix/VDA/${VDA_P}.patch.gz )
-	ssl? ( ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/${TLS_P}.tar.gz )
-	ipv6? ( ftp://ftp.stack.nl/pub/postfix/tls+ipv6/${IPV6}/${IPV6_P}.patch.gz )
-	ipv6? ( ftp://ftp.stack.nl/pub/postfix/tls+ipv6/${IPV6}/${IPV6_TLS_P}.patch.gz )
-	postgres? ( http://www.mat.cc/postfix/${PGSQL_P}.patch )"
-
-LICENSE="IPL-1"
-SLOT="0"
-KEYWORDS="~x86 ~sparc ~ppc ~alpha ~amd64 ~s390"
-IUSE="ipv6 pam ldap mysql postgres ssl sasl vda mailwrapper mbox"
-
-PROVIDE="virtual/mta virtual/mda"
-DEPEND=">=sys-libs/db-3.2
-	>=dev-libs/libpcre-3.4
-	>=sys-apps/sed-4
-	ldap? ( >=net-nds/openldap-1.2 )
-	mysql? ( >=dev-db/mysql-3.23.51 )
-	postgres? ( >=dev-db/postgresql-7.1 )
-	ssl? ( >=dev-libs/openssl-0.9.6g )
-	sasl? ( >=dev-libs/cyrus-sasl-2 )"
-RDEPEND="${DEPEND}
-	>=net-mail/mailbase-0.00
-	!mailwrapper? ( !virtual/mta )
-	mailwrapper? ( >=net-mail/mailwrapper-0.2 )"
-
-pkg_setup() {
-	# put out warnings to work around bug #45764
-	echo
-	ewarn "If you are upgrading from postfix-2.0.18 or earlier, one of the empty queue"
-	ewarn "directory get deleted during unmerge the older version (#45764). Please run"
-	ewarn "\`etc/postfix/post-install upgrade-permissions\` to recreate them."
-	ewarn "Waiting 15 seconds before continuing."
-	echo
-	epause 15
-	# should not upgrade while postfix-1.x running
-	if [[ -f $(type -p postconf) ]] ; then
-		VER=$(postconf | grep mail_version); VER=${VER/mail_version = }
-		MAJ_VER=${VER:0:3}
-		if [[ -n $(pidof master) ]] ; then
-			if [[ ${MAJ_VER} < 2.0 ]] ; then
-				echo
-				eerror "You are upgrading from the incompatible verion."
-				eerror "Please stop Postfix then emerge again."
-				die "Upgrade from incompatible version."
-			else
-				echo
-				ewarn "It is safe to upgrade your current version while it's running."
-				ewarn "If you don't want to take any chance; please hit ctrl+c now; stop"
-				ewarn "Postfix then emerge again."
-				ewarn "Waiting 30 seconds before continuing."
-				echo
-				epause 30
-			fi
-		fi
-	fi
-}
-
-src_unpack() {
-	unpack ${A} && cd "${S}"
-
-	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
-		epatch "${WORKDIR}/${IPV6_P}.patch"
-	fi
-
-	if use vda ; then
-		epatch "${WORKDIR}/${VDA_P}.patch"
-	fi
-
-	if use postgres ; then
-		epatch "${DISTDIR}/${PGSQL_P}.patch"
-	fi
-
-	# Verisign name services fixes.
-	epatch "${WORKDIR}/${PN}-2.0-ns-mx-acl-patch"
-
-	# Postfix does not get the FQDN if no hostname is configured.
-	epatch "${FILESDIR}/${PN}-2.0.9-get-FQDN.patch"
-
-	# Fix install paths.
-	sed -e "s:/usr/libexec/postfix:/usr/lib/postfix:" \
-		-i src/global/mail_params.h -i conf/main.cf || die "sed failed"
-}
-
-src_compile() {
-	local mycc="-DHAS_PCRE" mylibs="-L/usr/lib -lpcre -ldl -lcrypt -lpthread"
-
-	if use pam ; then
-		mylibs="${mylibs} -lpam"
-	fi
-	if use ldap ; then
-		mycc="${mycc} -DHAS_LDAP"
-		mylibs="${mylibs} -lldap -llber"
-	fi
-	if use mysql ; then
-		mycc="${mycc} -DHAS_MYSQL -I/usr/include/mysql"
-		mylibs="${mylibs} -lmysqlclient -lm -lz"
-	fi
-	if use postgres ; then
-		if best_version '=dev-db/postgresql-7.3*' ; then
-			mycc="${mycc} -DHAS_PGSQL -I/usr/include/postgresql"
-		else
-			mycc="${mycc} -DHAS_PGSQL -I/usr/include/postgresql/pgsql"
-		fi
-		mylibs="${mylibs} -lpq"
-	fi
-	if use ssl ; then
-		mycc="${mycc} -DUSE_SSL"
-		mylibs="${mylibs} -lssl -lcrypto"
-	fi
-	if use sasl ; then
-		mycc="${mycc} -DUSE_SASL_AUTH -I/usr/include/sasl"
-		mylibs="${mylibs} -lsasl2"
-	fi
-
-	mycc="${mycc} -DDEF_CONFIG_DIR=\\\"/etc/postfix\\\""
-	mycc="${mycc} -DDEF_DAEMON_DIR=\\\"/usr/lib/postfix\\\""
-	mycc="${mycc} -DDEF_PROGRAM_DIR=\\\"/usr/lib/postfix\\\""
-	mycc="${mycc} -DDEF_MANPAGE_DIR=\\\"/usr/share/man\\\""
-	mycc="${mycc} -DDEF_README_DIR=\\\"/usr/share/doc/${PF}/readme\\\""
-	mycc="${mycc} -DDEF_SAMPLE_DIR=\\\"/usr/share/doc/${PF}/sample\\\""
-
-	make CC="${CC:=gcc}" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \
-		makefiles || die "configure problem"
-
-	emake || die "compile problem"
-}
-
-src_install () {
-	/bin/sh postfix-install \
-		-non-interactive \
-		install_root="${D}" \
-		daemon_directory="/usr/lib/postfix" \
-		program_directory="/usr/lib/postfix" \
-		config_directory="/usr/share/doc/${PF}/defaults" \
-		readme_directory="/usr/share/doc/${PF}/readme" \
-		sample_directory="/usr/share/doc/${PF}/sample" \
-		manpage_directory="/usr/share/man" \
-		mail_owner="postfix" \
-		setgid_group="postdrop" || die "postfix-install failed"
-
-	# Fix spool removal on upgrade.
-	rm -rf "${D}/var"
-	keepdir /var/spool/postfix
-
-	# mailwrapper stuff
-	if use mailwrapper
-	then
-		mv "${D}/usr/sbin/sendmail" "${D}/usr/sbin/sendmail.postfix"
-		insinto /etc/mail
-		doins "${FILESDIR}/mailer.conf"
-	fi
-
-
-	# Provide another link for legacy FSH.
-	dosym /usr/sbin/sendmail /usr/lib/sendmail
-
-	# Install an rmail for UUCP, closing bug #19127.
-	dobin auxiliary/rmail/rmail
-
-	# Set proper permissions on required files/directories.
-	fowners root:postdrop /usr/sbin/post{drop,queue}
-	fperms 02711 /usr/sbin/post{drop,queue}
-
-	keepdir /etc/postfix
-	mv "${D}/usr/share/doc/${PF}/defaults/"{*.cf,post*-*} "${D}/etc/postfix"
-	if use mbox
-	then
-		mypostconf="mail_spool_directory=/var/spool/mail"
-	else
-		mypostconf="home_mailbox=.maildir/"
-	fi
-
-	"${D}/usr/sbin/postconf" -c "${D}/etc/postfix" -e \
-		"alias_maps=hash:/etc/mail/aliases" \
-		"alias_database=hash:/etc/mail/aliases" \
-		"local_destination_concurrency_limit=2" \
-		"default_destination_concurrency_limit=2" \
-		"queue_minfree=10000000" \
-		${mypostconf} || die "postconf failed"
-
-	insinto /etc/postfix
-	newins "${FILESDIR}/smtp.pass" saslpass
-	fperms 600 /etc/postfix/saslpass
-
-	exeinto /etc/init.d
-	newexe "${FILESDIR}/postfix.rc6" postfix
-
-	dodoc *README COMPATIBILITY HISTORY INSTALL LICENSE PORTING RELEASE_NOTES*
-	dohtml html/*
-
-	if use pam ; then
-		insinto /etc/pam.d
-		newins "${FILESDIR}/smtp.pam" smtp
-	fi
-	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
-		insinto /etc/sasl2
-		newins "${FILESDIR}/smtp.sasl" smtpd.conf
-	fi
-}
-
-pkg_postinst() {
-	ebegin "Fixing queue directories and permissions"
-	"${ROOT}/etc/postfix/post-install" upgrade-permissions
-	eend $?
-	echo
-
-	ewarn "If you upgraded from postfix-1.x, you must revisit"
-	ewarn "your configuration files.  See"
-	ewarn "  /usr/share/doc/${PF}/RELEASE_NOTES"
-	ewarn "for a list of changes."
-
-	if [ ! -e /etc/mail/aliases.db ] ; then
-		echo
-		ewarn "You must edit /etc/mail/aliases to suit your needs"
-		ewarn "and then run /usr/bin/newaliases. Postfix will not"
-		ewarn "work correctly without it."
-	fi
-
-	if ! use mailwrapper && [[ -e /etc/mailer.conf ]]
-	then
-		einfo
-		einfo "Since you emerged $PN without mailwrapper in USE,"
-		einfo "you probably want to 'emerge -C mailwrapper' now."
-		einfo
-	fi
-
-	echo
-	einfo "Update configs using 'etc-update' please. Maintaining current configs"
-	einfo "for some postfix configuration files is fairly important for the"
-	einfo "continued health of your system."
-	echo
-}
diff --git a/mail-mta/postfix/postfix-2.1.1.ebuild b/mail-mta/postfix/postfix-2.1.1.ebuild
deleted file mode 100644
index 9e920ac61fb9..000000000000
--- a/mail-mta/postfix/postfix-2.1.1.ebuild
+++ /dev/null
@@ -1,229 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.1.1.ebuild,v 1.2 2004/06/24 22:24:27 agriffis Exp $
-
-inherit eutils ssl-cert
-
-MAJOR_VER="2.1"
-PATCH_LEVEL="01"
-VDA_P="${PN}-2.1.1"
-TLS_P="pfixtls-0.8.18-2.1.0-0.9.7d"
-IPV6="1.24"
-IPV6_P="ipv6-${IPV6}-pf-2.1.1"
-IPV6_TLS_P="tls+${IPV6_P}"
-PGSQL_P="postfix-pg.postfix-2.0.0.2"
-
-DESCRIPTION="A fast and secure drop-in replacement for sendmail."
-HOMEPAGE="http://www.postfix.org/"
-SRC_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official/${PN}-${MAJOR_VER}.0.tar.gz
-	ftp://ftp.porcupine.org/mirrors/postfix-release/official/${PN}-${MAJOR_VER}-patch${PATCH_LEVEL}.gz
-	vda? ( http://web.onda.com.br/nadal/postfix/VDA/${VDA_P}.patch.gz )
-	ssl? ( ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/${TLS_P}.tar.gz )
-	ipv6? ( ftp://ftp.stack.nl/pub/postfix/tls+ipv6/${IPV6}/${IPV6_P}.patch.gz )
-	ipv6? ( ftp://ftp.stack.nl/pub/postfix/tls+ipv6/${IPV6}/${IPV6_TLS_P}.patch.gz )"
-
-LICENSE="IPL-1"
-SLOT="0"
-KEYWORDS="~x86 ~sparc ~ppc ~alpha ~amd64 ~s390"
-IUSE="ipv6 pam ldap mysql postgres ssl sasl vda mailwrapper mbox"
-
-PROVIDE="virtual/mta virtual/mda"
-DEPEND=">=sys-libs/db-3.2
-	>=dev-libs/libpcre-3.4
-	>=sys-apps/sed-4
-	ldap? ( >=net-nds/openldap-1.2 )
-	mysql? ( >=dev-db/mysql-3.23.51 )
-	postgres? ( >=dev-db/postgresql-7.1 )
-	ssl? ( >=dev-libs/openssl-0.9.6g )
-	sasl? ( >=dev-libs/cyrus-sasl-2 )"
-RDEPEND="${DEPEND}
-	>=net-mail/mailbase-0.00
-	!mailwrapper? ( !virtual/mta )
-	mailwrapper? ( >=net-mail/mailwrapper-0.2 )"
-
-S=${WORKDIR}/${PN}-${MAJOR_VER}.0
-
-src_unpack() {
-	unpack ${A} && cd "${S}"
-
-	# Patch patchlevel
-	epatch "${WORKDIR}/${PN}-${MAJOR_VER}-patch${PATCH_LEVEL}"
-	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
-		epatch "${WORKDIR}/${IPV6_P}.patch"
-	fi
-
-	if use vda ; then
-		epatch "${WORKDIR}/${VDA_P}.patch"
-	fi
-
-	# We don't need this patch anymore
-	# http://www.postfix.org/PGSQL_README.html
-	# if use postgres ; then
-	#	epatch "${DISTDIR}/${PGSQL_P}.patch"
-	# fi
-
-	# Verisign name services fixes. Do we need this anymore?
-	# epatch "${WORKDIR}/${PN}-2.0-ns-mx-acl-patch"
-
-	# Postfix does not get the FQDN if no hostname is configured.
-	epatch "${FILESDIR}/${PN}-2.0.9-get-FQDN.patch"
-
-	# Fix install paths.
-	sed -e "s:/usr/libexec/postfix:/usr/lib/postfix:" \
-		-i src/global/mail_params.h -i conf/main.cf || die "sed failed"
-}
-
-src_compile() {
-	local mycc="-DHAS_PCRE" mylibs="-L/usr/lib -lpcre -ldl -lcrypt -lpthread"
-
-	if use pam ; then
-		mylibs="${mylibs} -lpam"
-	fi
-	if use ldap ; then
-		mycc="${mycc} -DHAS_LDAP"
-		mylibs="${mylibs} -lldap -llber"
-	fi
-	if use mysql ; then
-		mycc="${mycc} -DHAS_MYSQL -I/usr/include/mysql"
-		mylibs="${mylibs} -lmysqlclient -lm -lz"
-	fi
-	if use postgres ; then
-		if best_version '=dev-db/postgresql-7.3*' ; then
-			mycc="${mycc} -DHAS_PGSQL -I/usr/include/postgresql"
-		else
-			mycc="${mycc} -DHAS_PGSQL -I/usr/include/postgresql/pgsql"
-		fi
-		mylibs="${mylibs} -lpq"
-	fi
-	if use ssl ; then
-		mycc="${mycc} -DUSE_SSL"
-		mylibs="${mylibs} -lssl -lcrypto"
-	fi
-	if use sasl ; then
-		mycc="${mycc} -DUSE_SASL_AUTH -I/usr/include/sasl"
-		mylibs="${mylibs} -lsasl2"
-	fi
-
-	mycc="${mycc} -DDEF_CONFIG_DIR=\\\"/etc/postfix\\\""
-	mycc="${mycc} -DDEF_DAEMON_DIR=\\\"/usr/lib/postfix\\\""
-	mycc="${mycc} -DDEF_PROGRAM_DIR=\\\"/usr/lib/postfix\\\""
-	mycc="${mycc} -DDEF_MANPAGE_DIR=\\\"/usr/share/man\\\""
-	mycc="${mycc} -DDEF_README_DIR=\\\"/usr/share/doc/${PF}/readme\\\""
-
-	make CC="${CC:=gcc}" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \
-		makefiles || die "configure problem"
-
-	emake || die "compile problem"
-}
-
-src_install () {
-	/bin/sh postfix-install \
-		-non-interactive \
-		install_root="${D}" \
-		daemon_directory="/usr/lib/postfix" \
-		program_directory="/usr/lib/postfix" \
-		config_directory="/usr/share/doc/${PF}/defaults" \
-		readme_directory="/usr/share/doc/${PF}/readme" \
-		manpage_directory="/usr/share/man" \
-		mail_owner="postfix" \
-		setgid_group="postdrop" || die "postfix-install failed"
-
-	# Fix spool removal on upgrade.
-	rm -rf "${D}/var"
-	keepdir /var/spool/postfix
-
-	# mailwrapper stuff
-	if use mailwrapper
-	then
-		mv "${D}/usr/sbin/sendmail" "${D}/usr/sbin/sendmail.postfix"
-		insinto /etc/mail
-		doins "${FILESDIR}/mailer.conf"
-	fi
-
-
-	# Provide another link for legacy FSH.
-	dosym /usr/sbin/sendmail /usr/lib/sendmail
-
-	# Install an rmail for UUCP, closing bug #19127.
-	dobin auxiliary/rmail/rmail
-
-	# Install qshape tool.
-	dobin auxiliary/qshape/qshape.pl
-
-	# Set proper permissions on required files/directories.
-	fowners root:postdrop /usr/sbin/post{drop,queue}
-	fperms 02711 /usr/sbin/post{drop,queue}
-
-	keepdir /etc/postfix
-	mv "${D}/usr/share/doc/${PF}/defaults/"{*.cf,post*-*} "${D}/etc/postfix"
-	if use mbox
-	then
-		mypostconf="mail_spool_directory=/var/spool/mail"
-	else
-		mypostconf="home_mailbox=.maildir/"
-	fi
-	"${D}/usr/sbin/postconf" -c "${D}/etc/postfix" -e \
-		"alias_maps=hash:/etc/mail/aliases" \
-		"alias_database=hash:/etc/mail/aliases" \
-		"local_destination_concurrency_limit=2" \
-		"default_destination_concurrency_limit=2" \
-		${mypostconf} || die "postconf failed"
-
-	insinto /etc/postfix
-	newins "${FILESDIR}/smtp.pass" saslpass
-	fperms 600 /etc/postfix/saslpass
-
-	exeinto /etc/init.d
-	newexe "${FILESDIR}/postfix.rc6" postfix
-
-	dodoc *README COMPATIBILITY HISTORY INSTALL LICENSE PORTING RELEASE_NOTES*
-	dohtml html/*
-
-	if use pam ; then
-		insinto /etc/pam.d
-		newins "${FILESDIR}/smtp.pam" smtp
-	fi
-	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
-		insinto /etc/sasl2
-		newins "${FILESDIR}/smtp.sasl" smtpd.conf
-	fi
-}
-
-pkg_postinst() {
-	ebegin "Fixing queue directories and permissions"
-	"${ROOT}/etc/postfix/post-install" upgrade-permissions
-	eend $?
-	echo
-
-	ewarn "If you upgraded from postfix-1.x, you must revisit"
-	ewarn "your configuration files.  See"
-	ewarn "  /usr/share/doc/${PF}/RELEASE_NOTES"
-	ewarn "for a list of changes."
-
-	if [ ! -e /etc/mail/aliases.db ] ; then
-		echo
-		ewarn "You must edit /etc/mail/aliases to suit your needs"
-		ewarn "and then run /usr/bin/newaliases. Postfix will not"
-		ewarn "work correctly without it."
-	fi
-
-	if ! use mailwrapper && [[ -e /etc/mailer.conf ]]
-	then
-		einfo
-		einfo "Since you emerged $PN without mailwrapper in USE,"
-		einfo "you probably want to 'emerge -C mailwrapper' now."
-		einfo
-	fi
-}
diff --git a/mail-mta/postfix/postfix-2.1.4.ebuild b/mail-mta/postfix/postfix-2.1.4.ebuild
deleted file mode 100644
index 666113a989e9..000000000000
--- a/mail-mta/postfix/postfix-2.1.4.ebuild
+++ /dev/null
@@ -1,252 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.1.4.ebuild,v 1.3 2004/09/28 18:15:56 langthang Exp $
-
-inherit eutils ssl-cert
-
-VDA_P="${PN}-2.1.4-trash"
-TLS_P="pfixtls-0.8.18-2.1.3-0.9.7d"
-IPV6="1.25"
-IPV6_P="ipv6-${IPV6}-pf-2.1.4"
-IPV6_TLS_P="tls+${IPV6_P}"
-PGSQL_P="postfix-pg.postfix-2.0.0.2"
-
-DESCRIPTION="A fast and secure drop-in replacement for sendmail."
-HOMEPAGE="http://www.postfix.org/"
-SRC_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official/${P}.tar.gz
-	vda? ( http://web.onda.com.br/nadal/postfix/VDA/${VDA_P}.patch.gz )
-	ssl? ( ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/${TLS_P}.tar.gz )
-	ipv6? ( ftp://ftp.stack.nl/pub/postfix/tls+ipv6/${IPV6}/${IPV6_P}.patch.gz )
-	ipv6? ( ftp://ftp.stack.nl/pub/postfix/tls+ipv6/${IPV6}/${IPV6_TLS_P}.patch.gz )"
-
-LICENSE="IPL-1"
-SLOT="0"
-KEYWORDS="~x86 ~sparc ~ppc ~alpha ~amd64 ~s390 ~mips"
-IUSE="ipv6 pam ldap mysql postgres ssl sasl vda mailwrapper mbox"
-
-PROVIDE="virtual/mta virtual/mda"
-DEPEND=">=sys-libs/db-3.2
-	>=dev-libs/libpcre-3.4
-	>=sys-apps/sed-4
-	ldap? ( >=net-nds/openldap-1.2 )
-	mysql? ( >=dev-db/mysql-3.23.51 )
-	postgres? ( >=dev-db/postgresql-7.1 )
-	ssl? ( >=dev-libs/openssl-0.9.6g )
-	sasl? ( >=dev-libs/cyrus-sasl-2 )"
-RDEPEND="${DEPEND}
-	>=net-mail/mailbase-0.00
-	!mailwrapper? ( !virtual/mta )
-	mailwrapper? ( >=net-mail/mailwrapper-0.2 )"
-
-pkg_setup() {
-	# put out warnings to work around bug #45764
-	if has_version '<=mail-mta/postfix-2.0.18'; then
-		echo
-		ewarn "You are upgrading from postfix-2.0.18 or earlier, one of the empty queue"
-		ewarn "directory get deleted during unmerge the older version (#45764). Please run"
-		ewarn "\`etc/postfix/post-install upgrade-source\` to recreate them."
-		echo
-	epause 5
-	fi
-
-	# logic to fix bug #53324
-	if [[ -n $(pidof master) ]] ; then
-		if has_version '<mail-mta/postfix-2.1.3' ; then
-			echo
-			eerror "You are upgrading from the incompatible version."
-			eerror "Please stop Postfix then emerge again."
-			die "Upgrade from incompatible version."
-		else
-			echo
-			ewarn "It is safe to upgrade your current version while it's running."
-			ewarn "If you don't want to take any chance; please hit Ctrl+C now;"
-			ewarn "stop Postfix then emerge again."
-			ewarn "You have been warned!"
-			ewarn "Waiting 10 seconds before continuing."
-			echo
-			epause 10
-		fi
-	fi
-}
-
-src_unpack() {
-	unpack ${A} && cd "${S}"
-
-	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
-		epatch "${WORKDIR}/${IPV6_P}.patch"
-	fi
-
-	if use vda ; then
-		epatch "${WORKDIR}/${VDA_P}.patch"
-	fi
-
-	# We don't need this patch anymore
-	# http://www.postfix.org/PGSQL_README.html
-	# if use postgres ; then
-	#	epatch "${DISTDIR}/${PGSQL_P}.patch"
-	# fi
-
-	# Verisign name services fixes. Do we need this anymore?
-	# epatch "${WORKDIR}/${PN}-2.0-ns-mx-acl-patch"
-
-	# Postfix does not get the FQDN if no hostname is configured.
-	epatch "${FILESDIR}/${PN}-2.0.9-get-FQDN.patch"
-
-	# Fix install paths.
-	sed -e "s:/usr/libexec/postfix:/usr/lib/postfix:" \
-		-i src/global/mail_params.h -i conf/main.cf || die "sed failed"
-}
-
-src_compile() {
-	local mycc="-DHAS_PCRE" mylibs="-L/usr/lib -lpcre -ldl -lcrypt -lpthread"
-
-	if use pam ; then
-		mylibs="${mylibs} -lpam"
-	fi
-	if use ldap ; then
-		mycc="${mycc} -DHAS_LDAP"
-		mylibs="${mylibs} -lldap -llber"
-	fi
-	if use mysql ; then
-		mycc="${mycc} -DHAS_MYSQL -I/usr/include/mysql"
-		mylibs="${mylibs} -lmysqlclient -lm -lz"
-	fi
-	if use postgres ; then
-		if best_version '=dev-db/postgresql-7.3*' ; then
-			mycc="${mycc} -DHAS_PGSQL -I/usr/include/postgresql"
-		else
-			mycc="${mycc} -DHAS_PGSQL -I/usr/include/postgresql/pgsql"
-		fi
-		mylibs="${mylibs} -lpq"
-	fi
-	if use ssl ; then
-		mycc="${mycc} -DUSE_SSL"
-		mylibs="${mylibs} -lssl -lcrypto"
-	fi
-	if use sasl ; then
-		mycc="${mycc} -DUSE_SASL_AUTH -I/usr/include/sasl"
-		mylibs="${mylibs} -lsasl2"
-	fi
-
-	mycc="${mycc} -DDEF_CONFIG_DIR=\\\"/etc/postfix\\\""
-	mycc="${mycc} -DDEF_DAEMON_DIR=\\\"/usr/lib/postfix\\\""
-	mycc="${mycc} -DDEF_PROGRAM_DIR=\\\"/usr/lib/postfix\\\""
-	mycc="${mycc} -DDEF_MANPAGE_DIR=\\\"/usr/share/man\\\""
-	mycc="${mycc} -DDEF_README_DIR=\\\"/usr/share/doc/${PF}/readme\\\""
-
-	make CC="${CC:=gcc}" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \
-		makefiles || die "configure problem"
-
-	emake || die "compile problem"
-}
-
-src_install () {
-	/bin/sh postfix-install \
-		-non-interactive \
-		install_root="${D}" \
-		daemon_directory="/usr/lib/postfix" \
-		program_directory="/usr/lib/postfix" \
-		config_directory="/usr/share/doc/${PF}/defaults" \
-		readme_directory="/usr/share/doc/${PF}/readme" \
-		manpage_directory="/usr/share/man" \
-		mail_owner="postfix" \
-		setgid_group="postdrop" || die "postfix-install failed"
-
-	# Fix spool removal on upgrade.
-	rm -rf "${D}/var"
-	keepdir /var/spool/postfix
-
-	# mailwrapper stuff
-	if use mailwrapper
-	then
-		mv "${D}/usr/sbin/sendmail" "${D}/usr/sbin/sendmail.postfix"
-		insinto /etc/mail
-		doins "${FILESDIR}/mailer.conf"
-	fi
-
-
-	# Provide another link for legacy FSH.
-	dosym /usr/sbin/sendmail /usr/lib/sendmail
-
-	# Install an rmail for UUCP, closing bug #19127.
-	dobin auxiliary/rmail/rmail
-
-	# Install qshape tool.
-	dobin auxiliary/qshape/qshape.pl
-
-	# Set proper permissions on required files/directories.
-	fowners root:postdrop /usr/sbin/post{drop,queue}
-	fperms 02711 /usr/sbin/post{drop,queue}
-
-	keepdir /etc/postfix
-	mv ${D}/usr/share/doc/${PF}/defaults/{*.cf,post*-*} ${D}/etc/postfix
-	if use mbox
-	then
-		mypostconf="mail_spool_directory=/var/spool/mail"
-	else
-		mypostconf="home_mailbox=.maildir/"
-	fi
-	"${D}/usr/sbin/postconf" -c "${D}/etc/postfix" -e \
-		"alias_maps=hash:/etc/mail/aliases" \
-		"alias_database=hash:/etc/mail/aliases" \
-		"local_destination_concurrency_limit=2" \
-		"default_destination_concurrency_limit=2" \
-		${mypostconf} || die "postconf failed"
-
-	insinto /etc/postfix
-	newins "${FILESDIR}/smtp.pass" saslpass
-	fperms 600 /etc/postfix/saslpass
-
-	exeinto /etc/init.d
-	newexe "${FILESDIR}/postfix.rc6" postfix
-
-	mv "${S}/examples" "${D}/usr/share/doc/${PF}/"
-	dodoc *README COMPATIBILITY HISTORY INSTALL LICENSE PORTING RELEASE_NOTES*
-	dohtml html/*
-
-	if use pam ; then
-		insinto /etc/pam.d
-		newins "${FILESDIR}/smtp.pam" smtp
-	fi
-	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
-		insinto /etc/sasl2
-		newins "${FILESDIR}/smtp.sasl" smtpd.conf
-	fi
-}
-
-pkg_postinst() {
-	ebegin "Fixing queue directories and permissions"
-	"${ROOT}/etc/postfix/post-install" upgrade-permissions
-	echo
-	ewarn "If you upgraded from postfix-1.x, you must revisit"
-	ewarn "your configuration files.  See"
-	ewarn "  /usr/share/doc/${PF}/RELEASE_NOTES"
-	ewarn "for a list of changes."
-
-	if [ ! -e /etc/mail/aliases.db ] ; then
-		echo
-		ewarn "You must edit /etc/mail/aliases to suit your needs"
-		ewarn "and then run /usr/bin/newaliases. Postfix will not"
-		ewarn "work correctly without it."
-	fi
-
-	if ! use mailwrapper && [[ -e /etc/mailer.conf ]]
-	then
-		einfo
-		einfo "Since you emerged $PN without mailwrapper in USE,"
-		einfo "you probably want to 'emerge -C mailwrapper' now."
-		einfo
-	fi
-}
diff --git a/mail-mta/postfix/postfix-2.1.5-r1.ebuild b/mail-mta/postfix/postfix-2.1.5-r1.ebuild
index cf9f75dbd948..7142974e658e 100644
--- a/mail-mta/postfix/postfix-2.1.5-r1.ebuild
+++ b/mail-mta/postfix/postfix-2.1.5-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/postfix/postfix-2.1.5-r1.ebuild,v 1.8 2004/10/26 19:02:08 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.1.5-r1.ebuild,v 1.9 2004/11/01 17:05:03 langthang Exp $
 
 inherit eutils ssl-cert toolchain-funcs
 
@@ -21,7 +21,7 @@ SRC_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official/${P}.tar.gz
 
 LICENSE="IPL-1"
 SLOT="0"
-KEYWORDS="x86 sparc ppc ~alpha amd64 ~s390 ~mips hppa"
+KEYWORDS="x86 sparc ppc ~alpha amd64 s390 ~mips hppa"
 IUSE="ipv6 pam ldap mysql postgres ssl sasl vda mailwrapper mbox"
 
 PROVIDE="virtual/mta virtual/mda"